diff --git a/hardware/TheReefEmbedded/include/http_server/HttpServerTemperature.h b/hardware/TheReefEmbedded/include/http_server/HttpServerTemperature.h index 6c8f064..e2d8610 100644 --- a/hardware/TheReefEmbedded/include/http_server/HttpServerTemperature.h +++ b/hardware/TheReefEmbedded/include/http_server/HttpServerTemperature.h @@ -3,12 +3,13 @@ #include -class HttpServerTemperature: public HttpServerBase { +class HttpServerTemperature : public HttpServerBase +{ private: String _sensorId; public: - HttpServerTemperature(String host, String secretKey, String path, String sensorId); + HttpServerTemperature(String host, String secretKey, String sensorId, String path); void sendCurrentTemperature(float temperature); }; diff --git a/hardware/TheReefEmbedded/include/http_server/HttpServerWaterPump.h b/hardware/TheReefEmbedded/include/http_server/HttpServerWaterPump.h index bec138c..1d08ff0 100644 --- a/hardware/TheReefEmbedded/include/http_server/HttpServerWaterPump.h +++ b/hardware/TheReefEmbedded/include/http_server/HttpServerWaterPump.h @@ -3,12 +3,13 @@ #include -class HttpServerWaterPump: public HttpServerBase { +class HttpServerWaterPump : public HttpServerBase +{ private: String _waterPumpId; public: - HttpServerWaterPump(String host, String secretKey, String path, String waterPumpId); + HttpServerWaterPump(String host, String secretKey, String waterPumpId, String path); void sendWaterPumpStatusOn(); void sendWaterPumpStatusOff(); }; diff --git a/hardware/TheReefEmbedded/src/http_server/HttpServerBuoy.cpp b/hardware/TheReefEmbedded/src/http_server/HttpServerBuoy.cpp index 7c69210..19765a0 100644 --- a/hardware/TheReefEmbedded/src/http_server/HttpServerBuoy.cpp +++ b/hardware/TheReefEmbedded/src/http_server/HttpServerBuoy.cpp @@ -39,7 +39,7 @@ void HttpServerBuoy::sendBuoyInactive() HTTPClient https = setupHttps(); JsonDocument payload; payload["buoyId"] = _buoyId; - payload["newValue"] = true; + payload["newValue"] = false; char requestBody[50]; serializeJson(payload, requestBody); diff --git a/hardware/TheReefEmbedded/src/http_server/HttpServerTemperature.cpp b/hardware/TheReefEmbedded/src/http_server/HttpServerTemperature.cpp index 62dd438..5a09685 100644 --- a/hardware/TheReefEmbedded/src/http_server/HttpServerTemperature.cpp +++ b/hardware/TheReefEmbedded/src/http_server/HttpServerTemperature.cpp @@ -1,6 +1,6 @@ #include "http_server/HttpServerTemperature.h" -HttpServerTemperature::HttpServerTemperature(String host, String secretKey, String path, String sensorId) : HttpServerBase(host, secretKey, path), _sensorId(sensorId) {} +HttpServerTemperature::HttpServerTemperature(String host, String secretKey, String sensorId, String path) : HttpServerBase(host, secretKey, path), _sensorId(sensorId) {} void HttpServerTemperature::sendCurrentTemperature(float temperature) { diff --git a/hardware/TheReefEmbedded/src/http_server/HttpServerWaterPump.cpp b/hardware/TheReefEmbedded/src/http_server/HttpServerWaterPump.cpp index c3fb4dc..d947622 100644 --- a/hardware/TheReefEmbedded/src/http_server/HttpServerWaterPump.cpp +++ b/hardware/TheReefEmbedded/src/http_server/HttpServerWaterPump.cpp @@ -1,6 +1,6 @@ #include "http_server/HttpServerWaterPump.h" -HttpServerWaterPump::HttpServerWaterPump(String host, String secretKey, String path, String waterPumpId) : HttpServerBase(host, secretKey, path), _waterPumpId(waterPumpId) {} +HttpServerWaterPump::HttpServerWaterPump(String host, String secretKey, String waterPumpId, String path) : HttpServerBase(host, secretKey, path), _waterPumpId(waterPumpId) {} void HttpServerWaterPump::sendWaterPumpStatusOn() { @@ -34,7 +34,7 @@ void HttpServerWaterPump::sendWaterPumpStatusOff() HTTPClient https = setupHttps(); JsonDocument payload; payload["fanId"] = _waterPumpId; - payload["on"] = true; + payload["on"] = false; char requestBody[50]; serializeJson(payload, requestBody); diff --git a/hardware/TheReefEmbedded/src/main.cpp b/hardware/TheReefEmbedded/src/main.cpp index 5c56afa..664d49b 100644 --- a/hardware/TheReefEmbedded/src/main.cpp +++ b/hardware/TheReefEmbedded/src/main.cpp @@ -45,10 +45,10 @@ WiFiHandler wiFiHandler(PIN_BUTTON_RESET_WIFI); TemperatureManager temperatureManager(minTemperature, maxTemperature); WaterLevelManager waterLevelManager; -HttpServerFan httpServerFan(HOST, secretKey, "10", "/fans/update_on"); -HttpServerTemperature httpServerTemperature(HOST, secretKey, "1", "/indicators/update"); -HttpServerBuoy httpServerBuoy(HOST, secretKey, "4", "/buoys/update"); -HttpServerWaterPump httpServerWaterPump(HOST, secretKey, "11", "/fans/update_on"); // no sevidor aparece como boia, pois é o sensor da boia que envia para o servidor da bomba +HttpServerFan httpServerFan(HOST, secretKey, "14", "/fans/update_on"); +HttpServerTemperature httpServerTemperature(HOST, secretKey, "5", "/indicators/update"); +HttpServerBuoy httpServerBuoy(HOST, secretKey, "15", "/buoys/update"); +HttpServerWaterPump httpServerWaterPump(HOST, secretKey, "15", "/fans/update_on"); // no sevidor aparece como boia, pois é o sensor da boia que envia para o servidor da bomba LcdManager lcdManager;