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

S2-LP: sync with development repository

pull/11647/head
Jarkko Paso 2019-10-07 16:08:51 +03:00 committed by Martin Kojtal
parent 31fb3f929b
commit f8564cfadd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,10 +550,11 @@ static void rf_init_registers(void)
rf_write_register_field(PCKTCTRL3, PCKT_FORMAT_FIELD, PCKT_FORMAT_802_15_4); rf_write_register_field(PCKTCTRL3, PCKT_FORMAT_FIELD, PCKT_FORMAT_802_15_4);
rf_write_register_field(MOD2, MOD_TYPE_FIELD, MOD_2FSK); rf_write_register_field(MOD2, MOD_TYPE_FIELD, MOD_2FSK);
rf_write_register(PCKT_FLT_OPTIONS, 0); rf_write_register(PCKT_FLT_OPTIONS, 0);
rf_write_register_field(PCKTCTRL1, PCKT_CRCMODE_FIELD, PCKT_CRCMODE_0X1021); rf_write_register_field(PCKTCTRL1, PCKT_CRCMODE_FIELD, PCKT_CRCMODE_0x04C11DB7);
rf_write_register_field(PCKTCTRL1, PCKT_TXSOURCE_FIELD, PCKT_TXSOURCE_NORMAL); rf_write_register_field(PCKTCTRL1, PCKT_TXSOURCE_FIELD, PCKT_TXSOURCE_NORMAL);
rf_write_register_field(PCKTCTRL1, PCKT_WHITENING_FIELD, PCKT_WHITENING_ENABLED); rf_write_register_field(PCKTCTRL1, PCKT_WHITENING_FIELD, PCKT_WHITENING_ENABLED);
rf_write_register_field(PCKTCTRL2, PCKT_FIXVARLEN_FIELD, PCKT_VARIABLE_LEN); rf_write_register_field(PCKTCTRL2, PCKT_FIXVARLEN_FIELD, PCKT_VARIABLE_LEN);
rf_write_register_field(PCKTCTRL2, PCKT_FCS_TYPE_FIELD, PCKT_FCS_TYPE_4_OCTET);
rf_write_register_field(PCKTCTRL3, PCKT_RXMODE_FIELD, PCKT_RXMODE_NORMAL); rf_write_register_field(PCKTCTRL3, PCKT_RXMODE_FIELD, PCKT_RXMODE_NORMAL);
rf_write_register_field(PCKTCTRL3, PCKT_BYTE_SWAP_FIELD, PCKT_BYTE_SWAP_LSB); rf_write_register_field(PCKTCTRL3, PCKT_BYTE_SWAP_FIELD, PCKT_BYTE_SWAP_LSB);
rf_write_register(PCKTCTRL5, PCKT_PREAMBLE_LEN); rf_write_register(PCKTCTRL5, PCKT_PREAMBLE_LEN);
@ -999,6 +1000,7 @@ static void rf_receive(uint8_t rx_channel)
rf_poll_state_change(S2LP_STATE_READY); rf_poll_state_change(S2LP_STATE_READY);
rf_flush_rx_fifo(); rf_flush_rx_fifo();
if (rf_update_config == true) { if (rf_update_config == true) {
rf_channel_multiplier = 1;
rf_update_config = false; rf_update_config = false;
rf_set_channel_configuration_registers(); rf_set_channel_configuration_registers();
} }

4
components/802.15.4_RF/stm-s2lp-rf-driver/source/s2lpReg.h
View File

@ -249,10 +249,14 @@ extern "C" {
// PCKTCTRL2 // PCKTCTRL2
#define PCKT_FIXVARLEN_FIELD 0x01 #define PCKT_FIXVARLEN_FIELD 0x01
#define PCKT_VARIABLE_LEN (1 << 0) #define PCKT_VARIABLE_LEN (1 << 0)
#define PCKT_FCS_TYPE_FIELD 0x20
#define PCKT_FCS_TYPE_4_OCTET (0 << 5)
#define PCKT_FCS_TYPE_2_OCTET (1 << 5)
// PCKTCTRL1 // PCKTCTRL1
#define PCKT_CRCMODE_FIELD 0xE0 #define PCKT_CRCMODE_FIELD 0xE0
#define PCKT_CRCMODE_0X1021 (3 << 5) #define PCKT_CRCMODE_0X1021 (3 << 5)
#define PCKT_CRCMODE_0x04C11DB7 (5 << 5)
#define PCKT_TXSOURCE_FIELD 0x0C #define PCKT_TXSOURCE_FIELD 0x0C
#define PCKT_TXSOURCE_NORMAL (0 << 2) #define PCKT_TXSOURCE_NORMAL (0 << 2)
#define PCKT_WHITENING_FIELD 0x10 #define PCKT_WHITENING_FIELD 0x10