FHSS: Compensation callback to return timeout value

Author: Jarkko Paso

source/Service_Libs/fhss/fhss.c

@@ -792,7 +792,7 @@ static void fhss_destroy_scramble_table(fhss_structure_t *fhss_structure)
     }
 }
 
-static uint32_t fhss_get_compensation(fhss_structure_t *fhss_structure)
+static uint32_t fhss_get_sf_timeout_callback(fhss_structure_t *fhss_structure)
 {
     uint32_t compensation = 0;
     /* Drift compensation doesn't work with Linux platform */
@@ -811,7 +811,7 @@ static uint32_t fhss_get_compensation(fhss_structure_t *fhss_structure)
 #else
     (void) fhss_structure;
 #endif //__linux__
-    return compensation;
+    return (fhss_structure->synch_configuration.fhss_superframe_length) + (compensation * fhss_structure->platform_functions.fhss_resolution_divider);
 }
 
 static void fhss_superframe_callback(fhss_structure_t *fhss_structure)
@@ -931,7 +931,7 @@ int fhss_set_callbacks(fhss_structure_t *fhss_structure)
     // Set internal API
     fhss_structure->update_channel = fhss_update_channel_callback;
     fhss_structure->update_superframe = fhss_superframe_callback;
-    fhss_structure->read_compensation = fhss_get_compensation;
+    fhss_structure->read_superframe_timeout = fhss_get_sf_timeout_callback;
     fhss_structure->handle_state_set = fhss_handle_state_set;
     return 0;
 }

source/Service_Libs/fhss/fhss_common.c

@@ -257,19 +257,17 @@ int fhss_compare_with_synch_parent_address(fhss_structure_t *fhss_structure, con
 
 void fhss_superframe_handler(const fhss_api_t *fhss_api, uint16_t delay)
 {
-    uint32_t compensation = 0;
+    uint32_t timeout = 0;
     fhss_structure_t *fhss_structure = fhss_get_object_with_api(fhss_api);
     if (!fhss_structure) {
         return;
     }
 
-    if (fhss_structure->current_superframe == 0) {
-        if (fhss_structure->read_compensation) {
-            compensation = fhss_structure->read_compensation(fhss_structure);
-        }
+    if (fhss_structure->read_superframe_timeout) {
+        timeout = fhss_structure->read_superframe_timeout(fhss_structure);
     }
 
-    fhss_start_timer(fhss_structure, (fhss_structure->synch_configuration.fhss_superframe_length) - (delay * fhss_structure->platform_functions.fhss_resolution_divider) + (compensation * fhss_structure->platform_functions.fhss_resolution_divider), fhss_superframe_handler);
+    fhss_start_timer(fhss_structure, timeout - (delay * fhss_structure->platform_functions.fhss_resolution_divider), fhss_superframe_handler);
 
     if (fhss_structure->current_superframe++ >= (fhss_structure->synch_configuration.fhss_number_of_superframes - 1)) {
         fhss_structure->current_superframe = 0;

source/Service_Libs/fhss/fhss_common.h

@@ -37,11 +37,11 @@ typedef void fhss_update_channel_cb(fhss_structure_t *fhss_structure);
 typedef void fhss_update_superframe_cb(fhss_structure_t *fhss_structure);
 
 /**
- * @brief Read FHSS compensation.
+ * @brief Read next FHSS superframe timeout length.
  * @param fhss_structure FHSS structure.
- * @return Compensation to be added to started dwell time
+ * @return timeout (us)
  */
-typedef uint32_t fhss_read_compensation_cb(fhss_structure_t *fhss_structure);
+typedef uint32_t fhss_read_superframe_timeout_cb(fhss_structure_t *fhss_structure);
 
 /**
  * @brief Set FHSS state.
@@ -120,7 +120,7 @@ struct fhss_structure
     struct fhss_ws *ws;
     fhss_update_channel_cb *update_channel;    /**< Update listening channel */
     fhss_update_superframe_cb *update_superframe;    /**< Update superframe */
-    fhss_read_compensation_cb *read_compensation;    /**< Read FHSS compensation */
+    fhss_read_superframe_timeout_cb *read_superframe_timeout;    /**< Read next FHSS superframe timeout length */
     fhss_handle_state_set_cb *handle_state_set;    /**< Set FHSS state */
 };
 

source/Service_Libs/fhss/fhss_ws.c

@@ -37,13 +37,18 @@ fhss_structure_t *fhss_ws_enable(fhss_api_t *fhss_api, const fhss_ws_configurati
     return NULL;
 }
 
+static uint32_t fhss_ws_get_sf_timeout_callback(fhss_structure_t *fhss_structure)
+{
+    return fhss_structure->fhss_conf.fhss_ws_configuration.fhss_uc_dwell_interval * 1000;
+}
+
 static int fhss_ws_handle_state_set(fhss_structure_t *fhss_structure, fhss_states fhss_state, uint16_t pan_id)
 {
     (void) fhss_state;
     (void) pan_id;
     //TODO: Remove hard coded channel function
     fhss_structure->ws->channel_function = WS_TR51CF;
-    fhss_start_timer(fhss_structure, fhss_structure->synch_configuration.fhss_superframe_length, fhss_superframe_handler);
+    fhss_start_timer(fhss_structure, fhss_structure->fhss_conf.fhss_ws_configuration.fhss_uc_dwell_interval*1000, fhss_superframe_handler);
     return 0;
 }
 
@@ -136,7 +141,7 @@ int fhss_ws_set_callbacks(fhss_structure_t *fhss_structure)
     // Set internal API
     fhss_structure->update_channel = fhss_ws_update_channel_callback;
     fhss_structure->update_superframe = fhss_ws_superframe_callback;
-    fhss_structure->read_compensation = NULL;
+    fhss_structure->read_superframe_timeout = fhss_ws_get_sf_timeout_callback;
     fhss_structure->handle_state_set = fhss_ws_handle_state_set;
     fhss_structure->ws = ns_dyn_mem_alloc(sizeof(fhss_ws_t));
     if (!fhss_structure->ws) {