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

firmware: keep temp config lookup outside UART guard

Browse Source
This commit is contained in:
nick
2026-06-08 09:04:59 -06:00
parent 75c1d4d909
commit 954bef4291
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/esp32/overland-controller/overland-controller.ino
+6 -6
View File
@@ -2025,7 +2025,7 @@ int findRelayConfigIndexForUart(const String& id) {
return -1; return -1;
} }
int findTempConfigIndexForUart(const String& id) { int findTempConfigIndexById(const String& id) {
for (int i = 0; i < MAX_TEMP_SENSORS; i++) { for (int i = 0; i < MAX_TEMP_SENSORS; i++) {
if (appConfig.tempSensors[i].id == id) { if (appConfig.tempSensors[i].id == id) {
return i; return i;
@@ -2110,7 +2110,7 @@ void handleUartMessage(const String& line) {
if (strcmp(type, "config_temp") == 0) { if (strcmp(type, "config_temp") == 0) {
String id = doc["id"] | ""; String id = doc["id"] | "";
int index = findTempConfigIndexForUart(id); int index = findTempConfigIndexById(id);
if (index < 0) { if (index < 0) {
sendError(DashboardSerial, "unknown_temp_sensor"); sendError(DashboardSerial, "unknown_temp_sensor");
@@ -2286,7 +2286,7 @@ void handleUartMessage(const String& line) {
int configIndex = -1; int configIndex = -1;
if (id.length() > 0) { if (id.length() > 0) {
configIndex = findTempConfigIndexForUart(id); configIndex = findTempConfigIndexById(id);
} else if (slot >= 1 && slot <= MAX_TEMP_SENSORS) { } else if (slot >= 1 && slot <= MAX_TEMP_SENSORS) {
configIndex = slot - 1; configIndex = slot - 1;
} }
@@ -2313,7 +2313,7 @@ void handleUartMessage(const String& line) {
int configIndex = -1; int configIndex = -1;
if (id.length() > 0) { if (id.length() > 0) {
configIndex = findTempConfigIndexForUart(id); configIndex = findTempConfigIndexById(id);
} else if (slot >= 1 && slot <= MAX_TEMP_SENSORS) { } else if (slot >= 1 && slot <= MAX_TEMP_SENSORS) {
configIndex = slot - 1; configIndex = slot - 1;
} }
@@ -3078,7 +3078,7 @@ void handleTempAssign() {
int configIndex = -1; int configIndex = -1;
if (id.length() > 0) { if (id.length() > 0) {
configIndex = findTempConfigIndexForUart(id); configIndex = findTempConfigIndexById(id);
} else if (slot >= 1 && slot <= MAX_TEMP_SENSORS) { } else if (slot >= 1 && slot <= MAX_TEMP_SENSORS) {
configIndex = slot - 1; configIndex = slot - 1;
} }
@@ -3128,7 +3128,7 @@ void handleTempClear() {
int configIndex = -1; int configIndex = -1;
if (id.length() > 0) { if (id.length() > 0) {
configIndex = findTempConfigIndexForUart(id); configIndex = findTempConfigIndexById(id);
} else if (slot >= 1 && slot <= MAX_TEMP_SENSORS) { } else if (slot >= 1 && slot <= MAX_TEMP_SENSORS) {
configIndex = slot - 1; configIndex = slot - 1;
} }
tests/test_http_api_contract.py
+12
View File
@@ -448,3 +448,15 @@ def test_legacy_dashboard_uart_is_disabled_by_default():
assert "DASHBOARD_UART_RX_PIN 22" not in config assert "DASHBOARD_UART_RX_PIN 22" not in config
assert "#if DASHBOARD_UART_ENABLED" in source assert "#if DASHBOARD_UART_ENABLED" in source
assert "pollDashboardUart();" in source assert "pollDashboardUart();" in source
def test_temp_config_lookup_is_available_to_http_handlers():
source = firmware_source()
assert "int findTempConfigIndexById(" in source
assert "configIndex = findTempConfigIndexById(id);" in source
assert "findTempConfigIndexForUart" not in source
helper_pos = source.index("int findTempConfigIndexById(")
uart_guard_pos = source.index("#if DASHBOARD_UART_ENABLED")
assert helper_pos < uart_guard_pos