testing2

richonguzman · Nov 5, 2024 · 8d102a7 · 8d102a7
1 parent 5030d2d
commit 8d102a7
Show file tree

Hide file tree

Showing 29 changed files with 254 additions and 539 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -55,19 +55,19 @@ build_flags =
 	-DRADIOLIB_EXCLUDE_APRS=1
 	-DRADIOLIB_EXCLUDE_LORAWAN=1
 	-I variants/${PIOENV}
-lib_deps = 
-	jgromes/RadioLib @ 6.6.0
-	mikalhart/TinyGPSPlus @ 1.0.3
-	bblanchon/ArduinoJson @ 6.21.3
+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
-	mathieucarbou/ESPAsyncWebServer @ 3.2.3
+	bblanchon/ArduinoJson @ 6.21.3
+	jgromes/RadioLib @ 6.6.0
 	mathieucarbou/AsyncTCP @ 3.2.5
-	arduino-libraries/NTPClient @ 3.2.1
+	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

diff --git a/src/boards_pinout.h b/src/boards_pinout.h
diff --git a/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h b/variants/ESP32_DIY_1W_LoRa_LLCC68/board_pinout.h
@@ -9,12 +9,10 @@
     #undef  OLED_SCL
     #undef  OLED_RST
 
-    #define OLED_SDA                22
-    #define OLED_SCL                21
+    #define OLED_SDA                21
+    #define OLED_SCL                22
     #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

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
@@ -13,16 +13,13 @@
     #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_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          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
-
+    #define RADIO_MOSI_PIN          27
+    #define RADIO_CS_PIN            18
+    #define RADIO_RST_PIN           23
+    #define RADIO_DIO1_PIN          33
+    #define RADIO_BUSY_PIN          32
+    #define RADIO_RXEN              14
+    #define RADIO_TXEN              13
 #endif