clean up standalone

lib_standalone/Arduino.cpp

@@ -17,17 +17,16 @@
 
 #ifdef EMSESP_STANDALONE
 
-#include <Arduino.h>
+
 #include <stdio.h>
 #include <stdarg.h>
-
 #include <iostream>
 #include <thread>
 #include <atomic>
-
 #include <string>
 
-#include <Network.h>
+#include "Arduino.h"
+#include "Network.h"
 
 NativeConsole Serial;
 

lib_standalone/Arduino.h

@@ -25,16 +25,14 @@
 #include <cstring>
 #include <string>
 #include <math.h>
-
+#include <algorithm>
-#include <algorithm> // for count_if
-
 #include <Print.h>
 #include <Printable.h>
 #include <Stream.h>
-#include <WString.h>
-
 #include <iostream>
 
+#include "WString.h"
+
 typedef double double_t;
 
 #define ICACHE_FLASH_ATTR
@@ -188,6 +186,4 @@ void yield(void);
 void setup(void);
 void loop(void);
 
-
-
 #endif

lib_standalone/AsyncJson.h

@@ -1,8 +1,10 @@
 
 #ifndef ASYNC_JSON_H_
 #define ASYNC_JSON_H_
+
 #include <ArduinoJson.h>
-#include <ESPAsyncWebServer.h>
+
+#include "ESPAsyncWebServer.h"
 
 #define DYNAMIC_JSON_DOCUMENT_SIZE 1024
 

lib_standalone/AsyncTCP.h

@@ -2,6 +2,7 @@
 #define ASYNCTCP_H_
 
 #include "Arduino.h"
+
 #include <functional>
 
 class AsyncClient;

lib_standalone/ESP8266React.h

@@ -1,21 +1,19 @@
 #ifndef ESP8266React_h
 #define ESP8266React_h
 
-#include <Arduino.h>
-
-#include <ArduinoJson.h>
-#include <AsyncJson.h>
-
-#include <espMqttClient.h>
-#include <ESPAsyncWebServer.h>
-
 #include <list>
 
-#include <FS.h>
+#include "Arduino.h"
-#include <SecurityManager.h>
+#include "ArduinoJson.h"
-#include <SecuritySettingsService.h>
+#include "AsyncJson.h"
-#include <StatefulService.h>
+#include "ESPAsyncWebServer.h"
-#include <Network.h>
+#include "FS.h"
+#include "SecurityManager.h"
+#include "SecuritySettingsService.h"
+#include "StatefulService.h"
+#include "Network.h"
+
+#include <espMqttClient.h>
 
 #define AP_SETTINGS_FILE "/config/apSettings.json"
 #define MQTT_SETTINGS_FILE "/config/mqttSettings.json"
@@ -104,7 +102,6 @@ class ESP8266React {
         , _securitySettingsService(server, fs){};
 
     void begin() {
-        // initialize mqtt
         _mqttClient = new espMqttClient();
     };
     void loop(){};

lib_standalone/ESPAsyncWebServer.h

@@ -2,9 +2,9 @@
 #define _ESPAsyncWebServer_H_
 
 #include "Arduino.h"
+#include "AsyncTCP.h"
 
 #include <functional>
-#include <AsyncTCP.h>
 #include <ArduinoJson.h>
 
 class AsyncWebServer;

lib_standalone/FS.h

@@ -21,9 +21,10 @@
 #ifndef FS_H
 #define FS_H
 
+#include "Arduino.h"
+
 #include <memory>
 #include <string>
-#include <Arduino.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <dirent.h>

lib_standalone/FSPersistence.h

@@ -1,8 +1,8 @@
 #ifndef FSPersistence_h
 #define FSPersistence_h
 
-#include <StatefulService.h>
+#include "StatefulService.h"
-#include <FS.h>
+#include "FS.h"
 
 template <class T>
 class FSPersistence {

lib_standalone/HttpEndpoint.h

@@ -3,11 +3,11 @@
 
 #include <functional>
 
-#include <AsyncJson.h>
+#include "AsyncJson.h"
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
 
-#include <SecurityManager.h>
+#include "SecurityManager.h"
-#include <StatefulService.h>
+#include "StatefulService.h"
 
 #define HTTP_ENDPOINT_ORIGIN_ID "http"
 

lib_standalone/LittleFS.cpp

@@ -17,9 +17,9 @@
  */
 #ifdef ENV_NATIVE
 
-#include <Arduino.h>
+#include "Arduino.h"
-#include <FS.h>
+#include "FS.h"
-#include <LittleFS.h>
+#include "LittleFS.h"
 
 fs::LittleFSFS LittleFS;
 

lib_standalone/Network.h

@@ -1,7 +1,8 @@
 #ifndef Network_h
 #define Network_h
 
-#include <Arduino.h>
+#include "Arduino.h"
+
 #include <functional>
 #include <IPAddress.h>
 

lib_standalone/Print.h

@@ -28,7 +28,8 @@
 #include <string>
 
 #include <Printable.h>
-#include <WString.h>
+
+#include "WString.h"
 
 int vsnprintf_P(char * str, size_t size, const char * format, va_list ap);
 

lib_standalone/SecurityManager.h

@@ -1,18 +1,15 @@
 #ifndef SecurityManager_h
 #define SecurityManager_h
 
-#include <Arduino.h>
+#include "Arduino.h"
-#include <Features.h>
+#include "Features.h"
-#include <ESPAsyncWebServer.h>
+#include "ESPAsyncWebServer.h"
-#include <AsyncJson.h>
+#include "AsyncJson.h"
+
 #include <list>
 
-#ifndef FACTORY_JWT_SECRET
+#define FACTORY_JWT_SECRET "ems-esp"
-#define FACTORY_JWT_SECRET ESPUtils::defaultDeviceValue()
-#endif
-
 #define ACCESS_TOKEN_PARAMATER "access_token"
-
 #define AUTHORIZATION_HEADER "Authorization"
 #define AUTHORIZATION_HEADER_PREFIX "Bearer "
 #define AUTHORIZATION_HEADER_PREFIX_LEN 7

lib_standalone/SecuritySettingsService.cpp

@@ -1,6 +1,6 @@
 #ifdef EMSESP_STANDALONE
 
-#include <SecuritySettingsService.h>
+#include "SecuritySettingsService.h"
 
 User ADMIN_USER = User(FACTORY_ADMIN_USERNAME, FACTORY_ADMIN_PASSWORD, true);
 

lib_standalone/SecuritySettingsService.h

@@ -1,10 +1,10 @@
 #ifndef SecuritySettingsService_h
 #define SecuritySettingsService_h
 
-#include <Features.h>
+#include "Features.h"
-#include <SecurityManager.h>
+#include "SecurityManager.h"
-#include <HttpEndpoint.h>
+#include "HttpEndpoint.h"
-#include <FSPersistence.h>
+#include "FSPersistence.h"
 
 #ifndef FACTORY_ADMIN_USERNAME
 #define FACTORY_ADMIN_USERNAME "admin"

lib_standalone/StatefulService.cpp

@@ -1,3 +1,3 @@
-#include <StatefulService.h>
+#include "StatefulService.h"
 
 update_handler_id_t StateUpdateHandlerInfo::currentUpdatedHandlerId = 0;

lib_standalone/StatefulService.h

@@ -1,7 +1,8 @@
 #ifndef StatefulService_h
 #define StatefulService_h
 
-#include <Arduino.h>
+#include "Arduino.h"
+
 #include <ArduinoJson.h>
 
 #include <list>

lib_standalone/WString.cpp

@@ -1,7 +1,7 @@
 
 #ifdef EMSESP_STANDALONE
 
-#include <Arduino.h>
+#include "Arduino.h"
 #include "WString.h"
 
 /*

lib_standalone/emsuart_standalone.h

@@ -19,7 +19,7 @@
 #ifndef EMSESP_EMSUART_H
 #define EMSESP_EMSUART_H
 
-#include <Arduino.h>
+#include "Arduino.h"
 
 namespace emsesp {