FHSS: Implemented setting hop count API

Author: Jarkko Paso

nanostack/fhss_ws_extension.h

@@ -98,6 +98,13 @@ extern int ns_fhss_ws_remove_parent(const fhss_api_t *fhss_api, const uint8_t eu
  */
 extern int ns_fhss_set_neighbor_info_fp(const fhss_api_t *fhss_api, fhss_get_neighbor_info *get_neighbor_info);
 
+/**
+ * @brief Set node hop count. Hop count is used to specify TX/RX slot. When hop count is set to 0xFF, TX/RX slots are ignored.
+ * @param fhss_api FHSS instance.
+ * @param hop_count Hop count to be set.
+ * @return 0 on success, -1 on fail.
+ */
+extern int ns_fhss_ws_set_hop_count(const fhss_api_t *fhss_api, const uint8_t hop_count);
 
 #ifdef __cplusplus
 }

source/Service_Libs/fhss/fhss_configuration_interface.c

@@ -129,3 +129,12 @@ int ns_fhss_ws_configuration_set(const fhss_api_t *fhss_api, const fhss_ws_confi
     }
     return fhss_ws_configuration_set(fhss_structure, fhss_configuration);
 }
+
+int ns_fhss_ws_set_hop_count(const fhss_api_t *fhss_api, const uint8_t hop_count)
+{
+    fhss_structure_t *fhss_structure = fhss_get_object_with_api(fhss_api);
+    if (!fhss_structure || !fhss_structure->ws) {
+        return -1;
+    }
+    return fhss_ws_set_hop_count(fhss_structure, hop_count);
+}

source/Service_Libs/fhss/fhss_ws.c

@@ -76,6 +76,7 @@ fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configurati
 
     fhss_struct->ws->fhss_configuration = *fhss_configuration;
     fhss_struct->number_of_channels = channel_count;
+    fhss_struct->own_hop = 0xff;
     ns_list_init(&fhss_struct->fhss_failed_tx_list);
     return fhss_struct;
 }
@@ -582,3 +583,9 @@ int fhss_ws_configuration_set(fhss_structure_t *fhss_structure, const fhss_ws_co
     fhss_structure->number_of_channels = channel_count;
     return 0;
 }
+
+int fhss_ws_set_hop_count(fhss_structure_t *fhss_structure, const uint8_t hop_count)
+{
+    fhss_structure->own_hop = hop_count;
+    return 0;
+}

source/Service_Libs/fhss/fhss_ws.h

@@ -39,5 +39,6 @@ int fhss_ws_set_callbacks(fhss_structure_t *fhss_structure);
 int fhss_ws_set_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8], const broadcast_timing_info_t *bc_timing_info);
 int fhss_ws_remove_parent(fhss_structure_t *fhss_structure, const uint8_t eui64[8]);
 int fhss_ws_configuration_set(fhss_structure_t *fhss_structure, const fhss_ws_configuration_t *fhss_configuration);
+int fhss_ws_set_hop_count(fhss_structure_t *fhss_structure, const uint8_t hop_count);
 
 #endif /*FHSS_WS_H_*/

test/nanostack/unittest/stub/fhss_ws_stub.c

@@ -52,3 +52,8 @@ int fhss_ws_configuration_set(fhss_structure_t *fhss_structure, const fhss_ws_co
 {
     return 0;
 }
+
+int fhss_ws_set_hop_count(fhss_structure_t *fhss_structure, const uint8_t hop_count)
+{
+    return 0;
+}