Redo /api/system endpoints to proto
This commit is contained in:
@@ -69,6 +69,7 @@ class WebServer {
|
||||
static esp_err_t sendJson(httpd_req_t* req, int status, JsonDocument& doc);
|
||||
static esp_err_t sendError(httpd_req_t* req, int status, const char* message);
|
||||
static esp_err_t sendOk(httpd_req_t* req);
|
||||
static esp_err_t sendOkProto(httpd_req_t* req);
|
||||
static esp_err_t sendProto(httpd_req_t* req, int status, const uint8_t* data, size_t len);
|
||||
|
||||
template <typename T>
|
||||
|
||||
@@ -359,6 +359,8 @@ esp_err_t WebServer::sendError(httpd_req_t* req, int status, const char* message
|
||||
|
||||
esp_err_t WebServer::sendOk(httpd_req_t* req) { return sendJson(req, 200, "{\"status\":\"ok\"}"); }
|
||||
|
||||
esp_err_t WebServer::sendOkProto(httpd_req_t* req) { return sendProto(req, 200, nullptr, 0); }
|
||||
|
||||
esp_err_t WebServer::sendProto(httpd_req_t* req, int status, const uint8_t* data, size_t len) {
|
||||
httpd_resp_set_status(req, status == 200 ? "200 OK"
|
||||
: status == 400 ? "400 Bad Request"
|
||||
|
||||
+6
-7
@@ -42,13 +42,12 @@ void setupServer() {
|
||||
server.config(50 + WWW_ASSETS_COUNT, 32768);
|
||||
server.listen(80);
|
||||
|
||||
// TODO: REMAKE TO PROTO
|
||||
server.on("/api/system/reset", HTTP_POST,
|
||||
[&](httpd_req_t *request, JsonVariant &json) { return system_service::handleReset(request); });
|
||||
server.on("/api/system/restart", HTTP_POST,
|
||||
[&](httpd_req_t *request, JsonVariant &json) { return system_service::handleRestart(request); });
|
||||
server.on("/api/system/sleep", HTTP_POST,
|
||||
[&](httpd_req_t *request, JsonVariant &json) { return system_service::handleSleep(request); });
|
||||
server.onProto("/api/system/reset", HTTP_POST,
|
||||
[&](httpd_req_t *request, api_Request *protoReq) { return system_service::handleReset(request); });
|
||||
server.onProto("/api/system/restart", HTTP_POST,
|
||||
[&](httpd_req_t *request, api_Request *protoReq) { return system_service::handleRestart(request); });
|
||||
server.onProto("/api/system/sleep", HTTP_POST,
|
||||
[&](httpd_req_t *request, api_Request *protoReq) { return system_service::handleSleep(request); });
|
||||
#if USE_CAMERA
|
||||
// TODO: REMAKE TO PROTO
|
||||
server.on("/api/camera/still", HTTP_GET, [&](httpd_req_t *request) { return cameraService.cameraStill(request); });
|
||||
|
||||
@@ -7,17 +7,17 @@ static const char *TAG = "SystemService";
|
||||
|
||||
esp_err_t handleReset(httpd_req_t *request) {
|
||||
reset();
|
||||
return WebServer::sendOk(request);
|
||||
return WebServer::sendOkProto(request);
|
||||
}
|
||||
|
||||
esp_err_t handleRestart(httpd_req_t *request) {
|
||||
restart();
|
||||
return WebServer::sendOk(request);
|
||||
return WebServer::sendOkProto(request);
|
||||
}
|
||||
|
||||
esp_err_t handleSleep(httpd_req_t *request) {
|
||||
sleep();
|
||||
return WebServer::sendOk(request);
|
||||
return WebServer::sendOkProto(request);
|
||||
}
|
||||
|
||||
void reset() {
|
||||
|
||||
Reference in New Issue
Block a user