802.15.4 STM S2LP driver update

Sync with master v1.0.5

Author: Arto Kinnunen

components/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp

@@ -182,7 +182,9 @@ static bool rf_rx_filter(uint8_t *mac_header, uint8_t *mac_64bit_addr, uint8_t *
 static void rf_cca_timer_start(uint32_t slots);
 
 static RFPins *rf;
+#ifdef TEST_GPIOS_ENABLED
 static TestPins_S2LP *test_pins;
+#endif
 static phy_device_driver_s device_driver;
 static int8_t rf_radio_driver_id = -1;
 static uint8_t *tx_data_ptr;
@@ -207,6 +209,7 @@ static uint8_t s2lp_short_address[2];
 static uint8_t s2lp_MAC[8];
 static rf_mode_e rf_mode = RF_MODE_NORMAL;
 static bool rf_update_config = false;
+static bool rf_update_cca_threshold = false;
 static uint16_t cur_packet_len = 0xffff;
 static uint32_t receiver_ready_timestamp;
 static int16_t rssi_threshold = RSSI_THRESHOLD;
@@ -704,6 +707,13 @@ static int8_t rf_extension(phy_extension_type_e extension_type, uint8_t *data_pt
                 rf_receive(rf_rx_channel);
             }
             break;
+        case PHY_EXTENSION_SET_CHANNEL_CCA_THRESHOLD:
+            if ((rssi_threshold != (int8_t)*data_ptr) && (rf_state != RF_RX_STARTED)) {
+                rssi_threshold = (int8_t)*data_ptr; // *NOPAD*
+                rf_update_cca_threshold = true;
+                rf_receive(rf_rx_channel);
+            }
+            break;
         default:
             break;
     }
@@ -752,9 +762,9 @@ static void rf_tx_sent_handler(void)
     TEST_TX_DONE
     rf_backup_timer_stop();
     rf_disable_interrupt(TX_DATA_SENT);
+    rf_update_tx_active_time();
     if (rf_state != RF_TX_ACK) {
         tx_finnish_time = rf_get_timestamp();
-        rf_update_tx_active_time();
         rf_state = RF_IDLE;
         rf_receive(rf_rx_channel);
         if (device_driver.phy_tx_done_cb) {
@@ -821,7 +831,6 @@ static void rf_cca_timer_interrupt(void)
         }
         rf_flush_tx_fifo();
         tx_finnish_time = rf_get_timestamp();
-        rf_update_tx_active_time();
         if (device_driver.phy_tx_done_cb) {
             device_driver.phy_tx_done_cb(rf_radio_driver_id, mac_tx_handle, PHY_LINK_CCA_FAIL, 0, 0);
         }
@@ -955,7 +964,6 @@ static void rf_handle_ack(uint8_t seq_number, uint8_t pending)
     phy_link_tx_status_e phy_status;
     if (tx_sequence == (uint16_t)seq_number) {
         tx_finnish_time = rf_get_timestamp();
-        rf_update_tx_active_time();
         if (pending) {
             phy_status = PHY_LINK_TX_DONE_PENDING;
         } else {
@@ -1047,6 +1055,12 @@ static void rf_receive(uint8_t rx_channel)
         rf_update_config = false;
         rf_set_channel_configuration_registers();
     }
+    if (rf_update_cca_threshold == true) {
+        rf_update_cca_threshold = false;
+        uint8_t rssi_th;
+        rf_conf_calculate_rssi_threshold_registers(rssi_threshold, &rssi_th);
+        rf_write_register(RSSI_TH, rssi_th);
+    }
     if (rx_channel != rf_rx_channel) {
         rf_write_register(CHNUM, rx_channel * rf_channel_multiplier);
         rf_rx_channel = rf_new_channel = rx_channel;
@@ -1280,7 +1294,9 @@ int8_t NanostackRfPhys2lp::rf_register()
     }
 
     rf = _rf;
+#ifdef TEST_GPIOS_ENABLED
     test_pins = _test_pins;
+#endif
 
     int8_t radio_id = rf_device_register(_mac_addr);
     if (radio_id < 0) {

components/802.15.4_RF/stm-s2lp-rf-driver/source/rf_configuration.c

@@ -157,7 +157,7 @@ void rf_conf_calculate_rx_filter_bandwidth_registers(uint32_t rx_bandwidth, uint
 
 int16_t rf_conf_cca_threshold_percent_to_rssi(uint8_t percent)
 {
-    uint8_t step = (MAX_RSSI_THRESHOLD-MIN_RSSI_THRESHOLD);
+    uint8_t step = (MAX_RSSI_THRESHOLD - MIN_RSSI_THRESHOLD);
     return MIN_RSSI_THRESHOLD + (step * percent) / 100;
 }
 

components/802.15.4_RF/stm-s2lp-rf-driver/stm-s2lp-rf-driver/NanostackRfPhys2lp.h

@@ -67,8 +67,8 @@
 #define S2LP_TEST_PIN_RX            D5
 #endif
 
-#if defined(TMBED_CONF_S2LP_TEST_PIN_CSMA)
-#define S2LP_TEST_PIN_CSMA          TMBED_CONF_S2LP_TEST_PIN_CSMA
+#if defined(MBED_CONF_S2LP_TEST_PIN_CSMA)
+#define S2LP_TEST_PIN_CSMA          MBED_CONF_S2LP_TEST_PIN_CSMA
 #else
 #define S2LP_TEST_PIN_CSMA          D4
 #endif
@@ -80,7 +80,7 @@
 #endif
 
 #if defined(MBED_CONF_S2LP_TEST_PIN_SPARE_2)
-#define S2LP_TEST_PIN_SPARE_2       DMBED_CONF_S2LP_TEST_PIN_SPARE_2
+#define S2LP_TEST_PIN_SPARE_2       MBED_CONF_S2LP_TEST_PIN_SPARE_2
 #else
 #define S2LP_TEST_PIN_SPARE_2       D8
 #endif