Skip to content

fix(t1000-e): fix extended uptime failures in GPS and sensor code #2074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickDunklee wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(t1000-e): fix extended uptime failures in GPS and sensor code #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/helpers/sensors/MicroNMEALocationProvider.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class MicroNMEALocationProvider : public LocationProvider {
RefCountedDigitalPin* _peripher_power;
int _pin_reset;
int _pin_en;
long next_check = 0;
uint32_t last_check = 0;
long time_valid = 0;

public :
Expand Down Expand Up @@ -127,8 +127,8 @@ public :

if (!isValid()) time_valid = 0;

if (millis() > next_check) {
next_check = millis() + 1000;
if ((uint32_t)(millis() - last_check) >= 1000) {
last_check = millis();
if (_time_sync_needed && time_valid > 2) {
if (_clock != NULL) {
_clock->setCurrentTime(getTimestamp());
Expand Down
21 changes: 16 additions & 5 deletions variants/t1000-e/t1000e_sensors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,30 @@ static char ntc_temp2[136] = {
};

static float get_heater_temperature(unsigned int vcc_volt, unsigned int ntc_volt) {
if (ntc_volt == 0) {
return 0.0f; // avoid division by zero on open circuit / sensor fault
}
int i = 0;
float Vout = 0, Rt = 0, temp = 0;
Vout = ntc_volt;

Rt = (HEATER_NTC_RP * vcc_volt) / Vout - HEATER_NTC_RP;
float Rt = 0, temp = 0;
Rt = (HEATER_NTC_RP * (float)vcc_volt) / ntc_volt - HEATER_NTC_RP;

for (i = 0; i < 136; i++) {
if (Rt >= ntc_res2[i]) {
break;
}
}

temp = ntc_temp2[i - 1] + 1 * (ntc_res2[i - 1] - Rt) / (float)(ntc_res2[i - 1] - ntc_res2[i]);
if (i <= 0) {
return (float)ntc_temp2[0];
}
if (i >= 136) {
return (float)ntc_temp2[135];
}
int denom = ntc_res2[i - 1] - ntc_res2[i];
if (denom == 0) {
return (float)ntc_temp2[i - 1];
}
temp = ntc_temp2[i - 1] + 1 * (ntc_res2[i - 1] - Rt) / (float)denom;

temp = (temp * 100 + 5) / 100;
return temp;
Expand Down
8 changes: 4 additions & 4 deletions variants/t1000-e/target.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,18 @@ bool T1000SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP&
}

void T1000SensorManager::loop() {
static long next_gps_update = 0;
static uint32_t last_gps_update = 0;
constexpr uint32_t GPS_UPDATE_INTERVAL_MS = 1000;

_nmea->loop();

if (millis() > next_gps_update) {
if ((uint32_t)(millis() - last_gps_update) >= GPS_UPDATE_INTERVAL_MS) {
if (gps_active && _nmea->isValid()) {
node_lat = ((double)_nmea->getLatitude())/1000000.;
node_lon = ((double)_nmea->getLongitude())/1000000.;
node_altitude = ((double)_nmea->getAltitude()) / 1000.0;
//Serial.printf("lat %f lon %f\r\n", _lat, _lon);
}
next_gps_update = millis() + 1000;
last_gps_update = millis();
}
}

Expand Down
Loading