auto-formatting

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;

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) {

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) {

lib/framework/FSPersistence.h

@@ -7,7 +7,12 @@
 template <class T>
 class FSPersistence {
   public:
-    FSPersistence(JsonStateReader<T> stateReader, JsonStateUpdater<T> stateUpdater, StatefulService<T> * statefulService, FS * fs, const char * filePath, size_t bufferSize = DEFAULT_BUFFER_SIZE)
+    FSPersistence(JsonStateReader<T>   stateReader,
+                  JsonStateUpdater<T>  stateUpdater,
+                  StatefulService<T> * statefulService,
+                  FS *                 fs,
+                  const char *         filePath,
+                  size_t               bufferSize = DEFAULT_BUFFER_SIZE)
         : _stateReader(stateReader)
         , _stateUpdater(stateUpdater)
         , _statefulService(statefulService)

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) {

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<T> stateReader, StatefulService<T> * statefulService, AsyncWebServer * server, const String & servicePath, size_t bufferSize = DEFAULT_BUFFER_SIZE)
+    HttpGetEndpoint(JsonStateReader<T>   stateReader,
+                    StatefulService<T> * 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<T> stateReader, JsonStateUpdater<T> stateUpdater, StatefulService<T> * statefulService, AsyncWebServer * server, const String & servicePath, size_t bufferSize = DEFAULT_BUFFER_SIZE)
+    HttpPostEndpoint(JsonStateReader<T>   stateReader,
+                     JsonStateUpdater<T>  stateUpdater,
+                     StatefulService<T> * 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<T>, public HttpPostEndpoint<T> {
         , HttpPostEndpoint<T>(stateReader, stateUpdater, statefulService, server, servicePath, securityManager, authenticationPredicate, bufferSize) {
     }
 
-    HttpEndpoint(JsonStateReader<T> stateReader, JsonStateUpdater<T> stateUpdater, StatefulService<T> * statefulService, AsyncWebServer * server, const String & servicePath, size_t bufferSize = DEFAULT_BUFFER_SIZE)
+    HttpEndpoint(JsonStateReader<T>   stateReader,
+                 JsonStateUpdater<T>  stateUpdater,
+                 StatefulService<T> * statefulService,
+                 AsyncWebServer *     server,
+                 const String &       servicePath,
+                 size_t               bufferSize = DEFAULT_BUFFER_SIZE)
         : HttpGetEndpoint<T>(stateReader, statefulService, server, servicePath, bufferSize)
         , HttpPostEndpoint<T>(stateReader, stateUpdater, statefulService, server, servicePath, bufferSize) {
     }

lib/framework/MqttPubSub.h

@@ -33,7 +33,11 @@ class MqttConnector {
 template <class T>
 class MqttPub : virtual public MqttConnector<T> {
   public:
-    MqttPub(JsonStateReader<T> stateReader, StatefulService<T> * statefulService, AsyncMqttClient * mqttClient, const String & pubTopic = "", size_t bufferSize = DEFAULT_BUFFER_SIZE)
+    MqttPub(JsonStateReader<T>   stateReader,
+            StatefulService<T> * statefulService,
+            AsyncMqttClient *    mqttClient,
+            const String &       pubTopic   = "",
+            size_t               bufferSize = DEFAULT_BUFFER_SIZE)
         : MqttConnector<T>(statefulService, mqttClient, bufferSize)
         , _stateReader(stateReader)
         , _pubTopic(pubTopic) {
@@ -74,7 +78,11 @@ class MqttPub : virtual public MqttConnector<T> {
 template <class T>
 class MqttSub : virtual public MqttConnector<T> {
   public:
-    MqttSub(JsonStateUpdater<T> stateUpdater, StatefulService<T> * statefulService, AsyncMqttClient * mqttClient, const String & subTopic = "", size_t bufferSize = DEFAULT_BUFFER_SIZE)
+    MqttSub(JsonStateUpdater<T>  stateUpdater,
+            StatefulService<T> * statefulService,
+            AsyncMqttClient *    mqttClient,
+            const String &       subTopic   = "",
+            size_t               bufferSize = DEFAULT_BUFFER_SIZE)
         : MqttConnector<T>(statefulService, mqttClient, bufferSize)
         , _stateUpdater(stateUpdater)
         , _subTopic(subTopic) {

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));
 }
 
 /*

lib/framework/NetworkSettingsService.cpp

@@ -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
     }

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) {

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) {

lib/framework/WebSocketTxRx.h

@@ -20,7 +20,12 @@ class WebSocketConnector {
     AsyncWebSocket       _webSocket;
     size_t               _bufferSize;
 
-    WebSocketConnector(StatefulService<T> * statefulService, AsyncWebServer * server, const char * webSocketPath, SecurityManager * securityManager, AuthenticationPredicate authenticationPredicate, size_t bufferSize)
+    WebSocketConnector(StatefulService<T> *    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<T> {
         WebSocketConnector<T>::_statefulService->addUpdateHandler([&](const String & originId) { transmitData(nullptr, originId); }, false);
     }
 
-    WebSocketTx(JsonStateReader<T> stateReader, StatefulService<T> * statefulService, AsyncWebServer * server, const char * webSocketPath, size_t bufferSize = DEFAULT_BUFFER_SIZE)
+    WebSocketTx(JsonStateReader<T>   stateReader,
+                StatefulService<T> * statefulService,
+                AsyncWebServer *     server,
+                const char *         webSocketPath,
+                size_t               bufferSize = DEFAULT_BUFFER_SIZE)
         : WebSocketConnector<T>(statefulService, server, webSocketPath, bufferSize)
         , _stateReader(stateReader) {
         WebSocketConnector<T>::_statefulService->addUpdateHandler([&](const String & originId) { transmitData(nullptr, originId); }, false);
@@ -140,7 +149,11 @@ class WebSocketRx : virtual public WebSocketConnector<T> {
         , _stateUpdater(stateUpdater) {
     }
 
-    WebSocketRx(JsonStateUpdater<T> stateUpdater, StatefulService<T> * statefulService, AsyncWebServer * server, const char * webSocketPath, size_t bufferSize = DEFAULT_BUFFER_SIZE)
+    WebSocketRx(JsonStateUpdater<T>  stateUpdater,
+                StatefulService<T> * statefulService,
+                AsyncWebServer *     server,
+                const char *         webSocketPath,
+                size_t               bufferSize = DEFAULT_BUFFER_SIZE)
         : WebSocketConnector<T>(statefulService, server, webSocketPath, bufferSize)
         , _stateUpdater(stateUpdater) {
     }
@@ -182,7 +195,12 @@ class WebSocketTxRx : public WebSocketTx<T>, public WebSocketRx<T> {
         , WebSocketRx<T>(stateUpdater, statefulService, server, webSocketPath, securityManager, authenticationPredicate, bufferSize) {
     }
 
-    WebSocketTxRx(JsonStateReader<T> stateReader, JsonStateUpdater<T> stateUpdater, StatefulService<T> * statefulService, AsyncWebServer * server, const char * webSocketPath, size_t bufferSize = DEFAULT_BUFFER_SIZE)
+    WebSocketTxRx(JsonStateReader<T>   stateReader,
+                  JsonStateUpdater<T>  stateUpdater,
+                  StatefulService<T> * statefulService,
+                  AsyncWebServer *     server,
+                  const char *         webSocketPath,
+                  size_t               bufferSize = DEFAULT_BUFFER_SIZE)
         : WebSocketConnector<T>(statefulService, server, webSocketPath, bufferSize)
         , WebSocketTx<T>(stateReader, statefulService, server, webSocketPath, bufferSize)
         , WebSocketRx<T>(stateUpdater, statefulService, server, webSocketPath, bufferSize) {

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(SCAN_NETWORKS_SERVICE_PATH,
-    server->on(LIST_NETWORKS_SERVICE_PATH, HTTP_GET, securityManager->wrapRequest(std::bind(&WiFiScanner::listNetworks, this, _1), AuthenticationPredicates::IS_ADMIN));
+               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) {