Merge branch 'master' into 2.7-MiscFixes-Week1

platformio.ini

@@ -51,6 +51,7 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
   	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
 	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
+	-D MAX_THREADS=40 ; As we've split modules, we have more threads to manage
         #-DBUILD_EPOCH=$UNIX_TIME
         #-D OLED_PL=1
 

src/PowerFSM.cpp

@@ -26,7 +26,7 @@
 #ifndef SLEEP_TIME
 #define SLEEP_TIME 30
 #endif
-#if EXCLUDE_POWER_FSM
+#if MESHTASTIC_EXCLUDE_POWER_FSM
 FakeFsm powerFSM;
 void PowerFSM_setup(){};
 #else

src/PowerFSM.h

@@ -22,7 +22,7 @@
 #define EVENT_SHUTDOWN 16        // force a full shutdown now (not just sleep)
 #define EVENT_INPUT 17           // input broker wants something, we need to wake up and enable screen
 
-#if EXCLUDE_POWER_FSM
+#if MESHTASTIC_EXCLUDE_POWER_FSM
 class FakeFsm
 {
   public:

src/PowerFSMThread.h

@@ -18,7 +18,7 @@ class PowerFSMThread : public OSThread
   protected:
     int32_t runOnce() override
     {
-#if !EXCLUDE_POWER_FSM
+#if !MESHTASTIC_EXCLUDE_POWER_FSM
         powerFSM.run_machine();
 
         /// If we are in power state we force the CPU to wake every 10ms to check for serial characters (we don't yet wake

src/modules/AdminModule.cpp

@@ -1137,7 +1137,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
 #endif
 #endif
     conn.has_serial = true; // No serial-less devices
-#if !EXCLUDE_POWER_FSM
+#if !MESHTASTIC_EXCLUDE_POWER_FSM
     conn.serial.is_connected = powerFSM.getState() == &stateSERIAL;
 #else
     conn.serial.is_connected = powerFSM.getState();

variants/heltec_vision_master_e213/platformio.ini

@@ -32,7 +32,6 @@ build_flags =
   ${inkhud.build_flags}
   -I variants/heltec_vision_master_e213
   -D HELTEC_VISION_MASTER_E213
-  -D MAX_THREADS=40 ; Required if used with WiFi
 lib_deps =
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${esp32s3_base.lib_deps}

variants/heltec_vision_master_e290/platformio.ini

@@ -36,7 +36,6 @@ build_flags =
   ${inkhud.build_flags}
   -I variants/heltec_vision_master_e290
   -D HELTEC_VISION_MASTER_E290
-  -D MAX_THREADS=40 ; Required if used with WiFi
 lib_deps =
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${esp32s3_base.lib_deps}

variants/heltec_wireless_paper/platformio.ini

@@ -33,7 +33,6 @@ build_flags =
   ${inkhud.build_flags}
   -I variants/heltec_wireless_paper
   -D HELTEC_WIRELESS_PAPER
-  -D MAX_THREADS=40 ; Required if used with WiFi
 lib_deps =
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${esp32s3_base.lib_deps}

variants/mesh-tab/platformio.ini

@@ -28,7 +28,6 @@ build_flags = ${esp32s3_base.build_flags}
   -D USE_LOG_DEBUG
   -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
   -D RADIOLIB_SPI_PARANOID=0
-  -D MAX_THREADS=40
   -D HAS_SCREEN=0
   -D HAS_TFT=1
   -D USE_PIN_BUZZER

variants/t-deck/platformio.ini

@@ -9,7 +9,6 @@ upload_protocol = esptool
 build_flags = ${esp32s3_base.build_flags} 
   -DT_DECK 
   -DBOARD_HAS_PSRAM
-  -DMAX_THREADS=40
   -DGPS_POWER_TOGGLE
   -Ivariants/t-deck
 

variants/tlora_t3s3_epaper/platformio.ini

@@ -31,7 +31,6 @@ build_flags =
   ${inkhud.build_flags}
   -I variants/tlora_t3s3_epaper
   -D TLORA_T3S3_EPAPER
-  -D MAX_THREADS=40 ; Required if used with WiFi
 lib_deps =
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${esp32s3_base.lib_deps}

variants/unphone/variant.h

@@ -57,8 +57,7 @@
 #define LED_PIN 13     // the red part of the RGB LED
 #define LED_STATE_ON 0 // State when LED is lit
 
-#define ALT_BUTTON_PIN 21 // Button 3 - square - top button in landscape mode
-#define BUTTON_NEED_PULLUP2 TB_UP
+#define ALT_BUTTON_PIN 21    // Button 3 - square - top button in landscape mode
 #define BUTTON_PIN 0         // Circle button
 #define BUTTON_NEED_PULLUP   // we do need a helping hand up
 #define CANCEL_BUTTON_PIN 45 // Button 1 - triangle - bottom button in landscape mode