FHSS: changed traces to use timestamp from MAC

Jarkko Paso · Jarkko Paso · commit 724696c86df3 · 2018-10-30T11:04:41.000+02:00
diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
@@ -166,7 +166,7 @@ static int32_t fhss_ws_calc_bc_channel(fhss_structure_t *fhss_structure)
         }
     }
 #ifdef FHSS_CHANNEL_DEBUG
-    tr_info("%"PRIu32" BC %u %u", fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api), next_channel, fhss_structure->ws->bc_slot);
+    tr_info("%"PRIu32" BC %u %u", fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api), next_channel, fhss_structure->ws->bc_slot);
 #endif /*FHSS_CHANNEL_DEBUG*/
     return next_channel;
 }
@@ -220,7 +220,7 @@ static void fhss_broadcast_handler(const fhss_api_t *fhss_api, uint16_t delay)
         eventOS_callback_timer_start(fhss_structure->fhss_event_timer, randLIB_get_random_in_range(uc_min_random, uc_max_random));
 
 #ifdef FHSS_CHANNEL_DEBUG
-    tr_info("%"PRIu32" UC %u", fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api), fhss_structure->rx_channel);
+    tr_info("%"PRIu32" UC %u", fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api), fhss_structure->rx_channel);
 #endif /*FHSS_CHANNEL_DEBUG*/
     }
     fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, next_channel);
@@ -380,7 +380,7 @@ static void fhss_ws_update_uc_channel_callback(fhss_structure_t *fhss_structure)
         return;
     }
 #ifdef FHSS_CHANNEL_DEBUG
-    tr_info("%"PRIu32" UC %u %u", fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api), next_channel, fhss_structure->ws->uc_slot);
+    tr_info("%"PRIu32" UC %u %u", fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api), next_channel, fhss_structure->ws->uc_slot);
 #endif /*FHSS_CHANNEL_DEBUG*/
     fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, next_channel);
 #ifdef FHSS_CHANNEL_DEBUG_CBS

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ static int32_t fhss_ws_calc_bc_channel(fhss_structure_t *fhss_structure)`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`#ifdef FHSS_CHANNEL_DEBUG`
`169`		`- tr_info("%"PRIu32" BC %u %u", fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api), next_channel, fhss_structure->ws->bc_slot);`
	`169`	`+ tr_info("%"PRIu32" BC %u %u", fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api), next_channel, fhss_structure->ws->bc_slot);`
`170`	`170`	`#endif /FHSS_CHANNEL_DEBUG/`
`171`	`171`	`return next_channel;`
`172`	`172`	`}`
`@@ -220,7 +220,7 @@ static void fhss_broadcast_handler(const fhss_api_t *fhss_api, uint16_t delay)`
`220`	`220`	`eventOS_callback_timer_start(fhss_structure->fhss_event_timer, randLIB_get_random_in_range(uc_min_random, uc_max_random));`
`221`	`221`
`222`	`222`	`#ifdef FHSS_CHANNEL_DEBUG`
`223`		`- tr_info("%"PRIu32" UC %u", fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api), fhss_structure->rx_channel);`
	`223`	`+ tr_info("%"PRIu32" UC %u", fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api), fhss_structure->rx_channel);`
`224`	`224`	`#endif /FHSS_CHANNEL_DEBUG/`
`225`	`225`	`}`
`226`	`226`	`fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, next_channel);`
`@@ -380,7 +380,7 @@ static void fhss_ws_update_uc_channel_callback(fhss_structure_t *fhss_structure)`
`380`	`380`	`return;`
`381`	`381`	`}`
`382`	`382`	`#ifdef FHSS_CHANNEL_DEBUG`
`383`		`- tr_info("%"PRIu32" UC %u %u", fhss_structure->platform_functions.fhss_get_timestamp(fhss_structure->fhss_api), next_channel, fhss_structure->ws->uc_slot);`
	`383`	`+ tr_info("%"PRIu32" UC %u %u", fhss_structure->callbacks.read_timestamp(fhss_structure->fhss_api), next_channel, fhss_structure->ws->uc_slot);`
`384`	`384`	`#endif /FHSS_CHANNEL_DEBUG/`
`385`	`385`	`fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, next_channel);`
`386`	`386`	`#ifdef FHSS_CHANNEL_DEBUG_CBS`