From f2457a7050085abb5399449ab9370d1c32efb5a1 Mon Sep 17 00:00:00 2001 From: Proddy Date: Mon, 11 Oct 2021 16:53:00 +0200 Subject: [PATCH] auto-formatting --- lib/PButton/PButon.cpp | 3 ++- lib/framework/APSettingsService.h | 3 ++- lib/framework/APStatus.cpp | 4 +++- lib/framework/FSPersistence.h | 7 ++++++- lib/framework/FactoryResetService.cpp | 4 +++- lib/framework/HttpEndpoint.h | 20 +++++++++++++++--- lib/framework/MqttPubSub.h | 12 +++++++++-- lib/framework/MqttSettingsService.cpp | 2 +- lib/framework/NTPStatus.cpp | 4 +++- lib/framework/NetworkSettingsService.cpp | 3 +-- lib/framework/NetworkStatus.cpp | 4 +++- lib/framework/UploadFirmwareService.cpp | 5 ++++- lib/framework/WebSocketTxRx.h | 26 ++++++++++++++++++++---- lib/framework/WiFiScanner.cpp | 8 ++++++-- 14 files changed, 83 insertions(+), 22 deletions(-) diff --git a/lib/PButton/PButon.cpp b/lib/PButton/PButon.cpp index 6a728e2e9..264257f3a 100644 --- a/lib/PButton/PButon.cpp +++ b/lib/PButton/PButon.cpp @@ -130,7 +130,8 @@ bool PButton::check(void) { } // Test for normal click event: DblClickDelay expired - if (state_ == pullMode_ && (millisRes - upTime_) >= DblClickDelay_ && dblClickWaiting_ == true && dblClickOnNextUp_ == false && singleClickOK_ == true && resultEvent != 2) { + if (state_ == pullMode_ && (millisRes - upTime_) >= DblClickDelay_ && dblClickWaiting_ == true && dblClickOnNextUp_ == false && singleClickOK_ == true + && resultEvent != 2) { // Serial.println("*single click pressed*"); resultEvent = 1; dblClickWaiting_ = false; diff --git a/lib/framework/APSettingsService.h b/lib/framework/APSettingsService.h index e08c7bf92..4e0000ceb 100644 --- a/lib/framework/APSettingsService.h +++ b/lib/framework/APSettingsService.h @@ -57,7 +57,8 @@ class APSettings { IPAddress subnetMask; bool operator==(const APSettings & settings) const { - return provisionMode == settings.provisionMode && ssid == settings.ssid && password == settings.password && localIP == settings.localIP && gatewayIP == settings.gatewayIP && subnetMask == settings.subnetMask; + return provisionMode == settings.provisionMode && ssid == settings.ssid && password == settings.password && localIP == settings.localIP + && gatewayIP == settings.gatewayIP && subnetMask == settings.subnetMask; } static void read(APSettings & settings, JsonObject & root) { diff --git a/lib/framework/APStatus.cpp b/lib/framework/APStatus.cpp index 620d94384..b60dd3ddd 100644 --- a/lib/framework/APStatus.cpp +++ b/lib/framework/APStatus.cpp @@ -4,7 +4,9 @@ using namespace std::placeholders; // for `_1` etc APStatus::APStatus(AsyncWebServer * server, SecurityManager * securityManager, APSettingsService * apSettingsService) : _apSettingsService(apSettingsService) { - server->on(AP_STATUS_SERVICE_PATH, HTTP_GET, securityManager->wrapRequest(std::bind(&APStatus::apStatus, this, _1), AuthenticationPredicates::IS_AUTHENTICATED)); + server->on(AP_STATUS_SERVICE_PATH, + HTTP_GET, + securityManager->wrapRequest(std::bind(&APStatus::apStatus, this, _1), AuthenticationPredicates::IS_AUTHENTICATED)); } void APStatus::apStatus(AsyncWebServerRequest * request) { diff --git a/lib/framework/FSPersistence.h b/lib/framework/FSPersistence.h index 7a56a6b5c..6ae644eb5 100644 --- a/lib/framework/FSPersistence.h +++ b/lib/framework/FSPersistence.h @@ -7,7 +7,12 @@ template class FSPersistence { public: - FSPersistence(JsonStateReader stateReader, JsonStateUpdater stateUpdater, StatefulService * statefulService, FS * fs, const char * filePath, size_t bufferSize = DEFAULT_BUFFER_SIZE) + FSPersistence(JsonStateReader stateReader, + JsonStateUpdater stateUpdater, + StatefulService * statefulService, + FS * fs, + const char * filePath, + size_t bufferSize = DEFAULT_BUFFER_SIZE) : _stateReader(stateReader) , _stateUpdater(stateUpdater) , _statefulService(statefulService) diff --git a/lib/framework/FactoryResetService.cpp b/lib/framework/FactoryResetService.cpp index 4e79c8ffb..1fa67bda1 100644 --- a/lib/framework/FactoryResetService.cpp +++ b/lib/framework/FactoryResetService.cpp @@ -4,7 +4,9 @@ using namespace std::placeholders; FactoryResetService::FactoryResetService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager) : fs(fs) { - server->on(FACTORY_RESET_SERVICE_PATH, HTTP_POST, securityManager->wrapRequest(std::bind(&FactoryResetService::handleRequest, this, _1), AuthenticationPredicates::IS_ADMIN)); + server->on(FACTORY_RESET_SERVICE_PATH, + HTTP_POST, + securityManager->wrapRequest(std::bind(&FactoryResetService::handleRequest, this, _1), AuthenticationPredicates::IS_ADMIN)); } void FactoryResetService::handleRequest(AsyncWebServerRequest * request) { diff --git a/lib/framework/HttpEndpoint.h b/lib/framework/HttpEndpoint.h index ed1e1169b..990ecc3db 100644 --- a/lib/framework/HttpEndpoint.h +++ b/lib/framework/HttpEndpoint.h @@ -28,7 +28,11 @@ class HttpGetEndpoint { server->on(servicePath.c_str(), HTTP_GET, securityManager->wrapRequest(std::bind(&HttpGetEndpoint::fetchSettings, this, _1), authenticationPredicate)); } - HttpGetEndpoint(JsonStateReader stateReader, StatefulService * statefulService, AsyncWebServer * server, const String & servicePath, size_t bufferSize = DEFAULT_BUFFER_SIZE) + HttpGetEndpoint(JsonStateReader stateReader, + StatefulService * statefulService, + AsyncWebServer * server, + const String & servicePath, + size_t bufferSize = DEFAULT_BUFFER_SIZE) : _stateReader(stateReader) , _statefulService(statefulService) , _bufferSize(bufferSize) { @@ -70,7 +74,12 @@ class HttpPostEndpoint { server->addHandler(&_updateHandler); } - HttpPostEndpoint(JsonStateReader stateReader, JsonStateUpdater stateUpdater, StatefulService * statefulService, AsyncWebServer * server, const String & servicePath, size_t bufferSize = DEFAULT_BUFFER_SIZE) + HttpPostEndpoint(JsonStateReader stateReader, + JsonStateUpdater stateUpdater, + StatefulService * statefulService, + AsyncWebServer * server, + const String & servicePath, + size_t bufferSize = DEFAULT_BUFFER_SIZE) : _stateReader(stateReader) , _stateUpdater(stateUpdater) , _statefulService(statefulService) @@ -124,7 +133,12 @@ class HttpEndpoint : public HttpGetEndpoint, public HttpPostEndpoint { , HttpPostEndpoint(stateReader, stateUpdater, statefulService, server, servicePath, securityManager, authenticationPredicate, bufferSize) { } - HttpEndpoint(JsonStateReader stateReader, JsonStateUpdater stateUpdater, StatefulService * statefulService, AsyncWebServer * server, const String & servicePath, size_t bufferSize = DEFAULT_BUFFER_SIZE) + HttpEndpoint(JsonStateReader stateReader, + JsonStateUpdater stateUpdater, + StatefulService * statefulService, + AsyncWebServer * server, + const String & servicePath, + size_t bufferSize = DEFAULT_BUFFER_SIZE) : HttpGetEndpoint(stateReader, statefulService, server, servicePath, bufferSize) , HttpPostEndpoint(stateReader, stateUpdater, statefulService, server, servicePath, bufferSize) { } diff --git a/lib/framework/MqttPubSub.h b/lib/framework/MqttPubSub.h index d15152abf..1ad2d437d 100644 --- a/lib/framework/MqttPubSub.h +++ b/lib/framework/MqttPubSub.h @@ -33,7 +33,11 @@ class MqttConnector { template class MqttPub : virtual public MqttConnector { public: - MqttPub(JsonStateReader stateReader, StatefulService * statefulService, AsyncMqttClient * mqttClient, const String & pubTopic = "", size_t bufferSize = DEFAULT_BUFFER_SIZE) + MqttPub(JsonStateReader stateReader, + StatefulService * statefulService, + AsyncMqttClient * mqttClient, + const String & pubTopic = "", + size_t bufferSize = DEFAULT_BUFFER_SIZE) : MqttConnector(statefulService, mqttClient, bufferSize) , _stateReader(stateReader) , _pubTopic(pubTopic) { @@ -74,7 +78,11 @@ class MqttPub : virtual public MqttConnector { template class MqttSub : virtual public MqttConnector { public: - MqttSub(JsonStateUpdater stateUpdater, StatefulService * statefulService, AsyncMqttClient * mqttClient, const String & subTopic = "", size_t bufferSize = DEFAULT_BUFFER_SIZE) + MqttSub(JsonStateUpdater stateUpdater, + StatefulService * statefulService, + AsyncMqttClient * mqttClient, + const String & subTopic = "", + size_t bufferSize = DEFAULT_BUFFER_SIZE) : MqttConnector(statefulService, mqttClient, bufferSize) , _stateUpdater(stateUpdater) , _subTopic(subTopic) { diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp index 35be27880..582383d96 100644 --- a/lib/framework/MqttSettingsService.cpp +++ b/lib/framework/MqttSettingsService.cpp @@ -146,7 +146,7 @@ void MqttSettingsService::configureMqtt() { _mqttClient.setCleanSession(_state.cleanSession); _mqttClient.setMaxTopicLength(_state.maxTopicLength); _mqttClient.connect(); - // } else { + // } else { // emsesp::EMSESP::logger().info(F("Error configuring Mqtt client")); } } diff --git a/lib/framework/NTPStatus.cpp b/lib/framework/NTPStatus.cpp index e3f68b1b1..1073572d5 100644 --- a/lib/framework/NTPStatus.cpp +++ b/lib/framework/NTPStatus.cpp @@ -3,7 +3,9 @@ using namespace std::placeholders; // for `_1` etc NTPStatus::NTPStatus(AsyncWebServer * server, SecurityManager * securityManager) { - server->on(NTP_STATUS_SERVICE_PATH, HTTP_GET, securityManager->wrapRequest(std::bind(&NTPStatus::ntpStatus, this, _1), AuthenticationPredicates::IS_AUTHENTICATED)); + server->on(NTP_STATUS_SERVICE_PATH, + HTTP_GET, + securityManager->wrapRequest(std::bind(&NTPStatus::ntpStatus, this, _1), AuthenticationPredicates::IS_AUTHENTICATED)); } /* diff --git a/lib/framework/NetworkSettingsService.cpp b/lib/framework/NetworkSettingsService.cpp index 8adf34f6c..a5a94b081 100644 --- a/lib/framework/NetworkSettingsService.cpp +++ b/lib/framework/NetworkSettingsService.cpp @@ -61,7 +61,7 @@ void NetworkSettingsService::manageSTA() { WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE); // configure for DHCP } - WiFi.setHostname(_state.hostname.c_str()); // set hostname + WiFi.setHostname(_state.hostname.c_str()); // set hostname // www.esp32.com/viewtopic.php?t=12055 read([&](NetworkSettings & networkSettings) { if (networkSettings.bandwidth20) { @@ -73,7 +73,6 @@ void NetworkSettingsService::manageSTA() { if (networkSettings.nosleep) { WiFi.setSleep(false); // turn off sleep - WIFI_PS_NONE } - }); WiFi.begin(_state.ssid.c_str(), _state.password.c_str()); // attempt to connect to the network } diff --git a/lib/framework/NetworkStatus.cpp b/lib/framework/NetworkStatus.cpp index fb369386c..51f6d8647 100644 --- a/lib/framework/NetworkStatus.cpp +++ b/lib/framework/NetworkStatus.cpp @@ -5,7 +5,9 @@ using namespace std::placeholders; // for `_1` etc NetworkStatus::NetworkStatus(AsyncWebServer * server, SecurityManager * securityManager) { - server->on(NETWORK_STATUS_SERVICE_PATH, HTTP_GET, securityManager->wrapRequest(std::bind(&NetworkStatus::networkStatus, this, _1), AuthenticationPredicates::IS_AUTHENTICATED)); + server->on(NETWORK_STATUS_SERVICE_PATH, + HTTP_GET, + securityManager->wrapRequest(std::bind(&NetworkStatus::networkStatus, this, _1), AuthenticationPredicates::IS_AUTHENTICATED)); } void NetworkStatus::networkStatus(AsyncWebServerRequest * request) { diff --git a/lib/framework/UploadFirmwareService.cpp b/lib/framework/UploadFirmwareService.cpp index 5f1a19966..18a20aecc 100644 --- a/lib/framework/UploadFirmwareService.cpp +++ b/lib/framework/UploadFirmwareService.cpp @@ -4,7 +4,10 @@ using namespace std::placeholders; // for `_1` etc UploadFirmwareService::UploadFirmwareService(AsyncWebServer * server, SecurityManager * securityManager) : _securityManager(securityManager) { - server->on(UPLOAD_FIRMWARE_PATH, HTTP_POST, std::bind(&UploadFirmwareService::uploadComplete, this, _1), std::bind(&UploadFirmwareService::handleUpload, this, _1, _2, _3, _4, _5, _6)); + server->on(UPLOAD_FIRMWARE_PATH, + HTTP_POST, + std::bind(&UploadFirmwareService::uploadComplete, this, _1), + std::bind(&UploadFirmwareService::handleUpload, this, _1, _2, _3, _4, _5, _6)); } void UploadFirmwareService::handleUpload(AsyncWebServerRequest * request, const String & filename, size_t index, uint8_t * data, size_t len, bool final) { diff --git a/lib/framework/WebSocketTxRx.h b/lib/framework/WebSocketTxRx.h index d4b5a46c7..86f5fd22a 100644 --- a/lib/framework/WebSocketTxRx.h +++ b/lib/framework/WebSocketTxRx.h @@ -20,7 +20,12 @@ class WebSocketConnector { AsyncWebSocket _webSocket; size_t _bufferSize; - WebSocketConnector(StatefulService * statefulService, AsyncWebServer * server, const char * webSocketPath, SecurityManager * securityManager, AuthenticationPredicate authenticationPredicate, size_t bufferSize) + WebSocketConnector(StatefulService * statefulService, + AsyncWebServer * server, + const char * webSocketPath, + SecurityManager * securityManager, + AuthenticationPredicate authenticationPredicate, + size_t bufferSize) : _statefulService(statefulService) , _server(server) , _webSocket(webSocketPath) @@ -67,7 +72,11 @@ class WebSocketTx : virtual public WebSocketConnector { WebSocketConnector::_statefulService->addUpdateHandler([&](const String & originId) { transmitData(nullptr, originId); }, false); } - WebSocketTx(JsonStateReader stateReader, StatefulService * statefulService, AsyncWebServer * server, const char * webSocketPath, size_t bufferSize = DEFAULT_BUFFER_SIZE) + WebSocketTx(JsonStateReader stateReader, + StatefulService * statefulService, + AsyncWebServer * server, + const char * webSocketPath, + size_t bufferSize = DEFAULT_BUFFER_SIZE) : WebSocketConnector(statefulService, server, webSocketPath, bufferSize) , _stateReader(stateReader) { WebSocketConnector::_statefulService->addUpdateHandler([&](const String & originId) { transmitData(nullptr, originId); }, false); @@ -140,7 +149,11 @@ class WebSocketRx : virtual public WebSocketConnector { , _stateUpdater(stateUpdater) { } - WebSocketRx(JsonStateUpdater stateUpdater, StatefulService * statefulService, AsyncWebServer * server, const char * webSocketPath, size_t bufferSize = DEFAULT_BUFFER_SIZE) + WebSocketRx(JsonStateUpdater stateUpdater, + StatefulService * statefulService, + AsyncWebServer * server, + const char * webSocketPath, + size_t bufferSize = DEFAULT_BUFFER_SIZE) : WebSocketConnector(statefulService, server, webSocketPath, bufferSize) , _stateUpdater(stateUpdater) { } @@ -182,7 +195,12 @@ class WebSocketTxRx : public WebSocketTx, public WebSocketRx { , WebSocketRx(stateUpdater, statefulService, server, webSocketPath, securityManager, authenticationPredicate, bufferSize) { } - WebSocketTxRx(JsonStateReader stateReader, JsonStateUpdater stateUpdater, StatefulService * statefulService, AsyncWebServer * server, const char * webSocketPath, size_t bufferSize = DEFAULT_BUFFER_SIZE) + WebSocketTxRx(JsonStateReader stateReader, + JsonStateUpdater stateUpdater, + StatefulService * statefulService, + AsyncWebServer * server, + const char * webSocketPath, + size_t bufferSize = DEFAULT_BUFFER_SIZE) : WebSocketConnector(statefulService, server, webSocketPath, bufferSize) , WebSocketTx(stateReader, statefulService, server, webSocketPath, bufferSize) , WebSocketRx(stateUpdater, statefulService, server, webSocketPath, bufferSize) { diff --git a/lib/framework/WiFiScanner.cpp b/lib/framework/WiFiScanner.cpp index 29507f84b..b7ac8f718 100644 --- a/lib/framework/WiFiScanner.cpp +++ b/lib/framework/WiFiScanner.cpp @@ -3,8 +3,12 @@ using namespace std::placeholders; // for `_1` etc WiFiScanner::WiFiScanner(AsyncWebServer * server, SecurityManager * securityManager) { - server->on(SCAN_NETWORKS_SERVICE_PATH, HTTP_GET, securityManager->wrapRequest(std::bind(&WiFiScanner::scanNetworks, this, _1), AuthenticationPredicates::IS_ADMIN)); - server->on(LIST_NETWORKS_SERVICE_PATH, HTTP_GET, securityManager->wrapRequest(std::bind(&WiFiScanner::listNetworks, this, _1), AuthenticationPredicates::IS_ADMIN)); + server->on(SCAN_NETWORKS_SERVICE_PATH, + HTTP_GET, + securityManager->wrapRequest(std::bind(&WiFiScanner::scanNetworks, this, _1), AuthenticationPredicates::IS_ADMIN)); + server->on(LIST_NETWORKS_SERVICE_PATH, + HTTP_GET, + securityManager->wrapRequest(std::bind(&WiFiScanner::listNetworks, this, _1), AuthenticationPredicates::IS_ADMIN)); }; void WiFiScanner::scanNetworks(AsyncWebServerRequest * request) {