From dc42284d87ea2ee31a22698b534d2731384d137c Mon Sep 17 00:00:00 2001 From: nick Date: Thu, 4 Jun 2026 03:21:45 -0600 Subject: [PATCH] Use generic temperature sensor fields --- .../overland-controller.ino | 24 +++++++++---------- .../esp32/overland-controller/sensors.cpp | 16 ++++++------- firmware/esp32/overland-controller/sensors.h | 16 ++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/firmware/esp32/overland-controller/overland-controller.ino b/firmware/esp32/overland-controller/overland-controller.ino index f41d14f..a098237 100644 --- a/firmware/esp32/overland-controller/overland-controller.ino +++ b/firmware/esp32/overland-controller/overland-controller.ino @@ -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; diff --git a/firmware/esp32/overland-controller/sensors.cpp b/firmware/esp32/overland-controller/sensors.cpp index a77e1d2..eff6d69 100644 --- a/firmware/esp32/overland-controller/sensors.cpp +++ b/firmware/esp32/overland-controller/sensors.cpp @@ -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]; } diff --git a/firmware/esp32/overland-controller/sensors.h b/firmware/esp32/overland-controller/sensors.h index eb9ff7c..6f6d309 100644 --- a/firmware/esp32/overland-controller/sensors.h +++ b/firmware/esp32/overland-controller/sensors.h @@ -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;