From c2ae38405e9119258fe54a0f950e54702969aa3f Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Thu, 24 Aug 2023 14:58:24 +0200 Subject: [PATCH 1/2] Update architecture.h (#2746) --- src/platform/esp32/architecture.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h index 8f71bace6..da2295fb5 100644 --- a/src/platform/esp32/architecture.h +++ b/src/platform/esp32/architecture.h @@ -119,6 +119,8 @@ #define HW_VENDOR meshtastic_HardwareModel_BETAFPV_900_NANO_TX #elif defined(PICOMPUTER_S3) #define HW_VENDOR meshtastic_HardwareModel_PICOMPUTER_S3 +#elif defined(HELTEC_HT62) +#define HW_VENDOR meshtastic_HardwareModel_HELTEC_HT62 #endif // @@ -149,4 +151,4 @@ #define RF95_NSS 18 #endif -#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32 \ No newline at end of file +#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32 From 03dc36ea1243d6958274ddd3e577823dd3221383 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Thu, 24 Aug 2023 10:55:49 -0500 Subject: [PATCH 2/2] Use fixed position regardless of gps lock (#2744) --- src/mesh/MeshService.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp index 96ea2f0a1..5fbd441b6 100644 --- a/src/mesh/MeshService.cpp +++ b/src/mesh/MeshService.cpp @@ -327,15 +327,15 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus) // load data from GPS object, will add timestamp + battery further down pos = gps->p; } else { - // The GPS has lost lock, if we are fixed position we should just keep using - // the old position + // The GPS has lost lock #ifdef GPS_EXTRAVERBOSE LOG_DEBUG("onGPSchanged() - lost validLocation\n"); #endif - if (config.position.fixed_position) { - LOG_WARN("Using fixed position\n"); - pos = ConvertToPosition(node->position); - } + } + // Used fixed position if configured regalrdless of GPS lock + if (config.position.fixed_position) { + LOG_WARN("Using fixed position\n"); + pos = ConvertToPosition(node->position); } // Finally add a fresh timestamp and battery level reading