ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

802.15.4 STM S2LP driver update 

Sync with master v1.0.4
pull/12950/head
Arto Kinnunen 2020-05-11 12:24:21 +03:00
parent cb94e609e1
commit e37631d68a
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/802.15.4_RF/stm-s2lp-rf-driver/mbed_lib.json
View File

@ -8,6 +8,9 @@
"target_overrides": { "target_overrides": {
"MTB_STM_S2LP": { "MTB_STM_S2LP": {
"s2lp.provide-default": true "s2lp.provide-default": true
},
"MTB_STM_S2LP_CT": {
"s2lp.provide-default": true
} }
} }
} }

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

@ -207,6 +207,7 @@ static uint8_t s2lp_short_address[2];
static uint8_t s2lp_MAC[8]; static uint8_t s2lp_MAC[8];
static rf_mode_e rf_mode = RF_MODE_NORMAL; static rf_mode_e rf_mode = RF_MODE_NORMAL;
static bool rf_update_config = false; static bool rf_update_config = false;
static bool rf_update_cca_threshold = false;
static uint16_t cur_packet_len = 0xffff; static uint16_t cur_packet_len = 0xffff;
static uint32_t receiver_ready_timestamp; static uint32_t receiver_ready_timestamp;
static int16_t rssi_threshold = RSSI_THRESHOLD; static int16_t rssi_threshold = RSSI_THRESHOLD;
@ -704,6 +705,13 @@ static int8_t rf_extension(phy_extension_type_e extension_type, uint8_t *data_pt
rf_receive(rf_rx_channel); rf_receive(rf_rx_channel);
} }
break; 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;
rf_update_cca_threshold = true;
rf_receive(rf_rx_channel);
}
break;
default: default:
break; break;
} }
@ -1047,6 +1055,12 @@ static void rf_receive(uint8_t rx_channel)
rf_update_config = false; rf_update_config = false;
rf_set_channel_configuration_registers(); 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) { if (rx_channel != rf_rx_channel) {
rf_write_register(CHNUM, rx_channel * rf_channel_multiplier); rf_write_register(CHNUM, rx_channel * rf_channel_multiplier);
rf_rx_channel = rf_new_channel = rx_channel; rf_rx_channel = rf_new_channel = rx_channel;

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

@ -28,7 +28,7 @@
// Uncomment to use testing gpios attached to TX/RX processes // Uncomment to use testing gpios attached to TX/RX processes
// #define TEST_GPIOS_ENABLED // #define TEST_GPIOS_ENABLED
#if defined(TARGET_MTB_STM_S2LP) #if defined(TARGET_MTB_STM_S2LP) || defined(TARGET_MTB_STM_S2LP_CT)
#if !defined(S2LP_SPI_SDI) #if !defined(S2LP_SPI_SDI)
#define S2LP_SPI_SDI PA_7 #define S2LP_SPI_SDI PA_7
#endif #endif