Converted servocontroller to protobufs + persistance defaults
This commit is contained in:
@@ -8,7 +8,8 @@ APService::APService()
|
||||
API_REQUEST_EXTRACTOR(ap_settings, api_APSettings),
|
||||
API_RESPONSE_ASSIGNER(ap_settings, api_APSettings)),
|
||||
_persistence(APSettings_read, APSettings_update, this,
|
||||
AP_SETTINGS_FILE, api_APSettings_fields, api_APSettings_size) {
|
||||
AP_SETTINGS_FILE, api_APSettings_fields, api_APSettings_size,
|
||||
APSettings_defaults()) {
|
||||
addUpdateHandler([&](const std::string &originId) { reconfigureAP(); }, false);
|
||||
}
|
||||
|
||||
@@ -23,7 +24,7 @@ esp_err_t APService::getStatusProto(httpd_req_t *request) {
|
||||
res.status_code = 200;
|
||||
res.which_payload = api_Response_ap_status_tag;
|
||||
statusProto(res.payload.ap_status);
|
||||
return NativeServer::sendProto(request, 200, res, api_Response_fields);
|
||||
return WebServer::sendProto(request, 200, res, api_Response_fields);
|
||||
}
|
||||
|
||||
void APService::statusProto(api_APStatus &proto) {
|
||||
|
||||
@@ -251,7 +251,7 @@ void WebServer::on(const char* uri, httpd_method_t method, HttpPostHandler handl
|
||||
}
|
||||
}
|
||||
|
||||
void NativeServer::onProto(const char* uri, httpd_method_t method, HttpProtoHandler handler) {
|
||||
void WebServer::onProto(const char* uri, httpd_method_t method, HttpProtoHandler handler) {
|
||||
HttpRoute route;
|
||||
route.uri = uri;
|
||||
route.method = method;
|
||||
|
||||
+3
-3
@@ -59,9 +59,9 @@ void setupServer() {
|
||||
});
|
||||
#endif
|
||||
server.on("/api/servo/config", HTTP_GET,
|
||||
[&](httpd_req_t *request) { return servoController.endpoint.getState(request); });
|
||||
server.on("/api/servo/config", HTTP_POST, [&](httpd_req_t *request, JsonVariant &json) {
|
||||
return servoController.endpoint.handleStateUpdate(request, json);
|
||||
[&](httpd_req_t *request) { return servoController.protoEndpoint.getState(request); });
|
||||
server.onProto("/api/servo/config", HTTP_POST, [&](httpd_req_t *request, api_Request *protoReq) {
|
||||
return servoController.protoEndpoint.handleStateUpdate(request, protoReq);
|
||||
});
|
||||
|
||||
server.on("/api/wifi/sta/settings", HTTP_GET,
|
||||
|
||||
Reference in New Issue
Block a user