diff --git a/Firmware/EggbotWireless/include/WebAPI.h b/Firmware/EggbotWireless/include/WebAPI.h index 76229dc..1ed65db 100644 --- a/Firmware/EggbotWireless/include/WebAPI.h +++ b/Firmware/EggbotWireless/include/WebAPI.h @@ -9,6 +9,7 @@ class WebAPI { private: void handleNotFound(); void handlePutCommand(); + void handleGetStatus(); String getStatusJson(); public: WebAPI(); diff --git a/Firmware/EggbotWireless/src/WebAPI.cpp b/Firmware/EggbotWireless/src/WebAPI.cpp index 1befb86..835057d 100644 --- a/Firmware/EggbotWireless/src/WebAPI.cpp +++ b/Firmware/EggbotWireless/src/WebAPI.cpp @@ -29,12 +29,19 @@ void WebAPI::handleNotFound() { void WebAPI::handlePutCommand() { queueManager.putCommand(server.arg("plain").c_str()); - server.send(200, "text/plain", getStatusJson()); + server.send(200, "application/json", getStatusJson()); +} + +void WebAPI::handleGetStatus() { + server.send(200, "application/json", getStatusJson()); } void WebAPI::init() { server.on("/putCommand", HTTP_POST, std::bind(&WebAPI::handlePutCommand, this)); + server.on("/getStatus", HTTP_GET, + std::bind(&WebAPI::handleGetStatus, this)); + server.onNotFound(std::bind(&WebAPI::handleNotFound, this)); server.begin(); }