Merge pull request #68 from rjwats/clang-format

reformat with .clang-format based on google's spec with some minor ch…

Author: rjwats

.clang-format

@@ -0,0 +1,15 @@
+Language: Cpp
+BasedOnStyle: Google
+ColumnLimit: 120
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+BinPackArguments: false
+BinPackParameters: false
+BreakConstructorInitializers: AfterColon
+AllowAllParametersOfDeclarationOnNextLine: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ExperimentalAutoDetectBinPacking: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+DerivePointerAlignment: false

lib/framework/APSettingsService.cpp

@@ -1,8 +1,11 @@
 #include <APSettingsService.h>
 
-APSettingsService::APSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager) : AdminSettingsService(server, fs, securityManager, AP_SETTINGS_SERVICE_PATH, AP_SETTINGS_FILE) {}
+APSettingsService::APSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager) :
+    AdminSettingsService(server, fs, securityManager, AP_SETTINGS_SERVICE_PATH, AP_SETTINGS_FILE) {
+}
 
-APSettingsService::~APSettingsService() {}
+APSettingsService::~APSettingsService() {
+}
 
 void APSettingsService::begin() {
   SettingsService::begin();
@@ -12,10 +15,10 @@ void APSettingsService::begin() {
 void APSettingsService::loop() {
   unsigned long currentMillis = millis();
   unsigned long manageElapsed = (unsigned long)(currentMillis - _lastManaged);
-  if (manageElapsed >= MANAGE_NETWORK_DELAY){
+  if (manageElapsed >= MANAGE_NETWORK_DELAY) {
     _lastManaged = currentMillis;
-     manageAP();
-  }  
+    manageAP();
+  }
   handleDNS();
 }
 

lib/framework/APSettingsService.h

@@ -20,39 +20,34 @@
 #define AP_SETTINGS_SERVICE_PATH "/rest/apSettings"
 
 class APSettingsService : public AdminSettingsService {
-
-  public:
-
-    APSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager);
-    ~APSettingsService();
-
-    void begin();
-    void loop();
-
-  protected:
-
-    void readFromJsonObject(JsonObject& root);
-    void writeToJsonObject(JsonObject& root);
-    void onConfigUpdated();
-
-  private:
-
-    // access point settings
-    uint8_t _provisionMode;
-    String _ssid;
-    String _password;
-
-    // for the mangement delay loop
-    unsigned long _lastManaged;
-
-    // for the captive portal
-    DNSServer *_dnsServer;
-
-    void manageAP();
-    void startAP();
-    void stopAP() ;
-    void handleDNS();
-
+ public:
+  APSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager);
+  ~APSettingsService();
+
+  void begin();
+  void loop();
+
+ protected:
+  void readFromJsonObject(JsonObject& root);
+  void writeToJsonObject(JsonObject& root);
+  void onConfigUpdated();
+
+ private:
+  // access point settings
+  uint8_t _provisionMode;
+  String _ssid;
+  String _password;
+
+  // for the mangement delay loop
+  unsigned long _lastManaged;
+
+  // for the captive portal
+  DNSServer* _dnsServer;
+
+  void manageAP();
+  void startAP();
+  void stopAP();
+  void handleDNS();
 };
 
-#endif // end APSettingsConfig_h
+#endif  // end APSettingsConfig_h

lib/framework/APStatus.cpp

@@ -1,17 +1,18 @@
 #include <APStatus.h>
 
 APStatus::APStatus(AsyncWebServer* server, SecurityManager* securityManager) {
- server->on(AP_STATUS_SERVICE_PATH, HTTP_GET, 
-    securityManager->wrapRequest(std::bind(&APStatus::apStatus, this, std::placeholders::_1), AuthenticationPredicates::IS_AUTHENTICATED)
-  );
+  server->on(AP_STATUS_SERVICE_PATH,
+             HTTP_GET,
+             securityManager->wrapRequest(std::bind(&APStatus::apStatus, this, std::placeholders::_1),
+                                          AuthenticationPredicates::IS_AUTHENTICATED));
 }
 
-void APStatus::apStatus(AsyncWebServerRequest *request) {
-  AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_AP_STATUS_SIZE);
+void APStatus::apStatus(AsyncWebServerRequest* request) {
+  AsyncJsonResponse* response = new AsyncJsonResponse(false, MAX_AP_STATUS_SIZE);
   JsonObject root = response->getRoot();
 
   WiFiMode_t currentWiFiMode = WiFi.getMode();
-  root["active"] =  (currentWiFiMode == WIFI_AP || currentWiFiMode == WIFI_AP_STA);
+  root["active"] = (currentWiFiMode == WIFI_AP || currentWiFiMode == WIFI_AP_STA);
   root["ip_address"] = WiFi.softAPIP().toString();
   root["mac_address"] = WiFi.softAPmacAddress();
   root["station_num"] = WiFi.softAPgetStationNum();

lib/framework/APStatus.h

@@ -2,32 +2,28 @@
 #define APStatus_h
 
 #if defined(ESP8266)
-  #include <ESP8266WiFi.h>
-  #include <ESPAsyncTCP.h>
+#include <ESP8266WiFi.h>
+#include <ESPAsyncTCP.h>
 #elif defined(ESP_PLATFORM)
-  #include <WiFi.h>
-  #include <AsyncTCP.h>
+#include <AsyncTCP.h>
+#include <WiFi.h>
 #endif
 
-#include <ESPAsyncWebServer.h>
 #include <ArduinoJson.h>
 #include <AsyncJson.h>
+#include <ESPAsyncWebServer.h>
 #include <IPAddress.h>
 #include <SecurityManager.h>
 
 #define MAX_AP_STATUS_SIZE 1024
 #define AP_STATUS_SERVICE_PATH "/rest/apStatus"
 
 class APStatus {
+ public:
+  APStatus(AsyncWebServer* server, SecurityManager* securityManager);
 
-  public:
-
-    APStatus(AsyncWebServer* server, SecurityManager* securityManager);
-
-  private:
-  
-    void apStatus(AsyncWebServerRequest *request);
-
+ private:
+  void apStatus(AsyncWebServerRequest* request);
 };
 
-#endif // end APStatus_h
+#endif  // end APStatus_h

lib/framework/AdminSettingsService.h

@@ -4,42 +4,46 @@
 #include <SettingsService.h>
 
 class AdminSettingsService : public SettingsService {
-  
-  public:  
-    AdminSettingsService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager, char const* servicePath, char const* filePath):
-      SettingsService(server, fs, servicePath, filePath), _securityManager(securityManager) {}
-
-  protected:
-    // will validate the requests with the security manager
-    SecurityManager* _securityManager;
-
-    void fetchConfig(AsyncWebServerRequest *request) {
-      // verify the request against the predicate
-      Authentication authentication = _securityManager->authenticateRequest(request);
-      if (!getAuthenticationPredicate()(authentication)) {
-        request->send(401);
-        return;
-      }
-      // delegate to underlying implemetation
-      SettingsService::fetchConfig(request);
-    }
-
-    void updateConfig(AsyncWebServerRequest *request, JsonDocument &jsonDocument) {
-      // verify the request against the predicate
-      Authentication authentication = _securityManager->authenticateRequest(request);
-      if (!getAuthenticationPredicate()(authentication)) {
-        request->send(401);
-        return;
-      }
-      // delegate to underlying implemetation
-      SettingsService::updateConfig(request, jsonDocument);
+ public:
+  AdminSettingsService(AsyncWebServer* server,
+                       FS* fs,
+                       SecurityManager* securityManager,
+                       char const* servicePath,
+                       char const* filePath) :
+      SettingsService(server, fs, servicePath, filePath),
+      _securityManager(securityManager) {
+  }
+
+ protected:
+  // will validate the requests with the security manager
+  SecurityManager* _securityManager;
+
+  void fetchConfig(AsyncWebServerRequest* request) {
+    // verify the request against the predicate
+    Authentication authentication = _securityManager->authenticateRequest(request);
+    if (!getAuthenticationPredicate()(authentication)) {
+      request->send(401);
+      return;
     }
-
-    // override this to replace the default authentication predicate, IS_ADMIN
-    AuthenticationPredicate getAuthenticationPredicate() {
-      return AuthenticationPredicates::IS_ADMIN;
+    // delegate to underlying implemetation
+    SettingsService::fetchConfig(request);
+  }
+
+  void updateConfig(AsyncWebServerRequest* request, JsonDocument& jsonDocument) {
+    // verify the request against the predicate
+    Authentication authentication = _securityManager->authenticateRequest(request);
+    if (!getAuthenticationPredicate()(authentication)) {
+      request->send(401);
+      return;
     }
-
+    // delegate to underlying implemetation
+    SettingsService::updateConfig(request, jsonDocument);
+  }
+
+  // override this to replace the default authentication predicate, IS_ADMIN
+  AuthenticationPredicate getAuthenticationPredicate() {
+    return AuthenticationPredicates::IS_ADMIN;
+  }
 };
 
-#endif // end AdminSettingsService
+#endif  // end AdminSettingsService