Merge branch 'master' into develop

src/Power.cpp

@@ -723,16 +723,6 @@ bool Power::setup()
             runASAP = true;
         },
         CHANGE);
-#endif
-#ifdef EXT_CHRG_DETECT
-    attachInterrupt(
-        EXT_CHRG_DETECT,
-        []() {
-            power->setIntervalFromNow(0);
-            runASAP = true;
-            BaseType_t higherWake = 0;
-        },
-        CHANGE);
 #endif
     enabled = found;
     low_voltage_counter = 0;

src/modules/NodeInfoModule.cpp

@@ -2,7 +2,6 @@
 #include "Default.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "NodeStatus.h"
 #include "RTC.h"
 #include "Router.h"
 #include "configuration.h"
@@ -130,17 +129,14 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
         LOG_DEBUG("Skip send NodeInfo > 40%% ch. util");
         return NULL;
     }
-
+    // If we sent our NodeInfo less than 5 min. ago, don't send it again as it may be still underway.
-    // Use graduated scaling based on active mesh size (10 minute base, scales with congestion coefficient)
+    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 5 * 60 * 1000)) {
-    uint32_t timeoutMs = Default::getConfiguredOrDefaultMsScaled(0, 10 * 60, nodeStatus->getNumOnline());
+        LOG_DEBUG("Skip send NodeInfo since we sent it <5min ago");
-    if (!shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, timeoutMs)) {
-        LOG_DEBUG("Skip send NodeInfo since we sent it <%us ago", timeoutMs / 1000);
         ignoreRequest = true; // Mark it as ignored for MeshModule
         return NULL;
     } else if (shorterTimeout && lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 60 * 1000)) {
-        // For interactive/urgent requests (e.g., user-triggered or implicit requests), use a shorter 60s timeout
         LOG_DEBUG("Skip send NodeInfo since we sent it <60s ago");
-        ignoreRequest = true;
+        ignoreRequest = true; // Mark it as ignored for MeshModule
         return NULL;
     } else {
         ignoreRequest = false; // Don't ignore requests anymore

variants/esp32/chatter2/platformio.ini

@@ -6,8 +6,6 @@ build_flags =
   ${esp32_base.build_flags}
   -D CHATTER_2
   -I variants/esp32/chatter2
-  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
-  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
   
 lib_deps =
   ${esp32_base.lib_deps}

variants/esp32/esp32-common.ini

@@ -65,7 +65,7 @@ lib_deps =
   # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
   https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
   # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
-  https://github.com/lewisxhe/XPowersLib/archive/v0.3.3.zip
+  https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
   rweather/Crypto@0.4.0
 

variants/esp32/esp32.ini

@@ -23,6 +23,6 @@ lib_deps =
   # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
   https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
   # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
-  https://github.com/lewisxhe/XPowersLib/archive/v0.3.3.zip
+  https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
   rweather/Crypto@0.4.0

variants/esp32/m5stack_core/platformio.ini

@@ -16,8 +16,6 @@ build_flags =
   ${esp32_base.build_flags}
   -I variants/esp32/m5stack_core
   -DM5STACK
-  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
-  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
   -DUSER_SETUP_LOADED
   -DTFT_SDA_READ
   -DTFT_DRIVER=0x9341

variants/esp32c6/esp32c6.ini

@@ -28,7 +28,7 @@ lib_deps =
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.3
+  lewisxhe/XPowersLib@0.3.2
   # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto