up1

richonguzman · Nov 5, 2024 · a95f552 · a95f552
1 parent 4014db0
commit a95f552
Show file tree

Hide file tree

Showing 52 changed files with 841 additions and 238 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -145,38 +145,6 @@ lib_deps =
 	${common.lib_deps}
 	${common.display_libs}
 
-[env:ESP32_DIY_1W_LoRa]
-board = esp32dev
-build_flags =
-	${common.build_flags}
-	-DESP32_DIY_1W_LoRa
-	-DHAS_SX1268
-	-DHAS_1W_LORA
-lib_deps =
-	${common.lib_deps}
-	${common.display_libs}
-
-[env:ESP32_DIY_1W_LoRa_915]
-board = esp32dev
-build_flags =
-	${common.build_flags}
-	-DESP32_DIY_1W_LoRa_915
-	-DHAS_SX1262
-	-DHAS_1W_LORA
-lib_deps =
-	${common.lib_deps}
-	${common.display_libs}
-
-[env:ESP32_DIY_1W_LoRa_LLCC68]
-board = esp32dev
-build_flags =
-	${common.build_flags}
- 	-DESP32_DIY_1W_LoRa_LLCC68
- 	-DHAS_LLCC68
- 	-DHAS_1W_LORA
-lib_deps =
- 	${common.lib_deps}
-	${common.display_libs}
 
 [env:ESP32_DIY_1W_LoRa_Mesh_V1_2]
 board = esp32dev
@@ -229,32 +197,6 @@ lib_deps =
 	${common.display_libs}
 	lewisxhe/XPowersLib @ 0.2.4
 
-[env:ttgo-t-beam-v1_915]
-board = ttgo-t-beam
-build_flags =
-	${common.build_flags}
-	-DTTGO_T_BEAM_V1_0_915
-	-DHAS_SX1276
-	-DHAS_AXP192
-	-DHAS_GPS
-lib_deps =
-	${common.lib_deps}
-	${common.display_libs}
-	lewisxhe/XPowersLib @ 0.2.4
-
-[env:ttgo-t-beam-v1_SX1268]
-board = ttgo-t-beam
-build_flags =
-	${common.build_flags}
-	-DTTGO_T_BEAM_V1_0_SX1268
-	-DHAS_SX1268
-	-DHAS_AXP192
-	-DHAS_GPS
-lib_deps =
-	${common.lib_deps}
-	${common.display_libs}
-	lewisxhe/XPowersLib @ 0.2.4
-
 [env:ttgo-t-beam-v1_2_SX1262]
 board = ttgo-t-beam
 build_flags =
@@ -367,35 +309,6 @@ lib_deps =
 	${common.lib_deps}
 	${common.display_libs}
 
-[env:WEMOS-LOLIN32-OLED-DIY]
-board = lolin32
-build_flags =
-	${common.build_flags}
-	-DWEMOS_LOLIN32_OLED_DIY_LoRa
-	-DHAS_SX1278
-lib_deps =
-	${common.lib_deps}
-	${common.display_libs}
-
-[env:WEMOS-D1-R32-RA02]
-board = wemos_d1_uno32
-build_flags =
-	${common.build_flags}
-	-DWEMOS_D1_R32_RA02
-	-DHAS_SX1278
-lib_deps =
-	${common.lib_deps}
-	${common.display_libs}
-
-[env:WEMOS_S2_MINI_DIY_LoRa]
-board = lolin_s2_mini
-build_flags =
-	${common.build_flags}
-	-DWEMOS_S2_MINI_DIY_LoRa
-	-DHAS_SX1278
-lib_deps =
-	${common.lib_deps}
-	${common.display_libs}
 
 [env:esp32c3_DIY_1W_LoRa]
 board = esp32-c3-devkitm-1
@@ -425,19 +338,6 @@ lib_deps =
 	${common.lib_deps}
 	${common.display_libs}
 
-[env:ESP32_C3_OctopusLab_LoRa]
-board = esp32-c3-devkitm-1
-board_build.mcu = esp32c3
-build_flags =
-	${common.build_flags}
-	-DESP32_C3_OctopusLab_LoRa
-	-DHAS_SX1268
-	-DRADIO_HAS_XTAL
-	-DARDUINO_USB_MODE=1
-	-DARDUINO_USB_CDC_ON_BOOT=1
-lib_deps =
-	${common.lib_deps}
-	${common.display_libs}
 
 [env:QRPLabs_LightGateway_1_0]
 board = esp32-s3-devkitc-1

diff --git a/src/boards_pinout.h b/src/boards_pinout.h
@@ -10,7 +10,7 @@
 
 
 // LORA MODULES
-#if defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_0_915)
+#if defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_0) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_BEAM_V1_2_915)
     #define RADIO_SCLK_PIN      5       // GPIO5    - SX1278 SCK
     #define RADIO_MISO_PIN      19      // GPIO19   - SX1278 MISO
     #define RADIO_MOSI_PIN      27      // GPIO27   - SX1278 MOSI
@@ -29,7 +29,7 @@
     #define RADIO_BUSY_PIN      13      // SX1262 BUSY
 #endif
 
-#if defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68)   // Ebyte E22 400M30S (SX1268) or E22 900M30S (SX1262) or E220 LLCC68
+#if defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68)   // Ebyte E22 400M30S (SX1268) or E22 900M30S (SX1262) or E220 LLCC68
     #define RADIO_SCLK_PIN      18
     #define RADIO_MISO_PIN      19
     #define RADIO_MOSI_PIN      23
@@ -53,16 +53,9 @@
     #define RADIO_TXEN          13
 #endif
 
-#ifdef WEMOS_LOLIN32_OLED_DIY_LoRa
-    #define RADIO_SCLK_PIN      15
-    #define RADIO_MISO_PIN      13
-    #define RADIO_MOSI_PIN      12
-    #define RADIO_CS_PIN        14
-    #define RADIO_RST_PIN       2
-    #define RADIO_BUSY_PIN      25
-#endif
 
-#if defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2_SX1262)
+
+#if defined(TTGO_T_BEAM_V1_2_SX1262)
     #define RADIO_SCLK_PIN      5
     #define RADIO_MISO_PIN      19
     #define RADIO_MOSI_PIN      27
@@ -108,18 +101,6 @@
     #define A7670_RX_PIN        27
 #endif
 
-#ifdef WEMOS_D1_R32_RA02
-    #define RADIO_SCLK_PIN      18
-    #define RADIO_MISO_PIN      19
-    #define RADIO_MOSI_PIN      23
-    #define RADIO_CS_PIN        5
-    #define RADIO_BUSY_PIN      12
-    #define RADIO_RST_PIN       13
-    #define RADIO_DIO1_PIN      14
-    #define OLED_SDA            21
-    #define OLED_SCL            22
-    #define OLED_RST            36
-#endif
 
 #if defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915)
     #define RADIO_SCLK_PIN      8
@@ -133,14 +114,7 @@
     #define RADIO_TXEN          7
 #endif
 
-#ifdef WEMOS_S2_MINI_DIY_LoRa
-    #define RADIO_SCLK_PIN      36
-    #define RADIO_MISO_PIN      37
-    #define RADIO_MOSI_PIN      35
-    #define RADIO_CS_PIN        34
-    #define RADIO_BUSY_PIN      38
-    #define RADIO_RST_PIN       33
-#endif
+
 
 #ifdef LIGHTGATEWAY_1_0
     #define RADIO_VCC_PIN       21
@@ -157,7 +131,7 @@
 
 
 // OLED 
-#if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa_A7670) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_2_915) || defined(ESP32_DIY_LoRa_A7670_915) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2)
+#if defined(ESP32_DIY_LoRa) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_SX1262) || defined(OE5HWN_MeshCom) || defined(ESP32_DIY_LoRa_A7670) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_BEAM_V1_2_915) || defined(ESP32_DIY_LoRa_A7670_915) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) || defined(ESP32_DIY_1W_LoRa_Mesh_V1_2)
     #define OLED_SDA    21
     #define OLED_SCL    22
     #define OLED_RST    -1      // Reset pin # (or -1 if sharing Arduino reset pin)
@@ -175,11 +149,6 @@
     #define OLED_RST    21
 #endif
 
-#ifdef WEMOS_LOLIN32_OLED_DIY_LoRa
-    #define OLED_SDA    5
-    #define OLED_SCL    4
-    #define OLED_RST    -1
-#endif
 
 #ifdef LIGHTGATEWAY_1_0
     #define OLED_SDA    3
@@ -188,7 +157,7 @@
 #endif
 
 
-#if !defined(HELTEC_HTCT62) && !defined(HELTEC_WSL_V3) && !defined(ESP32C3_DIY_1W_LoRa) && !defined(ESP32C3_DIY_1W_LoRa_915) && !defined(WEMOS_S2_MINI_DIY_LoRa)
+#if !defined(HELTEC_HTCT62) && !defined(HELTEC_WSL_V3) && !defined(ESP32C3_DIY_1W_LoRa) && !defined(ESP32C3_DIY_1W_LoRa_915)
     #define HAS_DISPLAY
 #endif
 
@@ -197,9 +166,7 @@
 #ifdef HELTEC_HTCT62
     #define BATTERY_PIN         1
 #endif
-#ifdef WEMOS_S2_MINI_DIY_LoRa
-    #define INTERNAL_LED_PIN    15
-#endif
+
 
 #if defined(HELTEC_V2)
     #define INTERNAL_LED_PIN    25
@@ -218,7 +185,7 @@
     #endif
 #endif
 
-#if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915)
+#if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_LoRa_915) || defined(ESP32_DIY_1W_LoRa_915)
     #define INTERNAL_LED_PIN    2
 #endif
 #if defined(ESP32_DIY_LoRa_A7670) || defined(ESP32_DIY_LoRa_A7670_915)
@@ -262,27 +229,14 @@
     #define RADIO_IRQ_PIN    2
 #endif
 
-#if defined(ESP32_C3_OctopusLab_LoRa)
-    #define OLED_SDA            0
-    #define OLED_SCL            1
-    #define OLED_RST            -1
-    #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
-#endif
-
 #ifdef LIGHTGATEWAY_1_0
     #define BUTTON_PIN          0
     #define INTERNAL_LED_PIN    16
 #endif
 
 
 //      GPS
-#if defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_0_915) || defined(TTGO_T_BEAM_V1_0_SX1268) || defined(TTGO_T_BEAM_V1_2_SX1262)
+#if defined(TTGO_T_BEAM_V1_2) || defined(TTGO_T_BEAM_V1_2_915) || defined(TTGO_T_BEAM_V1_0) || defined(TTGO_T_BEAM_V1_2_SX1262)
     #define GPS_RX              12
     #define GPS_TX              34
 #endif
@@ -309,21 +263,6 @@ REST                        14
 GND                         -  */
 
 
-#ifdef TTGO_LORA32_T3S3_V1_2
-    #define RADIO_SCLK_PIN      5       // SX1262 SCK
-    #define RADIO_MISO_PIN      3       // SX1262 MISO
-    #define RADIO_MOSI_PIN      6       // SX1262 MOSI
-    #define RADIO_CS_PIN        7       // SX1262 NSS
-    #define RADIO_RST_PIN       8       // SX1262 RST
-    #define RADIO_DIO1_PIN      33      // SX1262 DIO1
-    #define RADIO_BUSY_PIN      34      // SX1262 BUSY
-
-    #define OLED_SDA            18
-    #define OLED_SCL            17
-    #define OLED_RST            -1
 
-    #define INTERNAL_LED_PIN    37      // Green Led
-    #define BATTERY_PIN         1
-#endif
 
 #endif
diff --git a/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h b/variants/ESP32_C3_OctopusLab_LoRa/board_pinout.h
@@ -0,0 +1,27 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    #define HAS_SX1268
+    #define HAS_DISPLAY
+    #define RADIO_HAS_XTAL
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                0
+    #define OLED_SCL                1
+    #define OLED_RST                -1      // Reset pin # (or -1 if sharing Arduino reset pin)
+
+    #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
+
+#endif
diff --git a/variants/ESP32_C3_OctopusLab_LoRa/platformio.ini b/variants/ESP32_C3_OctopusLab_LoRa/platformio.ini
@@ -4,11 +4,8 @@ board_build.mcu = esp32c3
 build_flags =
 	${common.build_flags}
 	-DESP32_C3_OctopusLab_LoRa
-	-DHAS_SX1268
-	-DRADIO_HAS_XTAL
 	-DARDUINO_USB_MODE=1
 	-DARDUINO_USB_CDC_ON_BOOT=1
 lib_deps =
 	${common.lib_deps}
-	${common.display_libs}
-
+	${common.display_libs}
diff --git a/variants/ESP32_DIY_1W_LoRa/board_pinout.h b/variants/ESP32_DIY_1W_LoRa/board_pinout.h
@@ -0,0 +1,28 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    #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 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/platformio.ini b/variants/ESP32_DIY_1W_LoRa/platformio.ini
@@ -3,9 +3,6 @@ board = esp32dev
 build_flags =
 	${common.build_flags}
 	-DESP32_DIY_1W_LoRa
-	-DHAS_SX1268
-	-DHAS_1W_LORA
 lib_deps =
 	${common.lib_deps}
-	${common.display_libs}
-
+	${common.display_libs}