Merge branch 'develop' into esp32-h2

variants/esp32/esp32.ini

@@ -2,10 +2,16 @@
 [esp32_base]
 extends = arduino_base
 custom_esp32_kind = esp32
+custom_mtjson_part =
 platform =
   # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
   platformio/espressif32@6.11.0
 
+extra_scripts =
+  ${env.extra_scripts}
+  pre:extra_scripts/esp32_pre.py
+  extra_scripts/esp32_extra.py
+
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
 

variants/esp32s3/tlora_t3s3_epaper/platformio.ini

@@ -13,7 +13,10 @@ build_flags =
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
   -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
-  -DEINK_LIMIT_FASTREFRESH=10          ; How many consecutive fast-refreshes are permitted
+  -DEINK_LIMIT_FASTREFRESH=20          ; How many consecutive fast-refreshes are permitted    //20
+  -DEINK_LIMIT_RATE_BACKGROUND_SEC=30  ; Minimum interval between BACKGROUND updates          //30
+  -DEINK_LIMIT_RATE_RESPONSIVE_SEC=1   ; Minimum interval between RESPONSIVE updates
+  -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
 
 lib_deps =
   ${esp32s3_base.lib_deps}

variants/native/portduino/platformio.ini

@@ -114,5 +114,5 @@ extends = env:native
 build_flags = -lgcov --coverage -fprofile-abs-path -fsanitize=address ${env:native.build_flags}
 ; https://docs.platformio.org/en/latest/projectconf/sections/env/options/test/test_testing_command.html
 test_testing_command =
-  ${platformio.build_dir}/${this.__env__}/program
+  ${platformio.build_dir}/${this.__env__}/meshtasticd
   -s

variants/nrf52840/ELECROW-ThinkNode-M1/variant.h

@@ -62,17 +62,11 @@ extern "C" {
 /*
  * Buttons
  */
-#define PIN_BUTTON2 (32 + 10)
+#define PIN_BUTTON1 (32 + 10)
+#define PIN_BUTTON2 (32 + 7)
 #define ALT_BUTTON_PIN PIN_BUTTON2
 #define ALT_BUTTON_ACTIVE_LOW true
 #define ALT_BUTTON_ACTIVE_PULLUP true
-#define PIN_BUTTON1 (32 + 7)
-
-// #define PIN_BUTTON1 (0 + 11)
-// #define PIN_BUTTON1 (32 + 7)
-
-// #define BUTTON_CLICK_MS 400
-// #define BUTTON_TOUCH_MS 200
 
 /*
  * Analog pins
@@ -203,4 +197,4 @@ External serial flash WP25R1635FZUIL0
 }
 #endif
 
-#endif
+#endif

variants/nrf52840/nrf52.ini

@@ -11,6 +11,10 @@ platform_packages =
   ; Don't renovate toolchain-gccarmnoneeabi
   platformio/toolchain-gccarmnoneeabi@~1.90301.0
 
+extra_scripts =
+  ${env.extra_scripts}
+  extra_scripts/nrf52_extra.py
+
 build_type = release
 build_flags =
   -include variants/nrf52840/cpp_overrides/lfs_util.h

variants/nrf52840/t-echo/variant.h

@@ -181,9 +181,9 @@ External serial flash WP25R1635FZUIL0
 
 #define PIN_GPS_STANDBY (32 + 2) // An output to wake GPS, low means allow sleep, high means force wake
 // Seems to be missing on this new board
-// #define PIN_GPS_PPS (32 + 4)  // Pulse per second input from the GPS
-#define GPS_TX_PIN (32 + 8) // This is for bits going TOWARDS the CPU
-#define GPS_RX_PIN (32 + 9) // This is for bits going TOWARDS the GPS
+#define PIN_GPS_PPS (32 + 4) // Pulse per second input from the GPS
+#define GPS_TX_PIN (32 + 8)  // This is for bits going TOWARDS the CPU
+#define GPS_RX_PIN (32 + 9)  // This is for bits going TOWARDS the GPS
 
 #define GPS_THREAD_INTERVAL 50
 
@@ -203,8 +203,6 @@ External serial flash WP25R1635FZUIL0
 #define PIN_SPI_MOSI (0 + 22)
 #define PIN_SPI_SCK (0 + 19)
 
-#define PIN_PWR_EN (0 + 6)
-
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 

variants/nrf52840/wio-sdk-wm1110/platformio.ini

@@ -4,11 +4,22 @@ extends = nrf52840_base
 board = wio-sdk-wm1110
 
 extra_scripts =
-  ${env.extra_scripts}
+  ${nrf52840_base.extra_scripts}
   extra_scripts/disable_adafruit_usb.py
 
 # Remove adafruit USB serial from the build (it is incompatible with using the ch340 serial chip on this board)
-build_unflags = ${nrf52840_base:build_unflags} -DUSBCON -DUSE_TINYUSB
+build_unflags =
+  -Ofast
+  -Og
+  -ggdb3
+  -ggdb2
+  -g3
+  -g2
+  -g
+  -g1
+  -g0
+  -DUSBCON
+  -DUSE_TINYUSB
 build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/wio-sdk-wm1110
   -Isrc/platform/nrf52/softdevice

variants/stm32/stm32.ini

@@ -8,7 +8,7 @@ platform_packages =
   platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
 extra_scripts =
   ${env.extra_scripts}
-  post:extra_scripts/extra_stm32.py
+  extra_scripts/stm32_extra.py
 
 build_type = release