pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-28 18:47:40 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into BBQ10Kb-Fix

Browse Source
This commit is contained in:
Ben Meadors 2023-08-24 19:57:49 -05:00 committed by GitHub
commit ecd48db69c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesh/MeshService.cpp
View File

@ -327,15 +327,15 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
// load data from GPS object, will add timestamp + battery further down // load data from GPS object, will add timestamp + battery further down
pos = gps->p; pos = gps->p;
} else { } else {
// The GPS has lost lock, if we are fixed position we should just keep using // The GPS has lost lock
// the old position
#ifdef GPS_EXTRAVERBOSE #ifdef GPS_EXTRAVERBOSE
LOG_DEBUG("onGPSchanged() - lost validLocation\n"); LOG_DEBUG("onGPSchanged() - lost validLocation\n");
#endif #endif
if (config.position.fixed_position) { }
LOG_WARN("Using fixed position\n"); // Used fixed position if configured regalrdless of GPS lock
pos = ConvertToPosition(node->position); if (config.position.fixed_position) {
} LOG_WARN("Using fixed position\n");
pos = ConvertToPosition(node->position);
} }
// Finally add a fresh timestamp and battery level reading // Finally add a fresh timestamp and battery level reading

2
src/platform/esp32/architecture.h
View File

@ -119,6 +119,8 @@
#define HW_VENDOR meshtastic_HardwareModel_BETAFPV_900_NANO_TX #define HW_VENDOR meshtastic_HardwareModel_BETAFPV_900_NANO_TX
#elif defined(PICOMPUTER_S3) #elif defined(PICOMPUTER_S3)
#define HW_VENDOR meshtastic_HardwareModel_PICOMPUTER_S3 #define HW_VENDOR meshtastic_HardwareModel_PICOMPUTER_S3
#elif defined(HELTEC_HT62)
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_HT62
#endif #endif
// //