refactor inis

richonguzman · Nov 6, 2024 · 970d743 · 970d743
1 parent 7c5e58f
commit 970d743
Show file tree

Hide file tree

Showing 36 changed files with 406 additions and 379 deletions.
diff --git a/common_settings.ini b/common_settings.ini
@@ -0,0 +1,44 @@
+[common]
+build_flags =
+	-Werror -Wall
+	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
+	-DRADIOLIB_EXCLUDE_CC1101=1
+	-DRADIOLIB_EXCLUDE_NRF24=1
+	-DRADIOLIB_EXCLUDE_RF69=1
+	-DRADIOLIB_EXCLUDE_SX1231=1
+	-DRADIOLIB_EXCLUDE_SX1233=1
+	-DRADIOLIB_EXCLUDE_SI443X=1
+	-DRADIOLIB_EXCLUDE_RFM2X=1
+	-DRADIOLIB_EXCLUDE_AFSK=1
+	-DRADIOLIB_EXCLUDE_BELL=1
+	-DRADIOLIB_EXCLUDE_HELLSCHREIBER=1
+	-DRADIOLIB_EXCLUDE_MORSE=1
+	-DRADIOLIB_EXCLUDE_RTTY=1
+	-DRADIOLIB_EXCLUDE_SSTV=1
+	-DRADIOLIB_EXCLUDE_AX25=1
+	-DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1
+	-DRADIOLIB_EXCLUDE_BELL=1
+	-DRADIOLIB_EXCLUDE_PAGER=1
+	-DRADIOLIB_EXCLUDE_FSK4=1
+	-DRADIOLIB_EXCLUDE_APRS=1
+	-DRADIOLIB_EXCLUDE_LORAWAN=1
+	-I variants/${PIOENV}
+lib_deps =
+	adafruit/Adafruit Unified Sensor @ 1.1.14
+	adafruit/Adafruit BME280 Library @ 2.2.4
+	adafruit/Adafruit BMP280 Library @ 2.6.8
+	adafruit/Adafruit BME680 Library @ 2.0.4
+	adafruit/Adafruit Si7021 Library @ 1.5.3
+	arduino-libraries/NTPClient @ 3.2.1
+	ayushsharma82/ElegantOTA @ 3.1.5
+	bblanchon/ArduinoJson @ 6.21.3
+	jgromes/RadioLib @ 6.6.0
+	mathieucarbou/AsyncTCP @ 3.2.5
+	mathieucarbou/ESPAsyncWebServer @ 3.2.3
+	mikalhart/TinyGPSPlus @ 1.0.3	
+display_libs =
+	adafruit/Adafruit GFX Library @ 1.11.9
+	adafruit/Adafruit SSD1306 @ 2.5.10
+usb_flags=
+	-DARDUINO_USB_MODE=1
+	-DARDUINO_USB_CDC_ON_BOOT=1 
diff --git a/platformio.ini b/platformio.ini
@@ -12,6 +12,7 @@
 default_envs = ttgo-lora32-v21
 
 extra_configs =
+	common_settings.ini
   	variants/*/platformio.ini
 
 [env]
@@ -28,49 +29,4 @@ board_build.embed_files =
 	data_embed/favicon.png.gz
 extra_scripts = 
 	pre:tools/compress.py
-debug_tool = esp-prog
-
-[common]
-build_flags =
-	-Werror -Wall
-	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-	-DRADIOLIB_EXCLUDE_CC1101=1
-	-DRADIOLIB_EXCLUDE_NRF24=1
-	-DRADIOLIB_EXCLUDE_RF69=1
-	-DRADIOLIB_EXCLUDE_SX1231=1
-	-DRADIOLIB_EXCLUDE_SX1233=1
-	-DRADIOLIB_EXCLUDE_SI443X=1
-	-DRADIOLIB_EXCLUDE_RFM2X=1
-	-DRADIOLIB_EXCLUDE_AFSK=1
-	-DRADIOLIB_EXCLUDE_BELL=1
-	-DRADIOLIB_EXCLUDE_HELLSCHREIBER=1
-	-DRADIOLIB_EXCLUDE_MORSE=1
-	-DRADIOLIB_EXCLUDE_RTTY=1
-	-DRADIOLIB_EXCLUDE_SSTV=1
-	-DRADIOLIB_EXCLUDE_AX25=1
-	-DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1
-	-DRADIOLIB_EXCLUDE_BELL=1
-	-DRADIOLIB_EXCLUDE_PAGER=1
-	-DRADIOLIB_EXCLUDE_FSK4=1
-	-DRADIOLIB_EXCLUDE_APRS=1
-	-DRADIOLIB_EXCLUDE_LORAWAN=1
-	-I variants/${PIOENV}
-lib_deps =
-	adafruit/Adafruit Unified Sensor @ 1.1.14
-	adafruit/Adafruit BME280 Library @ 2.2.4
-	adafruit/Adafruit BMP280 Library @ 2.6.8
-	adafruit/Adafruit BME680 Library @ 2.0.4
-	adafruit/Adafruit Si7021 Library @ 1.5.3
-	arduino-libraries/NTPClient @ 3.2.1
-	ayushsharma82/ElegantOTA @ 3.1.5
-	bblanchon/ArduinoJson @ 6.21.3
-	jgromes/RadioLib @ 6.6.0
-	mathieucarbou/AsyncTCP @ 3.2.5
-	mathieucarbou/ESPAsyncWebServer @ 3.2.3
-	mikalhart/TinyGPSPlus @ 1.0.3	
-display_libs =
-	adafruit/Adafruit GFX Library @ 1.11.9
-	adafruit/Adafruit SSD1306 @ 2.5.10
-usb_flags=
-	-DARDUINO_USB_MODE=1
-	-DARDUINO_USB_CDC_ON_BOOT=1
+debug_tool = esp-prog
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
@@ -40,7 +40,7 @@ ________________________________________________________________________________
     #include "A7670_utils.h"
 #endif
 
-String              versionDate             = "2024.11.05";
+String              versionDate             = "2024.11.06";
 Configuration       Config;
 WiFiClient          espClient;
 #ifdef HAS_GPS

diff --git a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h
@@ -1,9 +1,19 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
+    //  LoRa Radio
     #define HAS_SX1268
-    #define HAS_DISPLAY
     #define RADIO_HAS_XTAL
+    #define RADIO_SCLK_PIN          6
+    #define RADIO_MISO_PIN          4
+    #define RADIO_MOSI_PIN          7
+    #define RADIO_CS_PIN            5
+    #define RADIO_DIO1_PIN          3
+    #define RADIO_RST_PIN           -1
+    #define RADIO_BUSY_PIN          8
+
+    //  Display
+    #define HAS_DISPLAY
 
     #undef  OLED_SDA
     #undef  OLED_SCL
@@ -13,15 +23,8 @@
     #define OLED_SCL                1
     #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
 
+    //  Aditional Config
     #define INTERNAL_LED_PIN        25      // Green Led
-    #define BATTERY_PIN             35
-
-    #define RADIO_SCLK_PIN          6
-    #define RADIO_MISO_PIN          4
-    #define RADIO_MOSI_PIN          7
-    #define RADIO_CS_PIN            5
-    #define RADIO_DIO1_PIN          3
-    #define RADIO_RST_PIN           -1
-    #define RADIO_BUSY_PIN          8
+    #define BATTERY_PIN             35    
 
 #endif
diff --git a/variants/ESP32_DIY_1W_LoRa/board_pinout.h b/variants/ESP32_DIY_1W_LoRa/board_pinout.h
@@ -1,9 +1,21 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
+    //  LoRa Radio
     #define HAS_SX1268
-    #define HAS_DISPLAY
     #define HAS_1W_LORA
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           27
+    #define RADIO_DIO1_PIN          12
+    #define RADIO_BUSY_PIN          14
+    #define RADIO_RXEN              32
+    #define RADIO_TXEN              25
+
+    //  Display
+    #define HAS_DISPLAY
 
     #undef  OLED_SDA
     #undef  OLED_SCL
@@ -13,16 +25,7 @@
     #define OLED_SCL                21
     #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
 
+    //  Aditional Config
     #define INTERNAL_LED_PIN        2
 
-    #define RADIO_SCLK_PIN          18
-    #define RADIO_MISO_PIN          19
-    #define RADIO_MOSI_PIN          23
-    #define RADIO_CS_PIN            5
-    #define RADIO_RST_PIN           27
-    #define RADIO_DIO1_PIN          12
-    #define RADIO_BUSY_PIN          14
-    #define RADIO_RXEN              32
-    #define RADIO_TXEN              25
-
 #endif
diff --git a/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_915/board_pinout.h
@@ -1,9 +1,21 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
+    //  LoRa Radio
     #define HAS_SX1262
-    #define HAS_DISPLAY
     #define HAS_1W_LORA
+    #define RADIO_SCLK_PIN          18
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          23
+    #define RADIO_CS_PIN            5
+    #define RADIO_RST_PIN           27
+    #define RADIO_DIO1_PIN          12
+    #define RADIO_BUSY_PIN          14
+    #define RADIO_RXEN              32
+    #define RADIO_TXEN              25
+
+    //  Display
+    #define HAS_DISPLAY    
 
     #undef  OLED_SDA
     #undef  OLED_SCL
@@ -13,16 +25,7 @@
     #define OLED_SCL                21
     #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
 
+    //  Aditional Config
     #define INTERNAL_LED_PIN        2
 
-    #define RADIO_SCLK_PIN          18
-    #define RADIO_MISO_PIN          19
-    #define RADIO_MOSI_PIN          23
-    #define RADIO_CS_PIN            5
-    #define RADIO_RST_PIN           27
-    #define RADIO_DIO1_PIN          12
-    #define RADIO_BUSY_PIN          14
-    #define RADIO_RXEN              32
-    #define RADIO_TXEN              25
-
 #endif
diff --git a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h
@@ -1,18 +1,9 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
+    //  LoRa Radio
     #define HAS_LLCC68
-    #define HAS_DISPLAY
     #define HAS_1W_LORA
-
-    #undef  OLED_SDA
-    #undef  OLED_SCL
-    #undef  OLED_RST
-
-    #define OLED_SDA                21
-    #define OLED_SCL                22
-    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
-
     #define RADIO_SCLK_PIN          18
     #define RADIO_MISO_PIN          19
     #define RADIO_MOSI_PIN          23
@@ -23,4 +14,15 @@
     #define RADIO_RXEN              32
     #define RADIO_TXEN              25
 
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                21
+    #define OLED_SCL                22
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
 #endif
diff --git a/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_Mesh_V1_2/board_pinout.h
@@ -1,18 +1,9 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
+    //  LoRa Radio
     #define HAS_SX1268
-    #define HAS_DISPLAY
     #define HAS_1W_LORA
-
-    #undef  OLED_SDA
-    #undef  OLED_SCL
-    #undef  OLED_RST
-
-    #define OLED_SDA                22
-    #define OLED_SCL                21
-    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
-
     #define RADIO_SCLK_PIN          5   // https://github.com/NanoVHF/Meshtastic-DIY/tree/main/PCB/ESP-32-devkit_EBYTE-E22/Mesh-v1.02-2LCD-FreePins
     #define RADIO_MISO_PIN          19
     #define RADIO_MOSI_PIN          27
@@ -22,4 +13,16 @@
     #define RADIO_BUSY_PIN          32
     #define RADIO_RXEN              14
     #define RADIO_TXEN              13
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                22
+    #define OLED_SCL                21
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
 #endif
diff --git a/variants/ESP32_DIY_LoRa/board_pinout.h b/variants/ESP32_DIY_LoRa/board_pinout.h
@@ -1,7 +1,16 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
+    //  LoRa Radio
     #define HAS_SX1278
+    #define RADIO_SCLK_PIN          5
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          27
+    #define RADIO_CS_PIN            18
+    #define RADIO_RST_PIN           14
+    #define RADIO_BUSY_PIN          26
+
+    //  Display
     #define HAS_DISPLAY
 
     #undef  OLED_SDA
@@ -12,13 +21,7 @@
     #define OLED_SCL                21
     #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
 
+    //  Aditional Config
     #define INTERNAL_LED_PIN        2
 
-    #define RADIO_SCLK_PIN          5
-    #define RADIO_MISO_PIN          19
-    #define RADIO_MOSI_PIN          27
-    #define RADIO_CS_PIN            18
-    #define RADIO_RST_PIN           14
-    #define RADIO_BUSY_PIN          26
-
 #endif
diff --git a/variants/ESP32_DIY_LoRa_915/board_pinout.h b/variants/ESP32_DIY_LoRa_915/board_pinout.h
@@ -1,7 +1,16 @@
 #ifndef BOARD_PINOUT_H_
 #define BOARD_PINOUT_H_
 
+    //  LoRa Radio
     #define HAS_SX1276
+    #define RADIO_SCLK_PIN          5
+    #define RADIO_MISO_PIN          19
+    #define RADIO_MOSI_PIN          27
+    #define RADIO_CS_PIN            18
+    #define RADIO_RST_PIN           14
+    #define RADIO_BUSY_PIN          26
+
+    //  Display
     #define HAS_DISPLAY
 
     #undef  OLED_SDA
@@ -12,13 +21,7 @@
     #define OLED_SCL                21
     #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
 
+    //  Aditional Config
     #define INTERNAL_LED_PIN        2
 
-    #define RADIO_SCLK_PIN          5
-    #define RADIO_MISO_PIN          19
-    #define RADIO_MOSI_PIN          27
-    #define RADIO_CS_PIN            18
-    #define RADIO_RST_PIN           14
-    #define RADIO_BUSY_PIN          26
-
 #endif