project migrated to arduino LMIC 1.6 MCCI

src/display.cpp

@@ -4,7 +4,7 @@
 #include "globals.h"
 #include <esp_spi_flash.h> // needed for reading ESP32 chip attributes
 
-HAS_DISPLAY u8x8(OLED_RST, I2C_SCL, I2C_SDA);
+HAS_DISPLAY u8x8(MY_OLED_RST, MY_OLED_SCL, MY_OLED_SDA);
 
 // helper string for converting LoRa spread factor values
 #if defined(CFG_eu868)

src/hal/ebox.h

@@ -1,21 +1,22 @@
+#ifndef _EBOX_H
+#define _EBOX_H
+
+#include <stdint.h>
+
 // Hardware related definitions for ebox ESP32-bit with external connected RFM95 LoRa
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
 #define HAS_SPI 1        // comment out if device shall not send data via SPI
 #define CFG_sx1276_radio 1
 
-#define HAS_LED GPIO_NUM_23 // blue LED on board
-#define HAS_BUTTON GPIO_NUM_0 // button "PROG" on board
+#define HAS_LED (23) // blue LED on board
+#define HAS_BUTTON (0) // button "PROG" on board
 #define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- SX1276 NSS (Pin19) SPI Chip Select Input
-#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- SX1276 MOSI (Pin18) SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- SX1276 MISO (Pin17) SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5 (Pin5)   -- SX1276 SCK (Pin16) SPI Clock Input
+// Pins for LORA chip reset and interrupt lines
+#define RST   (14)
+#define DIO0  (26)
+#define DIO1  (33)
+#define DIO2  LMIC_UNUSED_PIN
 
-// non arduino pin definitions
-#define RST   GPIO_NUM_14 // ESP32 GPIO14 (Pin14) -- SX1276 NRESET (Pin7) Reset Trigger Input
-#define DIO0  GPIO_NUM_26 // ESP32 GPIO26 (Pin15) -- SX1276 DIO0 (Pin8) used by LMIC for detecting LoRa RX_Done & TX_Done
-#define DIO1  GPIO_NUM_33 // ESP32 GPIO33 (Pin13) -- SX1276 DIO1 (Pin9) used by LMIC for detecting LoRa RX_Timeout
-#define DIO2  LMIC_UNUSED_PIN // 32 ESP32 GPIO32 (Pin12) -- SX1276 DIO2 (Pin10) not used by LMIC for LoRa (Timeout for FSK only)
+#endif

src/hal/eboxtube.h

@@ -1,22 +1,23 @@
+#ifndef _EBOXTUBE_H
+#define _EBOXTUBE_H
+
+#include <stdint.h>
+
 // Hardware related definitions for ebox ESP32-bit with external connected RFM95 LoRa
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
 #define HAS_SPI 1        // comment out if device shall not send data via SPI
 #define CFG_sx1276_radio 1
 
-#define HAS_LED GPIO_NUM_22     // Green LED on board
-#define HAS_RGB_LED GPIO_NUM_2  // WS2812B RGB LED on board
-#define HAS_BUTTON GPIO_NUM_0   // button "FLASH" on board
+#define HAS_LED (22)     // Green LED on board
+#define HAS_RGB_LED (2)  // WS2812B RGB LED on board
+#define HAS_BUTTON (0)   // button "FLASH" on board
 #define DISABLE_BROWNOUT 1      // comment out if you want to keep brownout feature
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- SX1276 NSS (Pin19) SPI Chip Select Input
-#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- SX1276 MOSI (Pin18) SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- SX1276 MISO (Pin17) SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5 (Pin5)   -- SX1276 SCK (Pin16) SPI Clock Input
+// Pins for LORA chip reset and interrupt lines
+#define RST   (14)
+#define DIO0  (26)
+#define DIO1  (33)
+#define DIO2  (32)
 
-// non arduino pin definitions
-#define RST   GPIO_NUM_14 // ESP32 GPIO14 (Pin14) -- SX1276 NRESET (Pin7) Reset Trigger Input
-#define DIO0  GPIO_NUM_26 // ESP32 GPIO26 (Pin15) -- SX1276 DIO0 (Pin8) used by LMIC for detecting LoRa RX_Done & TX_Done
-#define DIO1  GPIO_NUM_33 // ESP32 GPIO33 (Pin13) -- SX1276 DIO1 (Pin9) used by LMIC for detecting LoRa RX_Timeout
-#define DIO2  GPIO_NUM_32 // ESP32 GPIO32 (Pin12) -- SX1276 DIO2 (Pin10) not used by LMIC for LoRa (Timeout for FSK only)
+#endif

src/hal/fipy.h

@@ -1,3 +1,8 @@
+#ifndef _FIPY_H
+#define _FIPY_H
+
+#include <stdint.h>
+
 // Hardware related definitions for Pycom FiPy Board
 
 #define HAS_LORA 1 // comment out if device shall not send data via LoRa
@@ -8,16 +13,14 @@
 #define HAS_RGB_LED GPIO_NUM_0 // WS2812B RGB LED on GPIO0
 #define BOARD_HAS_PSRAM        // use extra 4MB extern RAM
 
-// Hardware pin definitions for Pycom FiPy board
-#define PIN_SPI_SS GPIO_NUM_18
-#define PIN_SPI_MOSI GPIO_NUM_27
-#define PIN_SPI_MISO GPIO_NUM_19
-#define PIN_SPI_SCK GPIO_NUM_5
-#define RST LMIC_UNUSED_PIN
-#define DIO0 GPIO_NUM_23 // LoRa IRQ
-#define DIO1 GPIO_NUM_23 // workaround
-#define DIO2 LMIC_UNUSED_PIN
+// 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
 
 // select WIFI antenna (internal = onboard / external = u.fl socket)
 #define HAS_ANTENNA_SWITCH GPIO_NUM_21 // pin for switching wifi antenna
 #define WIFI_ANTENNA 0                 // 0 = internal, 1 = external
+
+#endif

src/hal/generic.h

@@ -1,3 +1,8 @@
+#ifndef _GENERIC_H
+#define _GENERIC_H
+
+#include <stdint.h>
+
 // Hardware related definitions for generic ESP32 boards
 
 #define HAS_LORA 1 // comment out if device shall not send data via LoRa or has no LoRa
@@ -13,30 +18,28 @@
 #define HAS_BATTERY_PROBE ADC1_GPIO35_CHANNEL // uses GPIO7
 #define BATT_FACTOR 2 // voltage divider 100k/100k on board
 
-#define HAS_LED GPIO_NUM_21 // on board  LED
-#define HAS_BUTTON GPIO_NUM_39 // on board button
-#define HAS_RGB_LED   GPIO_NUM_0  // WS2812B RGB LED on GPIO0
+#define HAS_LED (21) // on board  LED
+#define HAS_BUTTON (39) // on board button
+#define HAS_RGB_LED (0) // WS2812B RGB LED on GPIO0
 
 #define BOARD_HAS_PSRAM // use extra 4MB extern RAM
 
 #define HAS_GPS 1 // use if board has GPS
 #define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_12, GPIO_NUM_15 // UBlox NEO 6M or 7M with default configuration
 
-// pin definitions for SPI interface of LoRa chip
-#define PIN_SPI_SS    GPIO_NUM_18 // SPI Chip Select
-#define PIN_SPI_MOSI  GPIO_NUM_27 // SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // SPI Clock
-#define RST LMIC_UNUSED_PIN  // LoRa Reset (if wired)
-#define DIO0 GPIO_NUM_26     // LoRa IO0
-#define DIO1 GPIO_NUM_32     // LoRa IO1
-#define DIO2 LMIC_UNUSED_PIN // LoRa IO2 (not needed)
+// Pins for I2C interface of OLED Display
+#define MY_OLED_SDA (4)
+#define MY_OLED_SCL (15)
+#define MY_OLED_RST (16)
 
-// pin definitions for I2C interface of OLED Display
-#define OLED_RST GPIO_NUM_16 // SSD1306 RST
-#define I2C_SDA GPIO_NUM_4  // SD1306 D1+D2
-#define I2C_SCL GPIO_NUM_15 // SD1306 D0
+// Pins for LORA chip reset and interrupt lines
+#define RST   (14)
+#define DIO0  (26)
+#define DIO1  (33)
+#define DIO2  LMIC_UNUSED_PIN
 
 // I2C config for Microchip 24AA02E64 DEVEUI unique address
 #define MCP_24AA02E64_I2C_ADDRESS 0x50 // I2C address for the 24AA02E64 
-#define MCP_24AA02E64_MAC_ADDRESS 0xF8 // Memory adress of unique deveui 64 bits
+#define MCP_24AA02E64_MAC_ADDRESS 0xF8 // Memory adress of unique deveui 64 bits
+
+#endif

src/hal/heltec.h

@@ -1,3 +1,8 @@
+#ifndef _HELTEC_H
+#define _HELTEC_H
+
+#include <stdint.h>
+
 // Hardware related definitions for Heltec LoRa-32 Board
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
@@ -5,22 +10,18 @@
 #define CFG_sx1276_radio 1
 
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // OLED-Display on board
-#define HAS_LED GPIO_NUM_25 // white LED on board
-#define HAS_BUTTON GPIO_NUM_0 // button "PROG" on board
+#define HAS_LED (25) // white LED on board
+#define HAS_BUTTON (0) // button "PROG" on board
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- SX1276 NSS (Pin19) SPI Chip Select Input
-#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- SX1276 MOSI (Pin18) SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- SX1276 MISO (Pin17) SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5 (Pin5)   -- SX1276 SCK (Pin16) SPI Clock Input
+// Pins for I2C interface of OLED Display
+#define MY_OLED_SDA (4)
+#define MY_OLED_SCL (15)
+#define MY_OLED_RST (16)
 
-// non arduino pin definitions
-#define RST   GPIO_NUM_14 // ESP32 GPIO14 (Pin14) -- SX1276 NRESET (Pin7) Reset Trigger Input
-#define DIO0  GPIO_NUM_26 // ESP32 GPIO26 (Pin15) -- SX1276 DIO0 (Pin8) used by LMIC for detecting LoRa RX_Done & TX_Done
-#define DIO1  GPIO_NUM_33 // ESP32 GPIO33 (Pin13) -- SX1276 DIO1 (Pin9) used by LMIC for detecting LoRa RX_Timeout
-#define DIO2  LMIC_UNUSED_PIN // 32 ESP32 GPIO32 (Pin12) -- SX1276 DIO2 (Pin10) not used by LMIC for LoRa (Timeout for FSK only)
+// Pins for LORA chip reset and interrupt lines
+#define RST   (14)
+#define DIO0  (26)
+#define DIO1  (33)
+#define DIO2  LMIC_UNUSED_PIN
 
-// Hardware pin definitions for Heltec LoRa-32 Board with OLED SSD1306 I2C Display
-#define OLED_RST GPIO_NUM_16 // ESP32 GPIO16 (Pin16) -- SD1306 RST
-#define I2C_SDA GPIO_NUM_4  // ESP32 GPIO4 (Pin4)   -- SD1306 D1+D2
-#define I2C_SCL GPIO_NUM_15 // ESP32 GPIO15 (Pin15) -- SD1306 D0
+#endif

src/hal/heltecv2.h

@@ -1,3 +1,8 @@
+#ifndef _HELTECV2_H
+#define _HELTECV2_H
+
+#include <stdint.h>
+
 // Hardware related definitions for Heltec V2 LoRa-32 Board
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
@@ -5,22 +10,18 @@
 #define CFG_sx1276_radio 1
 
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // OLED-Display on board
-#define HAS_LED GPIO_NUM_25 // white LED on board
-#define HAS_BUTTON GPIO_NUM_0 // button "PROG" on board
+#define HAS_LED (25) // white LED on board
+#define HAS_BUTTON (0) // button "PROG" on board
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 -- SX1276 NSS (Pin19) SPI Chip Select Input
-#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 -- SX1276 MOSI (Pin18) SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 -- SX1276 MISO (Pin17) SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5  -- SX1276 SCK (Pin16) SPI Clock Input
+// Pins for I2C interface of OLED Display
+#define OLED_SDA (4)
+#define OLED_SCL (15)
+#define OLED_RST (16)
 
-// non arduino pin definitions
-#define RST   GPIO_NUM_14 // ESP32 GPIO18 -- SX1276 NRESET (Pin7) Reset Trigger Input
-#define DIO0  GPIO_NUM_26 // ESP32 GPIO26 -- SX1276 DIO0 (Pin8) used by LMIC for detecting LoRa RX_Done & TX_Done
-#define DIO1  GPIO_NUM_34 // ESP32 GPIO33 -- SX1276 DIO1 (Pin9) used by LMIC for detecting LoRa RX_Timeout
-#define DIO2  GPIO_NUM_35 // 32 ESP32 GPIO32 -- SX1276 DIO2 (Pin10) not used by LMIC for LoRa (Timeout for FSK only)
+// Pins for LORA chip reset and interrupt lines
+#define RST   (14)
+#define DIO0  (26)
+#define DIO1  (34)
+#define DIO2  (35)
 
-// Hardware pin definitions for Heltec LoRa-32 Board with OLED SSD1306 I2C Display
-#define OLED_RST GPIO_NUM_16 // ESP32 GPIO16 -- SD1306 RST
-#define I2C_SDA GPIO_NUM_4  // ESP32 GPIO4   -- SD1306 D1+D2
-#define I2C_SCL GPIO_NUM_15 // ESP32 GPIO15  -- SD1306 D0
+#endif

src/hal/lolin32lite.h

@@ -1,3 +1,8 @@
+#ifndef _LOLINLITE_H
+#define _LOLINLITE_H
+
+#include <stdint.h>
+
 // Hardware related definitions for lolin32lite (without LoRa shield)
 
 #define CFG_sx1272_radio 1 // dummy
@@ -5,4 +10,6 @@
 #define HAS_LED 22        // on board LED on GPIO22
 #define LED_ACTIVE_LOW 1  // Onboard LED is active when pin is LOW
 
-#define HAS_SPI 1         // comment out if device shall not send data via SPI
+#define HAS_SPI 1         // comment out if device shall not send data via SPI
+
+#endif

src/hal/lolin32litelora.h

@@ -1,3 +1,8 @@
+#ifndef _LOLINLITELORA_H
+#define _LOLINLITELORA_H
+
+#include <stdint.h>
+
 // Hardware related definitions for lolin32 lite with loraNode32 shield
 // See https://github.com/hallard/LoLin32-Lite-Lora
 
@@ -16,24 +21,20 @@
 #define HAS_SPI   1       // comment out if device shall not send data via SPI
 #define CFG_sx1276_radio 1 // RFM95 module
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS     5 // ESP32  GPIO5 (Pin5)  -- SX1276 NSS  (Pin19) SPI Chip Select Input
-#define PIN_SPI_MOSI  23 // 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   18 // ESP32 GPIO18 (Pin18  -- SX1276 SCK  (Pin16) SPI Clock Input
+// 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
 
-// non arduino pin definitions
-#define RST   25 // ESP32 GPIO25 (Pin25) -- SX1276 NRESET (Pin7)  Reset Trigger Input
-#define DIO0  27 // ESP32 GPIO27 (Pin27) -- SX1276 DIO0   (Pin8)  used by LMIC for detecting LoRa RX_Done & TX_Done
-#define DIO1  26 // ESP32 GPIO26 (Pin26) -- SX1276 DIO1   (Pin9)  used by LMIC for detecting LoRa RX_Timeout
-#define DIO2  LMIC_UNUSED_PIN // 4 ESP32  GPIO4 (Pin4)  -- SX1276 DIO2   (Pin10) not used by LMIC for LoRa (Timeout for FSK only)
-#define DIO5  LMIC_UNUSED_PIN // 35 ESP32 GPIO35 (Pin35) -- SX1276 DIO5   not used by LMIC for LoRa (Timeout for FSK only)
-
-// Hardware pin definitions for LoRaNode32 Board with OLED I2C Display
-#define OLED_RST U8X8_PIN_NONE  // Not reset pin
-#define I2C_SDA 14             // ESP32 GPIO14 (Pin14) -- OLED SDA
-#define I2C_SCL 12             // ESP32 GPIO12 (Pin12) -- OLED SCL
+// Pins for I2C interface of OLED Display
+#define MY_OLED_SDA (14)
+#define MY_OLED_SCL (12)
+#define MY_OLED_RST U8X8_PIN_NONE
 
 // I2C config for Microchip 24AA02E64 DEVEUI unique address
 #define MCP_24AA02E64_I2C_ADDRESS 0x50 // I2C address for the 24AA02E64 
 #define MCP_24AA02E64_MAC_ADDRESS 0xF8 // Memory adress of unique deveui 64 bits
+
+#endif

src/hal/lolin32lora.h

@@ -1,3 +1,8 @@
+#ifndef _LOLINLORA_H
+#define _LOLINLORA_H
+
+#include <stdint.h>
+
 // Hardware related definitions for lolin32 with loraNode32 shield
 // See https://github.com/hallard/LoLin32-Lora
 
@@ -17,24 +22,20 @@
 #define HAS_SPI   1       // comment out if device shall not send data via SPI
 #define CFG_sx1276_radio 1 // RFM95 module
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS     5 // ESP32  GPIO5 (Pin5)  -- SX1276 NSS  (Pin19) SPI Chip Select Input
-#define PIN_SPI_MOSI  23 // 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   18 // ESP32 GPIO18 (Pin18  -- SX1276 SCK  (Pin16) SPI Clock Input
+// 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
 
-// non arduino pin definitions
-#define RST   25 // ESP32 GPIO25 (Pin25) -- SX1276 NRESET (Pin7)  Reset Trigger Input
-#define DIO0  27 // ESP32 GPIO27 (Pin27) -- SX1276 DIO0   (Pin8)  used by LMIC for detecting LoRa RX_Done & TX_Done
-#define DIO1  26 // ESP32 GPIO26 (Pin26) -- SX1276 DIO1   (Pin9)  used by LMIC for detecting LoRa RX_Timeout
-#define DIO2  LMIC_UNUSED_PIN // 4 ESP32  GPIO4 (Pin4)  -- SX1276 DIO2   (Pin10) not used by LMIC for LoRa (Timeout for FSK only)
-#define DIO5  LMIC_UNUSED_PIN // 35 ESP32 GPIO35 (Pin35) -- SX1276 DIO5   not used by LMIC for LoRa (Timeout for FSK only)
-
-// Hardware pin definitions for LoRaNode32 Board with OLED I2C Display
-#define OLED_RST U8X8_PIN_NONE  // Not reset pin
-#define I2C_SDA 21             // ESP32 GPIO21 (Pin21) -- OLED SDA
-#define I2C_SCL 22             // ESP32 GPIO22 (Pin22) -- OLED SCL
+// Pins for I2C interface of OLED Display
+#define MY_OLED_SDA (21)
+#define MY_OLED_SCL (22)
+#define MY_OLED_RST U8X8_PIN_NONE
 
 // I2C config for Microchip 24AA02E64 DEVEUI unique address
 #define MCP_24AA02E64_I2C_ADDRESS 0x50 // I2C address for the 24AA02E64 
 #define MCP_24AA02E64_MAC_ADDRESS 0xF8 // Memory adress of unique deveui 64 bits
+
+#endif

src/hal/lopy.h

@@ -1,23 +1,32 @@
+#ifndef _LOPY_H
+#define _LOPY_H
+
+#include <stdint.h>
+
 // Hardware related definitions for Pycom LoPy Board (NOT LoPy4)
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
 #define HAS_SPI 1        // comment out if device shall not send data via SPI
 #define CFG_sx1272_radio 1
 #define HAS_LED NOT_A_PIN // LoPy4 has no on board mono LED, we use on board RGB LED
-#define HAS_RGB_LED GPIO_NUM_0  // WS2812B RGB LED on GPIO0
+#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
-#define RST   GPIO_NUM_18
-#define DIO0  GPIO_NUM_23 // LoRa IRQ
-#define DIO1  GPIO_NUM_23 // Pin tied via diode to DIO0
-#define DIO2  GPIO_NUM_23 // Pin tied via diode to DIO0
+*/
+
+// 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
 
 // select WIFI antenna (internal = onboard / external = u.fl socket)
-#define HAS_ANTENNA_SWITCH  GPIO_NUM_16      // pin for switching wifi antenna
+#define HAS_ANTENNA_SWITCH  (16)      // pin for switching wifi antenna
 #define WIFI_ANTENNA 0              // 0 = internal, 1 = external
 
 // uncomment this only if your LoPy runs on a PYTRACK BOARD
@@ -26,10 +35,12 @@
 //#define GPS_ADDR 0x10
 
 // uncomment this only if your LoPy runs on a EXPANSION BOARD
-//#define HAS_LED GPIO_NUM_12 // use if LoPy is on Expansion Board, this has a user LED
+//#define HAS_LED (12) // use if LoPy is on Expansion Board, this has a user LED
 //#define LED_ACTIVE_LOW 1 // use if LoPy is on Expansion Board, this has a user LED
-//#define HAS_BUTTON GPIO_NUM_13 // user button on expansion board
+//#define HAS_BUTTON (13) // user button on expansion board
 //#define BUTTON_PULLUP 1  // Button need pullup instead of default pulldown
 //#define HAS_BATTERY_PROBE ADC1_GPIO39_CHANNEL // battery probe GPIO pin -> ADC1_CHANNEL_7
 //#define BATT_FACTOR 2 // voltage divider 1MOhm/1MOhm -> expansion board 3.0
 //#define BATT_FACTOR 4 // voltage divider 115kOhm/56kOhm -> expansion board 2.0
+
+#endif

src/hal/lopy4.h

@@ -1,24 +1,25 @@
+#ifndef _LOPY4_H
+#define _LOPY4_H
+
+#include <stdint.h>
+
 // Hardware related definitions for Pycom LoPy4 Board
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
 #define HAS_SPI 1        // comment out if device shall not send data via SPI
 #define CFG_sx1276_radio 1
 //#define HAS_LED NOT_A_PIN // LoPy4 has no on board mono LED, we use on board RGB LED
-#define HAS_RGB_LED   GPIO_NUM_0  // WS2812B RGB LED on GPIO0 (P2)
+#define HAS_RGB_LED (0)  // WS2812B RGB LED on GPIO0 (P2)
 #define BOARD_HAS_PSRAM // use extra 4MB extern RAM
 
-// Hardware pin definitions for Pycom LoPy4 board
-#define PIN_SPI_SS    GPIO_NUM_18
-#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   LMIC_UNUSED_PIN
-#define DIO0  GPIO_NUM_23 // LoRa IRQ
-#define DIO1  GPIO_NUM_23 // Pin tied via diode to DIO0
-#define DIO2  GPIO_NUM_23 // Pin tied via diode to DIO0
+#define DIO0  (23) // LoRa IRQ
+#define DIO1  (23) // Pin tied via diode to DIO0
+#define DIO2  (23) // Pin tied via diode to DIO0
 
 // select WIFI antenna (internal = onboard / external = u.fl socket)
-#define HAS_ANTENNA_SWITCH  GPIO_NUM_21 // pin for switching wifi antenna (P12)
+#define HAS_ANTENNA_SWITCH  (21) // pin for switching wifi antenna (P12)
 #define WIFI_ANTENNA 0    // 0 = internal, 1 = external
 
 // uncomment this only if your LoPy runs on a PYTRACK BOARD
@@ -27,10 +28,12 @@
 //#define GPS_ADDR 0x10
 
 // uncomment this only if your LoPy runs on a EXPANSION BOARD
-#define HAS_LED GPIO_NUM_12 // use if LoPy is on Expansion Board, this has a user LED
+#define HAS_LED (12) // use if LoPy is on Expansion Board, this has a user LED
 #define LED_ACTIVE_LOW 1 // use if LoPy is on Expansion Board, this has a user LED
-#define HAS_BUTTON GPIO_NUM_13 // user button on expansion board
+#define HAS_BUTTON (13) // user button on expansion board
 #define BUTTON_PULLUP 1  // Button need pullup instead of default pulldown
 #define HAS_BATTERY_PROBE ADC1_GPIO39_CHANNEL // battery probe GPIO pin -> ADC1_CHANNEL_7
 #define BATT_FACTOR 2 // voltage divider 1MOhm/1MOhm -> expansion board 3.0
-//#define BATT_FACTOR 4 // voltage divider 115kOhm/56kOhm -> expansion board 2.0
+//#define BATT_FACTOR 4 // voltage divider 115kOhm/56kOhm -> expansion board 2.0
+
+#endif

src/hal/octopus32.h

@@ -1,3 +1,8 @@
+#ifndef _OCTOPUS_H
+#define _OCTOPUS_H
+
+#include <stdint.h>
+
 // Hardware related definitions for #IoT Octopus32 with the Adafruit LoRaWAN Wing
 // You can use this configuration also with the Adafruit ESP32 Feather + the LoRaWAN Wing
 // In this config we use the Adafruit OLED Wing which is only 128x32 pixel, need to find a smaller font
@@ -15,27 +20,25 @@
 #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
 
-//GPIO_NUM_
-// non arduino pin definitions
-#define RST   LMIC_UNUSED_PIN // ESP32 GPIO25 (Pin25) -- SX1276 NRESET (Pin7)  Reset Trigger Input
-#define DIO0  33 // ESP32 GPIO27 (Pin27) -- SX1276 DIO0   (Pin8)  used by LMIC for detecting LoRa RX_Done & TX_Done
-#define DIO1  33 // ESP32 GPIO26 (Pin26) -- SX1276 DIO1   (Pin9)  used by LMIC for detecting LoRa RX_Timeout
-#define DIO2  LMIC_UNUSED_PIN // 4 ESP32  GPIO4 (Pin4)  -- SX1276 DIO2   (Pin10) not used by LMIC for LoRa (Timeout for FSK only)
-#define DIO5  LMIC_UNUSED_PIN // 35 ESP32 GPIO35 (Pin35) -- SX1276 DIO5   not used by LMIC for LoRa (Timeout for FSK only)
+// 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
 
-// Hardware pin definitions for LoRaNode32 Board with OLED I2C Display
-#define OLED_RST U8X8_PIN_NONE  // Not reset pin
-#define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // U8X8_SSD1306_128X32_UNIVISION_SW_I2C // 
-//#define DISPLAY_FLIP  1 // uncomment this for rotated display
-#define I2C_SDA 23  //21            // ESP32 GPIO14 (Pin14) -- OLED SDA
-#define I2C_SCL 22  //22            // ESP32 GPIO12 (Pin12) -- OLED SCL
+// Pins for I2C interface of OLED Display
+#define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // U8X8_SSD1306_128X32_UNIVISION_SW_I2C //
+//#define DISPLAY_FLIP  1 // uncomment this for rotated display 
+#define MY_OLED_SDA (23)
+#define MY_OLED_SCL (22)
+#define MY_OLED_RST U8X8_PIN_NONE 
 
-// I2C config for Microchip 24AA02E64 DEVEUI unique address
-//#define MCP_24AA02E64_I2C_ADDRESS 0x50 // I2C address for the 24AA02E64 
-//#define MCP_24AA02E64_MAC_ADDRESS 0xF8 // Memory adress of unique deveui 64 bits
+#endif

src/hal/ttgobeam.h

@@ -1,3 +1,8 @@
+#ifndef _TTGOBEAM_H
+#define _TTGOBEAM_H
+
+#include <stdint.h>
+
 // Hardware related definitions for TTGO T-Beam board
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
@@ -14,15 +19,11 @@
 #define HAS_GPS 1 // use on board GPS
 #define GPS_SERIAL 9600, SERIAL_8N1, GPIO_NUM_12, GPIO_NUM_15 // UBlox NEO 6M or 7M with default configuration
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- HPD13A NSS/SEL (Pin4) SPI Chip Select Input
-#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- HPD13A MOSI/DSI (Pin6) SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- HPD13A MISO/DSO (Pin7) SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5 (Pin5)   -- HPD13A SCK (Pin5) SPI Clock Input
+// 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
 
-// non arduino pin definitions
-#define RST LMIC_UNUSED_PIN // connected to ESP32 RST/EN
-#define DIO0 GPIO_NUM_26    // ESP32 GPIO26 <-> HPD13A IO0
-#define DIO1 GPIO_NUM_32 // Lora1 <-> HPD13A IO1 // !! NEEDS EXTERNAL WIRING !!
-//#define DIO1 GPIO_NUM_33 // Lora1 <-> HPD13A IO1 // for T-Beam T22_V05 and T22_V07, other versions may need external wiring
-#define DIO2 LMIC_UNUSED_PIN // Lora2 <-> HPD13A IO2 // not needed for LoRa
+#endif

src/hal/ttgov1.h

@@ -1,3 +1,8 @@
+#ifndef _TTGOV1_H
+#define _TTGOV1_H
+
+#include <stdint.h>
+
 // Hardware related definitions for TTGOv1 board
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
@@ -6,23 +11,19 @@
 
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // OLED-Display on board
 //#define DISPLAY_FLIP  1 // uncomment this for rotated display
-#define HAS_LED GPIO_NUM_2 // white LED on board
+#define HAS_LED (2) // white LED on board
 #define LED_ACTIVE_LOW 1  // Onboard LED is active when pin is LOW
-#define HAS_BUTTON GPIO_NUM_0 // button "PRG" on board
+#define HAS_BUTTON (0) // button "PRG" on board
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- SX1276 NSS (Pin19) SPI Chip Select Input
-#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- SX1276 MOSI (Pin18) SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- SX1276 MISO (Pin17) SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5 (Pin5)   -- SX1276 SCK (Pin16) SPI Clock Input
+// Pins for I2C interface of OLED Display
+#define MY_OLED_SDA (4)
+#define MY_OLED_SCL (15)
+#define MY_OLED_RST (16)
 
-// non arduino pin definitions
-#define RST   GPIO_NUM_14 // ESP32 GPIO14 (Pin14) -- SX1276 NRESET (Pin7) Reset Trigger Input
-#define DIO0  GPIO_NUM_26 // ESP32 GPIO26 (Pin15) -- SX1276 DIO0 (Pin8) used by LMIC for detecting LoRa RX_Done & TX_Done
-#define DIO1  GPIO_NUM_33 // ESP32 GPIO33 (Pin13) -- SX1276 DIO1 (Pin9) used by LMIC for detecting LoRa RX_Timeout
-#define DIO2  LMIC_UNUSED_PIN // 32 ESP32 GPIO32 (Pin12) -- SX1276 DIO2 (Pin10) not used by LMIC for LoRa (Timeout for FSK only)
+// Pins for LORA chip reset and interrupt lines
+#define RST   (14)
+#define DIO0  (26)
+#define DIO1  (33)
+#define DIO2  LMIC_UNUSED_PIN
 
-// Hardware pin definitions for TTGOv1 Board with OLED SSD1306 I2C Display
-#define OLED_RST GPIO_NUM_16 // ESP32 GPIO16 (Pin16) -- SD1306 Reset
-#define I2C_SDA GPIO_NUM_4  // ESP32 GPIO4 (Pin4)   -- SD1306 Data
-#define I2C_SCL GPIO_NUM_15 // ESP32 GPIO15 (Pin15) -- SD1306 Clock
+#endif

src/hal/ttgov2.h

@@ -1,3 +1,8 @@
+#ifndef _TTGOV2_H
+#define _TTGOV2_H
+
+#include <stdint.h>
+
 // Hardware related definitions for TTGO V2 Board
 
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
@@ -11,46 +16,15 @@
 // disable brownout detection (needed on TTGOv2 for battery powered operation)
 #define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- HPD13A NSS/SEL (Pin4) SPI Chip Select Input
-#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- HPD13A MOSI/DSI (Pin6) SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- HPD13A MISO/DSO (Pin7) SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5 (Pin5)   -- HPD13A SCK (Pin5) SPI Clock Input
+// Pins for I2C interface of OLED Display
+#define MY_OLED_SDA (21)
+#define MY_OLED_SCL (22)
+#define MY_OLED_RST U8X8_PIN_NONE
 
-// non arduino pin definitions
-#define RST   LMIC_UNUSED_PIN // connected to ESP32 RST/EN
-#define DIO0  GPIO_NUM_26 // ESP32 GPIO26 wired on PCB to HPD13A
-#define DIO1  GPIO_NUM_33 // HPDIO1 on pcb, needs to be wired external to GPIO33
-#define DIO2  LMIC_UNUSED_PIN // 32 HPDIO2 on pcb, needs to be wired external to GPIO32 (not necessary for LoRa, only FSK)
+// Pins for LORA chip reset and interrupt lines
+#define RST   LMIC_UNUSED_PIN
+#define DIO0  (26)
+#define DIO1  (33)
+#define DIO2  LMIC_UNUSED_PIN
 
-// Hardware pin definitions for TTGO V2 Board with OLED SSD1306 0,96" I2C Display
-#define OLED_RST U8X8_PIN_NONE // connected to CPU RST/EN
-#define I2C_SDA GPIO_NUM_21  // ESP32 GPIO21 -- SD1306 D1+D2
-#define I2C_SCL GPIO_NUM_22 // ESP32 GPIO22 -- SD1306 D0
-
-/* source:
-https://www.thethingsnetwork.org/forum/t/big-esp32-sx127x-topic-part-2/11973
-
-TTGO LoRa32 V2:
-ESP32          LoRa (SPI)      Display (I2C)  LED
------------    ----------      -------------  ------------------
-GPIO5  SCK     SCK
-GPIO27 MOSI    MOSI
-GPIO19 MISO    MISO
-GPIO18 SS      NSS
-EN     RST     RST
-GPIO26         DIO0
-GPIO33         DIO1 (see #1)
-GPIO32         DIO2 (see #2)
-GPIO22 SCL                     SCL
-GPIO21 SDA                     SDA
-GPIO22                                        useless (see #3)
-
-#1 Required (used by LMIC for LoRa).
-Not on-board wired to any GPIO. Must be manually wired. <<-- necessary for paxcounter
-
-#2 Optional (used by LMIC for FSK but not for LoRa). <<-- NOT necessary for paxcounter
-Not on-board wired to any GPIO. When needed: must be manually wired.
-
-#3 GPIO22 is already used for SCL therefore LED cannot be used without conflicting with I2C and display.
-*/ 
+#endif

src/hal/ttgov21new.h

@@ -1,3 +1,8 @@
+#ifndef _TTGOV21NEW_H
+#define _TTGOV21NEW_H
+
+#include <stdint.h>
+
 /*  Hardware related definitions for TTGO V2.1 Board
 // ATTENTION: check your board version!
 // This settings are for boards labeled v1.6 on pcb, NOT for v1.5 or older
@@ -8,23 +13,19 @@
 #define CFG_sx1276_radio 1 // HPD13A LoRa SoC
 
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C
-#define HAS_LED GPIO_NUM_25 // green on board LED
+#define HAS_LED (25) // green on board LED
 #define HAS_BATTERY_PROBE ADC1_GPIO35_CHANNEL // uses GPIO7
 #define BATT_FACTOR 2 // voltage divider 100k/100k on board
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- HPD13A NSS/SEL (Pin4) SPI Chip Select Input
-#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- HPD13A MOSI/DSI (Pin6) SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- HPD13A MISO/DSO (Pin7) SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5 (Pin5)   -- HPD13A SCK (Pin5) SPI Clock Input
+// Pins for I2C interface of OLED Display
+#define MY_OLED_SDA (21)
+#define MY_OLED_SCL (22)
+#define MY_OLED_RST U8X8_PIN_NONE
 
-// non arduino pin definitions
-#define RST   GPIO_NUM_23 // ESP32 GPIO23 <-> HPD13A RESET
-#define DIO0  GPIO_NUM_26 // ESP32 GPIO26 <-> HPD13A IO0
-#define DIO1  GPIO_NUM_33 // ESP32 GPIO33 <-> HPDIO1 <-> HPD13A IO1
-#define DIO2  GPIO_NUM_32 // ESP32 GPIO32 <-> HPDIO2 <-> HPD13A IO2
+// Pins for LORA chip reset and interrupt lines
+#define RST   (23)
+#define DIO0  (26)
+#define DIO1  (33)
+#define DIO2  (32)
 
-// Hardware pin definitions for TTGO V2 Board with OLED SSD1306 0,96" I2C Display
-#define OLED_RST U8X8_PIN_NONE // connected to CPU RST/EN
-#define I2C_SDA GPIO_NUM_21 // ESP32 GPIO21 -- SD1306 D1+D2
-#define I2C_SCL GPIO_NUM_22 // ESP32 GPIO22 -- SD1306 D0
+#endif

src/hal/ttgov21old.h

@@ -1,3 +1,9 @@
+#ifndef _TTGOV21OLD_H
+#define _TTGOV21OLD_H
+
+#include <stdint.h>
+
+
 /*  Hardware related definitions for TTGO V2.1 Board
 // ATTENTION: check your board version!
 // This settings are for boards without label on pcb, or labeled v1.5 on pcb
@@ -14,20 +20,15 @@
 //#define HAS_BATTERY_PROBE ADC1_GPIO35_CHANNEL // uses GPIO7
 //#define BATT_FACTOR 2 // voltage divider 100k/100k on board
 
-// re-define pin definitions of pins_arduino.h
-#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- HPD13A NSS/SEL (Pin4) SPI Chip Select Input
-#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- HPD13A MOSI/DSI (Pin6) SPI Data Input
-#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- HPD13A MISO/DSO (Pin7) SPI Data Output
-#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5 (Pin5)   -- HPD13A SCK (Pin5) SPI Clock Input
+// Pins for I2C interface of OLED Display
+#define MY_OLED_SDA (21)
+#define MY_OLED_SCL (22)
+#define MY_OLED_RST U8X8_PIN_NONE
 
-// non arduino pin definitions
-#define RST   LMIC_UNUSED_PIN   // connected to ESP32 RST/EN (old board)
-//#define RST   GPIO_NUM_12     // (boards labeled v1.5)
-#define DIO0  GPIO_NUM_26 // ESP32 GPIO26 <-> HPD13A IO0
-#define DIO1  GPIO_NUM_33 // ESP32 GPIO33 <-> HPDIO1 <-> HPD13A IO1
-#define DIO2  GPIO_NUM_32 // ESP32 GPIO32 <-> HPDIO2 <-> HPD13A IO2
+// Pins for LORA chip reset and interrupt lines
+#define RST   LMIC_UNUSED_PIN
+#define DIO0  (26)
+#define DIO1  (33)
+#define DIO2  (32)
 
-// Hardware pin definitions for TTGO V2 Board with OLED SSD1306 0,96" I2C Display
-#define OLED_RST U8X8_PIN_NONE // connected to CPU RST/EN
-#define I2C_SDA GPIO_NUM_21 // ESP32 GPIO21 -- SD1306 D1+D2
-#define I2C_SCL GPIO_NUM_22 // ESP32 GPIO22 -- SD1306 D0
+#endif

src/lmic_config.h

@@ -0,0 +1,95 @@
+// COUNTRY AND PROJECT SPECIFIC DEFINITIONS FOR LMIC STACK
+
+// COUNTRY SETTINGS
+// --> please check with you local regulations for ISM band frequency use!
+//
+// CFG_eu868	EU 863-870 MHz
+// CFG_us915    US 902-928 MHz
+// CFG_au921	Australia 915-928 MHz
+// CFG_as923	Asia 923 MHz
+// CFG_in866	India 865-867 MHz
+
+#define CFG_eu868 1
+//#define CFG_us915 1
+//#define CFG_in866 1
+//#define CFG_au921 1
+//#define CFG_as923 1
+//#define LMIC_COUNTRY_CODE LMIC_COUNTRY_CODE_JP	/* for as923-JP */
+
+// LMIC LORAWAN STACK SETTINGS
+// --> adapt to your device only if necessary
+
+//#define LMIC_USE_INTERRUPTS
+
+// 16 μs per tick
+// LMIC requires ticks to be 15.5μs - 100 μs long
+#define US_PER_OSTICK_EXPONENT 4
+#define US_PER_OSTICK (1 << US_PER_OSTICK_EXPONENT)
+#define OSTICKS_PER_SEC (1000000 / US_PER_OSTICK)
+
+// This tells LMIC to make the receive windows bigger, in case your clock is
+// faster or slower. This causes the transceiver to be earlier switched on,
+// so consuming more power. You may sharpen (reduce) this value if you are
+// limited on battery.
+#define CLOCK_ERROR_PROCENTAGE 20
+
+// Set this to 1 to enable some basic debug output (using printf) about
+// RF settings used during transmission and reception. Set to 2 to
+// enable more verbose output. Make sure that printf is actually
+// configured (e.g. on AVR it is not by default), otherwise using it can
+// cause crashing.
+//#define LMIC_DEBUG_LEVEL 1
+
+// Enable this to allow using printf() to print to the given serial port
+// (or any other Print object). This can be easy for debugging. The
+// current implementation only works on AVR, though.
+//#define LMIC_PRINTF_TO Serial
+
+// Any runtime assertion failures are printed to this serial port (or
+// any other Print object). If this is unset, any failures just silently
+// halt execution.
+#define LMIC_FAILURE_TO Serial
+
+// Uncomment this to disable all code related to joining
+//#define DISABLE_JOIN
+// Uncomment this to disable all code related to ping
+#define DISABLE_PING
+// Uncomment this to disable all code related to beacon tracking.
+// Requires ping to be disabled too
+#define DISABLE_BEACONS
+
+// Uncomment these to disable the corresponding MAC commands.
+// Class A
+//#define DISABLE_MCMD_DCAP_REQ // duty cycle cap
+//#define DISABLE_MCMD_DN2P_SET // 2nd DN window param
+//#define DISABLE_MCMD_SNCH_REQ // set new channel
+// Class B
+//#define DISABLE_MCMD_PING_SET // set ping freq, automatically disabled by
+// DISABLE_PING #define DISABLE_MCMD_BCNI_ANS // next beacon start, automatical
+// disabled by DISABLE_BEACON
+
+// In LoRaWAN, a gateway applies I/Q inversion on TX, and nodes do the
+// same on RX. This ensures that gateways can talk to nodes and vice
+// versa, but gateways will not hear other gateways and nodes will not
+// hear other nodes. By uncommenting this macro, this inversion is
+// disabled and this node can hear other nodes. If two nodes both have
+// this macro set, they can talk to each other (but they can no longer
+// hear gateways). This should probably only be used when debugging
+// and/or when talking to the radio directly (e.g. like in the "raw"
+// example).
+//#define DISABLE_INVERT_IQ_ON_RX
+
+// This allows choosing between multiple included AES implementations.
+// Make sure exactly one of these is uncommented.
+//
+// This selects the original AES implementation included LMIC. This
+// implementation is optimized for speed on 32-bit processors using
+// fairly big lookup tables, but it takes up big amounts of flash on the
+// AVR architecture.
+#define USE_ORIGINAL_AES
+//
+// This selects the AES implementation written by Ideetroon for their
+// own LoRaWAN library. It also uses lookup tables, but smaller
+// byte-oriented ones, making it use a lot less flash space (but it is
+// also about twice as slow as the original).
+// #define USE_IDEETRON_AES

src/lorawan.cpp

@@ -10,13 +10,22 @@ osjob_t sendjob;
 QueueHandle_t LoraSendQueue;
 
 // LMIC enhanced Pin mapping
-const lmic_pinmap lmic_pins = {.mosi = PIN_SPI_MOSI,
-                               .miso = PIN_SPI_MISO,
-                               .sck = PIN_SPI_SCK,
-                               .nss = PIN_SPI_SS,
-                               .rxtx = LMIC_UNUSED_PIN,
-                               .rst = RST,
-                               .dio = {DIO0, DIO1, DIO2}};
+const lmic_pinmap lmic_pins = {
+    .nss = SS,
+    .rxtx = LMIC_UNUSED_PIN,
+    .rst = RST,
+    .dio = {DIO0, DIO1, DIO2}
+    // optional: set polarity of rxtx pin.
+    //.rxtx_rx_active = 0,
+    // optional: set RSSI cal for listen-before-talk
+    // this value is in dB, and is added to RSSI
+    // measured prior to decision.
+    // Must include noise guardband! Ignored in US,
+    // EU, IN, other markets where LBT is not required.
+    //.rssi_cal = 0,
+    // optional: override LMIC_SPI_FREQ if non-zero
+    //.spi_freq = 0,
+};
 
 // DevEUI generator using devices's MAC address
 void gen_lora_deveui(uint8_t *pdeveui) {
@@ -100,7 +109,7 @@ void get_hard_deveui(uint8_t *pdeveui) {
   uint8_t i2c_ret;
 
   // Init this just in case, no more to 100KHz
-  Wire.begin(I2C_SDA, I2C_SCL, 100000);
+  Wire.begin(SDA, SCL, 100000);
   Wire.beginTransmission(MCP_24AA02E64_I2C_ADDRESS);
   Wire.write(MCP_24AA02E64_MAC_ADDRESS);
   i2c_ret = Wire.endTransmission();
@@ -149,82 +158,63 @@ void showLoraKeys(void) {
 
 void onEvent(ev_t ev) {
   char buff[24] = "";
-
   switch (ev) {
+
   case EV_SCAN_TIMEOUT:
     strcpy_P(buff, PSTR("SCAN TIMEOUT"));
     break;
+
   case EV_BEACON_FOUND:
-    strcpy_P(buff, PSTR("BEACON FOUND"));
+    strcpy_P(buff, PSTR("BEACON_FOUND"));
     break;
+
   case EV_BEACON_MISSED:
-    strcpy_P(buff, PSTR("BEACON MISSED"));
+    strcpy_P(buff, PSTR("BEACON_MISSED"));
     break;
+
   case EV_BEACON_TRACKED:
-    strcpy_P(buff, PSTR("BEACON TRACKED"));
+    strcpy_P(buff, PSTR("BEACON_TRACKED"));
     break;
+
   case EV_JOINING:
     strcpy_P(buff, PSTR("JOINING"));
     break;
-  case EV_LOST_TSYNC:
-    strcpy_P(buff, PSTR("LOST TSYNC"));
-    break;
-  case EV_RESET:
-    strcpy_P(buff, PSTR("RESET"));
-    break;
-  case EV_RXCOMPLETE:
-    strcpy_P(buff, PSTR("RX COMPLETE"));
-    break;
-  case EV_LINK_DEAD:
-    strcpy_P(buff, PSTR("LINK DEAD"));
-    break;
-  case EV_LINK_ALIVE:
-    strcpy_P(buff, PSTR("LINK ALIVE"));
-    break;
-  case EV_RFU1:
-    strcpy_P(buff, PSTR("RFUI"));
-    break;
-  case EV_JOIN_FAILED:
-    strcpy_P(buff, PSTR("JOIN FAILED"));
-    break;
-  case EV_REJOIN_FAILED:
-    strcpy_P(buff, PSTR("REJOIN FAILED"));
-    break;
 
   case EV_JOINED:
-
     strcpy_P(buff, PSTR("JOINED"));
     sprintf(display_line6, " "); // clear previous lmic status
-
     // set data rate adaptation according to saved setting
     LMIC_setAdrMode(cfg.adrmode);
-
     // set cyclic lmic link check to off if no ADR because is not supported by
     // ttn (but enabled by lmic after join)
     LMIC_setLinkCheckMode(cfg.adrmode);
-
     // Set data rate and transmit power (note: txpower seems to be ignored by
     // the library)
     switch_lora(cfg.lorasf, cfg.txpower);
-
     // kickoff first send job
     os_setCallback(&sendjob, lora_send);
-
     // show effective LoRa parameters after join
     ESP_LOGI(TAG, "ADR=%d, SF=%d, TXPOWER=%d", cfg.adrmode, cfg.lorasf,
              cfg.txpower);
     break;
 
-  case EV_TXCOMPLETE:
+  case EV_JOIN_FAILED:
+    strcpy_P(buff, PSTR("JOIN_FAILED"));
+    break;
 
+  case EV_REJOIN_FAILED:
+    strcpy_P(buff, PSTR("REJOIN_FAILED"));
+    break;
+
+  case EV_TXCOMPLETE:
     strcpy_P(buff, (LMIC.txrxFlags & TXRX_ACK) ? PSTR("RECEIVED ACK")
                                                : PSTR("TX COMPLETE"));
     sprintf(display_line6, " "); // clear previous lmic status
 
     if (LMIC.dataLen) {
       ESP_LOGI(TAG, "Received %d bytes of payload, RSSI %d SNR %d",
-               LMIC.dataLen, LMIC.rssi, (signed char)LMIC.snr);
-      sprintf(display_line6, "RSSI %d SNR %d", LMIC.rssi,
+               LMIC.dataLen, (signed char)LMIC.rssi, (signed char)LMIC.snr);
+      sprintf(display_line6, "RSSI %d SNR %d", (signed char)LMIC.rssi,
               (signed char)LMIC.snr);
 
       // check if command is received on command port, then call interpreter
@@ -234,6 +224,49 @@ void onEvent(ev_t ev) {
     }
     break;
 
+  case EV_LOST_TSYNC:
+    strcpy_P(buff, PSTR("LOST_TSYNC"));
+    break;
+
+  case EV_RESET:
+    strcpy_P(buff, PSTR("RESET"));
+    break;
+
+  case EV_RXCOMPLETE:
+    // data received in ping slot
+    strcpy_P(buff, PSTR("RX COMPLETE"));
+    break;
+
+  case EV_LINK_DEAD:
+    strcpy_P(buff, PSTR("LINK DEAD"));
+    break;
+
+  case EV_LINK_ALIVE:
+    strcpy_P(buff, PSTR("LINK ALIVE"));
+    break;
+
+  case EV_TXSTART:
+    strcpy_P(buff, PSTR("TX START"));
+    break;
+
+    /*
+    || This event is defined but not used in the code. No
+    || point in wasting codespace on it.
+    ||
+    || case EV_SCAN_FOUND:
+    ||    Serial.println(F("EV_SCAN_FOUND"));
+    ||    break;
+    */
+
+    /*
+    || This event is defined but not used in the code. No
+    || point in wasting codespace on it.
+    ||
+    || case EV_RFU1:
+    ||     Serial.println(F("EV_RFU1"));
+    ||     break;
+    */
+
   default:
     sprintf_P(buff, PSTR("UNKNOWN EVENT %d"), ev);
     break;
@@ -244,8 +277,7 @@ void onEvent(ev_t ev) {
     ESP_LOGI(TAG, "EV_%s", buff);
     sprintf(display_line7, buff);
   }
-
-} // onEvent()
+}
 
 // helper function to assign LoRa datarates to numeric spreadfactor values
 void switch_lora(uint8_t sf, uint8_t tx) {
@@ -306,7 +338,7 @@ void lora_send(osjob_t *job) {
       LMIC_setTxData2(SendBuffer.MessagePort, SendBuffer.Message,
                       SendBuffer.MessageSize, (cfg.countermode & 0x02));
       ESP_LOGI(TAG, "%d bytes sent to LoRa", SendBuffer.MessageSize);
-      sprintf(display_line7, "PACKET QUEUED");
+      //sprintf(display_line7, "PACKET QUEUED");
     }
   }
   // reschedule job every 0,5 - 1 sec. including a bit of random to prevent

src/main.cpp

@@ -166,10 +166,7 @@ void setup() {
   ESP_LOGI(TAG, "Starting LMIC...");
   os_init();    // initialize lmic run-time environment on core 1
   LMIC_reset(); // initialize lmic MAC
-  LMIC_setClockError(MAX_CLOCK_ERROR * 1 /
-                     100); // This tells LMIC to make the receive windows
-                           // bigger, in case your clock is 1% faster or slower.
-
+  LMIC_setClockError(MAX_CLOCK_ERROR * CLOCK_ERROR_PROCENTAGE / 100);
   LMIC_startJoining(); // start joining
 
 #endif

src/ota.cpp

@@ -250,7 +250,7 @@ void do_ota_update() {
   // check whether we have everything for OTA update
   if (contentLength && isValidContentType) {
 
-    size_t written, current, size;
+    size_t written = 0;
 
     if (Update.begin(contentLength)) {
 #ifdef HAS_DISPLAY
@@ -270,7 +270,7 @@ void do_ota_update() {
 
         if (written == contentLength) {
           ESP_LOGI(TAG, "Written %u bytes successfully", written);
-          snprintf(buf, 17, "%u kB Done!", (uint16_t)(written / 1024));
+          snprintf(buf, 17, "%ukB Done!", (uint16_t)(written / 1024));
           display(4, "OK", buf);
           break;
         } else {
@@ -329,7 +329,7 @@ void display(const uint8_t row, const std::string status,
 
 #ifdef HAS_DISPLAY
 // callback function to show download progress while streaming data
-void show_progress(size_t current, size_t size) {
+void show_progress (unsigned long current, unsigned long size) {
   char buf[17];
   snprintf(buf, 17, "%-9lu (%3lu%%)", current, current * 100 / size);
   display(4, "**", buf);

src/paxcounter.conf

@@ -72,82 +72,4 @@
 #define OTA_MIN_BATT                    3700    // minimum battery level vor OTA [millivolt]
 
 // LMIC settings
-// define hardware independent LMIC settings here, settings of standard library in /lmic/config.h will be ignored
-// define hardware specifics settings in platformio.ini as build_flag for hardware environment
-
-// Select frequency band here according to national regulations
-#define CFG_eu868 1
-//#define CFG_us915 1
-
-// This is the SX1272/SX1273 radio, which is also used on the HopeRF
-// RFM92 boards.
-//#define CFG_sx1272_radio 1
-// This is the SX1276/SX1277/SX1278/SX1279 radio, which is also used on
-// the HopeRF RFM95 boards.
-//#define CFG_sx1276_radio 1
-
-// 16 μs per tick
-// LMIC requires ticks to be 15.5μs - 100 μs long
-#define US_PER_OSTICK_EXPONENT 4
-#define US_PER_OSTICK (1 << US_PER_OSTICK_EXPONENT)
-#define OSTICKS_PER_SEC (1000000 / US_PER_OSTICK)
-
-// Set this to 1 to enable some basic debug output (using printf) about
-// RF settings used during transmission and reception. Set to 2 to
-// enable more verbose output. Make sure that printf is actually
-// configured (e.g. on AVR it is not by default), otherwise using it can
-// cause crashing.
-//#define LMIC_DEBUG_LEVEL 1
-
-// Enable this to allow using printf() to print to the given serial port
-// (or any other Print object). This can be easy for debugging. The
-// current implementation only works on AVR, though.
-//#define LMIC_PRINTF_TO Serial
-
-// Any runtime assertion failures are printed to this serial port (or
-// any other Print object). If this is unset, any failures just silently
-// halt execution.
-#define LMIC_FAILURE_TO Serial
-
-// Uncomment this to disable all code related to joining
-//#define DISABLE_JOIN
-// Uncomment this to disable all code related to ping
-#define DISABLE_PING
-// Uncomment this to disable all code related to beacon tracking.
-// Requires ping to be disabled too
-#define DISABLE_BEACONS
-
-// Uncomment these to disable the corresponding MAC commands.
-// Class A
-//#define DISABLE_MCMD_DCAP_REQ // duty cycle cap
-//#define DISABLE_MCMD_DN2P_SET // 2nd DN window param
-//#define DISABLE_MCMD_SNCH_REQ // set new channel
-// Class B
-//#define DISABLE_MCMD_PING_SET // set ping freq, automatically disabled by DISABLE_PING
-//#define DISABLE_MCMD_BCNI_ANS // next beacon start, automatical disabled by DISABLE_BEACON
-
-// In LoRaWAN, a gateway applies I/Q inversion on TX, and nodes do the
-// same on RX. This ensures that gateways can talk to nodes and vice
-// versa, but gateways will not hear other gateways and nodes will not
-// hear other nodes. By uncommenting this macro, this inversion is
-// disabled and this node can hear other nodes. If two nodes both have
-// this macro set, they can talk to each other (but they can no longer
-// hear gateways). This should probably only be used when debugging
-// and/or when talking to the radio directly (e.g. like in the "raw"
-// example).
-//#define DISABLE_INVERT_IQ_ON_RX
-
-// This allows choosing between multiple included AES implementations.
-// Make sure exactly one of these is uncommented.
-//
-// This selects the original AES implementation included LMIC. This
-// implementation is optimized for speed on 32-bit processors using
-// fairly big lookup tables, but it takes up big amounts of flash on the
-// AVR architecture.
-#define USE_ORIGINAL_AES
-//
-// This selects the AES implementation written by Ideetroon for their
-// own LoRaWAN library. It also uses lookup tables, but smaller
-// byte-oriented ones, making it use a lot less flash space (but it is
-// also about twice as slow as the original).
-// #define USE_IDEETRON_AES
+// moved to src/lmic_config.h