make SPI LORA pins configurable in hal-files

src/hal/ebox.h

@@ -14,9 +14,13 @@
 #define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   (14)
-#define DIO0  (26)
-#define DIO1  (33)
-#define DIO2  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  (14)
+#define LORA_IO0  (26)
+#define LORA_IO1  (33)
+#define LORA_IO2  LMIC_UNUSED_PIN
 
 #endif

src/hal/eboxtube.h

@@ -15,9 +15,13 @@
 #define DISABLE_BROWNOUT 1      // comment out if you want to keep brownout feature
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   (14)
-#define DIO0  (26)
-#define DIO1  (33)
-#define DIO2  (32)
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  (14)
+#define LORA_IO0  (26)
+#define LORA_IO1  (33)
+#define LORA_IO2  (32)
 
 #endif

src/hal/fipy.h

@@ -14,10 +14,14 @@
 #define BOARD_HAS_PSRAM        // use extra 4MB extern RAM
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   LMIC_UNUSED_PIN
-#define DIO0  (23) // LoRa IRQ
-#define DIO1  (23) // Pin tied via diode to DIO0
-#define DIO2  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  LMIC_UNUSED_PIN
+#define LORA_IO0  (23) // LoRa IRQ
+#define LORA_IO1  (23) // Pin tied via diode to DIO0
+#define LORA_IO2  LMIC_UNUSED_PIN
 
 // select WIFI antenna (internal = onboard / external = u.fl socket)
 #define HAS_ANTENNA_SWITCH GPIO_NUM_21 // pin for switching wifi antenna

src/hal/generic.h

@@ -33,10 +33,14 @@
 #define MY_OLED_RST (16)
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   (14)
-#define DIO0  (26)
-#define DIO1  (33)
-#define DIO2  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  (14)
+#define LORA_IO0  (26)
+#define LORA_IO1  (33)
+#define LORA_IO2  LMIC_UNUSED_PIN
 
 // I2C config for Microchip 24AA02E64 DEVEUI unique address
 #define MCP_24AA02E64_I2C_ADDRESS 0x50 // I2C address for the 24AA02E64 

src/hal/heltec.h

@@ -19,9 +19,13 @@
 #define MY_OLED_RST (16)
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   (14)
-#define DIO0  (26)
-#define DIO1  (33)
-#define DIO2  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  (14)
+#define LORA_IO0  (26)
+#define LORA_IO1  (33)
+#define LORA_IO2  LMIC_UNUSED_PIN
 
 #endif

src/hal/heltecv2.h

@@ -19,9 +19,13 @@
 #define OLED_RST (16)
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   (14)
-#define DIO0  (26)
-#define DIO1  (34)
-#define DIO2  (35)
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  (14)
+#define LORA_IO0  (26)
+#define LORA_IO1  (34)
+#define LORA_IO2  (35)
 
 #endif

src/hal/lolin32litelora.h

@@ -22,11 +22,14 @@
 #define CFG_sx1276_radio 1 // RFM95 module
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   (25)
-#define DIO0  (27)
-#define DIO1  (26)
-#define DIO2  LMIC_UNUSED_PIN
-#define DIO5  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  (25)
+#define LORA_IO0  (27)
+#define LORA_IO1  (26)
+#define LORA_IO2  LMIC_UNUSED_PIN
 
 // Pins for I2C interface of OLED Display
 #define MY_OLED_SDA (14)

src/hal/lolin32lora.h

@@ -23,11 +23,15 @@
 #define CFG_sx1276_radio 1 // RFM95 module
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   (25)
-#define DIO0  (27)
-#define DIO1  (26)
-#define DIO2  LMIC_UNUSED_PIN
-#define DIO5  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  (25)
+#define LORA_IO0  (27)
+#define LORA_IO1  (26)
+#define LORA_IO2  LMIC_UNUSED_PIN
+#define LORA_IO5  LMIC_UNUSED_PIN
 
 // Pins for I2C interface of OLED Display
 #define MY_OLED_SDA (21)

src/hal/lopy.h

@@ -11,19 +11,15 @@
 #define HAS_LED NOT_A_PIN // LoPy4 has no on board mono LED, we use on board RGB LED
 #define HAS_RGB_LED (0)  // WS2812B RGB LED on GPIO0
 
-/* SPI remapping does currently not work!!
-// Hardware pin definitions for Pycom LoPy board
-#define PIN_SPI_SS    GPIO_NUM_17
-#define PIN_SPI_MOSI  GPIO_NUM_27
-#define PIN_SPI_MISO  GPIO_NUM_19
-#define PIN_SPI_SCK   GPIO_NUM_5
-*/
-
 // Pins for LORA chip reset and interrupt lines
-#define RST   (18)
-#define DIO0  (23) // LoRa IRQ
-#define DIO1  (23) // Pin tied via diode to DIO0
-#define DIO2  (23) // Pin tied via diode to DIO0
+#define LORA_SCK  (5)  // GPIO5  - SX1276 SCK
+#define LORA_CS   (17) // GPIO17 - SX1276 CS
+#define LORA_MISO (19) // GPIO19 - SX1276 MISO
+#define LORA_MOSI (27) // GPIO27 - SX1276 MOSI
+#define LORA_RST  (18) // GPIO18 - SX1276 RESET
+#define LORA_IO0  (23) // LoRa IRQ
+#define LORA_IO1  (23) // Pin tied via diode to DIO0
+#define LORA_IO2  (23) // Pin tied via diode to DIO0
 
 // select WIFI antenna (internal = onboard / external = u.fl socket)
 #define HAS_ANTENNA_SWITCH  (16)      // pin for switching wifi antenna

src/hal/lopy4.h

@@ -13,10 +13,14 @@
 #define BOARD_HAS_PSRAM // use extra 4MB extern RAM
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   LMIC_UNUSED_PIN
-#define DIO0  (23) // LoRa IRQ
-#define DIO1  (23) // Pin tied via diode to DIO0
-#define DIO2  (23) // Pin tied via diode to DIO0
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  LMIC_UNUSED_PIN
+#define LORA_IO0  (23) // LoRa IRQ
+#define LORA_IO1  (23) // Pin tied via diode to DIO0
+#define LORA_IO2  (23) // Pin tied via diode to DIO0
 
 // select WIFI antenna (internal = onboard / external = u.fl socket)
 #define HAS_ANTENNA_SWITCH  (21) // pin for switching wifi antenna (P12)

src/hal/octopus32.h

@@ -20,19 +20,15 @@
 #define HAS_SPI   1       // comment out if device shall not send data via SPI
 #define CFG_sx1276_radio 1 // RFM95 module
 
-/* SPI remapping does currently not work!! */
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    14 //14 // ESP32  GPIO5 (Pin5)  -- SX1276 NSS  (Pin19) SPI Chip Select Input
-#define PIN_SPI_MOSI  18 // ESP32 GPIO23 (Pin23) -- SX1276 MOSI (Pin18) SPI Data Input
-#define PIN_SPI_MISO  19 // ESP32 GPIO19 (Pin19) -- SX1276 MISO (Pin17) SPI Data Output
-#define PIN_SPI_SCK   5 // ESP32 GPIO18 (Pin18) -- SX1276 SCK  (Pin16) SPI Clock Input
-
 // Pins for LORA chip reset and interrupt lines
-#define RST   LMIC_UNUSED_PIN
-#define DIO0  (33)
-#define DIO1  (33)
-#define DIO2  LMIC_UNUSED_PIN
-#define DIO5  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (14)
+#define LORA_MISO (19)
+#define LORA_MOSI (18)
+#define LORA_RST  LMIC_UNUSED_PIN
+#define LORA_IO0  (33)
+#define LORA_IO1  (33)
+#define LORA_IO2  LMIC_UNUSED_PIN
 
 // Pins for I2C interface of OLED Display
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // U8X8_SSD1306_128X32_UNIVISION_SW_I2C //

src/hal/ttgobeam.h

@@ -20,10 +20,14 @@
 #define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_12, GPIO_NUM_15 // UBlox NEO 6M or 7M with default configuration
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   LMIC_UNUSED_PIN
-#define DIO0  (26)
-#define DIO1  (32) // !! NEEDS EXTERNAL WIRING !!
-//#define DIO1  (33)  // for T-Beam T22_V05 and T22_V07, other versions may need external wiring
-#define DIO2  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST   LMIC_UNUSED_PIN
+#define LORA_IO0  (26)
+#define LORA_IO1  (32) // !! NEEDS EXTERNAL WIRING !!
+//#define LORA_IO1  (33)  // for T-Beam T22_V05 and T22_V07, other versions may need external wiring
+#define LORA_IO2  LMIC_UNUSED_PIN
 
 #endif

src/hal/ttgov1.h

@@ -21,9 +21,13 @@
 #define MY_OLED_RST (16)
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   (14)
-#define DIO0  (26)
-#define DIO1  (33)
-#define DIO2  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  (14)
+#define LORA_IO0  (26)
+#define LORA_IO1  (33)
+#define LORA_IO2  LMIC_UNUSED_PIN
 
 #endif

src/hal/ttgov2.h

@@ -22,9 +22,13 @@
 #define MY_OLED_RST U8X8_PIN_NONE
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   LMIC_UNUSED_PIN
-#define DIO0  (26)
-#define DIO1  (33)
-#define DIO2  LMIC_UNUSED_PIN
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  LMIC_UNUSED_PIN
+#define LORA_IO0  (26)
+#define LORA_IO1  (33)
+#define LORA_IO2  LMIC_UNUSED_PIN
 
 #endif

src/hal/ttgov21new.h

@@ -23,9 +23,13 @@
 #define MY_OLED_RST U8X8_PIN_NONE
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   (23)
-#define DIO0  (26)
-#define DIO1  (33)
-#define DIO2  (32)
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  (23)
+#define LORA_IO0  (26)
+#define LORA_IO1  (33)
+#define LORA_IO2  (32)
 
 #endif

src/hal/ttgov21old.h

@@ -26,9 +26,13 @@
 #define MY_OLED_RST U8X8_PIN_NONE
 
 // Pins for LORA chip reset and interrupt lines
-#define RST   LMIC_UNUSED_PIN
-#define DIO0  (26)
-#define DIO1  (33)
-#define DIO2  (32)
+#define LORA_SCK  (5) 
+#define LORA_CS   (18)
+#define LORA_MISO (19)
+#define LORA_MOSI (27)
+#define LORA_RST  LMIC_UNUSED_PIN
+#define LORA_IO0  (26)
+#define LORA_IO1  (33)
+#define LORA_IO2  (32)
 
 #endif

src/lorawan.cpp

@@ -11,10 +11,13 @@ QueueHandle_t LoraSendQueue;
 
 // LMIC enhanced Pin mapping
 const lmic_pinmap lmic_pins = {
-    .nss = SS,
+    .nss = LORA_CS,
     .rxtx = LMIC_UNUSED_PIN,
-    .rst = RST,
-    .dio = {DIO0, DIO1, DIO2}
+    .rst = LORA_RST,
+    .dio = {LORA_IO0, LORA_IO1, LORA_IO2},
+    .mosi = LORA_MOSI,
+    .miso = LORA_MISO,
+    .sck = LORA_SCK
     // optional: set polarity of rxtx pin.
     //.rxtx_rx_active = 0,
     // optional: set RSSI cal for listen-before-talk