Camera settings (#3029)

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

code/components/jomjol_controlcamera/ClassControllCamera.h

@@ -15,66 +15,100 @@
 #include "CImageBasis.h"
 #include "../../include/defines.h"
 
-class CCamera {
-    protected:
-        int ActualQuality;
-        framesize_t ActualResolution;
-        int brightness, contrast, saturation, autoExposureLevel;
-        bool isFixedExposure;
-        int waitbeforepicture_org;
-        int led_intensity = 4095;
+typedef enum
+{
+    OV2640_MODE_UXGA,
+    OV2640_MODE_SVGA,
+    OV2640_MODE_CIF
+} ov2640_sensor_mode_t;
 
+typedef struct
+{
+    framesize_t ImageFrameSize = FRAMESIZE_VGA; // 0 - 10
+    gainceiling_t ImageGainceiling;             // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)
+
+    int ImageQuality;    // 0 - 63
+    int ImageBrightness; // (-2 to 2) - set brightness
+    int ImageContrast;   //-2 - 2
+    int ImageSaturation; //-2 - 2
+    int ImageSharpness;  //-2 - 2
+    bool ImageAutoSharpness;
+    int ImageSpecialEffect; // 0 - 6
+    int ImageWbMode;        // 0 to 4 - if awb_gain enabled (0 - Auto, 1 - Sunny, 2 - Cloudy, 3 - Office, 4 - Home)
+    int ImageAwb;           // white balance enable (0 or 1)
+    int ImageAwbGain;       // Auto White Balance enable (0 or 1)
+    int ImageAec;           // auto exposure off (1 or 0)
+    int ImageAec2;          // automatic exposure sensor  (0 or 1)
+    int ImageAeLevel;       // auto exposure levels (-2 to 2)
+    int ImageAecValue;      // set exposure manually  (0-1200)
+    int ImageAgc;           // auto gain off (1 or 0)
+    int ImageAgcGain;       // set gain manually (0 - 30)
+    int ImageBpc;           // black pixel correction
+    int ImageWpc;           // white pixel correction
+    int ImageRawGma;        // (1 or 0)
+    int ImageLenc;          // lens correction (1 or 0)
+    int ImageHmirror;       // (0 or 1) flip horizontally
+    int ImageVflip;         // Invert image (0 or 1)
+    int ImageDcw;           // downsize enable (1 or 0)
+
+    int ImageWidth;
+    int ImageHeight;
+
+    int ImageLedIntensity;
+
+    bool ImageZoomEnabled;
+    int ImageZoomMode;
+    int ImageZoomOffsetX;
+    int ImageZoomOffsetY;
+    int ImageZoomSize;
+
+    int WaitBeforePicture;
+    bool isImageSize;
+
+    bool CameraInitSuccessful;
+    bool changedCameraSettings;
+    bool DemoMode;
+    bool SaveAllFiles;
+} camera_controll_config_temp_t;
+
+extern camera_controll_config_temp_t CCstatus;
+
+class CCamera
+{
+protected:
     void ledc_init(void);
-        bool CameraInitSuccessful = false;
-        bool demoMode = false;
-
     bool loadNextDemoImage(camera_fb_t *fb);
     long GetFileSize(std::string filename);
-
-        void SetCamWindow(sensor_t *s, int resolution, int xOffset, int yOffset, int xLength, int yLength);
+    void SetCamWindow(sensor_t *s, int resolution, int xOffset, int yOffset, int xTotal, int yTotal, int xOutput, int yOutput);
     void SetImageWidthHeightFromResolution(framesize_t resol);
 
-    public:
-        int image_height, image_width;
-        bool imageZoomEnabled = false;
-        int imageZoomMode = 0;
-        int imageZoomOffsetX = 0;
-        int imageZoomOffsetY = 0;
-        bool imageNegative = false;
-        bool imageAec2 = false;
-        bool imageAutoSharpness = false;
-        int imageSharpnessLevel = 0;
-    #ifdef GRAYSCALE_AS_DEFAULT
-        bool imageGrayscale = true;
-    #else
-        bool imageGrayscale = false;
-    #endif
-        
-        CCamera();
-        esp_err_t InitCam();
+public:
+    CCamera(void);
+    esp_err_t InitCam(void);
 	
     void LightOnOff(bool status);
     void LEDOnOff(bool status);
+
+    esp_err_t setSensorDatenFromCCstatus(void);
+    esp_err_t getSensorDatenToCCstatus(void);
+
     esp_err_t CaptureToHTTP(httpd_req_t *req, int delay = 0);
     esp_err_t CaptureToStream(httpd_req_t *req, bool FlashlightOn);
-        void SetQualitySize(int qual, framesize_t resol, bool zoomEnabled, int zoomMode, int zoomOffsetX, int zoomOffsetY);
-        bool SetBrightnessContrastSaturation(int _brightness, int _contrast, int _saturation, int _autoExposureLevel, bool _grayscale, bool _negative, bool _aec2, int _sharpnessLevel);
-        void SetZoom(bool zoomEnabled, int zoomMode, int zoomOffsetX, int zoomOffsetY);
-        void GetCameraParameter(httpd_req_t *req, int &qual, framesize_t &resol, bool &zoomEnabled, int &zoomMode, int &zoomOffsetX, int &zoomOffsetY);
+
+    void SetQualityZoomSize(int qual, framesize_t resol, bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, int imageSize);
+    void SetZoomSize(bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, int imageSize);
+    void SetCamSharpness(bool _autoSharpnessEnabled, int _sharpnessLevel);
+    
 	void SetLEDIntensity(float _intrel);
     bool testCamera(void);
-        void EnableAutoExposure(int flash_duration);
-        bool getCameraInitSuccessful();
+    bool getCameraInitSuccessful(void);
     void useDemoMode(void);
 
-
-        framesize_t TextToFramesize(const char * text);
+    framesize_t TextToFramesize(const char *text);
 	
     esp_err_t CaptureToFile(std::string nm, int delay = 0);
     esp_err_t CaptureToBasisImage(CImageBasis *_Image, int delay = 0);
 };
 
-
 extern CCamera Camera;
-
 #endif

code/components/jomjol_controlcamera/ov2640_sharpness.cpp

@@ -3,71 +3,78 @@
 #include "ov2640_sharpness.h"
 
 
-#define OV2640_MAXLEVEL_SHARPNESS 6
-
 const static uint8_t OV2640_SHARPNESS_AUTO[]=
 {
-    0xFF, 0x00, 0xff,
-    0x92, 0x01, 0xff,
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
     0x93, 0x20, 0x20,
     0x00, 0x00, 0x00
 };
 
 const static uint8_t OV2640_SHARPNESS_MANUAL[]=
 {
-    0xFF, 0x00, 0xff,
-    0x92, 0x01, 0xff,
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
     0x93, 0x00, 0x20,
     0x00, 0x00, 0x00
 };
 
 const static uint8_t OV2640_SHARPNESS_LEVEL0[]=
 {
-    0xFF, 0x00, 0xff,
-    0x92, 0x01, 0xff,
-    0x93, 0xc0, 0x1f,
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC0, 0x1F,
     0x00, 0x00, 0x00
 };
 const static uint8_t OV2640_SHARPNESS_LEVEL1[]=
 {
-    0xFF, 0x00, 0xff,
-    0x92, 0x01, 0xff,
-    0x93, 0xc1, 0x1f,
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC1, 0x1F,
     0x00, 0x00, 0x00
 };
 const static uint8_t OV2640_SHARPNESS_LEVEL2[]=
 {
-    0xFF, 0x00, 0xff,
-    0x92, 0x01, 0xff,
-    0x93, 0xc2, 0x1f,
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC2, 0x1F,
     0x00, 0x00, 0x00
 };
 const static uint8_t OV2640_SHARPNESS_LEVEL3[]=
 {
-    0xFF, 0x00, 0xff,
-    0x92, 0x01, 0xff,
-    0x93, 0xc4, 0x1f,
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC4, 0x1F,
     0x00, 0x00, 0x00
 };
 const static uint8_t OV2640_SHARPNESS_LEVEL4[]=
 {
-    0xFF, 0x00, 0xff,
-    0x92, 0x01, 0xff,
-    0x93, 0xc8, 0x1f,
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC8, 0x1F,
     0x00, 0x00, 0x00
 };
 const static uint8_t OV2640_SHARPNESS_LEVEL5[]=
 {
-    0xFF, 0x00, 0xff,
-    0x92, 0x01, 0xff,
-    0x93, 0xd0, 0x1f,
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xD0, 0x1F,
     0x00, 0x00, 0x00
 };
 const static uint8_t OV2640_SHARPNESS_LEVEL6[]=
 {
-    0xFF, 0x00, 0xff,
-    0x92, 0x01, 0xff,
-    0x93, 0xdf, 0x1f,
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xDF, 0x1F,
     0x00, 0x00, 0x00
 };
 
@@ -82,6 +89,9 @@ const static uint8_t *OV2640_SETTING_SHARPNESS[]=
     OV2640_SHARPNESS_LEVEL6  // +3 sharpness
 };
 
+#define OV2640_MAXLEVEL_SHARPNESS 6
+
+
 static int table_mask_write(sensor_t *sensor, const uint8_t* ptab)
 {
     uint8_t address;
@@ -91,34 +101,52 @@ static int table_mask_write(sensor_t *sensor, const uint8_t* ptab)
     const uint8_t *pdata = ptab;
 
     if (pdata == NULL)
+	{
         return -1;
+	}
 
     while (1)
     {   
         address = *pdata++;
         value = *pdata++;
         mask = *pdata++;
+		
         if ((address == 0) && (value == 0) && (mask == 0))
+		{
             break;
+		}
+		
         sensor->set_reg(sensor, address, mask, value);
     }   
 
     return 0;
 }
 
+
 int ov2640_enable_auto_sharpness(sensor_t *sensor)
 {
     table_mask_write(sensor, OV2640_SHARPNESS_AUTO);
+	
     return 0;
 }
 
 
 int ov2640_set_sharpness(sensor_t *sensor, int sharpness)
 {
-    if ((sharpness < -3) || (sharpness > OV2640_MAXLEVEL_SHARPNESS - 3))
-        return -1;
+	int sharpness_temp = 0;
+	
+    if (sharpness < -3)
+	{
+        sharpness_temp = -3;
+	}
+	
+    if (sharpness > OV2640_MAXLEVEL_SHARPNESS - 3)
+	{
+        sharpness_temp = OV2640_MAXLEVEL_SHARPNESS - 3;
+	}	
 
     table_mask_write(sensor, OV2640_SHARPNESS_MANUAL);
-    table_mask_write(sensor, OV2640_SETTING_SHARPNESS[sharpness + 3]);
+    table_mask_write(sensor, OV2640_SETTING_SHARPNESS[sharpness_temp + 3]);
+	
     return 0;
 }

code/components/jomjol_controlcamera/server_camera.cpp

@@ -5,6 +5,7 @@
 
 #include "esp_camera.h"
 #include "ClassControllCamera.h"
+#include "MainFlowControl.h"
 
 #include "ClassLogFile.h"
 #include "esp_log.h"
@@ -13,9 +14,8 @@
 
 static const char *TAG = "server_cam";
 
-
-void PowerResetCamera(){
-
+void PowerResetCamera()
+{
     ESP_LOGD(TAG, "Resetting camera by power down line");
     gpio_config_t conf;
     conf.intr_type = GPIO_INTR_DISABLE;
@@ -32,18 +32,17 @@ void PowerResetCamera(){
     vTaskDelay(1000 / portTICK_PERIOD_MS);
 }
 
-
 esp_err_t handler_lightOn(httpd_req_t *req)
 {
-    #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("handler_lightOn - Start");
     ESP_LOGD(TAG, "handler_lightOn uri: %s", req->uri);
-    #endif
+#endif
 
     if (Camera.getCameraInitSuccessful())
     {
         Camera.LightOnOff(true);
-        const char* resp_str = (const char*) req->user_ctx;
+        const char *resp_str = (const char *)req->user_ctx;
         httpd_resp_send(req, resp_str, strlen(resp_str));
     }
     else
@@ -52,25 +51,24 @@ esp_err_t handler_lightOn(httpd_req_t *req)
         return ESP_ERR_NOT_FOUND;
     }
 
-    #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("handler_lightOn - Done");
-    #endif
+#endif
 
     return ESP_OK;
 }
 
-
 esp_err_t handler_lightOff(httpd_req_t *req)
 {
-    #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("handler_lightOff - Start");
     ESP_LOGD(TAG, "handler_lightOff uri: %s", req->uri);
-    #endif
+#endif
 
     if (Camera.getCameraInitSuccessful())
     {
         Camera.LightOnOff(false);
-        const char* resp_str = (const char*) req->user_ctx;
+        const char *resp_str = (const char *)req->user_ctx;
         httpd_resp_send(req, resp_str, strlen(resp_str));
     }
     else
@@ -79,43 +77,39 @@ esp_err_t handler_lightOff(httpd_req_t *req)
         return ESP_ERR_NOT_FOUND;
     }
 
-    #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("handler_lightOff - Done");
-    #endif
+#endif
 
     return ESP_OK;
 }
 
-
 esp_err_t handler_capture(httpd_req_t *req)
 {
-    #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("handler_capture - Start");
-    #endif
+#endif
 
     if (Camera.getCameraInitSuccessful())
     {
-        int quality;
-        framesize_t res;
-        bool zoomEnabled;
-        int zoomMode;
-        int zoomOffsetX;
-        int zoomOffsetY;
-
-        Camera.GetCameraParameter(req, quality, res, zoomEnabled, zoomMode, zoomOffsetX, zoomOffsetY);
-
-        #ifdef DEBUG_DETAIL_ON
+#ifdef DEBUG_DETAIL_ON
         ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-        #endif
+#endif
 
-        Camera.SetQualitySize(quality, res, zoomEnabled, zoomMode, zoomOffsetX, zoomOffsetY);
+        // wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
+        if (CFstatus.changedCameraSettings)
+        {
+            Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
+            Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+            CFstatus.changedCameraSettings = false;
+        }
 
         esp_err_t result;
         result = Camera.CaptureToHTTP(req);
 
-        #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
         LogFile.WriteHeapInfo("handler_capture - Done");
-        #endif
+#endif
 
         return result;
     }
@@ -126,60 +120,60 @@ esp_err_t handler_capture(httpd_req_t *req)
     }
 }
 
-
 esp_err_t handler_capture_with_light(httpd_req_t *req)
 {
-    #ifdef DEBUG_DETAIL_ON  
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("handler_capture_with_light - Start");
-    #endif
+#endif
 
     if (Camera.getCameraInitSuccessful())
     {
         char _query[100];
         char _delay[10];
-
-        int quality;
-        framesize_t res;    
-        bool zoomEnabled;
-        int zoomMode;
-        int zoomOffsetX;
-        int zoomOffsetY;
         int delay = 2500;
 
         if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK)
         {
             ESP_LOGD(TAG, "Query: %s", _query);
+
             if (httpd_query_key_value(_query, "delay", _delay, 10) == ESP_OK)
             {
-                #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
                 ESP_LOGD(TAG, "Delay: %s", _delay);
-                #endif        
+#endif
                 delay = atoi(_delay);
 
                 if (delay < 0)
+                {
                     delay = 0;
                 }
             }
+        }
 
-        Camera.GetCameraParameter(req, quality, res, zoomEnabled, zoomMode, zoomOffsetX, zoomOffsetY);
-
-        #ifdef DEBUG_DETAIL_ON
+#ifdef DEBUG_DETAIL_ON
         ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-        #endif
+#endif
+
+        // wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
+        if (CFstatus.changedCameraSettings)
+        {
+            Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
+            Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+            CFstatus.changedCameraSettings = false;
+        }
 
-        Camera.SetQualitySize(quality, res, zoomEnabled, zoomMode, zoomOffsetX, zoomOffsetY);
         Camera.LightOnOff(true);
         const TickType_t xDelay = delay / portTICK_PERIOD_MS;
-        vTaskDelay( xDelay );
+        vTaskDelay(xDelay);
 
         esp_err_t result;
         result = Camera.CaptureToHTTP(req);
 
         Camera.LightOnOff(false);
 
-        #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
         LogFile.WriteHeapInfo("handler_capture_with_light - Done");
-        #endif
+#endif
 
         return result;
     }
@@ -190,12 +184,11 @@ esp_err_t handler_capture_with_light(httpd_req_t *req)
     }
 }
 
-
 esp_err_t handler_capture_save_to_file(httpd_req_t *req)
 {
-    #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("handler_capture_save_to_file - Start");
-    #endif
+#endif
 
     if (Camera.getCameraInitSuccessful())
     {
@@ -205,56 +198,61 @@ esp_err_t handler_capture_save_to_file(httpd_req_t *req)
         char filename[100];
         std::string fn = "/sdcard/";
 
-
-        int quality;
-        framesize_t res;    
-        bool zoomEnabled;
-        int zoomMode;
-        int zoomOffsetX;
-        int zoomOffsetY;
-
         if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK)
         {
             ESP_LOGD(TAG, "Query: %s", _query);
+
             if (httpd_query_key_value(_query, "filename", filename, 100) == ESP_OK)
             {
                 fn.append(filename);
-                #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
                 ESP_LOGD(TAG, "Filename: %s", fn.c_str());
-                #endif
+#endif
             }
             else
+            {
                 fn.append("noname.jpg");
+            }
 
             if (httpd_query_key_value(_query, "delay", _delay, 10) == ESP_OK)
             {
-                #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
                 ESP_LOGD(TAG, "Delay: %s", _delay);
-                #endif
+#endif
                 delay = atoi(_delay);
 
                 if (delay < 0)
+                {
                     delay = 0;
                 }
             }
+        }
         else
+        {
             fn.append("noname.jpg");
+        }
 
-        Camera.GetCameraParameter(req, quality, res, zoomEnabled, zoomMode, zoomOffsetX, zoomOffsetY);
-        #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
         ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-        #endif
-        Camera.SetQualitySize(quality, res, zoomEnabled, zoomMode, zoomOffsetX, zoomOffsetY);
+#endif
+
+        // wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
+        if (CFstatus.changedCameraSettings)
+        {
+            Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
+            Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+            CFstatus.changedCameraSettings = false;
+        }
 
         esp_err_t result;
         result = Camera.CaptureToFile(fn, delay);
 
-        const char* resp_str = (const char*) fn.c_str();
+        const char *resp_str = (const char *)fn.c_str();
         httpd_resp_send(req, resp_str, strlen(resp_str));
 
-        #ifdef DEBUG_DETAIL_ON   
+#ifdef DEBUG_DETAIL_ON
         LogFile.WriteHeapInfo("handler_capture_save_to_file - Done");
-        #endif
+#endif
 
         return result;
     }
@@ -265,24 +263,23 @@ esp_err_t handler_capture_save_to_file(httpd_req_t *req)
     }
 }
 
-
 void register_server_camera_uri(httpd_handle_t server)
 {
 #ifdef DEBUG_DETAIL_ON
     ESP_LOGI(TAG, "server_part_camera - Registering URI handlers");
 #endif
 
-    httpd_uri_t camuri = { };
+    httpd_uri_t camuri = {};
     camuri.method = HTTP_GET;
 
     camuri.uri = "/lighton";
     camuri.handler = handler_lightOn;
-    camuri.user_ctx  = (void*) "Light On";    
+    camuri.user_ctx = (void *)"Light On";
     httpd_register_uri_handler(server, &camuri);
 
     camuri.uri = "/lightoff";
     camuri.handler = handler_lightOff;
-    camuri.user_ctx  = (void*) "Light Off"; 
+    camuri.user_ctx = (void *)"Light Off";
     httpd_register_uri_handler(server, &camuri);
 
     camuri.uri = "/capture";

code/components/jomjol_controlcamera/server_camera.h

@@ -10,7 +10,6 @@
 //#include "ClassControllCamera.h"
 
 void register_server_camera_uri(httpd_handle_t server);
-
 void PowerResetCamera();
 
 #endif

code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp

@@ -6,22 +6,18 @@
 #include "CRotateImage.h"
 #include "esp_log.h"
 
-
 #include "ClassLogFile.h"
 #include "psram.h"
 #include "../../include/defines.h"
 
-
 static const char *TAG = "ALIGN";
 
 // #define DEBUG_DETAIL_ON
 
-
 void ClassFlowAlignment::SetInitialParameter(void)
 {
     initialrotate = 0;
     anz_ref = 0;
-    initialmirror = false;
     use_antialiasing = false;
     initialflip = false;
     SaveAllFiles = false;
@@ -31,16 +27,15 @@ void ClassFlowAlignment::SetInitialParameter(void)
     AlignAndCutImage = NULL;
     ImageBasis = NULL;
     ImageTMP = NULL;
-    #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-    AlgROI = (ImageData*)malloc_psram_heap(std::string(TAG) + "->AlgROI", sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
-    #endif
+#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
+    AlgROI = (ImageData *)malloc_psram_heap(std::string(TAG) + "->AlgROI", sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
+#endif
     previousElement = NULL;
     disabled = false;
     SAD_criteria = 0.05;
 }
 
-
-ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow*>* lfc)
+ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow *> *lfc)
 {
     SetInitialParameter();
     ListFlowControll = lfc;
@@ -49,7 +44,7 @@ ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow*>* lfc)
     {
         if (((*ListFlowControll)[i])->name().compare("ClassFlowTakeImage") == 0)
         {
-            ImageBasis = ((ClassFlowTakeImage*) (*ListFlowControll)[i])->rawImage;
+            ImageBasis = ((ClassFlowTakeImage *)(*ListFlowControll)[i])->rawImage;
         }
     }
 
@@ -60,55 +55,60 @@ ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow*>* lfc)
     }
 }
 
-
-bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph)
+bool ClassFlowAlignment::ReadParameter(FILE *pfile, string &aktparamgraph)
 {
     std::vector<string> splitted;
     int suchex = 40;
     int suchey = 40;
-    int alg_algo = 0; //default=0; 1 =HIGHACCURACY; 2= FAST; 3= OFF //add disable aligment algo |01.2023
-
+    int alg_algo = 0; // default=0; 1 =HIGHACCURACY; 2= FAST; 3= OFF //add disable aligment algo |01.2023
 
     aktparamgraph = trim(aktparamgraph);
 
     if (aktparamgraph.size() == 0)
+    {
         if (!this->GetNextParagraph(pfile, aktparamgraph))
+        {
             return false;
+        }
+    }
 
-    if (aktparamgraph.compare("[Alignment]") != 0)       //Paragraph does not fit Alignment
+    if (aktparamgraph.compare("[Alignment]") != 0)
+    {
+        // Paragraph does not fit Alignment
         return false;
+    }
 
     while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
     {
         splitted = ZerlegeZeile(aktparamgraph);
+
         if ((toUpper(splitted[0]) == "FLIPIMAGESIZE") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
+            {
                 initialflip = true;
             }
-        if ((toUpper(splitted[0]) == "INITIALMIRROR") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
-                initialmirror = true;
         }
-        if (((toUpper(splitted[0]) == "initialrotate") || (toUpper(splitted[0]) == "INITIALROTATE")) && (splitted.size() > 1))
+        else if (((toUpper(splitted[0]) == "initialrotate") || (toUpper(splitted[0]) == "INITIALROTATE")) && (splitted.size() > 1))
         {
             this->initialrotate = std::stod(splitted[1]);
         }
-        if ((toUpper(splitted[0]) == "SEARCHFIELDX") && (splitted.size() > 1))
+        else if ((toUpper(splitted[0]) == "SEARCHFIELDX") && (splitted.size() > 1))
         {
             suchex = std::stod(splitted[1]);
         }
-        if ((toUpper(splitted[0]) == "SEARCHFIELDY") && (splitted.size() > 1))
+        else if ((toUpper(splitted[0]) == "SEARCHFIELDY") && (splitted.size() > 1))
         {
             suchey = std::stod(splitted[1]);
         }
-        if ((toUpper(splitted[0]) == "ANTIALIASING") && (splitted.size() > 1))
+        else if ((toUpper(splitted[0]) == "ANTIALIASING") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
+            {
                 use_antialiasing = true;
             }
-        if ((splitted.size() == 3) && (anz_ref < 2))
+        }
+        else if ((splitted.size() == 3) && (anz_ref < 2))
         {
             References[anz_ref].image_file = FormatFileName("/sdcard" + splitted[0]);
             References[anz_ref].target_x = std::stod(splitted[1]);
@@ -116,25 +116,34 @@ bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph)
             anz_ref++;
         }
 
-        if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
+        else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
+            {
                 SaveAllFiles = true;
             }
-        if ((toUpper(splitted[0]) == "ALIGNMENTALGO") && (splitted.size() > 1))
+        }
+        else if ((toUpper(splitted[0]) == "ALIGNMENTALGO") && (splitted.size() > 1))
         {
-            #ifdef DEBUG_DETAIL_ON
+#ifdef DEBUG_DETAIL_ON
             std::string zw2 = "Alignment mode selected: " + splitted[1];
             LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw2);
-            #endif
+#endif
             if (toUpper(splitted[1]) == "HIGHACCURACY")
+            {
                 alg_algo = 1;
+            }
             if (toUpper(splitted[1]) == "FAST")
+            {
                 alg_algo = 2;
-            if (toUpper(splitted[1]) == "OFF") //no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
+            }
+            if (toUpper(splitted[1]) == "OFF")
+            {
+                // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
                 alg_algo = 3;
             }
         }
+    }
 
     for (int i = 0; i < anz_ref; ++i)
     {
@@ -142,22 +151,21 @@ bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph)
         References[i].search_y = suchey;
         References[i].fastalg_SAD_criteria = SAD_criteria;
         References[i].alignment_algo = alg_algo;
-        #ifdef DEBUG_DETAIL_ON
+#ifdef DEBUG_DETAIL_ON
         std::string zw2 = "Alignment mode written: " + std::to_string(alg_algo);
         LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw2);
-        #endif
+#endif
     }
 
-    //no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
-    if(References[0].alignment_algo != 3){
+    // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
+    if (References[0].alignment_algo != 3)
+    {
         LoadReferenceAlignmentValues();
     }
 
     return true;
-
 }
 
-
 string ClassFlowAlignment::getHTMLSingleStep(string host)
 {
     string result;
@@ -168,13 +176,13 @@ string ClassFlowAlignment::getHTMLSingleStep(string host)
     return result;
 }
 
-
 bool ClassFlowAlignment::doFlow(string time)
 {
-    #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
+#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
     if (!AlgROI) // AlgROI needs to be allocated before ImageTMP to avoid heap fragmentation
     {
-            AlgROI = (ImageData*)heap_caps_realloc(AlgROI, sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);     
+        AlgROI = (ImageData *)heap_caps_realloc(AlgROI, sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
+
         if (!AlgROI)
         {
             LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlgROI");
@@ -184,13 +192,14 @@ bool ClassFlowAlignment::doFlow(string time)
 
     if (AlgROI)
     {
-            ImageBasis->writeToMemoryAsJPG((ImageData*)AlgROI, 90);
+        ImageBasis->writeToMemoryAsJPG((ImageData *)AlgROI, 90);
     }
-    #endif
+#endif
 
     if (!ImageTMP)
     {
         ImageTMP = new CImageBasis("tmpImage", ImageBasis); // Make sure the name does not get change, it is relevant for the PSRAM allocation!
+
         if (!ImageTMP)
         {
             LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate tmpImage -> Exec this round aborted!");
@@ -201,6 +210,7 @@ bool ClassFlowAlignment::doFlow(string time)
 
     delete AlignAndCutImage;
     AlignAndCutImage = new CAlignAndCutImage("AlignAndCutImage", ImageBasis, ImageTMP);
+
     if (!AlignAndCutImage)
     {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlignAndCutImage -> Exec this round aborted!");
@@ -209,6 +219,7 @@ bool ClassFlowAlignment::doFlow(string time)
     }
 
     CRotateImage rt("rawImage", AlignAndCutImage, ImageTMP, initialflip);
+
     if (initialflip)
     {
         int _zw = ImageBasis->height;
@@ -220,47 +231,46 @@ bool ClassFlowAlignment::doFlow(string time)
         ImageTMP->height = _zw;
     }
 
-    if (initialmirror)
-    {
-        ESP_LOGD(TAG, "do mirror");
-        rt.Mirror();
-        
-        if (SaveAllFiles)
-            AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/mirror.jpg"));
-    }
- 
     if ((initialrotate != 0) || initialflip)
     {
         if (use_antialiasing)
+        {
             rt.RotateAntiAliasing(initialrotate);
+        }
         else
+        {
             rt.Rotate(initialrotate);
-        
-        if (SaveAllFiles)
-            AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/rot.jpg"));
         }
 
+        if (SaveAllFiles)
+        {
+            AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/rot.jpg"));
+        }
+    }
 
-        //no align algo if set to 3 = off //add disable aligment algo |01.2023
-        if(References[0].alignment_algo != 3){
+    // no align algo if set to 3 = off //add disable aligment algo |01.2023
+    if (References[0].alignment_algo != 3)
+    {
         if (!AlignAndCutImage->Align(&References[0], &References[1]))
         {
             SaveReferenceAlignmentValues();
         }
-        }// no align
+    } // no align
 
-
-    #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-        if (AlgROI) {
-            //no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
-            if(References[0].alignment_algo != 3){
+#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
+    if (AlgROI)
+    {
+        // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
+        if (References[0].alignment_algo != 3)
+        {
             DrawRef(ImageTMP);
         }
+
         flowctrl.DigitalDrawROI(ImageTMP);
         flowctrl.AnalogDrawROI(ImageTMP);
-            ImageTMP->writeToMemoryAsJPG((ImageData*)AlgROI, 90);
+        ImageTMP->writeToMemoryAsJPG((ImageData *)AlgROI, 90);
     }
-    #endif
+#endif
 
     if (SaveAllFiles)
     {
@@ -272,18 +282,18 @@ bool ClassFlowAlignment::doFlow(string time)
     delete ImageTMP;
     ImageTMP = NULL;
 
-    //no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
-    if(References[0].alignment_algo != 3){
+    // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
+    if (References[0].alignment_algo != 3)
+    {
         LoadReferenceAlignmentValues();
     }
 
     return true;
 }
 
-
 void ClassFlowAlignment::SaveReferenceAlignmentValues()
 {
-    FILE* pFile;
+    FILE *pFile;
     std::string zwtime, zwvalue;
 
     pFile = fopen(FileStoreRefAlignment.c_str(), "w");
@@ -291,7 +301,7 @@ void ClassFlowAlignment::SaveReferenceAlignmentValues()
     if (strlen(zwtime.c_str()) == 0)
     {
         time_t rawtime;
-        struct tm* timeinfo;
+        struct tm *timeinfo;
         char buffer[80];
 
         time(&rawtime);
@@ -305,30 +315,29 @@ void ClassFlowAlignment::SaveReferenceAlignmentValues()
     fputs("\n", pFile);
 
     zwvalue = std::to_string(References[0].fastalg_x) + "\t" + std::to_string(References[0].fastalg_y);
-    zwvalue = zwvalue + "\t" +std::to_string(References[0].fastalg_SAD)+ "\t" +std::to_string(References[0].fastalg_min); 
-    zwvalue = zwvalue + "\t" +std::to_string(References[0].fastalg_max)+ "\t" +std::to_string(References[0].fastalg_avg); 
+    zwvalue = zwvalue + "\t" + std::to_string(References[0].fastalg_SAD) + "\t" + std::to_string(References[0].fastalg_min);
+    zwvalue = zwvalue + "\t" + std::to_string(References[0].fastalg_max) + "\t" + std::to_string(References[0].fastalg_avg);
     fputs(zwvalue.c_str(), pFile);
     fputs("\n", pFile);
 
     zwvalue = std::to_string(References[1].fastalg_x) + "\t" + std::to_string(References[1].fastalg_y);
-    zwvalue = zwvalue + "\t" +std::to_string(References[1].fastalg_SAD)+ "\t" +std::to_string(References[1].fastalg_min); 
-    zwvalue = zwvalue + "\t" +std::to_string(References[1].fastalg_max)+ "\t" +std::to_string(References[1].fastalg_avg); 
+    zwvalue = zwvalue + "\t" + std::to_string(References[1].fastalg_SAD) + "\t" + std::to_string(References[1].fastalg_min);
+    zwvalue = zwvalue + "\t" + std::to_string(References[1].fastalg_max) + "\t" + std::to_string(References[1].fastalg_avg);
     fputs(zwvalue.c_str(), pFile);
     fputs("\n", pFile);
 
     fclose(pFile);
 }
 
-
 bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
 {
-    FILE* pFile;
+    FILE *pFile;
     char zw[1024];
     string zwvalue;
     std::vector<string> splitted;
 
-
     pFile = fopen(FileStoreRefAlignment.c_str(), "r");
+
     if (pFile == NULL)
         return false;
 
@@ -337,6 +346,7 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
 
     fgets(zw, 1024, pFile);
     splitted = ZerlegeZeile(std::string(zw), " \t");
+
     if (splitted.size() < 6)
     {
         fclose(pFile);
@@ -352,6 +362,7 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
 
     fgets(zw, 1024, pFile);
     splitted = ZerlegeZeile(std::string(zw));
+
     if (splitted.size() < 6)
     {
         fclose(pFile);
@@ -367,7 +378,6 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
 
     fclose(pFile);
 
-
     /*#ifdef DEBUG_DETAIL_ON
         std::string _zw = "\tLoadReferences[0]\tx,y:\t" + std::to_string(References[0].fastalg_x) + "\t" + std::to_string(References[0].fastalg_x);
         _zw = _zw + "\tSAD, min, max, avg:\t" + std::to_string(References[0].fastalg_SAD) + "\t" + std::to_string(References[0].fastalg_min);
@@ -382,7 +392,6 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
     return true;
 }
 
-
 void ClassFlowAlignment::DrawRef(CImageBasis *_zw)
 {
     if (_zw->ImageOkay())

code/components/jomjol_flowcontroll/ClassFlowAlignment.h

@@ -12,12 +12,10 @@
 
 using namespace std;
 
-class ClassFlowAlignment :
-    public ClassFlow
+class ClassFlowAlignment : public ClassFlow
 {
 protected:
     float initialrotate;
-    bool initialmirror;
     bool initialflip;
     bool use_antialiasing;
     RefInfo References[2];
@@ -34,21 +32,20 @@ protected:
 
 public:
     CImageBasis *ImageBasis, *ImageTMP;
-    #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG 
+#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
     ImageData *AlgROI;
-    #endif
+#endif
 
-    ClassFlowAlignment(std::vector<ClassFlow*>* lfc);
+    ClassFlowAlignment(std::vector<ClassFlow *> *lfc);
 
-    CAlignAndCutImage* GetAlignAndCutImage(){return AlignAndCutImage;};
+    CAlignAndCutImage *GetAlignAndCutImage() { return AlignAndCutImage; };
 
     void DrawRef(CImageBasis *_zw);
 
-    bool ReadParameter(FILE* pfile, string& aktparamgraph);
+    bool ReadParameter(FILE *pfile, string &aktparamgraph);
     bool doFlow(string time);
     string getHTMLSingleStep(string host);
-    string name(){return "ClassFlowAlignment";};
+    string name() { return "ClassFlowAlignment"; };
 };
 
-
-#endif //CLASSFLOWALIGNMENT_H
+#endif // CLASSFLOWALIGNMENT_H

code/components/jomjol_flowcontroll/ClassFlowTakeImage.cpp

@@ -1,9 +1,15 @@
+#include <iostream>
+#include <string>
+#include <vector>
+#include <regex>
+
 #include "ClassFlowTakeImage.h"
 #include "Helper.h"
 #include "ClassLogFile.h"
 
 #include "CImageBasis.h"
 #include "ClassControllCamera.h"
+#include "MainFlowControl.h"
 
 #include "esp_wifi.h"
 #include "esp_log.h"
@@ -13,12 +19,12 @@
 #include <time.h>
 
 // #define DEBUG_DETAIL_ON
-
 // #define WIFITURNOFF
 
-static const char* TAG = "TAKEIMAGE";
+static const char *TAG = "TAKEIMAGE";
 
-esp_err_t ClassFlowTakeImage::camera_capture(){
+esp_err_t ClassFlowTakeImage::camera_capture(void)
+{
     string nm = namerawimage;
     Camera.CaptureToFile(nm);
     time(&TimeImageTaken);
@@ -30,204 +36,479 @@ esp_err_t ClassFlowTakeImage::camera_capture(){
 void ClassFlowTakeImage::takePictureWithFlash(int flash_duration)
 {
     // in case the image is flipped, it must be reset here //
-    rawImage->width = image_width;          
-    rawImage->height = image_height;
-    /////////////////////////////////////////////////////////////////////////////////////
+    rawImage->width = CCstatus.ImageWidth;
+    rawImage->height = CCstatus.ImageHeight;
+
     ESP_LOGD(TAG, "flash_duration: %d", flash_duration);
+
     Camera.CaptureToBasisImage(rawImage, flash_duration);
+
     time(&TimeImageTaken);
     localtime(&TimeImageTaken);
 
-    if (SaveAllFiles) rawImage->SaveToFile(namerawimage);
+    if (CCstatus.SaveAllFiles)
+    {
+        rawImage->SaveToFile(namerawimage);
+    }
 }
 
 void ClassFlowTakeImage::SetInitialParameter(void)
 {
-    waitbeforepicture = 5;
-    isImageSize = false;
-    ImageQuality = -1;    
     TimeImageTaken = 0;
-    ImageQuality = 5;
     rawImage = NULL;
-    ImageSize = FRAMESIZE_VGA;
-    ZoomEnabled = false;
-    ZoomMode = 0;
-    zoomOffsetX = 0;
-    zoomOffsetY = 0;
-    ImageNegative = false;
-    ImageAec2 = false;
-#ifdef GRAYSCALE_AS_DEFAULT
-    ImageGrayscale = true;
-#else
-    ImageGrayscale = false;
-#endif
-    SaveAllFiles = false;
     disabled = false;
-    FixedExposure = false;
     namerawimage = "/sdcard/img_tmp/raw.jpg";
 }
 
-
-ClassFlowTakeImage::ClassFlowTakeImage(std::vector<ClassFlow*>* lfc) : ClassFlowImage(lfc, TAG)
+// auslesen der Kameraeinstellungen aus der config.ini
+// wird beim Start aufgerufen
+bool ClassFlowTakeImage::ReadParameter(FILE *pfile, string &aktparamgraph)
 {
-    imagesLocation = "/log/source";
-    imagesRetention = 5;
-    SetInitialParameter();
-}
+    Camera.getSensorDatenToCCstatus(); // Kamera >>> CCstatus
 
-
-bool ClassFlowTakeImage::ReadParameter(FILE* pfile, string& aktparamgraph)
-{
     std::vector<string> splitted;
 
     aktparamgraph = trim(aktparamgraph);
-    int _brightness = 0;
-    int _contrast = 0;
-    int _saturation = 0;
-    int _sharpness = 0;
-    int _autoExposureLevel = 0;
 
     if (aktparamgraph.size() == 0)
+    {
         if (!this->GetNextParagraph(pfile, aktparamgraph))
+        {
             return false;
+        }
+    }
 
-    if (aktparamgraph.compare("[TakeImage]") != 0)       // Paragraph does not fit TakeImage
+    if (aktparamgraph.compare("[TakeImage]") != 0)
+    {
+        // Paragraph does not fit TakeImage
         return false;
+    }
 
     while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
     {
         splitted = ZerlegeZeile(aktparamgraph);
+
         if ((toUpper(splitted[0]) == "RAWIMAGESLOCATION") && (splitted.size() > 1))
         {
             imagesLocation = "/sdcard" + splitted[1];
             isLogImage = true;
         }
-        if ((toUpper(splitted[0]) == "IMAGEQUALITY") && (splitted.size() > 1))
-            ImageQuality = std::stod(splitted[1]);
 
-        if ((toUpper(splitted[0]) == "ZOOM") && (splitted.size() > 1))
+        else if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
+        {
+            this->imagesRetention = std::stod(splitted[1]);
+        }
+
+        else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
-                ZoomEnabled = true;
-            else if (toUpper(splitted[1]) == "FALSE")
-                ZoomEnabled = false;
+            {
+                CCstatus.SaveAllFiles = 1;
             }
-        if ((toUpper(splitted[0]) == "ZOOMMODE") && (splitted.size() > 1))
-            ZoomMode = std::stod(splitted[1]);
-        if ((toUpper(splitted[0]) == "ZOOMOFFSETX") && (splitted.size() > 1))
-            zoomOffsetX = std::stod(splitted[1]);
-        if ((toUpper(splitted[0]) == "ZOOMOFFSETY") && (splitted.size() > 1))
-            zoomOffsetY = std::stod(splitted[1]);
-        if ((toUpper(splitted[0]) == "GRAYSCALE") && (splitted.size() > 1))
+            else
+            {
+                CCstatus.SaveAllFiles = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1))
+        {
+            int _WaitBeforePicture = std::stoi(splitted[1]);
+            if (_WaitBeforePicture != 0)
+            {
+                CCstatus.WaitBeforePicture = _WaitBeforePicture;
+            }
+            else
+            {
+                CCstatus.WaitBeforePicture = 2;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMGAINCEILING") && (splitted.size() > 1))
+        {
+            std::string _ImageGainceiling = toUpper(splitted[1]);
+            if (_ImageGainceiling == "X4")
+            {
+                CCstatus.ImageGainceiling = GAINCEILING_4X;
+            }
+            else if (_ImageGainceiling == "X8")
+            {
+                CCstatus.ImageGainceiling = GAINCEILING_8X;
+            }
+            else if (_ImageGainceiling == "X16")
+            {
+                CCstatus.ImageGainceiling = GAINCEILING_16X;
+            }
+            else if (_ImageGainceiling == "X32")
+            {
+                CCstatus.ImageGainceiling = GAINCEILING_32X;
+            }
+            else if (_ImageGainceiling == "X64")
+            {
+                CCstatus.ImageGainceiling = GAINCEILING_64X;
+            }
+            else if (_ImageGainceiling == "X128")
+            {
+                CCstatus.ImageGainceiling = GAINCEILING_128X;
+            }
+            else
+            {
+                CCstatus.ImageGainceiling = GAINCEILING_2X;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMQUALITY") && (splitted.size() > 1))
+        {
+            int _ImageQuality = std::stoi(splitted[1]);
+            if ((_ImageQuality >= 0) && (_ImageQuality <= 63))
+            {
+                CCstatus.ImageQuality = _ImageQuality;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMBRIGHTNESS") && (splitted.size() > 1))
+        {
+            int _ImageBrightness = std::stoi(splitted[1]);
+            if ((_ImageBrightness >= -2) && (_ImageBrightness <= 2))
+            {
+                CCstatus.ImageBrightness = _ImageBrightness;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMCONTRAST") && (splitted.size() > 1))
+        {
+            int _ImageContrast = std::stoi(splitted[1]);
+            if ((_ImageContrast >= -2) && (_ImageContrast <= 2))
+            {
+                CCstatus.ImageContrast = _ImageContrast;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMSATURATION") && (splitted.size() > 1))
+        {
+            int _ImageSaturation = std::stoi(splitted[1]);
+            if ((_ImageSaturation >= -2) && (_ImageSaturation <= 2))
+            {
+                CCstatus.ImageSaturation = _ImageSaturation;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMSHARPNESS") && (splitted.size() > 1))
+        {
+            int _ImageSharpness = std::stoi(splitted[1]);
+            if ((_ImageSharpness >= -2) && (_ImageSharpness <= 2))
+            {
+                CCstatus.ImageSharpness = _ImageSharpness;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAUTOSHARPNESS") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
-                ImageGrayscale = true;
-            else if (toUpper(splitted[1]) == "FALSE")
-                ImageGrayscale = false;
+            {
+                CCstatus.ImageAutoSharpness = 1;
             }
-        if ((toUpper(splitted[0]) == "NEGATIVE") && (splitted.size() > 1))
+            else
+            {
+                CCstatus.ImageAutoSharpness = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMSPECIALEFFECT") && (splitted.size() > 1))
+        {
+            std::string _ImageSpecialEffect = toUpper(splitted[1]);
+            if (_ImageSpecialEffect == "NEGATIVE")
+            {
+                CCstatus.ImageSpecialEffect = 1;
+            }
+            else if (_ImageSpecialEffect == "GRAYSCALE")
+            {
+                CCstatus.ImageSpecialEffect = 2;
+            }
+            else if (_ImageSpecialEffect == "RED")
+            {
+                CCstatus.ImageSpecialEffect = 3;
+            }
+            else if (_ImageSpecialEffect == "GREEN")
+            {
+                CCstatus.ImageSpecialEffect = 4;
+            }
+            else if (_ImageSpecialEffect == "BLUE")
+            {
+                CCstatus.ImageSpecialEffect = 5;
+            }
+            else if (_ImageSpecialEffect == "RETRO")
+            {
+                CCstatus.ImageSpecialEffect = 6;
+            }
+            else
+            {
+                CCstatus.ImageSpecialEffect = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMWBMODE") && (splitted.size() > 1))
+        {
+            std::string _ImageWbMode = toUpper(splitted[1]);
+            if (_ImageWbMode == "SUNNY")
+            {
+                CCstatus.ImageWbMode = 1;
+            }
+            else if (_ImageWbMode == "CLOUDY")
+            {
+                CCstatus.ImageWbMode = 2;
+            }
+            else if (_ImageWbMode == "OFFICE")
+            {
+                CCstatus.ImageWbMode = 3;
+            }
+            else if (_ImageWbMode == "HOME")
+            {
+                CCstatus.ImageWbMode = 4;
+            }
+            else
+            {
+                CCstatus.ImageWbMode = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAWB") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
-                ImageNegative = true;
-            else if (toUpper(splitted[1]) == "FALSE")
-                ImageNegative = false;
+            {
+                CCstatus.ImageAwb = 1;
             }
-        if ((toUpper(splitted[0]) == "AEC2") && (splitted.size() > 1))
+            else
+            {
+                CCstatus.ImageAwb = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAWBGAIN") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
-                ImageAec2 = true;
-            else if (toUpper(splitted[1]) == "FALSE")
-                ImageAec2 = false;
-        }
-        if ((toUpper(splitted[0]) == "AUTOEXPOSURELEVEL") && (splitted.size() > 1))
-            _autoExposureLevel = std::stod(splitted[1]);
-
-        if ((toUpper(splitted[0]) == "IMAGESIZE") && (splitted.size() > 1))
             {
-            ImageSize = Camera.TextToFramesize(splitted[1].c_str());
-            isImageSize = true;
+                CCstatus.ImageAwbGain = 1;
+            }
+            else
+            {
+                CCstatus.ImageAwbGain = 0;
+            }
         }
 
-        if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
+        else if ((toUpper(splitted[0]) == "CAMAEC") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
-                SaveAllFiles = true;
-        }
-        
-        if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1))
             {
-            waitbeforepicture = stoi(splitted[1]);
+                CCstatus.ImageAec = 1;
             }
-
-        if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
+            else
             {
-            this->imagesRetention = std::stoi(splitted[1]);
+                CCstatus.ImageAec = 0;
+            }
         }
 
-        if ((toUpper(splitted[0]) == "BRIGHTNESS") && (splitted.size() > 1))
-        {
-            _brightness = stoi(splitted[1]);
-        }
-
-        if ((toUpper(splitted[0]) == "CONTRAST") && (splitted.size() > 1))
-        {
-            _contrast = stoi(splitted[1]);
-        }
-
-        if ((toUpper(splitted[0]) == "SATURATION") && (splitted.size() > 1))
-        {
-            _saturation = stoi(splitted[1]);
-        }
-
-        if ((toUpper(splitted[0]) == "SHARPNESS") && (splitted.size() > 1))
-        {
-            _sharpness = stoi(splitted[1]);
-        }
-
-        if ((toUpper(splitted[0]) == "FIXEDEXPOSURE") && (splitted.size() > 1))
+        else if ((toUpper(splitted[0]) == "CAMAEC2") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
-                FixedExposure = true;  
+            {
+                CCstatus.ImageAec2 = 1;
+            }
+            else
+            {
+                CCstatus.ImageAec2 = 0;
+            }
         }
 
-        if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1))
+        else if ((toUpper(splitted[0]) == "CAMAELEVEL") && (splitted.size() > 1))
         {
-            float ledintensity = stof(splitted[1]);
-            ledintensity = min((float) 100, ledintensity);
-            ledintensity = max((float) 0, ledintensity);
+            int _ImageAeLevel = std::stoi(splitted[1]);
+            if ((_ImageAeLevel >= -2) && (_ImageAeLevel <= 2))
+            {
+                CCstatus.ImageAeLevel = _ImageAeLevel;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAECVALUE") && (splitted.size() > 1))
+        {
+            int _ImageAecValue = std::stoi(splitted[1]);
+            if ((_ImageAecValue >= 0) && (_ImageAecValue <= 1200))
+            {
+                CCstatus.ImageAecValue = _ImageAecValue;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAGC") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageAgc = 1;
+            }
+            else
+            {
+                CCstatus.ImageAgc = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAGCGAIN") && (splitted.size() > 1))
+        {
+            int _ImageAgcGain = std::stoi(splitted[1]);
+            if ((_ImageAgcGain >= 0) && (_ImageAgcGain <= 30))
+            {
+                CCstatus.ImageAgcGain = _ImageAgcGain;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMBPC") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageBpc = 1;
+            }
+            else
+            {
+                CCstatus.ImageBpc = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMWPC") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageWpc = 1;
+            }
+            else
+            {
+                CCstatus.ImageWpc = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMRAWGMA") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageRawGma = 1;
+            }
+            else
+            {
+                CCstatus.ImageRawGma = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMLENC") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageLenc = 1;
+            }
+            else
+            {
+                CCstatus.ImageLenc = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMHMIRROR") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageHmirror = 1;
+            }
+            else
+            {
+                CCstatus.ImageHmirror = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMVFLIP") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageVflip = 1;
+            }
+            else
+            {
+                CCstatus.ImageVflip = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMDCW") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageDcw = 1;
+            }
+            else
+            {
+                CCstatus.ImageDcw = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMZOOM") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageZoomEnabled = 1;
+            }
+            else
+            {
+                CCstatus.ImageZoomEnabled = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETX") && (splitted.size() > 1))
+        {
+            CCstatus.ImageZoomOffsetX = std::stoi(splitted[1]);
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETY") && (splitted.size() > 1))
+        {
+            CCstatus.ImageZoomOffsetY = std::stoi(splitted[1]);
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMZOOMSIZE") && (splitted.size() > 1))
+        {
+            int _ImageZoomSize = std::stoi(splitted[1]);
+            if (_ImageZoomSize >= 0)
+            {
+                CCstatus.ImageZoomSize = _ImageZoomSize;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1))
+        {
+            float ledintensity = std::stof(splitted[1]);
             Camera.SetLEDIntensity(ledintensity);
         }
 
-        if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
+        else if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.DemoMode = true;
                 Camera.useDemoMode();
             }
-    }
-
-    Camera.SetBrightnessContrastSaturation(_brightness, _contrast, _saturation, _autoExposureLevel, ImageGrayscale, ImageNegative, ImageAec2, _sharpness);
-    Camera.SetQualitySize(ImageQuality, ImageSize, ZoomEnabled, ZoomMode, zoomOffsetX, zoomOffsetY);
-
-    image_width = Camera.image_width;
-    image_height = Camera.image_height;
-    rawImage = new CImageBasis("rawImage");
-    rawImage->CreateEmptyImage(image_width, image_height, 3);
-
-    waitbeforepicture_store = waitbeforepicture;
-    if (FixedExposure && (waitbeforepicture > 0))
+            else
             {
-//        ESP_LOGD(TAG, "Fixed Exposure enabled!");
-        int flash_duration = (int) (waitbeforepicture * 1000);
-        Camera.EnableAutoExposure(flash_duration);
-        waitbeforepicture = 0.2;
-//        flash_duration = (int) (waitbeforepicture * 1000);
-//        takePictureWithFlash(flash_duration);
-//        rawImage->SaveToFile("/sdcard/init2.jpg");
+                CCstatus.DemoMode = false;
             }
+        }
+    }
+
+    Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
+    Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+
+    rawImage = new CImageBasis("rawImage");
+    rawImage->CreateEmptyImage(CCstatus.ImageWidth, CCstatus.ImageHeight, 3);
 
     return true;
 }
 
+ClassFlowTakeImage::ClassFlowTakeImage(std::vector<ClassFlow *> *lfc) : ClassFlowImage(lfc, TAG)
+{
+    imagesLocation = "/log/source";
+    imagesRetention = 5;
+    SetInitialParameter();
+}
 
 string ClassFlowTakeImage::getHTMLSingleStep(string host)
 {
@@ -236,64 +517,68 @@ string ClassFlowTakeImage::getHTMLSingleStep(string host)
     return result;
 }
 
-
+// wird bei jeder Auswertrunde aufgerufen
 bool ClassFlowTakeImage::doFlow(string zwtime)
 {
     psram_init_shared_memory_for_take_image_step();
 
     string logPath = CreateLogFolder(zwtime);
 
-    int flash_duration = (int) (waitbeforepicture * 1000);
+    int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
 
-    #ifdef DEBUG_DETAIL_ON  
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - Before takePictureWithFlash");
-    #endif
+#endif
 
-
-    #ifdef WIFITURNOFF
+#ifdef WIFITURNOFF
     esp_wifi_stop(); // to save power usage and
-    #endif
+#endif
+
+    // wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
+    if (CFstatus.changedCameraSettings)
+    {
+        Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
+        Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+        CFstatus.changedCameraSettings = false;
+    }
 
     takePictureWithFlash(flash_duration);
 
-    #ifdef WIFITURNOFF
+#ifdef WIFITURNOFF
     esp_wifi_start();
-    #endif
+#endif
 
-
-    #ifdef DEBUG_DETAIL_ON  
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After takePictureWithFlash");
-    #endif
+#endif
 
     LogImage(logPath, "raw", NULL, NULL, zwtime, rawImage);
 
     RemoveOldLogs();
 
-    #ifdef DEBUG_DETAIL_ON  
+#ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After RemoveOldLogs");
-    #endif
+#endif
 
     psram_deinit_shared_memory_for_take_image_step();
 
     return true;
 }
 
-
 esp_err_t ClassFlowTakeImage::SendRawJPG(httpd_req_t *req)
 {
-    int flash_duration = (int) (waitbeforepicture * 1000);
+    int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
     time(&TimeImageTaken);
     localtime(&TimeImageTaken);
 
     return Camera.CaptureToHTTP(req, flash_duration);
 }
 
-
-ImageData* ClassFlowTakeImage::SendRawImage()
+ImageData *ClassFlowTakeImage::SendRawImage(void)
 {
     CImageBasis *zw = new CImageBasis("SendRawImage", rawImage);
     ImageData *id;
-    int flash_duration = (int) (waitbeforepicture * 1000);
+    int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
     Camera.CaptureToBasisImage(zw, flash_duration);
     time(&TimeImageTaken);
     localtime(&TimeImageTaken);
@@ -303,7 +588,7 @@ ImageData* ClassFlowTakeImage::SendRawImage()
     return id;
 }
 
-time_t ClassFlowTakeImage::getTimeImageTaken()
+time_t ClassFlowTakeImage::getTimeImageTaken(void)
 {
     return TimeImageTaken;
 }
@@ -312,4 +597,3 @@ ClassFlowTakeImage::~ClassFlowTakeImage(void)
 {
     delete rawImage;
 }
-

code/components/jomjol_flowcontroll/ClassFlowTakeImage.h

@@ -9,54 +9,32 @@
 
 #include <string>
 
-class ClassFlowTakeImage :
-    public ClassFlowImage
+class ClassFlowTakeImage : public ClassFlowImage
 {
 protected:
-    float waitbeforepicture;
-    float waitbeforepicture_store;
-    framesize_t ImageSize;
-    bool isImageSize;
-    bool ZoomEnabled = false;
-    int ZoomMode = 0;
-    int zoomOffsetX = 0;
-    int zoomOffsetY = 0;
-    bool ImageGrayscale;
-    bool ImageNegative;
-    bool ImageAec2;
-    int ImageQuality;
     time_t TimeImageTaken;
     string namerawimage;
-    int image_height, image_width;
-    bool SaveAllFiles;
-    bool FixedExposure;
 
-
-
-    void CopyFile(string input, string output);
-
-    esp_err_t camera_capture();
+    esp_err_t camera_capture(void);
     void takePictureWithFlash(int flash_duration);
 
-
     void SetInitialParameter(void);
 
 public:
     CImageBasis *rawImage;
 
-    ClassFlowTakeImage(std::vector<ClassFlow*>* lfc);
+    ClassFlowTakeImage(std::vector<ClassFlow *> *lfc);
 
-    bool ReadParameter(FILE* pfile, string& aktparamgraph);
+    bool ReadParameter(FILE *pfile, string &aktparamgraph);
     bool doFlow(string time);
     string getHTMLSingleStep(string host);
-    time_t getTimeImageTaken();
-    string name(){return "ClassFlowTakeImage";};
+    time_t getTimeImageTaken(void);
+    string name() { return "ClassFlowTakeImage"; };
 
-    ImageData* SendRawImage();
+    ImageData *SendRawImage(void);
     esp_err_t SendRawJPG(httpd_req_t *req);
 
     ~ClassFlowTakeImage(void);
 };
 
-
-#endif //CLASSFFLOWTAKEIMAGE_H
+#endif // CLASSFFLOWTAKEIMAGE_H

code/components/jomjol_flowcontroll/MainFlowControl.h

@@ -10,25 +10,78 @@
 #include "CImageBasis.h"
 #include "ClassFlowControll.h"
 
+typedef struct
+{
+    framesize_t ImageFrameSize = FRAMESIZE_VGA; // 0 - 10
+    gainceiling_t ImageGainceiling; // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)
+
+    int ImageQuality;    // 0 - 63
+    int ImageBrightness; // (-2 to 2) - set brightness
+    int ImageContrast;   //-2 - 2
+    int ImageSaturation; //-2 - 2
+    int ImageSharpness;  //-2 - 2
+    bool ImageAutoSharpness;
+    int ImageSpecialEffect; // 0 - 6
+    int ImageWbMode;        // 0 to 4 - if awb_gain enabled (0 - Auto, 1 - Sunny, 2 - Cloudy, 3 - Office, 4 - Home)
+    int ImageAwb;           // white balance enable (0 or 1)
+    int ImageAwbGain;       // Auto White Balance enable (0 or 1)
+    int ImageAec;           // auto exposure off (1 or 0)
+    int ImageAec2;          // automatic exposure sensor  (0 or 1)
+    int ImageAeLevel;       // auto exposure levels (-2 to 2)
+    int ImageAecValue;      // set exposure manually  (0-1200)
+    int ImageAgc;           // auto gain off (1 or 0)
+    int ImageAgcGain;       // set gain manually (0 - 30)
+    int ImageBpc;           // black pixel correction
+    int ImageWpc;           // white pixel correction
+    int ImageRawGma;        // (1 or 0)
+    int ImageLenc;          // lens correction (1 or 0)
+    int ImageHmirror;       // (0 or 1) flip horizontally
+    int ImageVflip;         // Invert image (0 or 1)
+    int ImageDcw;           // downsize enable (1 or 0)
+
+    int ImageWidth;
+    int ImageHeight;
+
+    int ImageLedIntensity;
+
+    bool ImageZoomEnabled;
+    int ImageZoomMode;
+    int ImageZoomOffsetX;
+    int ImageZoomOffsetY;
+    int ImageZoomSize;
+
+    int WaitBeforePicture;
+    bool isImageSize;
+
+    bool CameraInitSuccessful;
+    bool changedCameraSettings;
+    bool DemoMode;
+    bool SaveAllFiles;
+} camera_flow_config_temp_t;
+
+extern camera_flow_config_temp_t CFstatus;
 extern ClassFlowControll flowctrl;
 
+esp_err_t setCCstatusToCFstatus(void); // CCstatus >>> CFstatus
+esp_err_t setCFstatusToCCstatus(void); // CFstatus >>> CCstatus
+esp_err_t setCFstatusToCam(void);      // CFstatus >>> Kamera
 
 void register_server_main_flow_task_uri(httpd_handle_t server);
 
-void CheckIsPlannedReboot();
-bool getIsPlannedReboot();
+void CheckIsPlannedReboot(void);
+bool getIsPlannedReboot(void);
 
-void InitializeFlowTask();
-void DeleteMainFlowTask();
-bool isSetupModusActive();
+void InitializeFlowTask(void);
+void DeleteMainFlowTask(void);
+bool isSetupModusActive(void);
 
-int getCountFlowRounds();
+int getCountFlowRounds(void);
 
 #ifdef ENABLE_MQTT
 esp_err_t MQTTCtrlFlowStart(std::string _topic);
-#endif //ENABLE_MQTT
+#endif // ENABLE_MQTT
 
 esp_err_t GetRawJPG(httpd_req_t *req);
 esp_err_t GetJPG(std::string _filename, httpd_req_t *req);
 
-#endif //MAINFLOWCONTROL_H
+#endif // MAINFLOWCONTROL_H

code/components/jomjol_image_proc/CRotateImage.cpp

@@ -18,50 +18,6 @@ CRotateImage::CRotateImage(std::string _name, CImageBasis *_org, CImageBasis *_t
     doflip = _flip;
 }
 
-
-void CRotateImage::Mirror(){
-    int memsize = width * height * channels;
-    uint8_t* odata;
-    if (ImageTMP)
-    {
-        odata = ImageTMP->RGBImageLock();
-    }
-    else
-    {
-        odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
-    }
-
-
-    int x_source, y_source;
-    stbi_uc* p_target;
-    stbi_uc* p_source;
-
-    RGBImageLock();
-
-    for (int x = 0; x < width; ++x)
-        for (int y = 0; y < height; ++y)
-        {
-            p_target = odata + (channels * (y * width + x));
-
-            x_source = width - x;
-            y_source = y;
-
-            p_source = rgb_image + (channels * (y_source * width + x_source));
-            for (int _channels = 0; _channels < channels; ++_channels)
-                p_target[_channels] = p_source[_channels];
-        }
-
-    //    memcpy(rgb_image, odata, memsize);
-    memCopy(odata, rgb_image, memsize);
-    if (!ImageTMP)
-        free_psram_heap(std::string(TAG) + "->odata", odata);
-
-    if (ImageTMP)
-        ImageTMP->RGBImageRelease();
-
-    RGBImageRelease();
-}
-
 void CRotateImage::Rotate(float _angle, int _centerx, int _centery)
 {
     int org_width, org_height;

code/components/jomjol_image_proc/CRotateImage.h

@@ -23,7 +23,6 @@ class CRotateImage: public CImageBasis
         void RotateAntiAliasing(float _angle, int _centerx, int _centery);
 
         void Translate(int _dx, int _dy);
-        void Mirror();
 };
 
 #endif //CROTATEIMAGE_H

param-docs/expert-params.txt

@@ -1,8 +1,29 @@
-demo
 WaitBeforeTakingPicture
-ImageQuality
-ImageSize
-FixedExposure
+CamFrameSize
+CamGainceiling
+CamQuality
+CamAutoSharpness
+CamSharpness
+CamSpecialEffect
+CamWbMode
+CamAwb
+CamAwbGain
+CamAec
+CamAec2
+CamAeLevel
+CamAecValue
+CamAgc
+CamAgcGain
+CamBpc
+CamWpc
+CamRawGma
+CamLenc
+CamDcw
+CamZoom
+CamZoomSize
+CamZoomOffsetX
+CamZoomOffsetY
+demo
 SearchFieldX
 SearchFieldY
 AlignmentAlgo

param-docs/parameter-pages/TakeImage/CamAeLevel.md

@@ -0,0 +1,15 @@
+# Parameter `CamAeLevel`
+Default Value: `0`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Auto-Exposure Compensation. Lower values produce darker image.
+
+Range (`-2` .. `2`)

param-docs/parameter-pages/TakeImage/CamAec.md

@@ -0,0 +1,13 @@
+# Parameter `CamAec`
+Default Value: `true`
+    
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+      
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Auto-Exposure Control Algorithm

param-docs/parameter-pages/TakeImage/CamAec2.md

@@ -0,0 +1,13 @@
+# Parameter `CamAec2`
+Default Value: `false`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+      
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Switch to "Auto-Exposure Control 2" Algorithm. This may resolve some over-exposure and under-exposure issues.

param-docs/parameter-pages/TakeImage/CamAecValue.md

@@ -0,0 +1,15 @@
+# Parameter `CamAecValue`
+Default Value: `0`
+    
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+      
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+set Manuall-Exposure Control Value
+
+Range (`0` .. `1200`)

param-docs/parameter-pages/TakeImage/CamAgc.md

@@ -0,0 +1,10 @@
+# Parameter `CamAgc`
+Default Value: `true`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+This sets the Automatic Gain Control, how the camera responds to the overall level of light in the image.

param-docs/parameter-pages/TakeImage/CamAgcGain.md

@@ -0,0 +1,13 @@
+# Parameter `CamAgcGain`
+Default Value: ` `
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    This is visible when AGC is off. Gain is an amplification of the values read from the image sensor. 
+
+Range (`0` .. `30`)

param-docs/parameter-pages/TakeImage/CamAutoSharpness.md

@@ -0,0 +1,13 @@
+# Parameter `CamAutoSharpness`
+Default Value: `false`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+      
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+	
+AutoSharpness	

param-docs/parameter-pages/TakeImage/CamAwb.md

@@ -0,0 +1,10 @@
+# Parameter `CamAwb`
+Default Value: ` `
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Auto White Balance

param-docs/parameter-pages/TakeImage/CamAwbGain.md

@@ -0,0 +1,10 @@
+# Parameter `CamAwbGain`
+Default Value: ` `
+    
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+	
+Auto White Balance Gain

param-docs/parameter-pages/TakeImage/CamBpc.md

@@ -0,0 +1,10 @@
+# Parameter `CamBpc`
+Default Value: `true`
+    
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Black Pixel Correction

param-docs/parameter-pages/TakeImage/CamBrightness.md

@@ -0,0 +1,10 @@
+# Parameter `CamBrightness`
+Default Value: `0`
+      
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Image Brightness (`-2` .. `2`) 

param-docs/parameter-pages/TakeImage/CamColorbar.md

@@ -0,0 +1,5 @@
+# Parameter `CamColorbar`
+Default Value: `false`
+    
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!

param-docs/parameter-pages/TakeImage/CamContrast.md

@@ -0,0 +1,11 @@
+# Parameter `CamContrast`
+Default Value: `0`
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Image Contrast (`-2` .. `2`)
+

param-docs/parameter-pages/TakeImage/CamDcw.md

@@ -0,0 +1,13 @@
+# Parameter `CamDcw`
+Default Value: `true`
+    
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    When DCW is on, the image that you receive will be the size that you requested (VGA, QQVGA, etc).
+    When DCW is off, the image that you receive will be one of UXGA, SVGA, or CIF. In other words, literally the actual image size as read from the sensor without any scaling.
+    Note that if DCW is off, and you pick a different image size, this implicitly turns DCW back on again (although this isn't reflected in the options). 

param-docs/parameter-pages/TakeImage/CamDenoise.md

@@ -0,0 +1,10 @@
+# Parameter `CamDenoise`
+Default Value: ` `
+    
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Denoise Image (not supported)

param-docs/parameter-pages/TakeImage/CamGainceiling.md

@@ -0,0 +1,21 @@
+# Parameter `CamGainceiling`
+Default Value: `x2`
+    
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    This is visible when AGC is on.
+
+Available options:
+
+- `x2`
+- `x4`
+- `x8`
+- `x16`
+- `x32`
+- `x64`
+- `x128`

param-docs/parameter-pages/TakeImage/CamHmirror.md

@@ -0,0 +1,10 @@
+# Parameter `CamHmirror`
+Default Value: `false`
+    
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Option for initially mirroring the image on the original x-axis.

param-docs/parameter-pages/TakeImage/CamLenc.md

@@ -0,0 +1,10 @@
+# Parameter `CamLenc`
+Default Value: `true`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Lens Correction

param-docs/parameter-pages/TakeImage/CamQuality.md

@@ -0,0 +1,10 @@
+# Parameter `CamQuality`
+Default Value: `12`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+Quality index for pictures: `8` (highest quality) ... `63` (lowest quality)
+
+!!! Warning
+    Value below 12 could result in system instabilities!

param-docs/parameter-pages/TakeImage/CamRawGma.md

@@ -0,0 +1,10 @@
+# Parameter `CamRawGma`
+Default Value: ` `
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+RawGma

param-docs/parameter-pages/TakeImage/CamSaturation.md

@@ -0,0 +1,11 @@
+# Parameter `CamSaturation`
+Default Value: `0`
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Image Saturation (`-2` .. `2`)
+

param-docs/parameter-pages/TakeImage/CamSharpness.md

@@ -0,0 +1,13 @@
+# Parameter `CamSharpness`
+Default Value: `0`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+      
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Range (`-2` .. `2`)

param-docs/parameter-pages/TakeImage/CamSpecialEffect.md

@@ -0,0 +1,21 @@
+# Parameter `CamSpecialEffect`
+Default Value: `no_effect`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+      
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Available options:
+
+- `no_effect`
+- `negative`
+- `grayscale`
+- `red`
+- `green`
+- `blue`
+- `retro`

param-docs/parameter-pages/TakeImage/CamVflip.md

@@ -0,0 +1,10 @@
+# Parameter `CamVflip`
+Default Value: `false`
+    
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Option for initially flip the image on the original y-axis. 

param-docs/parameter-pages/TakeImage/CamWbMode.md

@@ -0,0 +1,18 @@
+# Parameter `CamWbMode`
+Default Value: `auto`
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+White Balance Mode
+
+Available options:
+
+- `auto`
+- `sunny`
+- `cloudy`
+- `office`
+- `home`

param-docs/parameter-pages/TakeImage/CamWpc.md

@@ -0,0 +1,10 @@
+# Parameter `CamWpc`
+Default Value: `true`
+    
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+White Pixel Correction

param-docs/parameter-pages/TakeImage/CamZoom.md

@@ -0,0 +1,13 @@
+# Parameter `CamZoom`
+Default Value: `false`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Crop the camera sensor frame to `ImageSize` resolution instead of scaling it down.

param-docs/parameter-pages/TakeImage/CamZoomOffsetX.md

@@ -0,0 +1,14 @@
+# Parameter `CamZoomOffsetX`
+Default Value: `0`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+`ZoomOffsetX` only applies when `Zoom` is enabled.
+X coordinate of the crop location within the camera sensor frame.

param-docs/parameter-pages/TakeImage/CamZoomOffsetY.md

@@ -0,0 +1,14 @@
+# Parameter `CamZoomOffsetY`
+Default Value: `0`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+`ZoomOffsetY` only applies when `Zoom` is enabled.
+Y coordinate of the crop location within the camera sensor frame.

param-docs/parameter-pages/TakeImage/CamZoomSize.md

@@ -0,0 +1,13 @@
+# Parameter `CamZoomSize`
+Default Value: `0`
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
+
+!!! Note
+    After changing this parameter you need to update your reference image and alignment markers!
+
+`CamZoomSize` only applies when `Zoom` is enabled.

sd-card/config/config.ini

@@ -1,23 +1,36 @@
 [TakeImage]
 ;RawImagesLocation = /log/source
-WaitBeforeTakingPicture = 5
 ;RawImagesRetention = 15
-Brightness = 0
-Contrast = 0
-Saturation = 0
-Sharpness = 0
+WaitBeforeTakingPicture = 2
+CamGainceiling = x4
+CamQuality = 8
+CamBrightness = 0
+CamContrast = 0
+CamSaturation = 0
+CamSharpness = 1
+CamAutoSharpness = false
+CamSpecialEffect = no_effect
+CamWbMode = auto
+CamAwb = true
+CamAwbGain = true
+CamAec = true
+CamAec2 = true
+CamAeLevel = 2
+CamAecValue = 500
+CamAgc = true
+CamAgcGain = 0
+CamBpc = true
+CamWpc = true
+CamRawGma = true
+CamLenc = true
+CamHmirror = false
+CamVflip = false
+CamDcw = true
+CamZoom = false
+CamZoomOffsetX = 0
+CamZoomOffsetY = 0
+CamZoomSize = 0
 LEDIntensity = 50
-ImageQuality = 12
-ImageSize = VGA
-Zoom = false
-ZoomMode = 0
-ZoomOffsetX = 0
-ZoomOffsetY = 0
-Grayscale = false
-Negative = false
-Aec2 = false
-AutoExposureLevel = 0
-FixedExposure = false
 Demo = false
 
 [Alignment]

sd-card/html/edit_alignment.html

@@ -118,6 +118,7 @@
 			<col span="1" style="width: 33.3%;">
 			<col span="1" style="width: 33.3%;">
 		</colgroup>
+	
 		<tr>
 			<td>Marker: 
 				<select id="index" name="reference" onchange="ChangeSelection()">
@@ -127,36 +128,42 @@
 			</td>
 			<td colspan="2" style="padding-left: 22px; color: grey;">Filename: <output type="text" name="name" id="name" onchange="namechanged()"></td>
 		</tr>
+	  
 		<tr>
 			<td style="padding-top: 10px">x: <input type="number" name="refx" id="refx" step=1 onchange="valuemanualchanged()"></td>
 			<td style="padding-top: 10px">dx: <input type="number" name="refdx" id="refdx" step=1 onchange="valuemanualchanged()"></td>
 			<td rowspan="2" style="padding-top: 10px;"><input class="button" type="button" value="Update Marker" onclick="CutOutReference()"></td>	
 		</tr>
+	  
 		<tr>
 			<td>y: <input type="number" name="refy" id="refy" step=1 onchange="valuemanualchanged()"></td>
 			<td>dy: <input type="number" name="refdy" id="refdy" step=1 onchange="valuemanualchanged()"></td>
 		</tr>
+	  
 		<tr>
 			<td style="vertical-align: bottom;">Selected Image Area:</td>
 			<td style="vertical-align: bottom;">Resulting Marker:</td>
 			<td><input class="button" type="button" id="enhancecontrast" value="Enhance Image Contrast" onclick="EnhanceContrast()"></td>	
 		</tr> 
+	  
 		<tr>
 			<td style="height:70px; vertical-align: top;"><img id="img_ref_org" src = ""></td>    <!--/img_tmp/ref_zw_org.jpg-->
 			<td style="height:70px; vertical-align: top;"><img id="img_ref" src = ""></td>        <!--/img_tmp/ref_zw.jpg-->
 		</tr>
+	  
 		<tr>
 			<td style="vertical-align:bottom;"><b>Reference Image:</b></td>
 			<td></td>
-            <td><input style="font-weight:bold;" class="button" type="submit" name="saveroi" id="savemarker" onclick="SaveToConfig()" value="Save New Marker">
+			<td>
+				<input style="font-weight:bold;" class="button" type="submit" name="saveroi" id="savemarker" onclick="SaveToConfig()" value="Save New Marker">
 			</td>
 		</tr>
+	  
 		<tr>
 			<td colspan="3"><canvas id="canvas" crossorigin></canvas></td>
 		</tr>
 	</table>
 
-
 <script type="text/javascript" src="common.js?v=$COMMIT_HASH"></script> 
 <script type="text/javascript" src="readconfigcommon.js?v=$COMMIT_HASH"></script>
 <script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>  
@@ -173,6 +180,7 @@ var canvas = document.getElementById('canvas'),
     domainname = getDomainname(),
 	neueref1,
 	neueref2,
+	cofcat,	
     param;
     
 function doReboot() {
@@ -290,8 +298,7 @@ function UpdateReference(){
         draw();
     }
 
-    _filenameurl = refInfo[aktindex]["name"].replace("/config/", "/img_tmp/");
-
+    var _filenameurl = refInfo[aktindex]["name"].replace("/config/", "/img_tmp/");
     var url = domainname + "/fileserver" + _filenameurl + "?"  + Date.now();
     document.getElementById("img_ref").src = url;
 
@@ -352,7 +359,7 @@ function openDescription() {
     if(window.location.hash) {
         var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character
         if(hash == 'description') {
-            document.getElementById("desc_details").open = true;
+            document.getElementById("desc_details").open = false;
 		}
     }
 }
@@ -368,7 +375,7 @@ function LoadReference(){
         draw();
     }
 
-    _filenameurl = refInfo[aktindex]["name"];
+    var _filenameurl = refInfo[aktindex]["name"];
     var url = domainname + "/fileserver" + _filenameurl + "?"  + Date.now();
     document.getElementById("img_ref").src = url;
 	
@@ -387,9 +394,15 @@ function LoadReference(){
 function init() {
     openDescription();
     domainname = getDomainname();
-    loadConfig(domainname); 
+	
+    if (!loadConfig(domainname)) {
+		firework.launch('Configuration could not be loaded! Please reload the page!', 'danger', 30000);
+		return;
+    }
+
     ParseConfig();
     param = getConfigParameters();
+	cofcat = getConfigCategory();
 
     document.getElementById("savemarker").disabled = true;
     document.getElementById("enhancecontrast").disabled = true;
@@ -405,6 +418,7 @@ function init() {
     //UpdateReference();
 	LoadReference();
     drawImage();
+	draw();
 }
 
 function drawImage(){

sd-card/html/edit_analog.html

@@ -125,7 +125,6 @@
 
 
 <div id="div1">
-
     <table>
         <colgroup>
             <col span="1" style="width: 22%;">
@@ -133,9 +132,11 @@
             <col span="1" style="width: 26%;">
             <col span="1" style="width: 26%;">
         </colgroup>
+		
         <tr>
             <td colspan="4" style="padding: 0px"><class id="Numbers_text" style="color:black;">Number Sequence:</class></td>
         </tr>
+		
         <tr>
             <td>
                 <select id="Numbers_value1" onchange="numberChanged()">
@@ -156,15 +157,18 @@
             <col span="1" style="width: 26%;">
             <col span="1" style="width: 26%;">
         </colgroup>
+		
         <tr>
             <td style="padding: 0px">ROI:</td>
         </tr>
+		
         <tr>
             <td><select id="index" name="index" onchange="ChangeSelection()" tabindex=1></select></td>
             <td><input class="button" type="submit" id="newROI" name="newROI" onclick="newROI()" value="New ROI"></td>
             <td><input class="button" type="submit" id="renameROI" name="renameROI" onclick="renameROI()" value="Rename ROI"></td>	  
             <td><input class="button" type="submit" id="deleteROI" name="deleteROI" onclick="deleteROI()" value="Delete ROI"></td>
         </tr>
+		
         <tr>       
             <td class="multiplier">Multiplier: <output type="text" id="multiplier" name="multiplier"></output><br>
                 (only based on order)
@@ -183,14 +187,17 @@
             <col span="1" style="width: 18%;">
             <col span="1" style="width: 64%;">
         </colgroup>
+		
         <tr>
             <td>x: <input type="number" name="refx" id="refx" step=1 onchange="valuemanualchanged()" tabindex=2></td>	  
             <td>Δx: <input type="number" name="refdx" id="refdx" step=1 onchange="valuemanualchangeddx()" tabindex=4></td>
         </tr>
+		
         <tr>
             <td>y: <input type="number" name="refy" id="refy" step=1 onchange="valuemanualchanged()" tabindex=3></td>	
             <td>Δy: <input type="number" name="refdy" id="refdy" step=1 onchange="valuemanualchanged()" tabindex=5></td>
         </tr>
+		
         <tr>
             <td colspan="3"><input type="checkbox" id="CCW" name="CCW" value="0" onclick="changeCCW()" unchecked tabindex=8><label for="CCW">Counter clockwise rotation (CCW)</label></td>
         </tr>		
@@ -202,7 +209,6 @@ The following settings are only used for easier setup, they are <b>not</b> persi
 <input type="checkbox" id="showall" name="showall" value="1" onclick="draw()" checked tabindex=9><label for="showall">Show all ROIs</label><br>
 <input type="checkbox" id="lockAspectRatio" name="lockAspectRatio" value="1" onclick="changelockAspectRatio()" checked tabindex=6><label for="lockAspectRatio"> Lock aspect ratio </label><br>
 <input type="checkbox" id="lockSizes" name="lockSizes" value="1" onclick="changelockSizes()" checked tabindex=7><label for="lockSizes"> Synchronize y, Δx and Δy between ROIs</label><br>
-
 <hr>
 
     <table>
@@ -212,20 +218,23 @@ The following settings are only used for easier setup, they are <b>not</b> persi
             <col span="1" style="width: 26%;">
             <col span="1" style="width: 26%;">
         </colgroup>
+		
         <tr>
             <td colspan="3" style="vertical-align: bottom;"><b>Reference Image:</b></td>
-            <!---<td><button class="button" id="reboot" type="button" onclick="doReboot()">Reboot device</button></td>-->
-            <td><input style="font-weight:bold;" class="button" type="submit" id="saveroi" name="saveroi" onclick="SaveToConfig()" value="Save Config" tabindex=10></td>
+            <td>
+				<input style="font-weight:bold;" class="button" type="submit" id="saveroi" name="saveroi" onclick="SaveToConfig()" value="Save Config" tabindex=10>
+			</td>
         </tr>
+		
         <tr>
             <td colspan="4"><canvas id="canvas" crossorigin></canvas></td>
         </tr>
     </table>
 
-
     <script type="text/javascript" src="common.js?v=$COMMIT_HASH"></script> 
     <script type="text/javascript" src="readconfigcommon.js?v=$COMMIT_HASH"></script>
     <script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
+	<script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script>
     
 <script language="JavaScript">
     var canvas = document.getElementById('canvas'),
@@ -595,7 +604,7 @@ The following settings are only used for easier setup, they are <b>not</b> persi
         if(window.location.hash) {
             var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character
             if(hash == 'description') {
-                document.getElementById("desc_details").open = true;
+                document.getElementById("desc_details").open = false;
             }
         }
     }
@@ -603,18 +612,26 @@ The following settings are only used for easier setup, they are <b>not</b> persi
     function init() {
         openDescription();
         domainname = getDomainname();
+		
+		if (!loadConfig(domainname)) {
+			firework.launch('Configuration could not be loaded! Please reload the page!', 'danger', 30000);
+			return;
+		}
+	
+        ParseConfig();
+        param = getConfigParameters(); 
+        cofcat = getConfigCategory();
+		
         canvas.addEventListener('mousedown', mouseDown, false);
         canvas.addEventListener('mouseup', mouseUp, false);
         canvas.addEventListener('mousemove', mouseMove, false);
         loadCanvas(domainname + "/fileserver/config/reference.jpg");		
-        loadConfig(domainname); 
-        ParseConfig();
-        param = getConfigParameters(); 
-        cofcat = getConfigCategory();
+		
         UpdateNUMBERS();
 
         /* Check if the ROIs have same dy and dx. If so, tick the sync checkbox */
         var all_dx_dy_Identical = true;
+		
         if (ROIInfo.length > 1) {
             for (var i = 1; i < (ROIInfo.length); ++i) { // 2nd .. last ROI
                 if (parseInt(ROIInfo[i].dx) != parseInt(ROIInfo[0].dx) || parseInt(ROIInfo[i].dy) != parseInt(ROIInfo[0].dy)) { 

sd-card/html/edit_digits.html

@@ -11,7 +11,7 @@
         p {font-size: 1em;}
 
         input[type=number] {
-            width: 40px;
+            width: 60px;
             margin-right: 10px;
             padding: 3px 5px;
             display: inline-block;
@@ -123,17 +123,25 @@
             <col span="1" style="width: 26%;">
             <col span="1" style="width: 26%;">
         </colgroup>
+		
         <tr>
             <td colspan="4" style="padding: 0px"><class id="Numbers_text" style="color:black;">Number Sequence:</class></td>
         </tr>
+		
         <tr>
             <td>
                 <select id="Numbers_value1" onchange="numberChanged()">
                 </select>
             </td>
-            <td><input class="button" type="submit" id="newNumber" name="newNumber" onclick="newNumber()" value="New Sequence"></td>
-            <td><input class="button" type="submit" id="renameNumber" name="renameNumber" onclick="renameNumber()" value="Rename Sequence"></td> 
-            <td><input class="button" type="submit" id="removeNumber" name="removeNumber" onclick="removeNumber()" value="Delete Sequence"></td>
+            <td>
+				<input class="button" type="submit" id="newNumber" name="newNumber" onclick="newNumber()" value="New Sequence">
+			</td>
+            <td>
+				<input class="button" type="submit" id="renameNumber" name="renameNumber" onclick="renameNumber()" value="Rename Sequence">
+			</td> 
+            <td>
+				<input class="button" type="submit" id="removeNumber" name="removeNumber" onclick="removeNumber()" value="Delete Sequence">
+			</td>
         </tr>
     </table>
 
@@ -146,15 +154,26 @@
             <col span="1" style="width: 26%;">
             <col span="1" style="width: 26%;">
         </colgroup>
+		
         <tr>
             <td style="padding: 0px">ROI:</td>
         </tr>
+		
         <tr>
-            <td><select id="index" name="index" onchange="ChangeSelection()" tabindex=1></select></td>
-            <td><input class="button" type="submit" id="newROI" name="newROI" onclick="newROI()" value="New ROI"></td>
-            <td><input class="button" type="submit" id="renameROI" name="renameROI" onclick="renameROI()" value="Rename ROI"></td>	  
-            <td><input class="button" type="submit" id="deleteROI" name="deleteROI" onclick="deleteROI()" value="Delete ROI"></td>
+            <td>
+				<select id="index" name="index" onchange="ChangeSelection()" tabindex=1></select>
+			</td>
+            <td>
+				<input class="button" type="submit" id="newROI" name="newROI" onclick="newROI()" value="New ROI">
+			</td>
+            <td>
+				<input class="button" type="submit" id="renameROI" name="renameROI" onclick="renameROI()" value="Rename ROI">
+			</td>	  
+            <td>
+				<input class="button" type="submit" id="deleteROI" name="deleteROI" onclick="deleteROI()" value="Delete ROI">
+			</td>
         </tr>
+		
         <tr>       
             <td class="multiplier">Multiplier: <output type="text" id="multiplier" name="multiplier"></output><br>
                 (only based on order)
@@ -162,8 +181,12 @@
             <td class="multiplier">Multiplier: <output type="text" id="multiplier_decshift" name="multiplier_decshift"></output><br>
                 (order + decimal shift: <output type="text" id="decimalShift" name="decimalShift"></output>)
             </td>
-            <td><input class="button" type="submit" id="movePrevious" onclick="movePrevious()" value="Move ROI Higher"></td> 
-            <td><input class="button" type="submit" id="moveNext" onclick="moveNext()" value="Move ROI Lower"></td>
+            <td>
+				<input class="button" type="submit" id="movePrevious" onclick="movePrevious()" value="Move ROI Higher">
+			</td> 
+            <td>
+				<input class="button" type="submit" id="moveNext" onclick="moveNext()" value="Move ROI Lower">
+			</td>
         </tr>
     </table>
 
@@ -173,10 +196,12 @@
             <col span="1" style="width: 18%;">
             <col span="1" style="width: 64%;">
         </colgroup>
+		
         <tr>
             <td>x: <input type="number" name="refx" id="refx" step=1 onchange="valuemanualchanged()" tabindex=2></td>	  
             <td>Δx: <input type="number" name="refdx" id="refdx" step=1 onchange="valuemanualchangeddx()" tabindex=4></td>
         </tr>
+		
         <tr>
             <td>y: <input type="number" name="refy" id="refy" step=1 onchange="valuemanualchanged()" tabindex=3></td>	
             <td>Δy: <input type="number" name="refdy" id="refdy" step=1 onchange="valuemanualchanged()" tabindex=5></td>
@@ -186,11 +211,11 @@
 
 
 <hr>
-The following settings are only used for easier setup, they are <b>not</b> persisted on the device:<br>
-<input type="checkbox" id="showall" name="showall" value="1" onclick="draw()" checked tabindex=10><label for="showall">Show all ROIs</label><br>
-<input type="checkbox" id="lockAspectRatio" name="lockAspectRatio" value="1" onclick="changelockAspectRatio()" checked tabindex=6><label for="lockAspectRatio"> Lock aspect ratio </label><br>
-<input type="checkbox" id="lockSizes" name="lockSizes" value="1" onclick="changelockSizes()" checked tabindex=7><label for="lockSizes"> Synchronize y, Δx and Δy between ROIs</label><br>
-<input type="checkbox" id="lockSpaceEquidistant" name="lockSpaceEquidistant" value="1" onclick="changeLockSpaceEquidistant()" checked tabindex=8>
+	The following settings are only used for easier setup, they are <b>not</b> persisted on the device:<br>
+	<input type="checkbox" id="showall" name="showall" value="1" onclick="draw()" checked tabindex=10><label for="showall">Show all ROIs</label><br>
+	<input type="checkbox" id="lockAspectRatio" name="lockAspectRatio" value="1" onclick="changelockAspectRatio()" checked tabindex=6><label for="lockAspectRatio"> Lock aspect ratio </label><br>
+	<input type="checkbox" id="lockSizes" name="lockSizes" value="1" onclick="changelockSizes()" checked tabindex=7><label for="lockSizes"> Synchronize y, Δx and Δy between ROIs</label><br>
+	<input type="checkbox" id="lockSpaceEquidistant" name="lockSpaceEquidistant" value="1" onclick="changeLockSpaceEquidistant()" checked tabindex=8>
     <label for="lockSpaceEquidistant">Keep equidistance of <input type="number" name="space" id="space" maxlength="2" max=99 step=1 onchange="valuemanualchangedspace()" tabindex=9> between all ROIs</label><br>
 <hr>
 
@@ -201,10 +226,14 @@ The following settings are only used for easier setup, they are <b>not</b> persi
             <col span="1" style="width: 26%;">
             <col span="1" style="width: 26%;">
         </colgroup>
+		
         <tr>
             <td colspan="3" style="vertical-align: bottom;"><b>Reference Image:</b></td>
-            <td><input style="font-weight:bold;" class="button" type="submit" id="saveroi" name="saveroi" onclick="SaveToConfig()" value="Save Config" tabindex=11></td>
+            <td>
+				<input style="font-weight:bold;" class="button" type="submit" id="saveroi" name="saveroi" onclick="SaveToConfig()" value="Save Config" tabindex=11>
+			</td>
         </tr>
+		
         <tr>
             <td colspan="4"><canvas id="canvas" crossorigin></canvas></td>
         </tr>
@@ -491,6 +520,7 @@ The following settings are only used for easier setup, they are <b>not</b> persi
         }
 
         var _index = document.getElementById("index");
+		
         while (_index.length){
             _index.remove(0);
         }
@@ -582,7 +612,7 @@ The following settings are only used for easier setup, they are <b>not</b> persi
         if(window.location.hash) {
             var hash = window.location.hash.substring(1); //Puts hash in variable, and removes the # character
             if(hash == 'description') {
-                document.getElementById("desc_details").open = true;
+                document.getElementById("desc_details").open = false;
             }
         }
     }
@@ -590,14 +620,21 @@ The following settings are only used for easier setup, they are <b>not</b> persi
     function init() {
         openDescription();
         domainname = getDomainname();
+		
+		if (!loadConfig(domainname)) {
+			firework.launch('Configuration could not be loaded! Please reload the page!', 'danger', 30000);
+			return;
+		}
+		
+        ParseConfig();
+        param = getConfigParameters(); 
+        cofcat = getConfigCategory();
+		
         canvas.addEventListener('mousedown', mouseDown, false);
         canvas.addEventListener('mouseup', mouseUp, false);
         canvas.addEventListener('mousemove', mouseMove, false);
         loadCanvas(domainname + "/fileserver/config/reference.jpg");		
-        loadConfig(domainname); 
-        ParseConfig();
-        param = getConfigParameters(); 
-        cofcat = getConfigCategory();
+		
         UpdateNUMBERS();
 
         /* Check if the ROIs are equidistant. Only if not, untick the checkbox */
@@ -717,6 +754,7 @@ The following settings are only used for easier setup, they are <b>not</b> persi
         }
 
         erg = CreateNUMBER(_numbernew);
+		
         if (erg != "") {
             firework.launch(erg, 'danger', 30000);
         }
@@ -844,14 +882,17 @@ The following settings are only used for easier setup, they are <b>not</b> persi
 
     function mouseUp() {
         drag = false;
+		
         if (rect.w < 0) {
             rect.w = -rect.w
             rect.startX-=rect.w
         }
+		
         if (rect.h < 0) {
             rect.h = -rect.h
             rect.startY-=rect.h
         }
+		
         document.getElementById("refdx").value = rect.w;
         document.getElementById("refdy").value = rect.h;
         document.getElementById("refx").value = rect.startX;
@@ -876,10 +917,12 @@ The following settings are only used for easier setup, they are <b>not</b> persi
             }
             document.getElementById("refdx").value = rect.w;
             document.getElementById("refdy").value = rect.h;
+			
             draw();
         }
         else {
             draw();
+			
             var canvas = document.getElementById('canvas');
             var context = canvas.getContext('2d');
 
@@ -915,10 +958,10 @@ The following settings are only used for easier setup, they are <b>not</b> persi
             rect.startX = document.getElementById("refx").value;
             rect.startY = document.getElementById("refy").value; 
 
-            draw();   
             if (lockSpaceEquidistant) {
                 makeX_SpaceEquidistant();
             }
+			
             draw();      
         }
         document.getElementById("saveroi").disabled = false;
@@ -990,11 +1033,13 @@ The following settings are only used for easier setup, they are <b>not</b> persi
         _roialt= sel.options[sel.selectedIndex].text;
 
         var _roinew = prompt("Please enter a new name for the selected ROI", _roialt);
+		
         if (_roinew === null) {
             return; //break out of the function early because prompt was aborted
         }
 
         erg = RenameROI(_number, "digit", _roialt, _roinew);
+		
         if (erg != "") {
             firework.launch(erg, 'danger', 30000);
         }

sd-card/html/index.html

@@ -29,13 +29,13 @@
         function loadPage(page) {
             console.log("loadPage( " + page + " )");
 
-            if (streamPopup)   // Ensure that stream popup is closed because it's blocking web interface
+            if (streamPopup) {  // Ensure that stream popup is closed because it's blocking web interface
                 streamPopup.close();
+			}
 
             asyncPageLoad(page);
         }
 
-
         async function asyncPageLoad(page ) {
             console.log("  loading " + page + " ...");
             document.cookie = "page="+page + "; path=/";
@@ -46,7 +46,6 @@
             });
         }
 
-
         function resetMenu() {
             [].forEach.call(document.querySelectorAll('.submenu'), function (el) {
                 el.style.visibility = 'visible';
@@ -59,9 +58,11 @@
 			let ca = decodedCookie.split(';');
 			for(let i = 0; i <ca.length; i++) {
 				let c = ca[i];
+				
 				while (c.charAt(0) == ' ') {
 					c = c.substring(1);
 				}
+				
 				if (c.indexOf(name) == 0) {
 					return c.substring(name.length, c.length);
 				}
@@ -181,19 +182,18 @@
     }
     */
 
-
     function HA_send_discovery_visibility()	{
 		loadConfig(domainname); 
 		ParseConfig();
 		category = getConfigCategory();
         param = getConfigParameters();
-		if (category["MQTT"]["enabled"] && param["MQTT"]["HomeassistantDiscovery"]["value1"] == "true") {
+		
+		if (category["MQTT"]["enabled"] && param["MQTT"]["HomeassistantDiscovery"].value == "true") {
             document.getElementById("ManualControl").style.display="";
             document.getElementById("HASendDiscovery").style.display="";
         }
 	}
 
-
     function HA_send_discovery() {
     console.log("HA Discovery scheduled");
     var url = getDomainname() + '/mqtt_publish_discovery'; 
@@ -207,15 +207,17 @@
 		xhttp.send();
     }
 
-
     function start_livestream(streamFlashlight) {
-        if (streamPopup) 
+        if (streamPopup) {
             streamPopup.close();
+		}
 
-        if (streamFlashlight)
+        if (streamFlashlight) {
             streamPopup = window.open(getDomainname() + '/stream?flashlight=true','LivestreamWithlight',streamWindowFeatures);
-        else
+		}
+        else {
             streamPopup = window.open(getDomainname() + '/stream','Livestream',streamWindowFeatures);
+		}
 
         streamPopup.focus();
     }

sd-card/html/overview.html

@@ -5,13 +5,64 @@
 <meta charset="UTF-8" />
 
 <style>
-.tg  {border-collapse:collapse;border-spacing:0;width:100%;min-width:600px;height:100%;color:darkslategray;}
-.tg th{min-width:325px;width:325px;height:20px;font-size:18px;text-align:left;font-weight:bold;padding:5px 10px 5px 10px;;overflow:hidden;word-break:normal;background-color:lightgrey;}
-.tg td{font-size:15px;padding:5px 10px 5px 10px;overflow:hidden;word-break:normal;}
-.tg .tg-1{font-size:15px;vertical-align: top; font-family:Arial, Helvetica, sans-serif !important;}
-.tg .tg-2{height:52px;font-size:15px;padding:3px 0px 3px 10px;vertical-align:middle;font-family:Arial, Helvetica, sans-serif !important;}
-.tg .tg-3{height:45px;font-size:15px;padding:3px 10px 3px 10px;vertical-align:middle;font-family:Arial, Helvetica, sans-serif !important;}
-.tg .tg-4{height:fit-content;font-size:15px;padding:5px 10px 5px 10px;vertical-align:text-top;font-family:Arial, Helvetica, sans-serif !important;}
+.tg  {
+	border-collapse:collapse;
+	border-spacing:0;
+	width:100%;
+	min-width:600px;
+	height:100%;
+	color:darkslategray;
+	}
+	
+.tg th{
+	min-width:325px;
+	width:325px;
+	height:20px;
+	font-size:18px;
+	text-align:left;
+	font-weight:bold;
+	padding:5px 10px 5px 10px;
+	overflow:hidden;
+	word-break:normal;
+	background-color:lightgrey;
+	}
+
+.tg td{
+	font-size:15px;
+	padding:5px 10px 5px 10px;
+	overflow:hidden;
+	word-break:normal;
+	}
+
+.tg .tg-1{
+	font-size:15px;
+	vertical-align: top;
+	font-family:Arial, Helvetica, sans-serif !important;
+	}
+
+.tg .tg-2{
+	height:52px;
+	font-size:15px;
+	padding:3px 0px 3px 10px;
+	vertical-align:middle;
+	font-family:Arial, Helvetica, sans-serif !important;
+	}
+
+.tg .tg-3{
+	height:45px;
+	font-size:15px;
+	padding:3px 10px 3px 10px;
+	vertical-align:middle;
+	font-family:Arial, Helvetica, sans-serif !important;
+	}
+
+.tg .tg-4{
+	height:fit-content;
+	font-size:15px;
+	padding:5px 10px 5px 10px;
+	vertical-align:text-top;
+	font-family:Arial, Helvetica, sans-serif !important;
+	}
 </style>
 
 </head>
@@ -78,13 +129,12 @@
 		</tr>
 	</table>
 
-
 	<script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script>
 	<script type="text/javascript" src="common.js?v=$COMMIT_HASH"></script> 
 	<script type="text/javascript" src="readconfigcommon.js?v=$COMMIT_HASH"></script>
 	<script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
-	<script type="text/javascript">
 	
+	<script type="text/javascript">
 		function addZero(i) {
 			if (i < 10) {
 				i = "0" + i;
@@ -92,13 +142,11 @@
 			return i;
 		}
 
-
 		$(document).ready(function() {
 			LoadData();
 			LoadROIImage();
 		});
 
-
 		function LoadData(){
 			loadValue("value", "value", "border-collapse: collapse; width: 100%");
 			loadValue("raw", "raw", "border-collapse: collapse; width: 100%");
@@ -111,7 +159,6 @@
 			loadRoundCounter();
 		}
 
-
 		function LoadROIImage(){
 			var d = new Date();
 			var timestamp = d.getTime();
@@ -122,7 +169,6 @@
 			$('#timestamp').html("Last Page Refresh:" + (h + ":" + m + ":" + s));
 		}
 
-
 		function Refresh() {
 			setTimeout (function() {
 				LoadData();
@@ -131,7 +177,6 @@
 			}, 300000);
 		}
 
-
 		function loadStatus() {
 			url = domainname + '/statusflow';     
 			var xhttp = new XMLHttpRequest();
@@ -141,11 +186,11 @@
 					$('#statusflow').html(_rsp);
 				}
 			}
+			
 			xhttp.open("GET", url, true);
 			xhttp.send();
 		}
 
-
 		function loadCPUTemp() {
 			url = domainname + '/cpu_temperature';     
 			var xhttp = new XMLHttpRequest();
@@ -155,11 +200,11 @@
 					$('#cputemp').html("CPU Temperature: " +_rsp + "°C");
 				}
 			}
+			
 			xhttp.open("GET", url, true);
 			xhttp.send();
 		}
 
-
 		function loadRSSI() {
 			url = domainname + '/rssi';     
 			var xhttp = new XMLHttpRequest();
@@ -184,11 +229,11 @@
 					}
 				}
 			}
+			
 			xhttp.open("GET", url, true);
 			xhttp.send();		
 		}
 
-
 		function loadUptime() {
 			url = domainname + '/uptime';     
 			var xhttp = new XMLHttpRequest();
@@ -198,11 +243,11 @@
 					$('#uptime').html("Uptime: " + _rsp);
 				}
 			}
+			
 			xhttp.open("GET", url, true);
 			xhttp.send();
 		}
 
-
 		function loadRoundCounter() {
 			url = domainname + '/info?type=Round';     
 			var xhttp = new XMLHttpRequest();
@@ -212,11 +257,11 @@
 					$('#round').html("(Round: " + _rsp + ")");
 				}
 			}
+			
 			xhttp.open("GET", url, true);
 			xhttp.send();
 		}
 
-	
 		function loadValue(_type, _div, _style) {
 			url = domainname + '/value?all=true&type=' + _type;     
 			var xhttp = new XMLHttpRequest();
@@ -224,65 +269,59 @@
 				if (this.readyState == 4 && this.status == 200) {
 					var _rsp = xhttp.responseText;
 					var _split = _rsp.split("\r");
-			if (typeof _style == undefined)
-				out = "<table>";
-			else
-				out = "<table style=\"" + _style + "\">";
 					
-			if (_split.length == 1)
-			{
+					if (typeof _style == undefined) {
+						out = "<table>";
+					}
+					else {
+						out = "<table style=\"" + _style + "\">";
+					}
+
+					if (_split.length == 1) {
 						var _zer = ZerlegeZeile(_split[0], "\t")
-				if (_zer.length > 1)
+					
+						if (_zer.length > 1) {
 							out = _zer[1];
-				else
+						}
+						else {
 							out = "";
 						}
-			else
-			{
-				for (var j = 0; j < _split.length; ++j)
-				{
+					}
+					else {
+						for (var j = 0; j < _split.length; ++j) {
 							var _zer = ZerlegeZeile(_split[j], "\t")
-					if (_zer.length == 1)
+						
+							if (_zer.length == 1) {
 								out = out + "<tr><td style=\"width: 22%; padding: 3px 5px; text-align: left; vertical-align:middle; border: 1px solid lightgrey\">" + 
 								_zer[0] + "</td><td style=\"padding: 3px 5px; text-align: left; vertical-align:middle; border: 1px solid lightgrey\"> </td></tr>"; 
-					else
+							}
+							else {
 								out = out + "<tr><td style=\"width: 22%; padding: 3px 5px; text-align: left; vertical-align:middle; border: 1px solid lightgrey\">" + 
 								_zer[0] + "</td><td style=\"padding: 3px 5px; text-align: left; vertical-align:middle; border: 1px solid lightgrey\" >" + _zer[1] + "</td></tr>";
 							}
+						}
 						out = out + "</table>"
-
 					}
 				document.getElementById(_div).innerHTML = out;
 				}
 			};
+			
 			xhttp.open("GET", url, true);
 			xhttp.send();		
 		}
 
-
-	function setImageMaxWidth()
-	{
+		function setImageMaxWidth() {
 			loadConfig(domainname); 
 			ParseConfig();
 			param = getConfigParameters();
-		if(param["TakeImage"]["ImageSize"]["value1"] == "QVGA") {
-			if (param["Alignment"]["FlipImageSize"]["value1"] == "false") {
+			
+			if(param["TakeImage"]["CamFrameSize"].value == "QVGA") {
 				document.getElementById("img").style.maxWidth = "320px";
 			}
 			else {
-				document.getElementById("img").style.maxWidth = "240px";
-			}
-		}
-		else {
-			if (param["Alignment"]["FlipImageSize"]["value1"] == "false") { 
 				document.getElementById("img").style.maxWidth = "640px";
 			}
-			else {
-				document.getElementById("img").style.maxWidth = "480px";
 		}
-		}
-	}
-
 
 		function init(){
 			domainname = getDomainname();
@@ -290,9 +329,8 @@
 			Refresh();
 		}
 
-	
 		init();
 
-</script>
+	</script>
 </body>
 </html>

sd-card/html/readconfigcommon.js

@@ -1,11 +1,13 @@
 function SaveConfigToServer(_domainname){
      // leere Zeilen am Ende löschen
      var zw = config_split.length - 1;
+	 
      while (config_split[zw] == "") {
           config_split.pop();
      }
 
      var config_gesamt = "";
+	 
      for (var i = 0; i < config_split.length; ++i)
      {
           config_gesamt = config_gesamt + config_split[i] + "\n";
@@ -26,21 +28,23 @@ function UpdateConfig(zw, _index, _enhance, _domainname){
 
 function createReader(file) {
      var image = new Image();
+	 
      reader.onload = function(evt) {
          var image = new Image();
+		 
          image.onload = function(evt) {
              var width = this.width;
              var height = this.height;
-             //alert (width); // will produce something like 198
          };
+		 
          image.src = evt.target.result; 
      };
+	 
      reader.readAsDataURL(file);
  }
 
 
-function ZerlegeZeile(input, delimiter = " =\t\r")
-     {
+function ZerlegeZeile(input, delimiter = " =\t\r") {
     var Output = Array(0);
 //          delimiter = " =,\t";
      
@@ -68,6 +72,7 @@ function ZerlegeZeile(input, delimiter = " =\t\r")
         input = trim(input, delimiter);
         var pos = findDelimiterPos(input, delimiter);
         var token;
+        
 		while (pos > -1) {
             token = input.substr(0, pos);
             token = trim(token, delimiter);
@@ -76,101 +81,96 @@ function ZerlegeZeile(input, delimiter = " =\t\r")
             input = trim(input, delimiter);
             pos = findDelimiterPos(input, delimiter);
         }
+        
 		Output.push(input);
     }
      
     return Output;
-     }    
+}    
 
 
-function findDelimiterPos(input, delimiter)
-     {
+function findDelimiterPos(input, delimiter) {
     var pos = -1;
     var zw;
     var akt_del;
      
-          for (var anz = 0; anz < delimiter.length; ++anz)
-          {
+    for (var anz = 0; anz < delimiter.length; ++anz) {
         akt_del = delimiter[anz];
         zw = input.indexOf(akt_del);
-               if (zw > -1)
-               {
-                    if (pos > -1)
-                    {
-                         if (zw < pos)
-                              pos = zw;
-                    }
-                    else
+        
+		if (zw > -1) {
+            if (pos > -1) {
+                if (zw < pos) {
                     pos = zw;
 				}
             }
+            else {
+                pos = zw;
+			}
+        }
+    }
+    
 	return pos;
-     }
+}
      
 
-function trim(istring, adddelimiter)
-     {
-          while ((istring.length > 0) && (adddelimiter.indexOf(istring[0]) >= 0)){
+function trim(istring, adddelimiter) {
+    while ((istring.length > 0) && (adddelimiter.indexOf(istring[0]) >= 0)) {
         istring = istring.substr(1, istring.length-1);
     }
           
-          while ((istring.length > 0) && (adddelimiter.indexOf(istring[istring.length-1]) >= 0)){
+    while ((istring.length > 0) && (adddelimiter.indexOf(istring[istring.length-1]) >= 0)) {
         istring = istring.substr(0, istring.length-1);
     }
 
     return istring;
-     }
+}
      
 
-function getConfig()
-{
+function getConfig() {
     return config_gesamt;
 }
 
      
-function loadConfig(_domainname)
-{
+function loadConfig(_domainname) {
     var xhttp = new XMLHttpRequest();
+    
 	try {
         url = _domainname + '/fileserver/config/config.ini';     
         xhttp.open("GET", url, false);
         xhttp.send();
         config_gesamt = xhttp.responseText;
         config_gesamt = config_gesamt.replace("InitalRotate", "InitialRotate");         // Korrigiere Schreibfehler in config.ini !!!!!
-     }
-     catch (error)
-     {
-//	    firework.launch('Deleting Config.ini failed!', 'danger', 30000);
-     }
+    } catch (error) {}
+    
 	return true;
 }
 
      
-function dataURLtoBlob(dataurl)
-{
+function dataURLtoBlob(dataurl) {
     var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
           bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
+    
 	while(n--){
         u8arr[n] = bstr.charCodeAt(n);
     }
+    
 	return new Blob([u8arr], {type:mime});
 }	
  
 
-function FileCopyOnServer(_source, _target, _domainname = ""){
+function FileCopyOnServer(_source, _target, _domainname = "") {
     url = _domainname + "/editflow?task=copy&in=" + _source + "&out=" + _target;
     var xhttp = new XMLHttpRequest();  
+    
 	try {
         xhttp.open("GET", url, false);
-          xhttp.send();     }
-     catch (error)
-     {
-//	    firework.launch('Deleting Config.ini failed!', 'danger', 30000);
-     }
+        xhttp.send();
+	} catch (error) {}
 }
 
 
-function FileDeleteOnServer(_filename, _domainname = ""){
+function FileDeleteOnServer(_filename, _domainname = "") {
     var xhttp = new XMLHttpRequest();
     var okay = false;
 
@@ -178,30 +178,29 @@ function FileDeleteOnServer(_filename, _domainname = ""){
         if (xhttp.readyState == 4) {
             if (xhttp.status == 200) {
                 okay = true;
-               } else if (xhttp.status == 0) {
-//				firework.launch('Server closed the connection abruptly!', 'danger', 30000);
-//                    location.reload()
-               } else {
-//				firework.launch('An error occured: ' + xhttp.responseText, 'danger', 30000);
-//                    location.reload()
+            } 
+			else if (xhttp.status == 0) {
+				// firework.launch('Server closed the connection abruptly!', 'danger', 30000);
+				// location.reload()
+            } 
+			else {
+				// firework.launch('An error occured: ' + xhttp.responseText, 'danger', 30000);
+				// location.reload()
             }
         }
     };
+     
 	try {
         var url = _domainname + "/delete" + _filename;
         xhttp.open("POST", url, false);
         xhttp.send();
-     }
-     catch (error)
-     {
-//	    firework.launch('Deleting Config.ini failed!', 'danger', 30000);
-     }
+    } catch (error) {}
 
     return okay;
 }
 
 
-function FileSendContent(_content, _filename, _domainname = ""){
+function FileSendContent(_content, _filename, _domainname = "") {
     var xhttp = new XMLHttpRequest();  
     var okay = false;
 
@@ -209,9 +208,11 @@ function FileSendContent(_content, _filename, _domainname = ""){
         if (xhttp.readyState == 4) {
             if (xhttp.status == 200) {
                 okay = true;
-               } else if (xhttp.status == 0) {
+            } 
+			else if (xhttp.status == 0) {
 				firework.launch('Server closed the connection abruptly!', 'danger', 30000);
-               } else {
+            } 
+			else {
 				firework.launch('An error occured: ' + xhttp.responseText, 'danger', 30000);
             }
         }
@@ -221,11 +222,8 @@ function FileSendContent(_content, _filename, _domainname = ""){
         upload_path = _domainname + "/upload" + _filename;
         xhttp.open("POST", upload_path, false);
         xhttp.send(_content);
-     }
-     catch (error)
-     {
-//	    firework.launch('Deleting Config.ini failed!', 'danger', 30000);
-     }     
+    } catch (error) {}
+	
     return okay;        
 }