To expose LoRa pins at platformio.ini instead of header files

Author: IoTThinks

src/helpers/esp32/TBeamBoard.h

@@ -59,14 +59,6 @@
   // uint32_t  P_LORA_BUSY  = 0;   //shared, so define at run
   // uint32_t  P_LORA_DIO_2 = 0;   //SX1276 only, so define at run
 
-  #define  P_LORA_DIO_0  26
-  #define  P_LORA_DIO_1  33
-  #define  P_LORA_NSS    18
-  #define  P_LORA_RESET  23
-  #define  P_LORA_SCLK    5
-  #define  P_LORA_MISO   19
-  #define  P_LORA_MOSI   27
-
   // #define PIN_GPS_RX      34
   // #define PIN_GPS_TX      12
 

variants/heltec_mesh_solar/MeshSolarBoard.h

@@ -8,18 +8,6 @@
 #include "meshSolarApp.h"
 #endif
 
-// LoRa radio module pins for Heltec T114
-#define  P_LORA_DIO_1     20
-#define  P_LORA_NSS       24
-#define  P_LORA_RESET     25
-#define  P_LORA_BUSY      17
-#define  P_LORA_SCLK      19
-#define  P_LORA_MISO      23
-#define  P_LORA_MOSI      22
-
-#define SX126X_DIO2_AS_RF_SWITCH  true
-#define SX126X_DIO3_TCXO_VOLTAGE   1.8
-
 class MeshSolarBoard : public NRF52BoardOTA {
 public:
   MeshSolarBoard() : NRF52BoardOTA("MESH_SOLAR_OTA") {}

variants/heltec_mesh_solar/platformio.ini

@@ -9,6 +9,15 @@ build_flags =  ${nrf52_base.build_flags}
   -I lib/nrf52/s140_nrf52_6.1.1_API/include/nrf52
   -I variants/heltec_mesh_solar
   -D HELTEC_MESH_SOLAR
+  -D P_LORA_DIO_1=20
+  -D P_LORA_NSS=24
+  -D P_LORA_RESET=25
+  -D P_LORA_BUSY=17
+  -D P_LORA_SCLK=19
+  -D P_LORA_MISO=23
+  -D P_LORA_MOSI=22
+  -D SX126X_DIO2_AS_RF_SWITCH=true
+  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/lilygo_tbeam_SX1262/platformio.ini

@@ -5,6 +5,13 @@ build_flags =
   ${esp32_base.build_flags}
   -I variants/lilygo_tbeam_SX1262
   -D TBEAM_SX1262
+  -D P_LORA_DIO_0=26
+  -D P_LORA_DIO_1=33
+  -D P_LORA_NSS=18
+  -D P_LORA_RESET=23
+  -D P_LORA_SCLK=5
+  -D P_LORA_MISO=19
+  -D P_LORA_MOSI=27
   -D SX126X_DIO2_AS_RF_SWITCH=true
   -D SX126X_DIO3_TCXO_VOLTAGE=1.8
   -D SX126X_CURRENT_LIMIT=140

variants/lilygo_tbeam_supreme_SX1262/platformio.ini

@@ -5,6 +5,13 @@ build_flags =
   ${esp32_base.build_flags}
   -I variants/lilygo_tbeam_supreme_SX1262
   -D TBEAM_SUPREME_SX1262
+  -D P_LORA_DIO_0=26
+  -D P_LORA_DIO_1=33
+  -D P_LORA_NSS=18
+  -D P_LORA_RESET=23
+  -D P_LORA_SCLK=5
+  -D P_LORA_MISO=19
+  -D P_LORA_MOSI=27
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
   -D RADIO_CLASS=CustomSX1262

variants/promicro/PromicroBoard.h

@@ -4,19 +4,6 @@
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 
-#define P_LORA_NSS 13 //P1.13 45
-#define P_LORA_DIO_1 11 //P0.10 10
-#define P_LORA_RESET 10 //P0.09 9
-#define P_LORA_BUSY  16 //P0.29 29
-#define P_LORA_MISO  15 //P0.02 2
-#define P_LORA_SCLK  12 //P1.11 43
-#define P_LORA_MOSI  14 //P1.15 47
-#define SX126X_POWER_EN 21 //P0.13 13
-#define SX126X_RXEN 2 //P0.17
-#define SX126X_TXEN RADIOLIB_NC
-#define SX126X_DIO2_AS_RF_SWITCH  true
-#define SX126X_DIO3_TCXO_VOLTAGE (1.8f)
-
 #define  PIN_VBAT_READ 17
 #define  ADC_MULTIPLIER   (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking
 

variants/promicro/platformio.ini

@@ -4,6 +4,18 @@ board = promicro_nrf52840
 build_flags = ${nrf52_base.build_flags}
   -I variants/promicro
   -D PROMICRO
+  -D P_LORA_NSS=13
+  -D P_LORA_DIO_1=11
+  -D P_LORA_RESET=10
+  -D P_LORA_BUSY=16
+  -D P_LORA_MISO=15
+  -D P_LORA_SCLK=12
+  -D P_LORA_MOSI=14
+  -D SX126X_POWER_EN=21
+  -D SX126X_RXEN=2
+  -D SX126X_TXEN=RADIOLIB_NC
+  -D SX126X_DIO2_AS_RF_SWITCH=true
+  -D SX126X_DIO3_TCXO_VOLTAGE=1.8f
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
@@ -53,31 +65,6 @@ build_flags =
 lib_deps = ${Promicro.lib_deps}
   adafruit/RTClib @ ^2.1.3
 
-[env:ProMicro_repeater_bridge_rs232_serial1]
-extends = Promicro
-build_src_filter = ${Promicro.build_src_filter}
-  +<../examples/simple_repeater>
-  +<helpers/ui/SSD1306Display.cpp>
-  +<helpers/ui/MomentaryButton.cpp>
-  +<helpers/bridges/RS232Bridge.cpp>
-build_flags =
-  ${Promicro.build_flags}
-  -D ADVERT_NAME='"RS232 Bridge"'
-  -D ADVERT_LAT=0.0
-  -D ADVERT_LON=0.0
-  -D ADMIN_PASSWORD='"password"'
-  -D MAX_NEIGHBOURS=50
-  -D DISPLAY_CLASS=SSD1306Display
-  -D WITH_RS232_BRIDGE=Serial1
-  -D WITH_RS232_BRIDGE_RX=PIN_SERIAL1_RX
-  -D WITH_RS232_BRIDGE_TX=PIN_SERIAL1_TX
-  -UENV_INCLUDE_GPS
-;  -D BRIDGE_DEBUG=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-lib_deps = ${Promicro.lib_deps}
-  adafruit/RTClib @ ^2.1.3
-
 [env:ProMicro_room_server]
 extends = Promicro
 build_src_filter = ${Promicro.build_src_filter}

variants/rak4631/RAK4631Board.h

@@ -4,16 +4,6 @@
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 
-// LoRa radio module pins for RAK4631
-#define  P_LORA_DIO_1   47
-#define  P_LORA_NSS     42
-#define  P_LORA_RESET  RADIOLIB_NC   // 38
-#define  P_LORA_BUSY    46
-#define  P_LORA_SCLK    43
-#define  P_LORA_MISO    45
-#define  P_LORA_MOSI    44
-#define  SX126X_POWER_EN  37
-
 //#define PIN_GPS_SDA       13  //GPS SDA pin (output option)
 //#define PIN_GPS_SCL       14  //GPS SCL pin (output option)
 //#define PIN_GPS_TX        16  //GPS TX pin

variants/rak4631/platformio.ini

@@ -7,6 +7,14 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/rak4631
   -D RAK_4631
   -D RAK_BOARD
+  -D P_LORA_DIO_1=47
+  -D P_LORA_NSS=42
+  -D P_LORA_RESET=38
+  -D P_LORA_BUSY=46
+  -D P_LORA_SCLK=43
+  -D P_LORA_MISO=45
+  -D P_LORA_MOSI=44
+  -D SX126X_POWER_EN=37
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_GPS_TX=PIN_SERIAL1_RX
@@ -44,6 +52,8 @@ build_flags =
 build_src_filter = ${rak4631.build_src_filter}
   +<helpers/ui/SSD1306Display.cpp>
   +<../examples/simple_repeater>
+monitor_filters = 
+    time
 
 [env:RAK_4631_repeater_bridge_rs232_serial1]
 extends = rak4631
@@ -81,7 +91,6 @@ build_flags =
   -D WITH_RS232_BRIDGE=Serial2
   -D WITH_RS232_BRIDGE_RX=PIN_SERIAL2_RX
   -D WITH_RS232_BRIDGE_TX=PIN_SERIAL2_TX
-  -UENV_INCLUDE_GPS
 ;  -D BRIDGE_DEBUG=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1