lukas/WordClockESP
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #61 from rjwats/fix-formatting

Browse Source 
fix formatting issue
This commit is contained in:
rjwats 2019-11-30 13:47:18 +00:00 committed by GitHub
commit 5fa6a1218f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/framework/SettingsService.h
View File

@ -20,12 +20,11 @@
/* /*
* Abstraction of a service which stores it's settings as JSON in a file system. * Abstraction of a service which stores it's settings as JSON in a file system.
*/ */
class SettingsService : public SettingsPersistence class SettingsService : public SettingsPersistence {
{
public: public:
SettingsService(AsyncWebServer *server, FS *fs, char const *servicePath, char const *filePath) : SettingsPersistence(fs, filePath), _servicePath(servicePath)
{ SettingsService(AsyncWebServer* server, FS* fs, char const* servicePath, char const* filePath): SettingsPersistence(fs, filePath), _servicePath(servicePath) {
server->on(_servicePath, HTTP_GET, std::bind(&SettingsService::fetchConfig, this, std::placeholders::_1)); server->on(_servicePath, HTTP_GET, std::bind(&SettingsService::fetchConfig, this, std::placeholders::_1));
_updateHandler.setUri(servicePath); _updateHandler.setUri(servicePath);
@ -37,8 +36,7 @@ public:
virtual ~SettingsService() {} virtual ~SettingsService() {}
void begin() void begin() {
{
// read the initial data from the file system // read the initial data from the file system
readFromFS(); readFromFS();
} }
@ -47,8 +45,7 @@ protected:
char const* _servicePath; char const* _servicePath;
AsyncJsonWebHandler _updateHandler; AsyncJsonWebHandler _updateHandler;
virtual void fetchConfig(AsyncWebServerRequest *request) virtual void fetchConfig(AsyncWebServerRequest *request) {
{
// handle the request // handle the request
AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_SETTINGS_SIZE); AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_SETTINGS_SIZE);
JsonObject jsonObject = response->getRoot(); JsonObject jsonObject = response->getRoot();
@ -57,11 +54,9 @@ protected:
request->send(response); request->send(response);
} }
virtual void updateConfig(AsyncWebServerRequest *request, JsonDocument &jsonDocument) virtual void updateConfig(AsyncWebServerRequest *request, JsonDocument &jsonDocument) {
{
// handle the request // handle the request
if (jsonDocument.is<JsonObject>()) if (jsonDocument.is<JsonObject>()){
{
JsonObject newConfig = jsonDocument.as<JsonObject>(); JsonObject newConfig = jsonDocument.as<JsonObject>();
readFromJsonObject(newConfig); readFromJsonObject(newConfig);
writeToFS(); writeToFS();
@ -72,15 +67,14 @@ protected:
writeToJsonObject(jsonObject); writeToJsonObject(jsonObject);
response->setLength(); response->setLength();
request->send(response); request->send(response);
} } else {
else
{
request->send(400); request->send(400);
} }
} }
// implement to perform action when config has been updated // implement to perform action when config has been updated
virtual void onConfigUpdated(){} virtual void onConfigUpdated(){}
}; };
#endif // end SettingsService #endif // end SettingsService