diff --git a/Core/Src/http_server.c b/Core/Src/http_server.c index 9217a32..3303c82 100644 --- a/Core/Src/http_server.c +++ b/Core/Src/http_server.c @@ -183,14 +183,14 @@ static void handle_status_request(uint8_t sn) "\"initStatus\":%d" "}", deviceStatus.sensorStatus, - deviceStatus.valves.angle1, - deviceStatus.valves.angle2, - deviceStatus.pumps.status1, - deviceStatus.pumps.status2, - deviceStatus.pumps.speed1, - deviceStatus.pumps.speed2, + deviceStatus.valves.angle[0], + deviceStatus.valves.angle[1], + deviceStatus.pumps.status[0], + deviceStatus.pumps.status[1], + deviceStatus.pumps.speed[0], + deviceStatus.pumps.speed[1], deviceStatus.bubbleStatus, - deviceStatus.stopStatus, + deviceStatus.estopStatus, deviceStatus.errorCode, deviceStatus.initStatus ); diff --git a/Core/motor b/Core/motor index 93c676e..1378172 160000 --- a/Core/motor +++ b/Core/motor @@ -1 +1 @@ -Subproject commit 93c676e1cbaa7e278f9ed81646067c4fda37e5a1 +Subproject commit 13781723e047b8df30eb4f459fd304ef21f042b2