Merge branch '82-radio-in-rx-when-waiting-between-cca-2' into 'master'

Resolve "radio in rx when waiting between CCA"

Closes Sub-IoT#82

See merge request aloxy/oss-7!47

Author: glennergeerts

stack/framework/hal/chips/sx127x/sx127x.c

@@ -134,6 +134,11 @@
   #error "Invalid configuration"
 #endif
 
+static const uint16_t rx_bw_startup_time[21] = {63, 74, 85, 71, 84, 97, 119, 144, 169, 215, 264, 313, 
+  407, 504, 601, 791, 984, 1180, 1560, 1940, 2330};
+
+static uint8_t rx_bw_number = 21;
+
 typedef enum {
   OPMODE_SLEEP = 0,
   OPMODE_STANDBY = 1,
@@ -803,6 +808,7 @@ void hw_radio_set_rx_bw_hz(uint32_t bw_hz) {
       if(abs(computed_bw - bw_hz) < min_bw_dif) {
         min_bw_dif = abs(computed_bw - bw_hz);
         reg_bw = ((((bw_mant_count - 16) / 4) << 3) | bw_exp_count);
+        rx_bw_number = (bw_exp_count - 1) * 3 + ((bw_mant_count - 16) >> 2);
       }
     }
   }
@@ -984,8 +990,8 @@ __attribute__((weak)) void hw_radio_io_deinit() {
 }
 
 int16_t hw_radio_get_rssi() {
-    hw_radio_set_opmode(HW_STATE_RX);
+    hw_radio_set_opmode(HW_STATE_RX); 
     hw_gpio_disable_interrupt(SX127x_DIO1_PIN);
-    while(!(read_reg(REG_IRQFLAGS1) & 0x08));
+    hw_busy_wait(rx_bw_startup_time[rx_bw_number]); //TODO: optimise this timing. Now it should wait for ~700µs but actually waits ~900µs (low rate)
     return (- read_reg(REG_RSSIVALUE) >> 1);
 }

stack/modules/d7ap/dll.c

@@ -294,7 +294,7 @@ void start_background_scan()
 
     phy_rx_config_t config = {
         .channel_id = current_channel_id,
-        .rssi_thr = - E_CCA,
+        .rssi_thr = E_CCA,
     };
     phy_start_background_scan(&config, &dll_signal_packet_received);
 }
@@ -416,6 +416,7 @@ static void cca_rssi_valid(int16_t cur_rssi)
     {
         if (dll_state == DLL_STATE_CCA1)
         {
+            phy_switch_to_standby_mode();
             DPRINT("CCA1 RSSI: %d", cur_rssi);
             switch_state(DLL_STATE_CCA2);
 
@@ -750,7 +751,7 @@ void dll_execute_scan_automation(void *arg)
         if (tx_nf_method == D7ADLL_FIXED_NOISE_FLOOR)
         {
             //Use the default channel CCA threshold
-            E_CCA = current_access_profile.subbands[0].cca; // Eccao is set to 0 dB
+            E_CCA = - current_access_profile.subbands[0].cca; // Eccao is set to 0 dB
             DPRINT("E_CCA %i", E_CCA);
         }
 
@@ -966,7 +967,7 @@ void dll_tx_frame(packet_t* packet)
         if (tx_nf_method == D7ADLL_FIXED_NOISE_FLOOR)
         {
             //Use the default channel CCA threshold
-            E_CCA = remote_access_profile.subbands[0].cca; // Eccao is set to 0 dB
+            E_CCA = - remote_access_profile.subbands[0].cca; // Eccao is set to 0 dB
             DPRINT("E_CCA %i", E_CCA);
         }
         else

stack/modules/d7ap/phy.c

@@ -203,13 +203,13 @@ static void release_packet(hw_radio_packet_t* hw_radio_packet)
     packet_queue_free_packet(packet_queue_find_packet(hw_radio_packet));
 }
 
-static void switch_to_standby_mode()
+void phy_switch_to_standby_mode()
 {
     hw_radio_set_opmode(HW_STATE_STANDBY);
     state = STATE_IDLE;
 }
 
-static void switch_to_sleep_mode()
+void phy_switch_to_sleep_mode()
 {
     hw_radio_set_idle();
     state = STATE_IDLE;
@@ -222,7 +222,7 @@ static void packet_transmitted(timer_tick_t timestamp)
     current_packet->tx_meta.timestamp = timestamp;
     DPRINT("Transmitted packet @ %i with length = %i", current_packet->tx_meta.timestamp, current_packet->length);
 
-    switch_to_standby_mode();
+    phy_switch_to_standby_mode();
 
     transmitted_callback(packet_queue_find_packet(current_packet));
 }
@@ -270,7 +270,7 @@ static void packet_received(hw_radio_packet_t* hw_radio_packet)
         hw_radio_set_opmode(HW_STATE_RX);
     }
     else
-        switch_to_standby_mode();
+        phy_switch_to_standby_mode();
 
     received_callback(packet);
 }
@@ -533,7 +533,7 @@ error_t phy_start_energy_scan(channel_id_t* channel, rssi_valid_callback_t rssi_
 
 error_t phy_stop_rx(){
 
-    switch_to_sleep_mode();
+    phy_switch_to_sleep_mode();
     return SUCCESS;
 }
 
@@ -573,7 +573,7 @@ error_t phy_send_packet(hw_radio_packet_t* packet, phy_tx_config_t* config, tx_p
         pending_rx_cfg.channel_id = current_channel_id;
         pending_rx_cfg.syncword_class = current_syncword_class;
         should_rx_after_tx_completed = true;
-        switch_to_standby_mode();
+        phy_switch_to_standby_mode();
     }
 
     configure_channel(&config->channel_id);
@@ -828,9 +828,9 @@ error_t phy_start_background_scan(phy_rx_config_t* config, rx_packet_callback_t
     if (rssi <= config->rssi_thr)
     {
         DPRINT("FAST RX termination RSSI %i below limit %i\n", rssi, config->rssi_thr);
-        switch_to_sleep_mode();
+        phy_switch_to_sleep_mode();
         // TODO choose standby mode to allow rapid channel cycling
-        //switch_to_standby_mode();
+        //phy_switch_to_standby_mode();
         DEBUG_RX_END();
         return FAIL;
     }
@@ -854,7 +854,7 @@ void phy_continuous_tx(phy_tx_config_t const* tx_cfg, uint8_t time_period, tx_pa
         pending_rx_cfg.channel_id = current_channel_id;
         pending_rx_cfg.syncword_class = current_syncword_class;
         should_rx_after_tx_completed = true;
-        switch_to_standby_mode();
+        phy_switch_to_standby_mode();
     }
 
     configure_channel(&tx_cfg->channel_id);

stack/modules/d7ap/phy.h

@@ -270,6 +270,8 @@ error_t phy_start_rx(channel_id_t *channel, syncword_class_t syncword_class, rx_
  */
 error_t phy_start_energy_scan(channel_id_t *channel, rssi_valid_callback_t rssi_cb, int16_t scan_duration);
 
+void phy_switch_to_sleep_mode(void);
+void phy_switch_to_standby_mode(void);
 
 #endif //__HW_RADIO_H_