Skip to content

Commit 079564b

Browse files
authored
Merge pull request #11647 from JarkkoPaso/nanostack_driver_update_for_mbed_os_5.14.1
Nanostack RF driver updates for Mbed OS 5.14.1
2 parents 4611662 + f8564cf commit 079564b

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,10 +550,11 @@ static void rf_init_registers(void)
550550
rf_write_register_field(PCKTCTRL3, PCKT_FORMAT_FIELD, PCKT_FORMAT_802_15_4);
551551
rf_write_register_field(MOD2, MOD_TYPE_FIELD, MOD_2FSK);
552552
rf_write_register(PCKT_FLT_OPTIONS, 0);
553-
rf_write_register_field(PCKTCTRL1, PCKT_CRCMODE_FIELD, PCKT_CRCMODE_0X1021);
553+
rf_write_register_field(PCKTCTRL1, PCKT_CRCMODE_FIELD, PCKT_CRCMODE_0x04C11DB7);
554554
rf_write_register_field(PCKTCTRL1, PCKT_TXSOURCE_FIELD, PCKT_TXSOURCE_NORMAL);
555555
rf_write_register_field(PCKTCTRL1, PCKT_WHITENING_FIELD, PCKT_WHITENING_ENABLED);
556556
rf_write_register_field(PCKTCTRL2, PCKT_FIXVARLEN_FIELD, PCKT_VARIABLE_LEN);
557+
rf_write_register_field(PCKTCTRL2, PCKT_FCS_TYPE_FIELD, PCKT_FCS_TYPE_4_OCTET);
557558
rf_write_register_field(PCKTCTRL3, PCKT_RXMODE_FIELD, PCKT_RXMODE_NORMAL);
558559
rf_write_register_field(PCKTCTRL3, PCKT_BYTE_SWAP_FIELD, PCKT_BYTE_SWAP_LSB);
559560
rf_write_register(PCKTCTRL5, PCKT_PREAMBLE_LEN);
@@ -999,6 +1000,7 @@ static void rf_receive(uint8_t rx_channel)
9991000
rf_poll_state_change(S2LP_STATE_READY);
10001001
rf_flush_rx_fifo();
10011002
if (rf_update_config == true) {
1003+
rf_channel_multiplier = 1;
10021004
rf_update_config = false;
10031005
rf_set_channel_configuration_registers();
10041006
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,14 @@ extern "C" {
249249
// PCKTCTRL2
250250
#define PCKT_FIXVARLEN_FIELD 0x01
251251
#define PCKT_VARIABLE_LEN (1 << 0)
252+
#define PCKT_FCS_TYPE_FIELD 0x20
253+
#define PCKT_FCS_TYPE_4_OCTET (0 << 5)
254+
#define PCKT_FCS_TYPE_2_OCTET (1 << 5)
252255

253256
// PCKTCTRL1
254257
#define PCKT_CRCMODE_FIELD 0xE0
255258
#define PCKT_CRCMODE_0X1021 (3 << 5)
259+
#define PCKT_CRCMODE_0x04C11DB7 (5 << 5)
256260
#define PCKT_TXSOURCE_FIELD 0x0C
257261
#define PCKT_TXSOURCE_NORMAL (0 << 2)
258262
#define PCKT_WHITENING_FIELD 0x10

0 commit comments

Comments
 (0)