pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-14 09:02:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix build and probably break GPS

Browse Source
This commit is contained in:
Thomas Göttgens 2024-07-22 17:09:46 +02:00
parent 50238fbaf5
commit 7568a35372
3 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gps/GPS.cpp
View File

@ -1489,20 +1489,6 @@ bool GPS::lookForTime()
#ifdef GNSS_Airoha // add by WayenWeng #ifdef GNSS_Airoha // add by WayenWeng
uint8_t fix = reader.fixQuality(); uint8_t fix = reader.fixQuality();
uint32_t now = millis(); uint32_t now = millis();
if (fix > 0) {
if (lastFixStartMsec > 0) {
if ((now - lastFixStartMsec) < GPS_FIX_HOLD_TIME) {
return false;
} else {
clearBuffer();
}
} else {
lastFixStartMsec = now;
return false;
}
} else {
return false;
}
#endif #endif
auto ti = reader.time; auto ti = reader.time;
@ -1543,20 +1529,6 @@ bool GPS::lookForLocation()
if ((config.position.gps_update_interval * 1000) >= (GPS_FIX_HOLD_TIME * 2)) { if ((config.position.gps_update_interval * 1000) >= (GPS_FIX_HOLD_TIME * 2)) {
uint8_t fix = reader.fixQuality(); uint8_t fix = reader.fixQuality();
uint32_t now = millis(); uint32_t now = millis();
if (fix > 0) {
if (lastFixStartMsec > 0) {
if ((now - lastFixStartMsec) < GPS_FIX_HOLD_TIME) {
return false;
} else {
clearBuffer();
}
} else {
lastFixStartMsec = now;
return false;
}
} else {
return false;
}
} }
#endif #endif

2
src/modules/Telemetry/EnvironmentTelemetry.cpp
View File

@ -293,7 +293,7 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
m->which_variant = meshtastic_Telemetry_environment_metrics_tag; m->which_variant = meshtastic_Telemetry_environment_metrics_tag;
#ifdef T1000X_SENSOR_EN // add by WayenWeng #ifdef T1000X_SENSOR_EN // add by WayenWeng
valid = valid && t1000xSensor.getMetrics(&m); valid = valid && t1000xSensor.getMetrics(m);
hasSensor = true; hasSensor = true;
#else #else
if (dfRobotLarkSensor.hasSensor()) { if (dfRobotLarkSensor.hasSensor()) {

4
src/platform/nrf52/NRF52Bluetooth.cpp
View File

@ -16,10 +16,12 @@ static BLECharacteristic logRadio = BLECharacteristic(BLEUuid(LOGRADIO_UUID_16))
static BLEDis bledis; // DIS (Device Information Service) helper class instance static BLEDis bledis; // DIS (Device Information Service) helper class instance
static BLEBas blebas; // BAS (Battery Service) helper class instance static BLEBas blebas; // BAS (Battery Service) helper class instance
#ifndef BLE_DFU_SECURE
static BLEDfu bledfu; // DFU software update helper service static BLEDfu bledfu; // DFU software update helper service
#else
static BLEDfuSecure bledfusecure; // DFU software update helper service static BLEDfuSecure bledfusecure; // DFU software update helper service
#endif
static BLEDfu bledfu; // DFU software update helper service
// This scratch buffer is used for various bluetooth reads/writes - but it is safe because only one bt operation can be in // This scratch buffer is used for various bluetooth reads/writes - but it is safe because only one bt operation can be in
// process at once // process at once
// static uint8_t trBytes[_max(_max(_max(_max(ToRadio_size, RadioConfig_size), User_size), MyNodeInfo_size), FromRadio_size)]; // static uint8_t trBytes[_max(_max(_max(_max(ToRadio_size, RadioConfig_size), User_size), MyNodeInfo_size), FromRadio_size)];