Added device min sensitivity setting and stack information

New API function created to set the DEVICE_MIN_SENSE

Added Configuration override to the network stack

Modified the neighbor class to support automatic and static modes

Author: Mika

nanostack/ws_management_api.h

@@ -113,6 +113,8 @@ typedef struct ws_stack_info {
     uint8_t rsl_out;
     /** parent RSSI in measured RSSI value calculated using EWMA specified by Wi-SUN from range of -174 (0) to +80 (254) dBm.*/
     uint8_t rsl_in;
+    /** Device RF minimum sensitivity configuration. lowest level of radio signal strength packet heard. Range of -174 (0) to +80 (254) dBm*/
+    uint8_t device_min_sens;
     /** ETX To border router */
     uint16_t routing_cost;
     /** Network PAN ID */
@@ -615,6 +617,30 @@ int ws_stack_info_get(
     int8_t interface_id,
     ws_stack_info_t *info_ptr);
 
+/**
+ * Set minimum RF sensitivity acceptable for the parent selection
+ *
+ * Set radio signal minimum sensitivity level acceptable for parent selection.
+ * Range of -174 (0) to +80 (254) dBm.
+ *
+ * If device_min_sens is set to 0 then automatic adjustment is done by the stack.
+ *
+ * Setting a value that is not suitable for Radio might prevent the device joining to the network.
+ *
+ * NOTE: Currently lower EAPOL parents are accepted if there is no parents higher than
+ *       DEVICE_MIN_SENS + CAND_PARENT_THRESHOLD + CAND_PARENT_HYSTERESIS
+ * NOTE: Currently not using this value to limit parents as it is only RECOMENDED in specification.
+ *
+ * \param interface_id Network interface ID.
+ * \param device_min_sens value used in the parent selections.
+ *
+ * \return 0 Success.
+ * \return <0 Failure.
+ */
+int ws_device_min_sens_set(
+    int8_t interface_id,
+    uint8_t device_min_sens);
+
 #ifdef __cplusplus
 }
 #endif

source/6LoWPAN/ws/ws_bootstrap.c

@@ -3576,6 +3576,7 @@ int ws_bootstrap_get_info(protocol_interface_info_entry_t *cur, struct ws_stack_
         info_ptr->rsl_out = ws_neighbour->rsl_out;
         info_ptr->routing_cost = ws_neighbour->routing_cost;
     }
+    info_ptr->device_min_sens = DEVICE_MIN_SENS;
     if (ws_bootstrap_state_discovery(cur)) {
         info_ptr->join_state = 1;
     } else if (ws_bootstrap_state_authenticate(cur)) {

source/6LoWPAN/ws/ws_common.h

@@ -83,6 +83,7 @@ typedef struct ws_info_s {
     uint8_t rpl_state; // state from rpl_event_t
     uint8_t pas_requests; // Amount of PAN solicits sent
     uint8_t eapol_tx_index;
+    uint8_t device_min_sens; // Device min sensitivity set by the application
     parent_info_t parent_info[WS_PARENT_LIST_SIZE];
     parent_info_list_t parent_list_free;
     parent_info_list_t parent_list_reserved;

source/6LoWPAN/ws/ws_empty_functions.c

@@ -413,4 +413,13 @@ int ws_stack_info_get(int8_t interface_id, ws_stack_info_t *info_ptr)
     return -1;
 }
 
+int ws_device_min_sens_set(
+    int8_t interface_id,
+    uint8_t device_min_sens)
+{
+    (void) interface_id;
+    (void) device_min_sens;
+    return -1;
+}
+
 #endif // no HAVE_WS

source/6LoWPAN/ws/ws_llc_data_service.c

@@ -724,7 +724,8 @@ static void ws_llc_data_indication_cb(const mac_api_t *api, const mcps_data_ind_
         neighbor_info.ws_neighbor->unicast_data_rx = true;
     }
 
-    // Calculate RSL for all UDATA packages heard
+    // Calculate RSL for all UDATA packets heard
+    ws_neighbor_class_rf_sensitivity_calculate(interface->ws_info->device_min_sens, data->signal_dbm);
     ws_neighbor_class_rsl_in_calculate(neighbor_info.ws_neighbor, data->signal_dbm);
 
     if (neighbor_info.neighbor) {

source/6LoWPAN/ws/ws_management_api.c

@@ -741,4 +741,18 @@ int ws_stack_info_get(int8_t interface_id, ws_stack_info_t *info_ptr)
     return ws_bootstrap_get_info(cur, info_ptr);
 }
 
+int ws_device_min_sens_set(
+    int8_t interface_id,
+    uint8_t device_min_sens)
+{
+    protocol_interface_info_entry_t *cur;
+    cur = protocol_stack_interface_info_get_by_id(interface_id);
+    if (!cur || !ws_info(cur)) {
+        return -1;
+    }
+    DEVICE_MIN_SENS = device_min_sens;
+    ws_info(cur)->device_min_sens = device_min_sens;
+    return 0;
+}
+
 #endif // HAVE_WS

source/6LoWPAN/ws/ws_neighbor_class.c

@@ -281,8 +281,13 @@ void ws_neighbor_class_neighbor_broadcast_schedule_set(ws_neighbor_class_entry_t
     ws_neighbor->fhss_data.bc_timing_info.broadcast_schedule_id = ws_bs_ie->broadcast_schedule_identifier;
 }
 
-void ws_neighbor_class_rf_sensitivity_calculate(uint8_t rsl_heard)
+void ws_neighbor_class_rf_sensitivity_calculate(uint8_t dev_min_sens_config, int8_t dbm_heard)
 {
+    if (dev_min_sens_config != 0) {
+        // Automatic mode disabled
+        return;
+    }
+    uint8_t rsl_heard = ws_neighbor_class_rsl_from_dbm_calculate(dbm_heard);
     if (DEVICE_MIN_SENS > rsl_heard) {
         // We are hearing packet with lower than min_sens dynamically learn the sensitivity
         DEVICE_MIN_SENS = rsl_heard;
@@ -321,8 +326,6 @@ static void ws_neighbor_class_parent_set_analyze(ws_neighbor_class_entry_t *ws_n
 void ws_neighbor_class_rsl_in_calculate(ws_neighbor_class_entry_t *ws_neighbor, int8_t dbm_heard)
 {
     uint8_t rsl = ws_neighbor_class_rsl_from_dbm_calculate(dbm_heard);
-    // Calculate minimum sensitivity from heard packets.
-    ws_neighbor_class_rf_sensitivity_calculate(rsl);
     if (ws_neighbor->rsl_in == RSL_UNITITIALIZED) {
         ws_neighbor->rsl_in = rsl << WS_RSL_SCALING;
     }

source/6LoWPAN/ws/ws_neighbor_class.h

@@ -146,7 +146,7 @@ void ws_neighbor_class_neighbor_broadcast_schedule_set(ws_neighbor_class_entry_t
  * \param rsl_heard; rsl_heard heard from Radio
  *
  */
-void ws_neighbor_class_rf_sensitivity_calculate(uint8_t rsl_heard);
+void ws_neighbor_class_rf_sensitivity_calculate(uint8_t dev_min_sens_config, int8_t dbm_heard);
 
 /**
  * ws_neighbor_class_rsl_from_dbm_calculate

test/nanostack/unittest/6LoWPAN/ws_llc_data_service/test_ws_llc_data_service.c

@@ -33,6 +33,7 @@
 #include "6LoWPAN/ws/ws_llc.h"
 #include "6LoWPAN/ws/ws_mpx_header.h"
 #include "6LoWPAN/ws/ws_neighbor_class.h"
+#include "6LoWPAN/ws/ws_common.h"
 #include "Service_Libs/mac_neighbor_table/mac_neighbor_table.h"
 #include "nsdynmemLIB_stub.h"
 #include "mac_ie_lib_stub.h"
@@ -52,6 +53,8 @@ static mcps_data_confirm_ext *data_confirmation_cb;
 
 static protocol_interface_info_entry_t interface;
 
+static ws_info_t ws_info;
+
 static arm_15_4_mac_parameters_t mac_parameters;
 
 
@@ -142,8 +145,10 @@ static void interface_api_init(mac_api_t *api)
 {
     memset(&interface, 0, sizeof(protocol_interface_info_entry_t));
     memset(&mac_parameters, 0, sizeof(arm_15_4_mac_parameters_t));
+    memset(&ws_info, 0, sizeof(ws_info_t));
     interface.mac_api = api;
     interface.mac_parameters = &mac_parameters;
+    interface.ws_info = &ws_info;
     api->mcps_purge_req = &test_mcps_purge_request;
     api->mcps_data_req_ext = &test_mcps_data_request_ext;
     api->mac_mcps_extension_enable = &test_mac_api_enable_mcps_ext;

test/nanostack/unittest/stub/ws_common_stub.c

@@ -29,6 +29,8 @@
 
 ws_common_stub_def ws_common_stub;
 
+uint8_t DEVICE_MIN_SENS = 174 - 93;
+
 void ws_common_network_size_configure(protocol_interface_info_entry_t *cur, uint16_t network_size)
 {
     (void) cur;

test/nanostack/unittest/stub/ws_neighbour_class_stub.c

@@ -90,7 +90,7 @@ void ws_neighbor_class_neighbor_broadcast_schedule_set(ws_neighbor_class_entry_t
 {
 
 }
-void ws_neighbor_class_rf_sensitivity_calculate(uint8_t rsl_heard)
+void ws_neighbor_class_rf_sensitivity_calculate(uint8_t dev_min_sens_config, int8_t dbm_heard)
 {
 
 }