Merge branch '2264-feature-check-for-low-heap-before-adding-to-nodedb-was-reboot-loop-heap-too-low' of github.com:meshtastic/firmware into 2264-feature-check-for-low-heap-before-adding-to-nodedb-was-reboot-loop-heap-too-low

variants/heltec_v3/platformio.ini

@@ -1,9 +1,6 @@
 [env:heltec-v3] 
-platform = https://github.com/Baptou88/platform-espressif32.git
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
 # Temporary until espressif creates a release with this new target
-platform_packages =
-   framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git
 build_flags = 
   ${esp32s3_base.build_flags} -D HELTEC_V3 -I variants/heltec_v3

variants/heltec_wsl_v3/platformio.ini

@@ -1,9 +1,6 @@
 [env:heltec-wsl-v3] 
-platform = https://github.com/Baptou88/platform-espressif32.git
 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
 # Temporary until espressif creates a release with this new target
-platform_packages =
-   framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git
 build_flags = 
   ${esp32s3_base.build_flags} -D HELTEC_WSL_V3 -I variants/heltec_wsl_v3

variants/nano-g1-explorer/variant.h

@@ -33,5 +33,4 @@
 #define BATTERY_SENSE_SAMPLES 15 // Set the number of samples, It has an effect of increasing sensitivity.
 #define ADC_MULTIPLIER 2
 
-//#define USE_SH1107    // Finally we will use SH1107 128x64 resolution driver, because SH1106 will shift the screen by 2 lines.
-#define USE_SH1106
+#define USE_SH1107_128_64

variants/tlora_t3s3_v1/variant.h

@@ -13,6 +13,9 @@
 #define I2C_SDA 18 // I2C pins for this board
 #define I2C_SCL 17
 
+#define I2C_SDA1 43
+#define I2C_SCL1 44
+
 #define LED_PIN 37   // If defined we will blink this LED
 #define BUTTON_PIN 0 // If defined, this will be used for user button presses,
 
@@ -28,26 +31,30 @@
 #define RF95_MISO 3
 #define RF95_MOSI 6
 #define RF95_NSS 7
-
 #define LORA_RESET 8
-#define LORA_DIO0 9
-#define LORA_DIO1 9
-#define LORA_DIO2 33 // SX1262 BUSY
-#define LORA_DIO3 34 // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
 
+// per SX1276_Receive_Interrupt/utilities.h
+#define LORA_DIO0 9
+#define LORA_DIO1 33 // TCXO_EN ?
+#define LORA_DIO2 34
+#define LORA_RXEN 21
+#define LORA_TXEN 10
+
+// per SX1262_Receive_Interrupt/utilities.h
 #ifdef USE_SX1262
-#define SX126X_CS RF95_NSS // FIXME - we really should define LORA_CS instead
+#define SX126X_CS RF95_NSS
 #define SX126X_DIO1 33
 #define SX126X_BUSY 34
 #define SX126X_RESET LORA_RESET
-//#define SX126X_RXEN 21
-//#define SX126X_TXEN 10
 #define SX126X_E22
 #endif
 
+// per SX128x_Receive_Interrupt/utilities.h
 #ifdef USE_SX1280
 #define SX128X_CS RF95_NSS
-#define SX128X_DIO1 LORA_DIO1
+#define SX128X_DIO1 9
+#define SX128X_DIO2 33
+#define SX128X_DIO3 34
 #define SX128X_BUSY 36
 #define SX128X_RESET LORA_RESET
 #define SX128X_RXEN 21