From 6bd3f92cad04c564aeaf92f16703e0a2087e8030 Mon Sep 17 00:00:00 2001 From: jgromes Date: Mon, 27 May 2024 21:22:19 +0200 Subject: [PATCH] [LR11x0] Update RF switch map for WM1110 --- ...x0_Channel_Activity_Detection_Blocking.ino | 21 +++++++++---------- ...0_Channel_Activity_Detection_Interrupt.ino | 21 +++++++++---------- .../LR11x0_Receive_Blocking.ino | 21 +++++++++---------- .../LR11x0_Receive_Interrupt.ino | 21 +++++++++---------- .../LR11x0_Transmit_Blocking.ino | 21 +++++++++---------- .../LR11x0_Transmit_Interrupt.ino | 21 +++++++++---------- .../LR11x0_WiFi_Scan_Blocking.ino | 21 +++++++++---------- .../LR11x0_WiFi_Scan_Interrupt.ino | 21 +++++++++---------- 8 files changed, 80 insertions(+), 88 deletions(-) diff --git a/examples/LR11x0/LR11x0_Channel_Activity_Detection_Blocking/LR11x0_Channel_Activity_Detection_Blocking.ino b/examples/LR11x0/LR11x0_Channel_Activity_Detection_Blocking/LR11x0_Channel_Activity_Detection_Blocking.ino index d6cab7c7..10712cd8 100644 --- a/examples/LR11x0/LR11x0_Channel_Activity_Detection_Blocking/LR11x0_Channel_Activity_Detection_Blocking.ino +++ b/examples/LR11x0/LR11x0_Channel_Activity_Detection_Blocking/LR11x0_Channel_Activity_Detection_Blocking.ino @@ -35,23 +35,22 @@ LR1110 radio = new Module(10, 2, 3, 9); // set RF switch configuration for Wio WM1110 -// Wio WM1110 uses DIO5, 6, 7 and 8 for RF switching +// Wio WM1110 uses DIO5 and DIO6 for RF switching // NOTE: other boards may be different! static const uint32_t rfswitch_dio_pins[] = { RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, - RADIOLIB_LR11X0_DIO7, RADIOLIB_LR11X0_DIO8, - RADIOLIB_NC + RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC }; static const Module::RfSwitchMode_t rfswitch_table[] = { - // mode DIO5 DIO6 DIO7 DIO8 - { LR11x0::MODE_STBY, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_RX, { HIGH, LOW, LOW, LOW } }, - { LR11x0::MODE_TX, { HIGH, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HP, { LOW, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HF, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_GNSS, { LOW, LOW, HIGH, LOW } }, - { LR11x0::MODE_WIFI, { LOW, LOW, LOW, HIGH } }, + // mode DIO5 DIO6 + { LR11x0::MODE_STBY, { LOW, LOW } }, + { LR11x0::MODE_RX, { HIGH, LOW } }, + { LR11x0::MODE_TX, { HIGH, HIGH } }, + { LR11x0::MODE_TX_HP, { LOW, HIGH } }, + { LR11x0::MODE_TX_HF, { LOW, LOW } }, + { LR11x0::MODE_GNSS, { LOW, LOW } }, + { LR11x0::MODE_WIFI, { LOW, LOW } }, END_OF_MODE_TABLE, }; diff --git a/examples/LR11x0/LR11x0_Channel_Activity_Detection_Interrupt/LR11x0_Channel_Activity_Detection_Interrupt.ino b/examples/LR11x0/LR11x0_Channel_Activity_Detection_Interrupt/LR11x0_Channel_Activity_Detection_Interrupt.ino index 86578afb..c1f29aa3 100644 --- a/examples/LR11x0/LR11x0_Channel_Activity_Detection_Interrupt/LR11x0_Channel_Activity_Detection_Interrupt.ino +++ b/examples/LR11x0/LR11x0_Channel_Activity_Detection_Interrupt/LR11x0_Channel_Activity_Detection_Interrupt.ino @@ -30,23 +30,22 @@ LR1110 radio = new Module(10, 2, 3, 9); // set RF switch configuration for Wio WM1110 -// Wio WM1110 uses DIO5, 6, 7 and 8 for RF switching +// Wio WM1110 uses DIO5 and DIO6 for RF switching // NOTE: other boards may be different! static const uint32_t rfswitch_dio_pins[] = { RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, - RADIOLIB_LR11X0_DIO7, RADIOLIB_LR11X0_DIO8, - RADIOLIB_NC + RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC }; static const Module::RfSwitchMode_t rfswitch_table[] = { - // mode DIO5 DIO6 DIO7 DIO8 - { LR11x0::MODE_STBY, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_RX, { HIGH, LOW, LOW, LOW } }, - { LR11x0::MODE_TX, { HIGH, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HP, { LOW, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HF, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_GNSS, { LOW, LOW, HIGH, LOW } }, - { LR11x0::MODE_WIFI, { LOW, LOW, LOW, HIGH } }, + // mode DIO5 DIO6 + { LR11x0::MODE_STBY, { LOW, LOW } }, + { LR11x0::MODE_RX, { HIGH, LOW } }, + { LR11x0::MODE_TX, { HIGH, HIGH } }, + { LR11x0::MODE_TX_HP, { LOW, HIGH } }, + { LR11x0::MODE_TX_HF, { LOW, LOW } }, + { LR11x0::MODE_GNSS, { LOW, LOW } }, + { LR11x0::MODE_WIFI, { LOW, LOW } }, END_OF_MODE_TABLE, }; diff --git a/examples/LR11x0/LR11x0_Receive_Blocking/LR11x0_Receive_Blocking.ino b/examples/LR11x0/LR11x0_Receive_Blocking/LR11x0_Receive_Blocking.ino index 3e3c9eab..cd40b816 100644 --- a/examples/LR11x0/LR11x0_Receive_Blocking/LR11x0_Receive_Blocking.ino +++ b/examples/LR11x0/LR11x0_Receive_Blocking/LR11x0_Receive_Blocking.ino @@ -40,23 +40,22 @@ LR1110 radio = new Module(10, 2, 3, 9); // set RF switch configuration for Wio WM1110 -// Wio WM1110 uses DIO5, 6, 7 and 8 for RF switching +// Wio WM1110 uses DIO5 and DIO6 for RF switching // NOTE: other boards may be different! static const uint32_t rfswitch_dio_pins[] = { RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, - RADIOLIB_LR11X0_DIO7, RADIOLIB_LR11X0_DIO8, - RADIOLIB_NC + RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC }; static const Module::RfSwitchMode_t rfswitch_table[] = { - // mode DIO5 DIO6 DIO7 DIO8 - { LR11x0::MODE_STBY, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_RX, { HIGH, LOW, LOW, LOW } }, - { LR11x0::MODE_TX, { HIGH, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HP, { LOW, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HF, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_GNSS, { LOW, LOW, HIGH, LOW } }, - { LR11x0::MODE_WIFI, { LOW, LOW, LOW, HIGH } }, + // mode DIO5 DIO6 + { LR11x0::MODE_STBY, { LOW, LOW } }, + { LR11x0::MODE_RX, { HIGH, LOW } }, + { LR11x0::MODE_TX, { HIGH, HIGH } }, + { LR11x0::MODE_TX_HP, { LOW, HIGH } }, + { LR11x0::MODE_TX_HF, { LOW, LOW } }, + { LR11x0::MODE_GNSS, { LOW, LOW } }, + { LR11x0::MODE_WIFI, { LOW, LOW } }, END_OF_MODE_TABLE, }; diff --git a/examples/LR11x0/LR11x0_Receive_Interrupt/LR11x0_Receive_Interrupt.ino b/examples/LR11x0/LR11x0_Receive_Interrupt/LR11x0_Receive_Interrupt.ino index b8be9c9b..1f9c86b2 100644 --- a/examples/LR11x0/LR11x0_Receive_Interrupt/LR11x0_Receive_Interrupt.ino +++ b/examples/LR11x0/LR11x0_Receive_Interrupt/LR11x0_Receive_Interrupt.ino @@ -36,23 +36,22 @@ LR1110 radio = new Module(10, 2, 3, 9); // set RF switch configuration for Wio WM1110 -// Wio WM1110 uses DIO5, 6, 7 and 8 for RF switching +// Wio WM1110 uses DIO5 and DIO6 for RF switching // NOTE: other boards may be different! static const uint32_t rfswitch_dio_pins[] = { RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, - RADIOLIB_LR11X0_DIO7, RADIOLIB_LR11X0_DIO8, - RADIOLIB_NC + RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC }; static const Module::RfSwitchMode_t rfswitch_table[] = { - // mode DIO5 DIO6 DIO7 DIO8 - { LR11x0::MODE_STBY, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_RX, { HIGH, LOW, LOW, LOW } }, - { LR11x0::MODE_TX, { HIGH, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HP, { LOW, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HF, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_GNSS, { LOW, LOW, HIGH, LOW } }, - { LR11x0::MODE_WIFI, { LOW, LOW, LOW, HIGH } }, + // mode DIO5 DIO6 + { LR11x0::MODE_STBY, { LOW, LOW } }, + { LR11x0::MODE_RX, { HIGH, LOW } }, + { LR11x0::MODE_TX, { HIGH, HIGH } }, + { LR11x0::MODE_TX_HP, { LOW, HIGH } }, + { LR11x0::MODE_TX_HF, { LOW, LOW } }, + { LR11x0::MODE_GNSS, { LOW, LOW } }, + { LR11x0::MODE_WIFI, { LOW, LOW } }, END_OF_MODE_TABLE, }; diff --git a/examples/LR11x0/LR11x0_Transmit_Blocking/LR11x0_Transmit_Blocking.ino b/examples/LR11x0/LR11x0_Transmit_Blocking/LR11x0_Transmit_Blocking.ino index 8700369e..9ec59be1 100644 --- a/examples/LR11x0/LR11x0_Transmit_Blocking/LR11x0_Transmit_Blocking.ino +++ b/examples/LR11x0/LR11x0_Transmit_Blocking/LR11x0_Transmit_Blocking.ino @@ -31,23 +31,22 @@ LR1110 radio = new Module(10, 2, 3, 9); // set RF switch configuration for Wio WM1110 -// Wio WM1110 uses DIO5, 6, 7 and 8 for RF switching +// Wio WM1110 uses DIO5 and DIO6 for RF switching // NOTE: other boards may be different! static const uint32_t rfswitch_dio_pins[] = { RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, - RADIOLIB_LR11X0_DIO7, RADIOLIB_LR11X0_DIO8, - RADIOLIB_NC + RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC }; static const Module::RfSwitchMode_t rfswitch_table[] = { - // mode DIO5 DIO6 DIO7 DIO8 - { LR11x0::MODE_STBY, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_RX, { HIGH, LOW, LOW, LOW } }, - { LR11x0::MODE_TX, { HIGH, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HP, { LOW, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HF, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_GNSS, { LOW, LOW, HIGH, LOW } }, - { LR11x0::MODE_WIFI, { LOW, LOW, LOW, HIGH } }, + // mode DIO5 DIO6 + { LR11x0::MODE_STBY, { LOW, LOW } }, + { LR11x0::MODE_RX, { HIGH, LOW } }, + { LR11x0::MODE_TX, { HIGH, HIGH } }, + { LR11x0::MODE_TX_HP, { LOW, HIGH } }, + { LR11x0::MODE_TX_HF, { LOW, LOW } }, + { LR11x0::MODE_GNSS, { LOW, LOW } }, + { LR11x0::MODE_WIFI, { LOW, LOW } }, END_OF_MODE_TABLE, }; diff --git a/examples/LR11x0/LR11x0_Transmit_Interrupt/LR11x0_Transmit_Interrupt.ino b/examples/LR11x0/LR11x0_Transmit_Interrupt/LR11x0_Transmit_Interrupt.ino index 0593253a..459a1d30 100644 --- a/examples/LR11x0/LR11x0_Transmit_Interrupt/LR11x0_Transmit_Interrupt.ino +++ b/examples/LR11x0/LR11x0_Transmit_Interrupt/LR11x0_Transmit_Interrupt.ino @@ -32,23 +32,22 @@ LR1110 radio = new Module(10, 2, 3, 9); // set RF switch configuration for Wio WM1110 -// Wio WM1110 uses DIO5, 6, 7 and 8 for RF switching +// Wio WM1110 uses DIO5 and DIO6 for RF switching // NOTE: other boards may be different! static const uint32_t rfswitch_dio_pins[] = { RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, - RADIOLIB_LR11X0_DIO7, RADIOLIB_LR11X0_DIO8, - RADIOLIB_NC + RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC }; static const Module::RfSwitchMode_t rfswitch_table[] = { - // mode DIO5 DIO6 DIO7 DIO8 - { LR11x0::MODE_STBY, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_RX, { HIGH, LOW, LOW, LOW } }, - { LR11x0::MODE_TX, { HIGH, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HP, { LOW, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HF, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_GNSS, { LOW, LOW, HIGH, LOW } }, - { LR11x0::MODE_WIFI, { LOW, LOW, LOW, HIGH } }, + // mode DIO5 DIO6 + { LR11x0::MODE_STBY, { LOW, LOW } }, + { LR11x0::MODE_RX, { HIGH, LOW } }, + { LR11x0::MODE_TX, { HIGH, HIGH } }, + { LR11x0::MODE_TX_HP, { LOW, HIGH } }, + { LR11x0::MODE_TX_HF, { LOW, LOW } }, + { LR11x0::MODE_GNSS, { LOW, LOW } }, + { LR11x0::MODE_WIFI, { LOW, LOW } }, END_OF_MODE_TABLE, }; diff --git a/examples/LR11x0/LR11x0_WiFi_Scan_Blocking/LR11x0_WiFi_Scan_Blocking.ino b/examples/LR11x0/LR11x0_WiFi_Scan_Blocking/LR11x0_WiFi_Scan_Blocking.ino index be898e4d..e2cafbef 100644 --- a/examples/LR11x0/LR11x0_WiFi_Scan_Blocking/LR11x0_WiFi_Scan_Blocking.ino +++ b/examples/LR11x0/LR11x0_WiFi_Scan_Blocking/LR11x0_WiFi_Scan_Blocking.ino @@ -33,23 +33,22 @@ LR1110 radio = new Module(10, 2, 3, 9); // set RF switch configuration for Wio WM1110 -// Wio WM1110 uses DIO5, 6, 7 and 8 for RF switching +// Wio WM1110 uses DIO5 and DIO6 for RF switching // NOTE: other boards may be different! static const uint32_t rfswitch_dio_pins[] = { RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, - RADIOLIB_LR11X0_DIO7, RADIOLIB_LR11X0_DIO8, - RADIOLIB_NC + RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC }; static const Module::RfSwitchMode_t rfswitch_table[] = { - // mode DIO5 DIO6 DIO7 DIO8 - { LR11x0::MODE_STBY, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_RX, { HIGH, LOW, LOW, LOW } }, - { LR11x0::MODE_TX, { HIGH, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HP, { LOW, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HF, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_GNSS, { LOW, LOW, HIGH, LOW } }, - { LR11x0::MODE_WIFI, { LOW, LOW, LOW, HIGH } }, + // mode DIO5 DIO6 + { LR11x0::MODE_STBY, { LOW, LOW } }, + { LR11x0::MODE_RX, { HIGH, LOW } }, + { LR11x0::MODE_TX, { HIGH, HIGH } }, + { LR11x0::MODE_TX_HP, { LOW, HIGH } }, + { LR11x0::MODE_TX_HF, { LOW, LOW } }, + { LR11x0::MODE_GNSS, { LOW, LOW } }, + { LR11x0::MODE_WIFI, { LOW, LOW } }, END_OF_MODE_TABLE, }; diff --git a/examples/LR11x0/LR11x0_WiFi_Scan_Interrupt/LR11x0_WiFi_Scan_Interrupt.ino b/examples/LR11x0/LR11x0_WiFi_Scan_Interrupt/LR11x0_WiFi_Scan_Interrupt.ino index af00066f..37b2431c 100644 --- a/examples/LR11x0/LR11x0_WiFi_Scan_Interrupt/LR11x0_WiFi_Scan_Interrupt.ino +++ b/examples/LR11x0/LR11x0_WiFi_Scan_Interrupt/LR11x0_WiFi_Scan_Interrupt.ino @@ -33,23 +33,22 @@ LR1110 radio = new Module(10, 2, 3, 9); // set RF switch configuration for Wio WM1110 -// Wio WM1110 uses DIO5, 6, 7 and 8 for RF switching +// Wio WM1110 uses DIO5 and DIO6 for RF switching // NOTE: other boards may be different! static const uint32_t rfswitch_dio_pins[] = { RADIOLIB_LR11X0_DIO5, RADIOLIB_LR11X0_DIO6, - RADIOLIB_LR11X0_DIO7, RADIOLIB_LR11X0_DIO8, - RADIOLIB_NC + RADIOLIB_NC, RADIOLIB_NC, RADIOLIB_NC }; static const Module::RfSwitchMode_t rfswitch_table[] = { - // mode DIO5 DIO6 DIO7 DIO8 - { LR11x0::MODE_STBY, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_RX, { HIGH, LOW, LOW, LOW } }, - { LR11x0::MODE_TX, { HIGH, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HP, { LOW, HIGH, LOW, LOW } }, - { LR11x0::MODE_TX_HF, { LOW, LOW, LOW, LOW } }, - { LR11x0::MODE_GNSS, { LOW, LOW, HIGH, LOW } }, - { LR11x0::MODE_WIFI, { LOW, LOW, LOW, HIGH } }, + // mode DIO5 DIO6 + { LR11x0::MODE_STBY, { LOW, LOW } }, + { LR11x0::MODE_RX, { HIGH, LOW } }, + { LR11x0::MODE_TX, { HIGH, HIGH } }, + { LR11x0::MODE_TX_HP, { LOW, HIGH } }, + { LR11x0::MODE_TX_HF, { LOW, LOW } }, + { LR11x0::MODE_GNSS, { LOW, LOW } }, + { LR11x0::MODE_WIFI, { LOW, LOW } }, END_OF_MODE_TABLE, };