samples: radio_test: share channel index for TX sleep sweeps

Use channel_sequence.current_index when stepping both TX sweep with
sleep variants.

Signed-off-by: Aleksandr Mirlenko <aleksandr.mirlenko@nordicsemi.no>

Author: Mirlenko

samples/peripheral/radio_test/src/radio_test.c

@@ -194,6 +194,9 @@ static nrfx_timer_t timer =
 
 static bool sweep_processing;
 
+/* First COMPARE0 runs before the first COMPARE4 TX; skip increment so index 0 is used first. */
+static bool tx_sweep_with_sleep_first_cc0;
+
 /* Total payload size */
 static uint16_t total_payload_size;
 
@@ -1198,7 +1201,8 @@ static void radio_tx_sweep_with_sleep(int8_t txpower, uint16_t t_tx_us, uint16_t
 	radio_disable();
 	const uint32_t total_time_per_channel_us = t_tx_us + t_sleep_us;
 
-	current_channel = 0;
+	channel_sequence.current_index = 0;
+	tx_sweep_with_sleep_first_cc0 = true;
 
 	nrfx_timer_disable(&timer);
 	nrf_timer_shorts_disable(timer.p_reg, ~0);
@@ -1369,6 +1373,18 @@ static void rx_timeout_work_handler(struct k_work *work)
 	}
 }
 
+static void increment_channel_index_and_reshuffle_on_wrap(void)
+{
+	channel_sequence.current_index =
+		(channel_sequence.current_index + 1) % channel_sequence.length;
+
+	if (channel_sequence.hopping_mode == CHANNEL_HOP_RANDOM_FISHER_YATES &&
+	    channel_sequence.current_index == 0) {
+		radio_disable();
+		shuffle_channel_sequence();
+	}
+}
+
 static void timer_handler(nrf_timer_event_t event_type, void *context)
 {
 	const struct radio_test_config *config =
@@ -1399,15 +1415,16 @@ static void timer_handler(nrf_timer_event_t event_type, void *context)
 
 			sweep_processing = true;
 
-			/* disable radio after tone */
+			if (tx_sweep_with_sleep_first_cc0) {
+				tx_sweep_with_sleep_first_cc0 = false;
+			} else {
+				increment_channel_index_and_reshuffle_on_wrap();
+			}
+
 			radio_unmodulated_tx_carrier_radio_setup(
 				NRF_RADIO_MODE_BLE_1MBIT,
 				config->params.tx_sweep_with_sleep.txpower,
-				active_channel_sequence()[current_channel], false);
-
-			/* set up next channel */
-			channel_start = 0;
-			channel_end = channel_sequence.length - 1;
+				active_channel_sequence()[channel_sequence.current_index], false);
 		} else if (config->type == TX_SWEEP_WITH_SLEEP_MODULATED) {
 
 			nrf_radio_task_trigger(NRF_RADIO, NRF_RADIO_TASK_DISABLE);
@@ -1416,15 +1433,9 @@ static void timer_handler(nrf_timer_event_t event_type, void *context)
 			}
 			nrf_radio_event_clear(NRF_RADIO, NRF_RADIO_EVENT_DISABLED);
 			nrf_radio_event_clear(NRF_RADIO, NRF_RADIO_EVENT_READY);
-			channel_sequence.current_index =
-				(channel_sequence.current_index + 1) % channel_sequence.length;
-
-			if (channel_sequence.hopping_mode == CHANNEL_HOP_RANDOM_FISHER_YATES &&
-				channel_sequence.current_index == 0) {
-				shuffle_channel_sequence();
-			}
-
 			nrf_radio_event_clear(NRF_RADIO, RADIO_TEST_EVENT_END);
+
+			increment_channel_index_and_reshuffle_on_wrap();
 			radio_channel_set(
 				config->mode,
 				active_channel_sequence()[channel_sequence.current_index]);
@@ -1438,11 +1449,6 @@ static void timer_handler(nrf_timer_event_t event_type, void *context)
 		current_channel++;
 		if (current_channel > channel_end) {
 			current_channel = channel_start;
-
-			if (channel_sequence.hopping_mode == CHANNEL_HOP_RANDOM_FISHER_YATES &&
-			    config->type == TX_SWEEP_WITH_SLEEP) {
-				shuffle_channel_sequence();
-			}
 		}
 #if NRF_ERRATA_STATIC_CHECK(54H, 216)
 	} else if (event_type == NRF_TIMER_EVENT_COMPARE7) { /* HMPAN-216 errata */