beta 2

Author: abratchik

src/app_httpd.h

@@ -22,18 +22,21 @@ uint8_t temprature_sens_read();
 enum capture_mode {CAPTURE_STILL, CAPTURE_STREAM};
 
 String processor(const String& var);
-void onDump(AsyncWebServerRequest *request);
+void onSystemStatus(AsyncWebServerRequest *request);
 void onStatus(AsyncWebServerRequest *request);
 void onInfo(AsyncWebServerRequest *request);
 void onControl(AsyncWebServerRequest *request);
 void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len);
 void onSnapTimer(TimerHandle_t pxTimer);
 
+void dumpSystemStatusToJson(char * buf, size_t size);
+
 class CLAppHttpd : public CLAppComponent {
     public:
         CLAppHttpd();
 
         int start();
+        int loadPrefs();
 
         uint32_t getClientId() {return client_id;};
 
@@ -51,17 +54,24 @@ class CLAppHttpd : public CLAppComponent {
 
         void updateSnapTimer(int frameRate);
 
-        void dumpInfo();
-
-        void serialSendCommand(const char *cmd);
-        void serialSendCommand(String* cmd);
+        void serialSendCommand(char *cmd);
+        void serialSendCommand(String cmd);
 
         int getSketchSize(){ return sketchSize;};
         int getSketchSpace() {return sketchSpace;};
         String getSketchMD5() {return sketchMD5;};
 
+        String getVersion() {return version;};
+
+        char * getName() {return myName;};
+
 
     private:
+
+        // Name of the application used in web interface
+        // Can be re-defined in the httpd.json file
+        char myName[20] = CAM_NAME;
+
         AsyncWebServer *server;
         AsyncWebSocket *ws; 
         uint32_t client_id = 0;
@@ -72,15 +82,15 @@ class CLAppHttpd : public CLAppComponent {
         unsigned long imagesServed;
 
         // mode of the image capture
-        // 
         capture_mode streammode = CAPTURE_STILL;
 
-        // Gather static values used when dumping status; these are slow functions, so just do them once during startup
         // Sketch Info
         int sketchSize ;
         int sketchSpace ;
         String sketchMD5;
 
+        const String version = __DATE__ " @ " __TIME__;
+
 };