Merge branch 'userPrefs' of https://github.com/gjelsoe/firmware into …

…userPrefs
meshtastic · Nov 14, 2024 · 692b47d · 692b47d
2 parents 6d54d95 + 07424c4
commit 692b47d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/src/Power.cpp b/src/Power.cpp
@@ -251,7 +251,6 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #if HAS_TELEMETRY && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(HAS_PMU) &&                                  \
     !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
         if (hasINA()) {
-            LOG_DEBUG("Use INA on I2C addr 0x%x for device battery voltage", config.power.device_battery_ina_address);
             return getINAVoltage();
         }
 #endif

diff --git a/src/mesh/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h
@@ -20,12 +20,8 @@
 
 /// max number of nodes allowed in the mesh
 #ifndef MAX_NUM_NODES
-#ifdef ARCH_NRF52
-#define MAX_NUM_NODES 80
-#else
 #define MAX_NUM_NODES 100
 #endif
-#endif
 
 /// Max number of channels allowed
 #define MAX_NUM_CHANNELS (member_size(meshtastic_ChannelFile, channels) / member_size(meshtastic_ChannelFile, channels[0]))

diff --git a/version.properties b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 5
-build = 12
+build = 14