Clean up generic project branding and relay fields

This commit is contained in:
2026-06-04 03:16:18 -06:00
parent 84c13b4b5f
commit 32247823fd
5 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
Verify ESP32 creates AP: Verify ESP32 creates AP:
* SSID: XterraController * SSID: OverlandController
### HTTP API ### HTTP API
@@ -109,8 +109,8 @@ void buildStatusDocument(JsonDocument& doc) {
sensorHealth["outside"] = sensors.outsideAirOnline; sensorHealth["outside"] = sensors.outsideAirOnline;
JsonObject relayObj = doc.createNestedObject("relays"); JsonObject relayObj = doc.createNestedObject("relays");
relayObj["starlink"] = relays.starlink; relayObj["starlink"] = relays.relay1;
relayObj["fridge"] = relays.fridge; relayObj["fridge"] = relays.relay2;
JsonObject vehicle = doc.createNestedObject("vehicle"); JsonObject vehicle = doc.createNestedObject("vehicle");
vehicle["ignition_on"] = digitalRead(IGNITION_PIN); vehicle["ignition_on"] = digitalRead(IGNITION_PIN);
@@ -185,9 +185,9 @@ void sendError(Stream& output, const char* message) {
bool setRelayByName(const char* relayName, bool enabled) { bool setRelayByName(const char* relayName, bool enabled) {
if (strcmp(relayName, "starlink") == 0) { if (strcmp(relayName, "starlink") == 0) {
relays.starlink = enabled; relays.relay1 = enabled;
} else if (strcmp(relayName, "fridge") == 0) { } else if (strcmp(relayName, "fridge") == 0) {
relays.fridge = enabled; relays.relay2 = enabled;
} else { } else {
return false; return false;
} }
@@ -626,9 +626,9 @@ void handleGenericRelayRoute() {
} }
if (relayId == "relay_1") { if (relayId == "relay_1") {
relays.starlink = enabled; relays.relay1 = enabled;
} else if (relayId == "relay_2") { } else if (relayId == "relay_2") {
relays.fridge = enabled; relays.relay2 = enabled;
} else { } else {
server.send(404, "application/json", "{\"ok\":false,\"error\":\"unknown_relay\"}"); server.send(404, "application/json", "{\"ok\":false,\"error\":\"unknown_relay\"}");
return; return;
@@ -719,7 +719,7 @@ void setup() {
WiFi.mode(WIFI_AP); WiFi.mode(WIFI_AP);
bool apResult = WiFi.softAP("XterraController"); bool apResult = WiFi.softAP("OverlandController");
if (apResult) { if (apResult) {
Serial.println("AP Started"); Serial.println("AP Started");
@@ -12,6 +12,6 @@ void initRelays() {
} }
void updateRelayOutputs() { void updateRelayOutputs() {
digitalWrite(RELAY_STARLINK_PIN, relays.starlink); digitalWrite(RELAY_STARLINK_PIN, relays.relay1);
digitalWrite(RELAY_FRIDGE_PIN, relays.fridge); digitalWrite(RELAY_FRIDGE_PIN, relays.relay2);
} }
+2 -2
View File
@@ -1,8 +1,8 @@
#pragma once #pragma once
struct RelayState { struct RelayState {
bool starlink = false; bool relay1 = false;
bool fridge = false; bool relay2 = false;
}; };
extern RelayState relays; extern RelayState relays;
+2 -2
View File
@@ -6,8 +6,8 @@ struct SensorData {
float rearSeat = -127.0; float rearSeat = -127.0;
float outsideAir = -127.0; float outsideAir = -127.0;
bool fridgeZone1Online = false; bool relay2Zone1Online = false;
bool fridgeZone2Online = false; bool relay2Zone2Online = false;
bool rearSeatOnline = false; bool rearSeatOnline = false;
bool outsideAirOnline = false; bool outsideAirOnline = false;
}; };