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

Use generic temperature sensor fields

Browse Source
This commit is contained in:
nick
2026-06-04 03:21:45 -06:00
parent 32247823fd
commit dc42284d87
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/esp32/overland-controller/overland-controller.ino
+12 -12
View File
@@ -78,35 +78,35 @@ void buildStatusDocument(JsonDocument& doc) {
JsonObject temps = doc.createNestedObject("temps");
if (sensors.fridgeZone1Online) {
temps["fridge_zone_1"] = sensors.fridgeZone1;
if (sensors.temp1Online) {
temps["fridge_zone_1"] = sensors.temp1;
} else {
temps["fridge_zone_1"] = nullptr;
}
if (sensors.fridgeZone2Online) {
temps["fridge_zone_2"] = sensors.fridgeZone2;
if (sensors.temp2Online) {
temps["fridge_zone_2"] = sensors.temp2;
} else {
temps["fridge_zone_2"] = nullptr;
}
if (sensors.rearSeatOnline) {
temps["rear_seat"] = sensors.rearSeat;
if (sensors.temp3Online) {
temps["rear_seat"] = sensors.temp3;
} else {
temps["rear_seat"] = nullptr;
}
if (sensors.outsideAirOnline) {
temps["outside"] = sensors.outsideAir;
if (sensors.temp4Online) {
temps["outside"] = sensors.temp4;
} else {
temps["outside"] = nullptr;
}
JsonObject sensorHealth = doc.createNestedObject("sensor_health");
sensorHealth["fridge_zone_1"] = sensors.fridgeZone1Online;
sensorHealth["fridge_zone_2"] = sensors.fridgeZone2Online;
sensorHealth["rear_seat"] = sensors.rearSeatOnline;
sensorHealth["outside"] = sensors.outsideAirOnline;
sensorHealth["fridge_zone_1"] = sensors.temp1Online;
sensorHealth["fridge_zone_2"] = sensors.temp2Online;
sensorHealth["rear_seat"] = sensors.temp3Online;
sensorHealth["outside"] = sensors.temp4Online;
JsonObject relayObj = doc.createNestedObject("relays");
relayObj["starlink"] = relays.relay1;
firmware/esp32/overland-controller/sensors.cpp
+8 -8
View File
@@ -75,13 +75,13 @@ void updateSensors() {
}
}
sensors.fridgeZone1 = tempsF[0];
sensors.fridgeZone2 = tempsF[1];
sensors.rearSeat = tempsF[2];
sensors.outsideAir = tempsF[3];
sensors.temp1 = tempsF[0];
sensors.temp2 = tempsF[1];
sensors.temp3 = tempsF[2];
sensors.temp4 = tempsF[3];
sensors.fridgeZone1Online = online[0];
sensors.fridgeZone2Online = online[1];
sensors.rearSeatOnline = online[2];
sensors.outsideAirOnline = online[3];
sensors.temp1Online = online[0];
sensors.temp2Online = online[1];
sensors.temp3Online = online[2];
sensors.temp4Online = online[3];
}
firmware/esp32/overland-controller/sensors.h
+8 -8
View File
@@ -1,15 +1,15 @@
#pragma once
struct SensorData {
float fridgeZone1 = -127.0;
float fridgeZone2 = -127.0;
float rearSeat = -127.0;
float outsideAir = -127.0;
float temp1 = -127.0;
float temp2 = -127.0;
float temp3 = -127.0;
float temp4 = -127.0;
bool relay2Zone1Online = false;
bool relay2Zone2Online = false;
bool rearSeatOnline = false;
bool outsideAirOnline = false;
bool temp1Online = false;
bool temp2Online = false;
bool temp3Online = false;
bool temp4Online = false;
};
extern SensorData sensors;