FHSS: Do not return to RX channel when configured fixed channel

Jarkko Paso · Jarkko Paso · commit 7706f2e6ad4d · 2018-04-04T16:34:09.000+03:00
diff --git a/source/Service_Libs/fhss/fhss_ws.c b/source/Service_Libs/fhss/fhss_ws.c
@@ -332,7 +332,7 @@ static void fhss_ws_data_tx_done_callback(const fhss_api_t *api, bool waiting_ac
     if (!fhss_structure) {
         return;
     }
-    if (fhss_structure->fhss_state == FHSS_SYNCHRONIZED) {
+    if ((fhss_structure->fhss_state == FHSS_SYNCHRONIZED) && (fhss_structure->ws->fhss_configuration.ws_channel_function != WS_FIXED_CHANNEL)) {
         if ((waiting_ack == false) && (fhss_structure->ws->is_on_bc_channel == false)) {
             fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, fhss_structure->rx_channel);
         }

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ static void fhss_ws_data_tx_done_callback(const fhss_api_t *api, bool waiting_ac`
`332`	`332`	`if (!fhss_structure) {`
`333`	`333`	`return;`
`334`	`334`	`}`
`335`		`- if (fhss_structure->fhss_state == FHSS_SYNCHRONIZED) {`
	`335`	`+ if ((fhss_structure->fhss_state == FHSS_SYNCHRONIZED) && (fhss_structure->ws->fhss_configuration.ws_channel_function != WS_FIXED_CHANNEL)) {`
`336`	`336`	`if ((waiting_ack == false) && (fhss_structure->ws->is_on_bc_channel == false)) {`
`337`	`337`	`fhss_structure->callbacks.change_channel(fhss_structure->fhss_api, fhss_structure->rx_channel);`
`338`	`338`	`}`