From 3a66c738bdf869126f9def2c4c6d31d6289c1c83 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 13 Nov 2024 10:21:55 -0600 Subject: [PATCH 1/4] =?UTF-8?q?Revert=20"Decrease=20max=20nodes=20for=20NR?= =?UTF-8?q?F52=20to=2080=20as=20workaround=20to=20prevent=20FS=20blowou?= =?UTF-8?q?=E2=80=A6"=20(#5340)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ea150c32f3826cfdf42d8f2498a826438bd4a9ae. --- src/mesh/mesh-pb-constants.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/mesh/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h index 539fecb3f..f91c48560 100644 --- 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])) From 73430cb582c866580660c70ab1df67dac2a73724 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 13 Nov 2024 11:00:23 -0600 Subject: [PATCH 2/4] Update version.properties (#5343) --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 91c1f4823..091ebde9e 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 2 minor = 5 -build = 12 +build = 13 From 528e177c62198f172d688af08a5525a4f6fbb640 Mon Sep 17 00:00:00 2001 From: Mictronics Date: Wed, 13 Nov 2024 20:18:38 +0100 Subject: [PATCH 3/4] Remove log spam when reading INA sensor. (#5345) * Fix LED pinout for T-Echo board marked v1.0, date 2021-6-28 * Merge PR #420 * Fixed double and missing Default class. * Use correct format specifier and fixed typo. * Removed duplicate code. * Fix error: #if with no expression * Fix warning: extra tokens at end of #endif directive. * Fix antenna switching logic. Complementary-pin control logic is required on the rp2040-lora board. * Fix deprecated macros. * Set RP2040 in dormant mode when deep sleep is triggered. * Fix array out of bounds read. * Admin key count needs to be set otherwise the key will be zero loaded after reset. * Don't reset the admin key size when loading defaults. Preserve an existing key in config if possible. * Remove log spam when reading INA voltage sensor. --------- Co-authored-by: Ben Meadors --- src/Power.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Power.cpp b/src/Power.cpp index d66214315..a354b74e2 100644 --- 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 From f4908fadd69be8849b2260bfeb85cdc9d76d5e8c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2024 13:18:57 -0600 Subject: [PATCH 4/4] [create-pull-request] automated change (#5344) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com> --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 091ebde9e..bed14bad5 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 2 minor = 5 -build = 13 +build = 14