From d83ab162181105c0fb8c45da19b94eea0934ea4c Mon Sep 17 00:00:00 2001 From: Mictronics Date: Thu, 4 Jan 2024 10:27:31 +0100 Subject: [PATCH 1/6] Fix LED pinout for T-Echo board marked v1.0, date 2021-6-28 --- variants/t-echo/variant.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/variants/t-echo/variant.h b/variants/t-echo/variant.h index 6bd5091dd0..8679dbde9d 100644 --- a/variants/t-echo/variant.h +++ b/variants/t-echo/variant.h @@ -43,9 +43,9 @@ extern "C" { #define NUM_ANALOG_OUTPUTS (0) // LEDs -#define PIN_LED1 (0 + 14) // 13 red (confirmed on 1.0 board) -#define PIN_LED2 (0 + 15) // 14 blue -#define PIN_LED3 (0 + 13) // 15 green +#define PIN_LED1 (0 + 14) // blue (confirmed on boards marked v1.0, date 2021-6-28) +#define PIN_LED2 (32 + 1) // green +#define PIN_LED3 (32 + 3) // red #define LED_RED PIN_LED3 #define LED_BLUE PIN_LED1 @@ -232,4 +232,4 @@ External serial flash WP25R1635FZUIL0 * Arduino objects - C++ only *----------------------------------------------------------------------------*/ -#endif +#endif \ No newline at end of file From 32f1aea6b5b40d449813e5226a1e780775194025 Mon Sep 17 00:00:00 2001 From: Mictronics Date: Wed, 10 Jan 2024 09:49:51 +0100 Subject: [PATCH 2/6] Merge PR #420 --- protobufs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protobufs b/protobufs index 2ccf73428d..1091250d25 160000 --- a/protobufs +++ b/protobufs @@ -1 +1 @@ -Subproject commit 2ccf73428da8dac87aca12a1f91ac5cd76a7442c +Subproject commit 1091250d256d415df2a1b2644b4d282eab6570f4 From 0dd9ce35aa7a05691b934713d261ee6c1bde0726 Mon Sep 17 00:00:00 2001 From: Mictronics Date: Tue, 19 Mar 2024 19:41:03 +0100 Subject: [PATCH 3/6] Fixed double and missing Default class. --- src/gps/GPS.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 5595172ddb..506f6d89c6 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -759,7 +759,7 @@ uint32_t GPS::getWakeTime() const if (t == UINT32_MAX) return t; // already maxint - return Default::Default::getConfiguredOrDefaultMs(t, default_broadcast_interval_secs); + return Default::getConfiguredOrDefaultMs(t, default_broadcast_interval_secs); } /** Get how long we should sleep between aqusition attempts in msecs @@ -775,7 +775,7 @@ uint32_t GPS::getSleepTime() const if (t == UINT32_MAX) return t; // already maxint - return t * 1000; + return Default::getConfiguredOrDefaultMs(t, default_gps_update_interval); } void GPS::publishUpdate() From 55e0a8429e13180b85132cc7b914c35b3093e71c Mon Sep 17 00:00:00 2001 From: Mictronics Date: Sun, 21 Apr 2024 19:26:02 +0200 Subject: [PATCH 4/6] Use correct format specifier and fixed typo. --- src/mesh/NodeDB.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h index 8e3784e582..4946672ece 100644 --- a/src/mesh/NodeDB.h +++ b/src/mesh/NodeDB.h @@ -150,12 +150,12 @@ class NodeDB void setLocalPosition(meshtastic_Position position, bool timeOnly = false) { if (timeOnly) { - LOG_DEBUG("Setting local position time only: time=%i timestamp=%i\n", position.time, position.timestamp); + LOG_DEBUG("Setting local position time only: time=%u timestamp=%u\n", position.time, position.timestamp); localPosition.time = position.time; localPosition.timestamp = position.timestamp > 0 ? position.timestamp : position.time; return; } - LOG_DEBUG("Setting local position: latitude=%i, longitude=%i, time=%i, timeestamp=%i\n", position.latitude_i, + LOG_DEBUG("Setting local position: latitude=%i, longitude=%i, time=%u, timestamp=%u\n", position.latitude_i, position.longitude_i, position.time, position.timestamp); localPosition = position; } From 328becfa502db8a30fbdd61ce87c71a6fb5f164a Mon Sep 17 00:00:00 2001 From: Mictronics Date: Sat, 20 Jul 2024 09:41:16 +0200 Subject: [PATCH 5/6] Removed duplicate code. --- src/mesh/NodeDB.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 5678009c08..c0bed34371 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -432,7 +432,6 @@ void NodeDB::initModuleConfigIntervals() moduleConfig.telemetry.power_update_interval = 0; moduleConfig.neighbor_info.update_interval = 0; moduleConfig.paxcounter.paxcounter_update_interval = 0; - moduleConfig.neighbor_info.update_interval = 0; } void NodeDB::installDefaultChannels() From ff10e99793fd327529b3bf324c4594e277b6eea5 Mon Sep 17 00:00:00 2001 From: Mictronics Date: Sat, 20 Jul 2024 09:55:52 +0200 Subject: [PATCH 6/6] Fix error: #if with no expression --- src/gps/GPS.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 8eb7fef273..feeac84945 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -865,7 +865,7 @@ void GPS::writePinStandby(bool standby) // Determine the new value for the pin // Normally: active HIGH for awake -#if PIN_GPS_STANDBY_INVERTED +#ifdef PIN_GPS_STANDBY_INVERTED bool val = standby; #else bool val = !standby;