nick/overland-controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "dashboard: use cargo temp alert contract fields"

Browse Source 
This reverts commit 3e88a7a28a.
This commit is contained in:
nick
2026-06-19 01:58:34 -06:00
parent 5fbc33001a
commit f4c6623334
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/esp32-s3-dashboard/dashboard_config.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once #pragma once
static const char *DASHBOARD_VERSION = "0.1.117-temp-alert-contract-logic"; static const char *DASHBOARD_VERSION = "0.1.116-temp-alert-field-parsing";
// Update these if your Cargo ESP AP credentials are different. // Update these if your Cargo ESP AP credentials are different.
//static const char *CARGO_WIFI_SSID = "OverlandController"; //static const char *CARGO_WIFI_SSID = "OverlandController";
firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino
+13 -5
View File
@@ -1464,13 +1464,21 @@ static void parse_status_json(const String &body)
} }
float temp_f = (float)(temp["temperature_f"] | 0.0); float temp_f = (float)(temp["temperature_f"] | 0.0);
bool high_alert = bool high_alert =
(temp["high_alert"] | false) || (temp["high_alert"] | false) ||
( (temp["alert"] | false) ||
(temp["high_alert_enabled"] | false) && (temp["alarm"] | false) ||
!temp["high_alert_f"].isNull() && (temp["high_alarm"] | false) ||
temp_f > (float)(temp["high_alert_f"] | 9999.0) (temp["temp_high"] | false);
);
if (!temp["high_threshold_f"].isNull()) {
high_alert = high_alert || temp_f >= (float)(temp["high_threshold_f"] | 9999.0);
}
if (!temp["alarm_threshold_f"].isNull()) {
high_alert = high_alert || temp_f >= (float)(temp["alarm_threshold_f"] | 9999.0);
}
if (weather) { if (weather) {
outside_status = "OUT "; outside_status = "OUT ";