Update edit_config_template.html

CamFrameSize is no longer needed/used for zoom

.github/workflows/reply-bot.yaml

@@ -1,5 +1,5 @@
 # Reply Bot
-# It uses the configuration in .github/label-commenter-config.yml
+# It uses the configuration in .github/label-commenter-config.yaml
 # See https://github.com/peaceiris/actions-label-commenter
 
 name: Reply-Bot
@@ -25,7 +25,7 @@ jobs:
       
       ####################################################################
       ## Remove labels again (issues only)
-      ## Make sure to also add the reply message to .github/label-commenter-config.yml!
+      ## Make sure to also add the reply message to .github/label-commenter-config.yaml!
       ## This currently seems no longer to work due to changes on the actions-cool/issues-helper!
       ####################################################################
 #      - name: Remove 'Logfile' label again (issues only)
@@ -74,6 +74,7 @@ jobs:
       ## Write the response
       ####################################################################
       - name: Write Response
-        uses: peaceiris/actions-label-commenter@c2d00660c86f2b9ed0fb35b372c451558eba85b3
+        uses: peaceiris/actions-label-commenter@v1
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          github_token: "${{ secrets.GITHUB_TOKEN }}"
+          config_file: .github/label-commenter-config.yaml

Changelog.md

@@ -1,3 +1,31 @@
+## [update] - 2024-03-30
+
+For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.6.0...v15.7.0)
+
+#### Core Changes
+
+- New tflite-Model for Analog (v13.0.0)
+- New tflite-Model for Digital Hybrid (v7.0.0)
+
+#### Bug Fixes
+
+- tbd
+
+## [15.7.0] - 2024-02-17
+
+For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.6.0...v15.7.0)
+
+#### Core Changes
+- Added new camera settings (See `Settings > Alignment > Reference Image and Camera Settings`). You might need to re-create the reference image and alignment marks. Note worthy:
+  - You can now crop the image
+  - Support to configure sharpness, grayscale, negatoive and exposure
+- Enhanced various WebUI pages with better explanations and usability
+- Add Firmware Version to MQTT
+
+#### Bug Fixes
+- Reverted "Implemented late analog / digital transition [#2778](https://github.com/jomjol/AI-on-the-edge-device/pull/2778) (introduced in `v15.5`) as is seems to cause issues for many users.
+
+
 ## [15.6.0] - 2024-02-09
 
 For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.5.0...v15.6.0)
@@ -43,6 +71,8 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
    - dig-class11_1700_s2.tflite
    - ana-cont_1208_s2_q.tflite
   
+ - Added config entries for MQTT TLS
+
 
 #### Fixed
 

code/components/jomjol_controlcamera/ClassControllCamera.h

@@ -15,49 +15,100 @@
 #include "CImageBasis.h"
 #include "../../include/defines.h"
 
-class CCamera {
+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:
-        int ActualQuality;
-        framesize_t ActualResolution;
-        int brightness, contrast, saturation;
-        bool isFixedExposure;
-        int waitbeforepicture_org;
-        int led_intensity = 4095;
-
     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 xTotal, int yTotal, int xOutput, int yOutput);
+    void SetImageWidthHeightFromResolution(framesize_t resol);
 
 public:
-        int image_height, image_width;
-        
-        CCamera();
-        esp_err_t InitCam();
+    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 SetBrightnessContrastSaturation(int _brightness, int _contrast, int _saturation);
-        void GetCameraParameter(httpd_req_t *req, int &qual, framesize_t &resol);
+
+    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);
 	
     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

@@ -0,0 +1,152 @@
+#include <stdint.h>
+#include "esp_camera.h"
+#include "ov2640_sharpness.h"
+
+
+const static uint8_t OV2640_SHARPNESS_AUTO[]=
+{
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0x20, 0x20,
+    0x00, 0x00, 0x00
+};
+
+const static uint8_t OV2640_SHARPNESS_MANUAL[]=
+{
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0x00, 0x20,
+    0x00, 0x00, 0x00
+};
+
+const static uint8_t OV2640_SHARPNESS_LEVEL0[]=
+{
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC0, 0x1F,
+    0x00, 0x00, 0x00
+};
+const static uint8_t OV2640_SHARPNESS_LEVEL1[]=
+{
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC1, 0x1F,
+    0x00, 0x00, 0x00
+};
+const static uint8_t OV2640_SHARPNESS_LEVEL2[]=
+{
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC2, 0x1F,
+    0x00, 0x00, 0x00
+};
+const static uint8_t OV2640_SHARPNESS_LEVEL3[]=
+{
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC4, 0x1F,
+    0x00, 0x00, 0x00
+};
+const static uint8_t OV2640_SHARPNESS_LEVEL4[]=
+{
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xC8, 0x1F,
+    0x00, 0x00, 0x00
+};
+const static uint8_t OV2640_SHARPNESS_LEVEL5[]=
+{
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xD0, 0x1F,
+    0x00, 0x00, 0x00
+};
+const static uint8_t OV2640_SHARPNESS_LEVEL6[]=
+{
+	//reg, val, mask
+    0xFF, 0x00, 0xFF,
+    0x92, 0x01, 0xFF,
+    0x93, 0xDF, 0x1F,
+    0x00, 0x00, 0x00
+};
+
+const static uint8_t *OV2640_SETTING_SHARPNESS[]=
+{
+    OV2640_SHARPNESS_LEVEL0, // -3 sharpness
+    OV2640_SHARPNESS_LEVEL1,
+    OV2640_SHARPNESS_LEVEL2,
+    OV2640_SHARPNESS_LEVEL3,
+    OV2640_SHARPNESS_LEVEL4,
+    OV2640_SHARPNESS_LEVEL5,
+    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;
+    uint8_t value;
+    uint8_t orgval;
+    uint8_t mask;
+    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)
+{
+	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_temp + 3]);
+	
+    return 0;
+}

code/components/jomjol_controlcamera/ov2640_sharpness.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#ifndef OV2640_SHARPNESS_H
+#define OV2640_SHARPNESS_H
+
+#include "esp_camera.h"
+
+int ov2640_enable_auto_sharpness(sensor_t *sensor);
+int ov2640_set_sharpness(sensor_t *sensor, int sharpness); // -3 to +3, -4 for auto-sharpness
+
+#endif

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,7 +32,6 @@ void PowerResetCamera(){
     vTaskDelay(1000 / portTICK_PERIOD_MS);
 }
 
-
 esp_err_t handler_lightOn(httpd_req_t *req)
 {
 #ifdef DEBUG_DETAIL_ON
@@ -59,7 +58,6 @@ esp_err_t handler_lightOn(httpd_req_t *req)
     return ESP_OK;
 }
 
-
 esp_err_t handler_lightOff(httpd_req_t *req)
 {
 #ifdef DEBUG_DETAIL_ON
@@ -86,7 +84,6 @@ esp_err_t handler_lightOff(httpd_req_t *req)
     return ESP_OK;
 }
 
-
 esp_err_t handler_capture(httpd_req_t *req)
 {
 #ifdef DEBUG_DETAIL_ON
@@ -95,16 +92,17 @@ esp_err_t handler_capture(httpd_req_t *req)
 
     if (Camera.getCameraInitSuccessful())
     {
-        int quality;
-        framesize_t res;
-
-        Camera.GetCameraParameter(req, quality, res);
-
 #ifdef DEBUG_DETAIL_ON
         ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
 #endif
 
-        Camera.SetQualitySize(quality, res);
+        // 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);
@@ -122,7 +120,6 @@ esp_err_t handler_capture(httpd_req_t *req)
     }
 }
 
-
 esp_err_t handler_capture_with_light(httpd_req_t *req)
 {
 #ifdef DEBUG_DETAIL_ON
@@ -133,14 +130,12 @@ esp_err_t handler_capture_with_light(httpd_req_t *req)
     {
         char _query[100];
         char _delay[10];
-
-        int quality;
-        framesize_t res;    
         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
@@ -149,17 +144,24 @@ esp_err_t handler_capture_with_light(httpd_req_t *req)
                 delay = atoi(_delay);
 
                 if (delay < 0)
+                {
                     delay = 0;
                 }
             }
-
-        Camera.GetCameraParameter(req, quality, res);
+        }
 
 #ifdef DEBUG_DETAIL_ON
         ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
 #endif
 
-        Camera.SetQualitySize(quality, res);
+        // 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.LightOnOff(true);
         const TickType_t xDelay = delay / portTICK_PERIOD_MS;
         vTaskDelay(xDelay);
@@ -182,7 +184,6 @@ 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
@@ -197,13 +198,10 @@ esp_err_t handler_capture_save_to_file(httpd_req_t *req)
         char filename[100];
         std::string fn = "/sdcard/";
 
-
-        int quality;
-        framesize_t res;    
-
         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);
@@ -212,7 +210,9 @@ esp_err_t handler_capture_save_to_file(httpd_req_t *req)
 #endif
             }
             else
+            {
                 fn.append("noname.jpg");
+            }
 
             if (httpd_query_key_value(_query, "delay", _delay, 10) == ESP_OK)
             {
@@ -222,17 +222,27 @@ esp_err_t handler_capture_save_to_file(httpd_req_t *req)
                 delay = atoi(_delay);
 
                 if (delay < 0)
+                {
                     delay = 0;
                 }
             }
+        }
         else
+        {
             fn.append("noname.jpg");
+        }
 
-        Camera.GetCameraParameter(req, quality, res);
 #ifdef DEBUG_DETAIL_ON
         ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
 #endif
-        Camera.SetQualitySize(quality, res);
+
+        // 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);
@@ -253,7 +263,6 @@ 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

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)
 {
-    initalrotate = 0;
+    initialrotate = 0;
     anz_ref = 0;
-    initialmirror = false;
     use_antialiasing = false;
     initialflip = false;
     SaveAllFiles = false;
@@ -39,7 +35,6 @@ void ClassFlowAlignment::SetInitialParameter(void)
     SAD_criteria = 0.05;
 }
 
-
 ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow *> *lfc)
 {
     SetInitialParameter();
@@ -60,7 +55,6 @@ ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow*>* lfc)
     }
 }
 
-
 bool ClassFlowAlignment::ReadParameter(FILE *pfile, string &aktparamgraph)
 {
     std::vector<string> splitted;
@@ -68,47 +62,53 @@ bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph)
     int suchey = 40;
     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]) == "INITALROTATE") || (toUpper(splitted[0]) == "INITIALROTATE")) && (splitted.size() > 1))
+        else if (((toUpper(splitted[0]) == "initialrotate") || (toUpper(splitted[0]) == "INITIALROTATE")) && (splitted.size() > 1))
         {
-            this->initalrotate = std::stod(splitted[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
             std::string zw2 = "Alignment mode selected: " + splitted[1];
             LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw2);
 #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)
     {
@@ -149,15 +158,14 @@ bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph)
     }
 
     // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
-    if(References[0].alignment_algo != 3){
+    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
     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);
+
         if (!AlgROI)
         {
             LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlgROI");
@@ -191,6 +199,7 @@ bool ClassFlowAlignment::doFlow(string time)
     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,42 +231,41 @@ 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 ((initalrotate != 0) || initialflip)
+    if ((initialrotate != 0) || initialflip)
     {
         if (use_antialiasing)
-            rt.RotateAntiAliasing(initalrotate);
+        {
+            rt.RotateAntiAliasing(initialrotate);
+        }
         else
-            rt.Rotate(initalrotate);
-        
-        if (SaveAllFiles)
-            AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/rot.jpg"));
+        {
+            rt.Rotate(initialrotate);
         }
 
+        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){
+    if (References[0].alignment_algo != 3)
+    {
         if (!AlignAndCutImage->Align(&References[0], &References[1]))
         {
             SaveReferenceAlignmentValues();
         }
     } // no align
 
-
 #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-        if (AlgROI) {
+    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){
+        if (References[0].alignment_algo != 3)
+        {
             DrawRef(ImageTMP);
         }
+
         flowctrl.DigitalDrawROI(ImageTMP);
         flowctrl.AnalogDrawROI(ImageTMP);
         ImageTMP->writeToMemoryAsJPG((ImageData *)AlgROI, 90);
@@ -273,14 +283,14 @@ bool ClassFlowAlignment::doFlow(string time)
     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){
+    if (References[0].alignment_algo != 3)
+    {
         LoadReferenceAlignmentValues();
     }
 
     return true;
 }
 
-
 void ClassFlowAlignment::SaveReferenceAlignmentValues()
 {
     FILE *pFile;
@@ -319,7 +329,6 @@ void ClassFlowAlignment::SaveReferenceAlignmentValues()
     fclose(pFile);
 }
 
-
 bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
 {
     FILE *pFile;
@@ -327,8 +336,8 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
     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 initalrotate;
-    bool initialmirror;
+    float initialrotate;
     bool initialflip;
     bool use_antialiasing;
     RefInfo References[2];
@@ -50,5 +48,4 @@ public:
     string name() { return "ClassFlowAlignment"; };
 };
 
-
 #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";
 
-esp_err_t ClassFlowTakeImage::camera_capture(){
+esp_err_t ClassFlowTakeImage::camera_capture(void)
+{
     string nm = namerawimage;
     Camera.CaptureToFile(nm);
     time(&TimeImageTaken);
@@ -30,32 +36,472 @@ 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;
-    SaveAllFiles = false;
     disabled = false;
-    FixedExposure = false;
     namerawimage = "/sdcard/img_tmp/raw.jpg";
 }
 
+// auslesen der Kameraeinstellungen aus der config.ini
+// wird beim Start aufgerufen
+bool ClassFlowTakeImage::ReadParameter(FILE *pfile, string &aktparamgraph)
+{
+    Camera.getSensorDatenToCCstatus(); // Kamera >>> CCstatus
+
+    std::vector<string> splitted;
+
+    aktparamgraph = trim(aktparamgraph);
+
+    if (aktparamgraph.size() == 0)
+    {
+        if (!this->GetNextParagraph(pfile, aktparamgraph))
+        {
+            return false;
+        }
+    }
+
+    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;
+        }
+
+        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")
+            {
+                CCstatus.SaveAllFiles = 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")
+            {
+                CCstatus.ImageAutoSharpness = 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")
+            {
+                CCstatus.ImageAwb = 1;
+            }
+            else
+            {
+                CCstatus.ImageAwb = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAWBGAIN") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageAwbGain = 1;
+            }
+            else
+            {
+                CCstatus.ImageAwbGain = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAEC") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageAec = 1;
+            }
+            else
+            {
+                CCstatus.ImageAec = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAEC2") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.ImageAec2 = 1;
+            }
+            else
+            {
+                CCstatus.ImageAec2 = 0;
+            }
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMAELEVEL") && (splitted.size() > 1))
+        {
+            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);
+        }
+
+        else if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+            {
+                CCstatus.DemoMode = true;
+                Camera.useDemoMode();
+            }
+            else
+            {
+                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)
 {
@@ -64,116 +510,6 @@ ClassFlowTakeImage::ClassFlowTakeImage(std::vector<ClassFlow*>* lfc) : ClassFlow
     SetInitialParameter();
 }
 
-
-bool ClassFlowTakeImage::ReadParameter(FILE* pfile, string& aktparamgraph)
-{
-    std::vector<string> splitted;
-
-    aktparamgraph = trim(aktparamgraph);
-    int _brightness = -100;
-    int _contrast = -100;
-    int _saturation = -100;
-
-    if (aktparamgraph.size() == 0)
-        if (!this->GetNextParagraph(pfile, aktparamgraph))
-            return false;
-
-    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]) == "IMAGESIZE") && (splitted.size() > 1))
-        {
-            ImageSize = Camera.TextToFramesize(splitted[1].c_str());
-            isImageSize = true;
-        }
-
-        if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
-                SaveAllFiles = true;
-        }
-        
-        if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1))
-        {
-            waitbeforepicture = stoi(splitted[1]);
-        }
-
-        if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
-        {
-            this->imagesRetention = std::stoi(splitted[1]);
-        }
-
-        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]) == "FIXEDEXPOSURE") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
-                FixedExposure = true;  
-        }
-
-        if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1))
-        {
-            float ledintensity = stof(splitted[1]);
-            ledintensity = min((float) 100, ledintensity);
-            ledintensity = max((float) 0, ledintensity);
-            Camera.SetLEDIntensity(ledintensity);
-        }
-
-        if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
-                Camera.useDemoMode();
-        }
-    }
-
-    Camera.SetBrightnessContrastSaturation(_brightness, _contrast, _saturation);
-    Camera.SetQualitySize(ImageQuality, ImageSize);
-
-    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))
-    {
-//        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");
-    }
-
-    return true;
-}
-
-
 string ClassFlowTakeImage::getHTMLSingleStep(string host)
 {
     string result;
@@ -181,31 +517,37 @@ 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
     LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - Before takePictureWithFlash");
 #endif
 
-
 #ifdef WIFITURNOFF
     esp_wifi_stop(); // to save power usage and
 #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
     esp_wifi_start();
 #endif
 
-
 #ifdef DEBUG_DETAIL_ON
     LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After takePictureWithFlash");
 #endif
@@ -223,22 +565,20 @@ bool ClassFlowTakeImage::doFlow(string zwtime)
     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);
@@ -248,7 +588,7 @@ ImageData* ClassFlowTakeImage::SendRawImage()
     return id;
 }
 
-time_t ClassFlowTakeImage::getTimeImageTaken()
+time_t ClassFlowTakeImage::getTimeImageTaken(void)
 {
     return TimeImageTaken;
 }
@@ -257,4 +597,3 @@ ClassFlowTakeImage::~ClassFlowTakeImage(void)
 {
     delete rawImage;
 }
-

code/components/jomjol_flowcontroll/ClassFlowTakeImage.h

@@ -9,29 +9,15 @@
 
 #include <string>
 
-class ClassFlowTakeImage :
-    public ClassFlowImage
+class ClassFlowTakeImage : public ClassFlowImage
 {
 protected:
-    float waitbeforepicture;
-    float waitbeforepicture_store;
-    framesize_t ImageSize;
-    bool isImageSize;
-    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:
@@ -42,14 +28,13 @@ public:
     bool ReadParameter(FILE *pfile, string &aktparamgraph);
     bool doFlow(string time);
     string getHTMLSingleStep(string host);
-    time_t getTimeImageTaken();
+    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

code/components/jomjol_flowcontroll/MainFlowControl.h

@@ -10,19 +10,72 @@
 #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);

code/components/jomjol_helper/Helper.cpp

@@ -14,7 +14,8 @@
 #include <math.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 #include <dirent.h>
 #ifdef __cplusplus
@@ -45,7 +46,8 @@ bool SDCardIsMMC;
 // #define DEBUG_DETAIL_ON
 
 /////////////////////////////////////////////////////////////////////////////////////////////
-string getESPHeapInfo(){
+string getESPHeapInfo()
+{
 	string espInfoResultStr = "";
 	char aMsgBuf[80];
 
@@ -60,7 +62,6 @@ string getESPHeapInfo(){
 	size_t aMinFreeHeapSize = heap_caps_get_minimum_free_size(MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
 	size_t aMinFreeInternalHeapSize = heap_caps_get_minimum_free_size(MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
 
-
 	sprintf(aMsgBuf, "Heap Total: %ld", (long)aFreeHeapSize);
 	espInfoResultStr += string(aMsgBuf);
 
@@ -81,20 +82,18 @@ string getESPHeapInfo(){
 	return espInfoResultStr;
 }
 
-
 size_t getESPHeapSize()
 {
 	return heap_caps_get_free_size(MALLOC_CAP_8BIT);
 }
 
-
 size_t getInternalESPHeapSize()
 {
 	return heap_caps_get_free_size(MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
 }
 
-
-string getSDCardPartitionSize(){
+string getSDCardPartitionSize()
+{
 	FATFS *fs;
 	uint32_t fre_clust, tot_sect;
 
@@ -107,8 +106,8 @@ string getSDCardPartitionSize(){
 	return std::to_string(tot_sect);
 }
 
-
-string getSDCardFreePartitionSpace(){
+string getSDCardFreePartitionSpace()
+{
 	FATFS *fs;
 	uint32_t fre_clust, fre_sect;
 
@@ -121,8 +120,8 @@ string getSDCardFreePartitionSpace(){
 	return std::to_string(fre_sect);
 }
 
-
-string getSDCardPartitionAllocationSize(){
+string getSDCardPartitionAllocationSize()
+{
 	FATFS *fs;
 	uint32_t fre_clust, allocation_size;
 
@@ -135,39 +134,39 @@ string getSDCardPartitionAllocationSize(){
 	return std::to_string(allocation_size);
 }
 
-
-void SaveSDCardInfo(sdmmc_card_t* card) {
+void SaveSDCardInfo(sdmmc_card_t *card)
+{
 	SDCardCid = card->cid;
 	SDCardCsd = card->csd;
 	SDCardIsMMC = card->is_mmc;
 }
 
-
-string getSDCardManufacturer(){
+string getSDCardManufacturer()
+{
 	string SDCardManufacturer = SDCardParseManufacturerIDs(SDCardCid.mfg_id);
 	// ESP_LOGD(TAG, "SD Card Manufacturer: %s", SDCardManufacturer.c_str());
 
 	return (SDCardManufacturer + " (ID: " + std::to_string(SDCardCid.mfg_id) + ")");
 }
 
-
-string getSDCardName(){
+string getSDCardName()
+{
 	char *SDCardName = SDCardCid.name;
 	// ESP_LOGD(TAG, "SD Card Name: %s", SDCardName);
 
 	return std::string(SDCardName);
 }
 
-
-string getSDCardCapacity(){
+string getSDCardCapacity()
+{
 	int SDCardCapacity = SDCardCsd.capacity / (1024 / SDCardCsd.sector_size) / 1024; // total sectors * sector size  --> Byte to MB (1024*1024)
 	// ESP_LOGD(TAG, "SD Card Capacity: %s", std::to_string(SDCardCapacity).c_str());
 
 	return std::to_string(SDCardCapacity);
 }
 
-
-string getSDCardSectorSize(){
+string getSDCardSectorSize()
+{
 	int SDCardSectorSize = SDCardCsd.sector_size;
 	// ESP_LOGD(TAG, "SD Card Sector Size: %s bytes", std::to_string(SDCardSectorSize).c_str());
 
@@ -179,9 +178,10 @@ string getSDCardSectorSize(){
 void memCopyGen(uint8_t *_source, uint8_t *_target, int _size)
 {
 	for (int i = 0; i < _size; ++i)
+	{
 		*(_target + i) = *(_source + i);
 	}
-
+}
 
 std::string FormatFileName(std::string input)
 {
@@ -194,31 +194,48 @@ std::string FormatFileName(std::string input)
 	return input;
 }
 
-
-std::size_t file_size(const std::string& file_name) {
+std::size_t file_size(const std::string &file_name)
+{
 	std::ifstream file(file_name.c_str(), std::ios::in | std::ios::binary);
-    if (!file) return 0;
+
+	if (!file)
+	{
+		return 0;
+	}
+
 	file.seekg(0, std::ios::end);
 	return static_cast<std::size_t>(file.tellg());
 }
 
-
-void FindReplace(std::string& line, std::string& oldString, std::string& newString) {
+void FindReplace(std::string &line, std::string &oldString, std::string &newString)
+{
 	const size_t oldSize = oldString.length();
 
 	// do nothing if line is shorter than the string to find
-    if (oldSize > line.length()) return;
+	if (oldSize > line.length())
+	{
+		return;
+	}
 
 	const size_t newSize = newString.length();
-    for (size_t pos = 0; ; pos += newSize) {
+
+	for (size_t pos = 0;; pos += newSize)
+	{
 		// Locate the substring to replace
 		pos = line.find(oldString, pos);
-        if (pos == std::string::npos) return;
-        if (oldSize == newSize) {
+
+		if (pos == std::string::npos)
+		{
+			return;
+		}
+
+		if (oldSize == newSize)
+		{
 			// if they're same size, use std::string::replace
 			line.replace(pos, oldSize, newString);
 		}
-        else {
+		else
+		{
 			// if not same size, replace by erasing and inserting
 			line.erase(pos, oldSize);
 			line.insert(pos, newString);
@@ -226,7 +243,6 @@ void FindReplace(std::string& line, std::string& oldString, std::string& newStri
 	}
 }
 
-
 /**
  * Create a folder and its parent folders as needed
  */
@@ -238,18 +254,23 @@ bool MakeDir(std::string path)
 
 	bool bSuccess = false;
 	int nRC = ::mkdir(path.c_str(), 0775);
+
 	if (nRC == -1)
 	{
-        switch( errno ) {
+		switch (errno)
+		{
 		case ENOENT:
 			// parent didn't exist, try to create it
 			parent = path.substr(0, path.find_last_of('/'));
 			LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Need to create parent folder first: " + parent);
-                if(MakeDir(parent)) {
+
+			if (MakeDir(parent))
+			{
 				// Now, try to create again.
 				bSuccess = 0 == ::mkdir(path.c_str(), 0775);
 			}
-                else {
+			else
+			{
 				LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to create parent folder: " + parent);
 				bSuccess = false;
 			}
@@ -266,27 +287,29 @@ bool MakeDir(std::string path)
 			break;
 		}
 	}
-    else {
+	else
+	{
 		bSuccess = true;
 	}
 
 	return bSuccess;
 }
 
-
 bool ctype_space(const char c, string adddelimiter)
 {
 	if (c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == 11)
 	{
 		return true;
 	}
+
 	if (adddelimiter.find(c) != string::npos)
+	{
 		return true;
+	}
 
 	return false;
 }
 
-
 string trim(string istring, string adddelimiter)
 {
 	bool trimmed = false;
@@ -313,77 +336,88 @@ string trim(string istring, string adddelimiter)
 	}
 }
 
-
 size_t findDelimiterPos(string input, string delimiter)
 {
 	size_t pos = std::string::npos;
-	size_t zw;
+	// size_t zw;
 	string akt_del;
 
 	for (int anz = 0; anz < delimiter.length(); ++anz)
 	{
 		akt_del = delimiter[anz];
-		if ((zw = input.find(akt_del)) != std::string::npos)
+		size_t zw = input.find(akt_del);
+
+		if (zw != std::string::npos)
 		{
-			if (pos != std::string::npos)
+			if ((pos != std::string::npos) && (zw < pos))
 			{
-				if (zw < pos)
 				pos = zw;
 			}
 			else
+			{
 				pos = zw;
 			}
 		}
-	return pos;
 	}
 
+	return pos;
+}
 
 bool RenameFile(string from, string to)
 {
 	//	ESP_LOGI(logTag, "Deleting file: %s", fn.c_str());
 	/* Delete file */
 	FILE *fpSourceFile = fopen(from.c_str(), "rb");
-	if (!fpSourceFile)	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
+
+	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
+	if (!fpSourceFile)
 	{
 		ESP_LOGE(TAG, "DeleteFile: File %s existiert nicht!", from.c_str());
 		return false;
 	}
+
 	fclose(fpSourceFile);
 
 	rename(from.c_str(), to.c_str());
+
 	return true;
 }
 
-
 bool FileExists(string filename)
 {
 	FILE *fpSourceFile = fopen(filename.c_str(), "rb");
-	if (!fpSourceFile)	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
+
+	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
+	if (!fpSourceFile)
 	{
 		return false;
 	}
+
 	fclose(fpSourceFile);
+
 	return true;
 }
 
-
 bool DeleteFile(string fn)
 {
 	//	ESP_LOGI(logTag, "Deleting file: %s", fn.c_str());
 	/* Delete file */
 	FILE *fpSourceFile = fopen(fn.c_str(), "rb");
-	if (!fpSourceFile)	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
+
+	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
+	if (!fpSourceFile)
 	{
 		ESP_LOGD(TAG, "DeleteFile: File %s existiert nicht!", fn.c_str());
 		return false;
 	}
+
 	fclose(fpSourceFile);
 
 	unlink(fn.c_str());
+
 	return true;
 }
 
-
 bool CopyFile(string input, string output)
 {
 	input = FormatFileName(input);
@@ -397,7 +431,9 @@ bool CopyFile(string input, string output)
 
 	char cTemp;
 	FILE *fpSourceFile = fopen(input.c_str(), "rb");
-	if (!fpSourceFile)	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
+
+	// Sourcefile existiert nicht sonst gibt es einen Fehler beim Kopierversuch!
+	if (!fpSourceFile)
 	{
 		ESP_LOGD(TAG, "File %s existiert nicht!", input.c_str());
 		return false;
@@ -418,16 +454,18 @@ bool CopyFile(string input, string output)
 	fclose(fpSourceFile);
 	fclose(fpTargetFile);
 	ESP_LOGD(TAG, "File copied: %s to %s", input.c_str(), output.c_str());
+
 	return true;
 }
 
-
 string getFileFullFileName(string filename)
 {
 	size_t lastpos = filename.find_last_of('/');
 
 	if (lastpos == string::npos)
+	{
 		return "";
+	}
 
 	//	ESP_LOGD(TAG, "Last position: %d", lastpos);
 
@@ -436,16 +474,19 @@ string getFileFullFileName(string filename)
 	return zw;
 }
 
-
 string getDirectory(string filename)
 {
 	size_t lastpos = filename.find('/');
 
 	if (lastpos == string::npos)
+	{
 		lastpos = filename.find('\\');
+	}
 
 	if (lastpos == string::npos)
+	{
 		return "";
+	}
 
 	//	ESP_LOGD(TAG, "Directory: %d", lastpos);
 
@@ -453,18 +494,20 @@ string getDirectory(string filename)
 	return zw;
 }
 
-
 string getFileType(string filename)
 {
 	size_t lastpos = filename.rfind(".", filename.length());
 	size_t neu_pos;
+
 	while ((neu_pos = filename.find(".", lastpos + 1)) > -1)
 	{
 		lastpos = neu_pos;
 	}
 
 	if (lastpos == string::npos)
+	{
 		return "";
+	}
 
 	string zw = filename.substr(lastpos + 1, filename.size() - lastpos);
 	zw = toUpper(zw);
@@ -472,9 +515,9 @@ string getFileType(string filename)
 	return zw;
 }
 
-
 /* recursive mkdir */
-int mkdir_r(const char *dir, const mode_t mode) {
+int mkdir_r(const char *dir, const mode_t mode)
+{
 	char tmp[FILE_PATH_MAX];
 	char *p = NULL;
 	struct stat sb;
@@ -482,73 +525,94 @@ int mkdir_r(const char *dir, const mode_t mode) {
 
 	/* copy path */
 	len = strnlen(dir, FILE_PATH_MAX);
-    if (len == 0 || len == FILE_PATH_MAX) {
+
+	if (len == 0 || len == FILE_PATH_MAX)
+	{
 		return -1;
 	}
+
 	memcpy(tmp, dir, len);
 	tmp[len] = '\0';
 
 	/* remove trailing slash */
-    if(tmp[len - 1] == '/') {
+	if (tmp[len - 1] == '/')
+	{
 		tmp[len - 1] = '\0';
 	}
 
 	/* check if path exists and is a directory */
-    if (stat (tmp, &sb) == 0) {
-        if (S_ISDIR (sb.st_mode)) {
+	if (stat(tmp, &sb) == 0)
+	{
+		if (S_ISDIR(sb.st_mode))
+		{
 			return 0;
 		}
 	}
 
 	/* recursive mkdir */
-    for(p = tmp + 1; *p; p++) {
-        if(*p == '/') {
+	for (p = tmp + 1; *p; p++)
+	{
+		if (*p == '/')
+		{
 			*p = 0;
+
 			/* test path */
-            if (stat(tmp, &sb) != 0) {
+			if (stat(tmp, &sb) != 0)
+			{
 				/* path does not exist - create directory */
-                if (mkdir(tmp, mode) < 0) {
+				if (mkdir(tmp, mode) < 0)
+				{
 					return -1;
 				}
-            } else if (!S_ISDIR(sb.st_mode)) {
+			}
+			else if (!S_ISDIR(sb.st_mode))
+			{
 				/* not a directory */
 				return -1;
 			}
+
 			*p = '/';
 		}
 	}
+
 	/* test path */
-    if (stat(tmp, &sb) != 0) {
+	if (stat(tmp, &sb) != 0)
+	{
 		/* path does not exist - create directory */
-        if (mkdir(tmp, mode) < 0) {
+		if (mkdir(tmp, mode) < 0)
+		{
 			return -1;
 		}
-    } else if (!S_ISDIR(sb.st_mode)) {
+	}
+	else if (!S_ISDIR(sb.st_mode))
+	{
 		/* not a directory */
 		return -1;
 	}
+
 	return 0;
 }
 
-
 string toUpper(string in)
 {
 	for (int i = 0; i < in.length(); ++i)
+	{
 		in[i] = toupper(in[i]);
+	}
 
 	return in;
 }
 
-
 string toLower(string in)
 {
 	for (int i = 0; i < in.length(); ++i)
+	{
 		in[i] = tolower(in[i]);
+	}
 
 	return in;
 }
 
-
 // CPU Temp
 extern "C" uint8_t temprature_sens_read();
 float temperatureRead()
@@ -556,61 +620,75 @@ float temperatureRead()
 	return (temprature_sens_read() - 32) / 1.8;
 }
 
-
-time_t addDays(time_t startTime, int days) {
+time_t addDays(time_t startTime, int days)
+{
 	struct tm *tm = localtime(&startTime);
 	tm->tm_mday += days;
 	return mktime(tm);
 }
 
-
-int removeFolder(const char* folderPath, const char* logTag) {
+int removeFolder(const char *folderPath, const char *logTag)
+{
 	// ESP_LOGD(logTag, "Delete content in path %s", folderPath);
 
 	DIR *dir = opendir(folderPath);
-    if (!dir) {
+
+	if (!dir)
+	{
 		ESP_LOGE(logTag, "Failed to stat dir: %s", folderPath);
 		return -1;
 	}
 
 	struct dirent *entry;
 	int deleted = 0;
-    while ((entry = readdir(dir)) != NULL) {
+
+	while ((entry = readdir(dir)) != NULL)
+	{
 		std::string path = string(folderPath) + "/" + entry->d_name;
-		if (entry->d_type == DT_REG) {
+
+		if (entry->d_type == DT_REG)
+		{
 			// ESP_LOGD(logTag, "Delete file %s", path.c_str());
-			if (unlink(path.c_str()) == 0) {
+			if (unlink(path.c_str()) == 0)
+			{
 				deleted++;
-			} else {
+			}
+			else
+			{
 				ESP_LOGE(logTag, "can't delete file: %s", path.c_str());
 			}
-        } else if (entry->d_type == DT_DIR) {
+		}
+		else if (entry->d_type == DT_DIR)
+		{
 			deleted += removeFolder(path.c_str(), logTag);
 		}
 	}
 
 	closedir(dir);
-	if (rmdir(folderPath) != 0) {
+
+	if (rmdir(folderPath) != 0)
+	{
 		ESP_LOGE(logTag, "can't delete folder: %s", folderPath);
 	}
+
 	ESP_LOGD(logTag, "%d files in folder %s deleted.", deleted, folderPath);
 
 	return deleted;
 }
 
-
 std::vector<string> HelperZerlegeZeile(std::string input, std::string _delimiter = "")
 {
 	std::vector<string> Output;
 	std::string delimiter = " =,";
-    if (_delimiter.length() > 0){
+
+	if (_delimiter.length() > 0)
+	{
 		delimiter = _delimiter;
 	}
 
 	return ZerlegeZeile(input, delimiter);
 }
 
-
 std::vector<string> ZerlegeZeile(std::string input, std::string delimiter)
 {
 	std::vector<string> Output;
@@ -628,16 +706,22 @@ std::vector<string> ZerlegeZeile(std::string input, std::string delimiter)
 	 * As a workaround and to not break any legacy usage, we enforce to only use the
 	 * equal sign, if the key is "password"
 	 */
-	if ((input.find("password") != string::npos) || (input.find("Token") != string::npos)) { // Line contains a password, use the equal sign as the only delimiter and only split on first occurrence
+	if ((input.find("password") != string::npos) || (input.find("Token") != string::npos))
+	{
+		// Line contains a password, use the equal sign as the only delimiter and only split on first occurrence
 		size_t pos = input.find("=");
 		Output.push_back(trim(input.substr(0, pos), ""));
 		Output.push_back(trim(input.substr(pos + 1, string::npos), ""));
 	}
-	else { // Legacy Mode
+	else
+	{
+		// Legacy Mode
 		input = trim(input, delimiter); // sonst werden delimiter am Ende (z.B. == im Token) gelöscht)
 		size_t pos = findDelimiterPos(input, delimiter);
 		std::string token;
-		while (pos != std::string::npos) {
+
+		while (pos != std::string::npos)
+		{
 			token = input.substr(0, pos);
 			token = trim(token, delimiter);
 			Output.push_back(token);
@@ -645,34 +729,35 @@ std::vector<string> ZerlegeZeile(std::string input, std::string delimiter)
 			input = trim(input, delimiter);
 			pos = findDelimiterPos(input, delimiter);
 		}
+
 		Output.push_back(input);
 	}
 
 	return Output;
-
 }
 
-
-std::string ReplaceString(std::string subject, const std::string& search,
-                          const std::string& replace) {
+std::string ReplaceString(std::string subject, const std::string &search, const std::string &replace)
+{
 	size_t pos = 0;
-    while ((pos = subject.find(search, pos)) != std::string::npos) {
+
+	while ((pos = subject.find(search, pos)) != std::string::npos)
+	{
 		subject.replace(pos, search.length(), replace);
 		pos += replace.length();
 	}
+
 	return subject;
 }
 
-
 /* Source: https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/tree/lsmmc.c */
 /* SD Card Manufacturer Database */
-struct SDCard_Manufacturer_database {
+struct SDCard_Manufacturer_database
+{
 	string type;
 	int id;
 	string manufacturer;
 };
 
-
 /* Source: https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/tree/lsmmc.c */
 /* SD Card Manufacturer Database */
 struct SDCard_Manufacturer_database sd_database[] = {
@@ -900,33 +985,26 @@ string SDCardParseManufacturerIDs(int id)
 	}
 }
 
-
 string RundeOutput(double _in, int _anzNachkomma)
 {
 	std::stringstream stream;
 	int _zw = _in;
 	//    ESP_LOGD(TAG, "AnzNachkomma: %d", _anzNachkomma);
 
-    if (_anzNachkomma < 0) {
-        _anzNachkomma = 0;
-    }
-
 	if (_anzNachkomma > 0)
 	{
 		stream << std::fixed << std::setprecision(_anzNachkomma) << _in;
-        return stream.str();          
 	}
 	else
 	{
 		stream << _zw;
 	}
 
-
 	return stream.str();
 }
 
-
-string getMac(void) {
+string getMac(void)
+{
 	uint8_t macInt[6];
 	char macFormated[6 * 2 + 5 + 1]; // AA:BB:CC:DD:EE:FF
 
@@ -936,8 +1014,8 @@ string getMac(void) {
 	return macFormated;
 }
 
-
-void setSystemStatusFlag(SystemStatusFlag_t flag) {
+void setSystemStatusFlag(SystemStatusFlag_t flag)
+{
 	systemStatus = systemStatus | flag; // set bit
 
 	char buf[20];
@@ -945,8 +1023,8 @@ void setSystemStatusFlag(SystemStatusFlag_t flag) {
 	LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "New System Status: " + std::string(buf));
 }
 
-
-void clearSystemStatusFlag(SystemStatusFlag_t flag) {
+void clearSystemStatusFlag(SystemStatusFlag_t flag)
+{
 	systemStatus = systemStatus | ~flag; // clear bit
 
 	char buf[20];
@@ -954,56 +1032,80 @@ void clearSystemStatusFlag(SystemStatusFlag_t flag) {
 	LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "New System Status: " + std::string(buf));
 }
 
-
-int getSystemStatus(void) {
+int getSystemStatus(void)
+{
 	return systemStatus;
 }
 
-
-bool isSetSystemStatusFlag(SystemStatusFlag_t flag) {
+bool isSetSystemStatusFlag(SystemStatusFlag_t flag)
+{
 	// ESP_LOGE(TAG, "Flag (0x%08X) is set (0x%08X): %d", flag, systemStatus , ((systemStatus & flag) == flag));
 
-	if ((systemStatus & flag) == flag) {
+	if ((systemStatus & flag) == flag)
+	{
 		return true;
 	}
-	else {
+	else
+	{
 		return false;
 	}
 }
 
-
-time_t getUpTime(void) {
+time_t getUpTime(void)
+{
 	return (uint32_t)(esp_timer_get_time() / 1000 / 1000); // in seconds
 }
 
-
-string getResetReason(void) {
+string getResetReason(void)
+{
 	std::string reasonText;
 
-	switch(esp_reset_reason()) {
-		case ESP_RST_POWERON: reasonText = "Power-on event (or reset button)"; break;    //!< Reset due to power-on event
-		case ESP_RST_EXT: reasonText = "External pin"; break;        //!< Reset by external pin (not applicable for ESP32)
-		case ESP_RST_SW: reasonText = "Via esp_restart"; break;         //!< Software reset via esp_restart
-		case ESP_RST_PANIC: reasonText = "Exception/panic"; break;      //!< Software reset due to exception/panic
-		case ESP_RST_INT_WDT: reasonText = "Interrupt watchdog"; break;    //!< Reset (software or hardware) due to interrupt watchdog
-		case ESP_RST_TASK_WDT: reasonText = "Task watchdog"; break;   //!< Reset due to task watchdog
-		case ESP_RST_WDT: reasonText = "Other watchdogs"; break;        //!< Reset due to other watchdogs
-		case ESP_RST_DEEPSLEEP: reasonText = "Exiting deep sleep mode"; break;  //!< Reset after exiting deep sleep mode
-		case ESP_RST_BROWNOUT: reasonText = "Brownout"; break;   //!< Brownout reset (software or hardware)
-		case ESP_RST_SDIO: reasonText = "SDIO"; break;       //!< Reset over SDIO
+	switch (esp_reset_reason())
+	{
+	case ESP_RST_POWERON:
+		reasonText = "Power-on event (or reset button)";
+		break; //!< Reset due to power-on event
+	case ESP_RST_EXT:
+		reasonText = "External pin";
+		break; //!< Reset by external pin (not applicable for ESP32)
+	case ESP_RST_SW:
+		reasonText = "Via esp_restart";
+		break; //!< Software reset via esp_restart
+	case ESP_RST_PANIC:
+		reasonText = "Exception/panic";
+		break; //!< Software reset due to exception/panic
+	case ESP_RST_INT_WDT:
+		reasonText = "Interrupt watchdog";
+		break; //!< Reset (software or hardware) due to interrupt watchdog
+	case ESP_RST_TASK_WDT:
+		reasonText = "Task watchdog";
+		break; //!< Reset due to task watchdog
+	case ESP_RST_WDT:
+		reasonText = "Other watchdogs";
+		break; //!< Reset due to other watchdogs
+	case ESP_RST_DEEPSLEEP:
+		reasonText = "Exiting deep sleep mode";
+		break; //!< Reset after exiting deep sleep mode
+	case ESP_RST_BROWNOUT:
+		reasonText = "Brownout";
+		break; //!< Brownout reset (software or hardware)
+	case ESP_RST_SDIO:
+		reasonText = "SDIO";
+		break; //!< Reset over SDIO
 
 	case ESP_RST_UNKNOWN: //!< Reset reason can not be determined
 	default:
 		reasonText = "Unknown";
 	}
+
 	return reasonText;
 }
 
-
 /**
  * Returns the current uptime  formated ad xxf xxh xxm [xxs]
  */
-std::string getFormatedUptime(bool compact) {
+std::string getFormatedUptime(bool compact)
+{
 	char buf[20];
 #pragma GCC diagnostic ignored "-Wformat-truncation"
 
@@ -1014,20 +1116,21 @@ std::string getFormatedUptime(bool compact) {
 	int minutes = int(floor((uptime - days * 3600 * 24 - hours * 3600) / (60)));
 	int seconds = uptime - days * 3600 * 24 - hours * 3600 - minutes * 60;
 
-	if (compact) {
+	if (compact)
+	{
 		snprintf(buf, sizeof(buf), "%dd%02dh%02dm%02ds", days, hours, minutes, seconds);
 	}
-	else {
+	else
+	{
 		snprintf(buf, sizeof(buf), "%3dd %02dh %02dm %02ds", days, hours, minutes, seconds);
 	}
 
 	return std::string(buf);
 }
 
-
-const char* get404(void) {
-    return 
-"<pre>\n\n\n\n"
+const char *get404(void)
+{
+	return "<pre>\n\n\n\n"
 		   "        _\n"
 		   "    .__(.)< ( oh oh! This page does not exist! )\n"
 		   "    \\___)\n"
@@ -1036,7 +1139,6 @@ const char* get404(void) {
 		   "<script>document.cookie = \"page=overview.html\"</script>"; // Make sure we load the overview page
 }
 
-
 std::string UrlDecode(const std::string &value)
 {
 	std::string result;
@@ -1066,33 +1168,41 @@ std::string UrlDecode(const std::string& value)
 	return result;
 }
 
-
-bool replaceString(std::string& s, std::string const& toReplace, std::string const& replaceWith) {
+bool replaceString(std::string &s, std::string const &toReplace, std::string const &replaceWith)
+{
 	return replaceString(s, toReplace, replaceWith, true);
 }
 
-
-bool replaceString(std::string& s, std::string const& toReplace, std::string const& replaceWith, bool logIt) {
+bool replaceString(std::string &s, std::string const &toReplace, std::string const &replaceWith, bool logIt)
+{
 	std::size_t pos = s.find(toReplace);
 
-    if (pos == std::string::npos) { // Not found
+	if (pos == std::string::npos)
+	{
+		// Not found
 		return false;
 	}
 
 	std::string old = s;
 	s.replace(pos, toReplace.length(), replaceWith);
-    if (logIt) {
+
+	if (logIt)
+	{
 		LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line '" + old + "' to '" + s + "'");
 	}
+
 	return true;
 }
 
-
-bool isInString(std::string& s, std::string const& toFind) {
+bool isInString(std::string &s, std::string const &toFind)
+{
 	std::size_t pos = s.find(toFind);
 
-    if (pos == std::string::npos) { // Not found
+	if (pos == std::string::npos)
+	{
+		// Not found
 		return false;
 	}
+
 	return true;
 }

code/components/jomjol_image_proc/CImageBasis.cpp

@@ -443,7 +443,7 @@ void CImageBasis::LoadFromMemory(stbi_uc *_buffer, int len)
         //free_psram_heap(std::string(TAG) + "->rgb_image (LoadFromMemory)", rgb_image);
     }
 
-    rgb_image = stbi_load_from_memory(_buffer, len, &width, &height, &channels, 3);
+    rgb_image = stbi_load_from_memory(_buffer, len, &width, &height, &channels, STBI_rgb);
     bpp = channels;
     ESP_LOGD(TAG, "Image loaded from memory: %d, %d, %d", width, height, channels);
     
@@ -459,6 +459,44 @@ void CImageBasis::LoadFromMemory(stbi_uc *_buffer, int len)
 }
 
 
+void CImageBasis::crop_image(unsigned short cropLeft, unsigned short cropRight, unsigned short cropTop, unsigned short cropBottom)
+{
+    unsigned int maxTopIndex = cropTop * width * channels;
+    unsigned int minBottomIndex = ((width*height) - (cropBottom * width)) * channels;
+    unsigned short maxX = width - cropRight; // In pixels
+    unsigned short newWidth = width - cropLeft - cropRight;
+    unsigned short newHeight = height - cropTop - cropBottom;
+
+    unsigned int writeIndex = 0;
+    // Loop over all bytes
+    for (int i = 0; i < width * height * channels; i += channels) {
+        // Calculate current X, Y pixel position
+        int x = (i/channels) % width;
+
+        // Crop from the top
+        if (i < maxTopIndex) { continue; }
+
+        // Crop from the bottom
+        if (i > minBottomIndex) { continue; }
+
+        // Crop from the left
+        if (x <= cropLeft) { continue; }
+
+        // Crop from the right
+        if (x > maxX) { continue; }
+
+        // If we get here, keep the pixels
+        for (int c = 0; c < channels; c++) {
+            rgb_image[writeIndex++] = rgb_image[i+c];
+        }
+    }
+
+    // Set the new dimensions of the framebuffer for further use.
+    width = newWidth;
+    height = newHeight;
+}
+
+
 CImageBasis::CImageBasis(string _name, CImageBasis *_copyfrom) 
 {
     name = _name;
@@ -598,6 +636,20 @@ CImageBasis::CImageBasis(string _name, uint8_t* _rgb_image, int _channels, int _
 }
 
 
+void CImageBasis::Negative(void)
+{
+    RGBImageLock();
+
+    for (int i = 0; i < width * height * channels; i += channels) {
+        for (int c = 0; c < channels; c++) {
+            rgb_image[i+c] = 255 - rgb_image[i+c];
+        }
+    }
+
+    RGBImageRelease();
+}
+
+
 void CImageBasis::Contrast(float _contrast)  //input range [-100..100]
 {
     stbi_uc* p_source;

code/components/jomjol_image_proc/CImageBasis.h

@@ -56,6 +56,7 @@ class CImageBasis
         void drawEllipse(int x1, int y1, int radx, int rady, int r, int g, int b, int thickness = 1);
 
         void setPixelColor(int x, int y, int r, int g, int b);
+        void Negative(void);
         void Contrast(float _contrast);
         bool ImageOkay();
         bool CopyFromMemory(uint8_t* _source, int _size);
@@ -74,6 +75,7 @@ class CImageBasis
 
         void Resize(int _new_dx, int _new_dy);        
         void Resize(int _new_dx, int _new_dy, CImageBasis *_target);        
+        void crop_image(unsigned short cropLeft, unsigned short cropRight, unsigned short cropTop, unsigned short cropBottom);
 
         void LoadFromMemory(stbi_uc *_buffer, int len);
 

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

code/components/jomjol_tfliteclass/CTfLiteClass.cpp

@@ -333,3 +333,17 @@ CTfLiteClass::~CTfLiteClass()
 
   psram_free_shared_tensor_arena_and_model_memory();
 }        
+
+#ifdef SUPRESS_TFLITE_ERRORS
+namespace tflite 
+{
+//tflite::ErrorReporter
+//  int OwnMicroErrorReporter::Report(const char* format, va_list args) 
+
+  int OwnMicroErrorReporter::Report(const char* format, va_list args) 
+  {
+    return 0;
+  }
+} 
+#endif
+ 

code/dependencies.lock

@@ -1,3 +1,16 @@
-manifest_hash: 63f5c6c9f0bcebc7b9ca12d2aa8b26b2c5f5218d377dc4b2375d9b9ca1df7815
+dependencies:
+  espressif/esp-nn:
+    component_hash: b32869798bdb40dec6bc99caca48cd65d42f8a9f506b9ab9c598a076f891ede9
+    source:
+      pre_release: true
+      service_url: https://api.components.espressif.com/
+      type: service
+    version: 1.0.2
+  idf:
+    component_hash: null
+    source:
+      type: idf
+    version: 5.1.2
+manifest_hash: a5f7be33336cfab90d6c2eb74757b616296d8c1e61665336749ed18905905567
 target: esp32
 version: 1.0.0

code/include/defines.h

@@ -66,6 +66,7 @@
     #define FLASH_GPIO GPIO_NUM_4               // PIN for flashlight LED
     #define USE_PWM_LEDFLASH                    // if __LEDGLOBAL is defined, a global variable is used for LED control, otherwise locally and each time a new
     #define CAM_LIVESTREAM_REFRESHRATE 500      // Camera livestream feature: Waiting time in milliseconds to refresh image
+    // #define GRAYSCALE_AS_DEFAULT
 
 
     //ClassControllCamera + ClassFlowTakeImage
@@ -190,7 +191,7 @@
     #define Digital_Uncertainty 0.2
     #define DigitalBand 3
     #define Digital_Transition_Range_Predecessor 2
-    #define Digital_Transition_Area_Predecessor 0.7 // 9.3 - 0.7
+    #define Digital_Transition_Area_Predecessor 1.0 // 9.0 - 1.0
     #define Digital_Transition_Area_Forward 9.7 // Pre-run zero crossing only happens from approx. 9.7 onwards
 
 

code/sdkconfig.defaults

@@ -109,11 +109,6 @@ CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
 CONFIG_HTTPD_PURGE_BUF_LEN=16
-<<<<<<< Updated upstream
-=======
-CONFIG_HTTPD_WS_SUPPORT=y
-CONFIG_LWIP_MAX_SOCKETS=12
->>>>>>> Stashed changes
 
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16

code/test/components/jomjol-flowcontroll/test_PointerEvalAnalogToDigitNew.cpp

@@ -46,7 +46,7 @@ void test_analogToDigit_Standard() {
     // Default: dig=6.8, ana=8.6 => erg=7
     // Transition = no
     // Offset = no
-    TEST_ASSERT_EQUAL_INT(7,  undertest->PointerEvalAnalogToDigitNew( 6.8, 8.6, 6, 9.2));
+    TEST_ASSERT_EQUAL_INT(7,  undertest->PointerEvalAnalogToDigitNew( 6.8, 8.6, 8, 9.2));
 
     // https://github.com/jomjol/AI-on-the-edge-device/issues/1143#issuecomment-1274434805
     // Also hanging digit () with small pointer after 0 pass.

code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp

@@ -108,7 +108,11 @@ void test_ZeigerEvalHybrid() {
 
     // pre = 9.9 (0.0 raw)
     // zahl = 1.8
-    TEST_ASSERT_EQUAL(2, undertest.PointerEvalHybridNew(1.8, 9.0, 9));    
+    TEST_ASSERT_EQUAL(1, undertest.PointerEvalHybridNew(1.8, 9.0, 9));
+
+    // pre = 8.8 (0.0 raw)
+    // zahl = 1.8
+    TEST_ASSERT_EQUAL(2, undertest.PointerEvalHybridNew(1.8, 8.9, 8));
 
     // if a digit have an early transition and the pointer is < 9.0
     // prev (pointer) = 6.2, but on digital readout = 6.0 (prev is int parameter)
@@ -121,4 +125,3 @@ void test_ZeigerEvalHybrid() {
 
 
 }
-

code/test/components/jomjol-flowcontroll/test_flow_pp_negative.cpp

@@ -109,7 +109,7 @@ void testNegative_Issues() {
         setAllowNegatives(underTestPost, false);
         setPreValue(underTestPost, preValue_extended);
         std::string result = process_doFlow(underTestPost);
-        TEST_ASSERT_EQUAL_STRING("Neg. Rate - Read:  - Raw: 22017.98 - Pre: 22018.08 ", underTestPost->getReadoutError().c_str());
+        TEST_ASSERT_EQUAL_STRING("Neg. Rate - Read:  - Raw: 22017.98 - Pre: 22018.09 ", underTestPost->getReadoutError().c_str());
         // if negativ no result any more
 
         TEST_ASSERT_EQUAL_STRING("", result.c_str());

code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp

@@ -476,12 +476,18 @@ void test_doFlowPP3() {
         expected_extended= "126.9231";
         
         // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, 0);
+        undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+        setAnalogdigitTransistionStart(undertestPost, 9.4); // Extreme late transition
+        result = process_doFlow(undertestPost);
         TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
+        delete undertestPost;
 
         // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, 0);
+        undertestPost = init_do_flow(analogs, digits, Digital100, false, true, 0);
+        setAnalogdigitTransistionStart(undertestPost, 9.4); // Extreme late transition
+        result = process_doFlow(undertestPost);
         TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
+        delete undertestPost;
 
        // Fehler  V12.0.1 
         // https://github.com/jomjol/AI-on-the-edge-device/issues/1110#issuecomment-1282168030
@@ -543,12 +549,13 @@ void test_doFlowPP4() {
 
 std::string postProcess(std::vector<float> digits,
                         std::vector<float> analogs,
-                        float analog2DigitalTransition=0.0)
+                        float analog2DigitalTransition=0.0,
+                        int decimalShift=0)
 {
         std::unique_ptr<UnderTestPost> undertestPost(init_do_flow(std::move(analogs),
                                                                   std::move(digits),
                                                                   Digital100,
-                                                                  false, false));
+                                                                  false, false, decimalShift));
 
         setAnalogdigitTransistionStart(undertestPost.get(), analog2DigitalTransition);
         return process_doFlow(undertestPost.get());
@@ -557,37 +564,39 @@ std::string postProcess(std::vector<float> digits,
 void test_doFlowLateTransition()
 {
         // in these test cases, the last digit before comma turns 3.6 too late
-        float a2dt = 3.6;
+        float a2dt = 3.4; // value when last digit reaches x.8 region
 
-        // meter shows 011.0210 but it already needs to be 012.0210,  before transition
-        TEST_ASSERT_EQUAL_STRING("12.0210", postProcess({0.0, 1.0, 1.0}, {0.2, 2.2, 1.0, 0.0}, a2dt).c_str());
+        // Questionable? (Meter shows 011.0210 but it already needs to be 012.0210,  before transition)
+        // Slider0007: In my opionion this series starts clearly with 11.x
+        // As I remember right, this is a real series from rainman110, therefore the following cases 
+        // also needs to be corrected the same way
+        TEST_ASSERT_EQUAL_STRING("11.0210", postProcess({0.0, 1.0, 1.0}, {0.2, 2.2, 1.0, 0.0}, a2dt).c_str());
 
         // meter shows 011.3210 but it already needs to be 012.3210, just before transition
-        TEST_ASSERT_EQUAL_STRING("12.3210", postProcess({0.0, 1.0, 1.2}, {3.3, 2.2, 1.0, 0.0}, a2dt).c_str());
+        TEST_ASSERT_EQUAL_STRING("11.3210", postProcess({0.0, 1.0, 1.2}, {3.3, 2.2, 1.0, 0.0}, a2dt).c_str());
 
         // meter shows 012.4210 , this is after transition
-        TEST_ASSERT_EQUAL_STRING("12.4210", postProcess({0.0, 1.0, 2.0}, {4.3, 2.2, 1.0, 0.0}, a2dt).c_str());
+        TEST_ASSERT_EQUAL_STRING("11.4210", postProcess({0.0, 1.0, 2.0}, {4.3, 2.2, 1.0, 0.0}, a2dt).c_str());
 
         // meter shows 012.987
-        TEST_ASSERT_EQUAL_STRING("12.9870", postProcess({0.0, 1.0, 2.0}, {9.8, 8.7, 7.0, 0.0}, a2dt).c_str());
+        TEST_ASSERT_EQUAL_STRING("11.9870", postProcess({0.0, 1.0, 2.0}, {9.8, 8.7, 7.0, 0.0}, a2dt).c_str());
 
         // meter shows 0012.003
-        TEST_ASSERT_EQUAL_STRING("13.003", postProcess({0.0, 0.0, 1.0, 2.0}, {0.1, 0.3, 3.1}, a2dt).c_str());
+        TEST_ASSERT_EQUAL_STRING("12.003", postProcess({0.0, 0.0, 1.0, 2.0}, {0.1, 0.3, 3.1}, a2dt).c_str());
 
         // meter shows 0012.351
-        TEST_ASSERT_EQUAL_STRING("13.351", postProcess({0.0, 0.0, 1.0, 2.8}, {3.5, 5.2, 1.1}, a2dt).c_str());
+        TEST_ASSERT_EQUAL_STRING("12.351", postProcess({0.0, 0.0, 1.0, 2.8}, {3.5, 5.2, 1.1}, a2dt).c_str());
 
         // meter shows 0013.421
-        TEST_ASSERT_EQUAL_STRING("13.421", postProcess({0.0, 0.0, 1.0, 3.0}, {4.1, 2.2, 1.1}, a2dt).c_str());
+        TEST_ASSERT_EQUAL_STRING("12.421", postProcess({0.0, 0.0, 1.0, 3.0}, {4.1, 2.2, 1.1}, a2dt).c_str());
 }
 
 void test_doFlowEarlyTransition()
 {
         // in these test cases, the last digit before comma turns at around 7.5
         // start transition 7.0 end transition 8.0
-        float a2dt = 7.5;
+        float a2dt = 7.8; // value when last digit reaches x.8 region
 
-        // meter shows 011.0210 but it already needs to be 012.0210,  before transition
         TEST_ASSERT_EQUAL_STRING("12.6789", postProcess({0.0, 1.0, 2.0}, {6.7, 7.8, 8.9, 9.0}, a2dt).c_str());
 
         TEST_ASSERT_EQUAL_STRING("12.7234", postProcess({0.0, 1.0, 2.4}, {7.2, 2.3, 3.4, 4.0}, a2dt).c_str());
@@ -597,8 +606,207 @@ void test_doFlowEarlyTransition()
         TEST_ASSERT_EQUAL_STRING("12.8123", postProcess({0.0, 1.0, 3.0}, {8.1, 1.2, 2.3, 3.0}, a2dt).c_str());
 
         TEST_ASSERT_EQUAL_STRING("13.1234", postProcess({0.0, 1.0, 3.0}, {1.2, 2.3, 3.4, 4.0}, a2dt).c_str());
-
 }
 
 
+void test_doFlowEarlyTransitionEdgeCase()
+{
+    float a2dt = 8.;
 
+    // Silder0007: In my opinion this is a unrealistic case {0.0, **0.0**, 9.9, 9,0}, {5.0, 0.0}
+    // More realistic values: {0.0, 0.9, 9.9, 9,0}, {5.0, 0.0}
+    TEST_ASSERT_EQUAL_STRING("99.50", postProcess({0.0, 0.0, 9.0, 9.0}, {5.0, 0.0}, a2dt).c_str());
+
+    // fails with 99.50    
+    TEST_ASSERT_EQUAL_STRING("199.50", postProcess({0.0, 1.0, 9.0, 9.0}, {5.0, 0.0}, a2dt).c_str());
+
+    TEST_ASSERT_EQUAL_STRING("99.95", postProcess({0.0, 1.0, 0.0, 0.0}, {9.5, 5.0}, a2dt).c_str());
+}
+
+void test_doFlowIssue2857()
+{
+    // reported by gec75
+    float a2dt = 9.2;
+    int decimalShift = 3;
+    TEST_ASSERT_EQUAL_STRING("252090.0", postProcess({ 2.0, 5.0, 1.9}, { 0.8, 8.8, 9.9, 0.1},
+                                                     a2dt, decimalShift).c_str());
+
+    // reported by Kornelius777
+    decimalShift = 0;
+    TEST_ASSERT_EQUAL_STRING("1017.8099", postProcess({ 0.0, 1.0, 0.0, 1.0, 7.0}, { 8.2, 0.9, 9.9, 9.8},
+                                                     a2dt, decimalShift).c_str());
+
+    // with hanging digit
+    TEST_ASSERT_EQUAL_STRING("1017.8099", postProcess({ 0.0, 1.0, 0.0, 1.0, 6.9}, { 8.2, 0.9, 9.9, 9.8},
+                                                      a2dt, decimalShift).c_str());
+
+    // and deccimal shift
+    decimalShift = -2;
+    TEST_ASSERT_EQUAL_STRING("10.178099", postProcess({ 0.0, 1.0, 0.0, 1.0, 6.9}, { 8.2, 0.9, 9.9, 9.8},
+                                                      a2dt, decimalShift).c_str());
+
+
+    // reported by marcniedersachsen
+    decimalShift = 0;
+    TEST_ASSERT_EQUAL_STRING("778.1480", postProcess({ 0.0, 7.0, 7.0, 7.9}, { 1.4, 4.7, 8.0, 0.5},
+                                                      a2dt, decimalShift).c_str());
+
+    decimalShift = 3;
+    TEST_ASSERT_EQUAL_STRING("778148.0", postProcess({ 0.0, 7.0, 7.0, 7.9}, { 1.4, 4.7, 8.0, 0.5},
+                                                     a2dt, decimalShift).c_str());
+
+     // reported by ohkaja
+    decimalShift = 0;
+    TEST_ASSERT_EQUAL_STRING("1052.6669", postProcess({ 0.0, 1.0, 10.0, 4.9, 2.0}, { 6.7, 6.7, 6.9, 9.1},
+                                                     a2dt, decimalShift).c_str());
+
+    // FrankCGN01
+    decimalShift = -3;
+    a2dt = 9.7;
+    TEST_ASSERT_EQUAL_STRING("159.3659", postProcess({ 0.9, 4.8, 8.9, 3.0, 6.0, 5.0}, { 9.6},
+                                                    a2dt, decimalShift).c_str());
+
+    // Second test in https://github.com/jomjol/AI-on-the-edge-device/issues/2857#issuecomment-1937452352
+    // The last digit seems to be falsely recongnized. It looks like a regular "2" (no transition)
+    // but it is recognized by the inference as "2.5".
+    decimalShift = -3;
+    TEST_ASSERT_EQUAL_STRING("159.5022", postProcess({ 0.9, 4.9, 8.9, 5.0, 0.0, 2.5}, { 2.2},
+                                                      a2dt, decimalShift).c_str());
+
+    // reported by penapena
+    // Note: this is a strange example, as the last digit (4.4) seems to have very early transition
+    decimalShift = 0;
+    TEST_ASSERT_EQUAL_STRING("124.4981", postProcess({ 0.0, 1.0, 2.0, 4.4}, { 5.1, 9.8, 8.3, 1.6},
+                                                      a2dt, decimalShift).c_str());
+
+    // reported by warnmat
+    decimalShift = 0;
+    TEST_ASSERT_EQUAL_STRING("51.653", postProcess({ 0.1, 0.1, 5.0, 1.0}, { 6.7, 5.4, 3.1},
+                                                     a2dt, decimalShift).c_str());
+}
+
+
+void test_doFlowLateTransitionHanging()
+{
+    float a2dt = 3.6;
+
+    // haverland: this is the case if the analog pointer is a bit before the digit.
+    // It's the normal late transition up to 2.0 on analog must the digit transition ends
+    // After 2.0 on analog it named "hanging digit" by me. It never reach the x.0 until the next
+    // transition begins.
+    // BUT. It makes the issue you have later, because all other unter 3.6 are negative values now.
+    TEST_ASSERT_EQUAL_STRING("12.1210", postProcess({0.0, 1.0, 1.9}, {1.2, 2.2, 1.0, 0.0}, a2dt).c_str());
+
+    // Questionable? (meter shows 012.4210 , this is after transition)
+    // Slider0007: In my opionion this series starts with 11.x with this a2dt value
+    // As I remember right, this is a real series from rainman110, therefore the following cases 
+    // also needs to be corrected the same way
+    TEST_ASSERT_EQUAL_STRING("11.4210", postProcess({0.0, 1.0, 1.9}, {4.3, 2.2, 1.0, 0.0}, a2dt).c_str());
+
+    TEST_ASSERT_EQUAL_STRING("11.6210", postProcess({0.0, 1.0, 1.9}, {6.3, 2.2, 1.0, 0.0}, a2dt).c_str());
+
+    TEST_ASSERT_EQUAL_STRING("12.3610", postProcess({0.0, 1.0, 2.5}, {3.5, 6.2, 1.0, 0.0}, a2dt).c_str());
+
+    TEST_ASSERT_EQUAL_STRING("12.4510", postProcess({0.0, 1.0, 3.0}, {4.5, 5.2, 1.0, 0.0}, a2dt).c_str());
+
+    TEST_ASSERT_EQUAL_STRING("12.4510", postProcess({0.0, 1.0, 2.9}, {4.5, 5.2, 1.0, 0.0}, a2dt).c_str());
+}
+
+
+void test_doFlowPP_rainman110()
+{
+
+    // https://github.com/jomjol/AI-on-the-edge-device/issues/2743
+    // --> Extreme early digit transition. AnanlogDigitTransition needs to set to 3.5 (was limited to 6)
+    std::vector<float> digits = {4.0, 1.0, 1.8};  // wrong result: 412.3983
+    std::vector<float> analogs = {3.6, 9.9, 8.1, 3.5};
+    UnderTestPost* undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+    setAnalogdigitTransistionStart(undertestPost, 3.5);
+    TEST_ASSERT_EQUAL_STRING("411.3983", process_doFlow(undertestPost).c_str());
+    delete undertestPost;
+
+    // https://github.com/jomjol/AI-on-the-edge-device/pull/2887
+    // --> Extreme early digit transition. AnanlogDigitTransition needs to set to 3.5 (was limited to 6)
+    digits = {4.0, 1.0, 7.9};  // wrong result: 417.2579
+    analogs = {2.5, 5.8, 7.7, 9.0};
+
+    undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+    setAnalogdigitTransistionStart(undertestPost, 3.5);
+    TEST_ASSERT_EQUAL_STRING("418.2579", process_doFlow(undertestPost).c_str());
+    delete undertestPost;
+
+    // Edge Case
+    digits = {9.9, 9.4};
+    analogs = {5.0, 0.0};
+
+    undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+    setAnalogdigitTransistionStart(undertestPost, 8.0);
+    TEST_ASSERT_EQUAL_STRING("99.50", process_doFlow(undertestPost).c_str());
+    delete undertestPost;
+
+    // Edge Case
+    digits = {1.0, 0.0, 0.0};
+    analogs = {9.5, 5.0};
+    undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+    setAnalogdigitTransistionStart(undertestPost, 8.0);
+    TEST_ASSERT_EQUAL_STRING("99.95", process_doFlow(undertestPost).c_str());
+    delete undertestPost;
+
+    // https://github.com/jomjol/AI-on-the-edge-device/pull/2887
+    // Discussion 149365.9 vs. 149364.9
+    digits = {0.9, 4.8, 9.0, 3.0, 6.0, 5.0};
+    analogs = {9.6};
+
+    undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+    setAnalogdigitTransistionStart(undertestPost, 9.2);
+    TEST_ASSERT_EQUAL_STRING("149364.9", process_doFlow(undertestPost).c_str());
+    delete undertestPost;
+}
+
+
+void test_doFlowPP_rainman110_transition()
+{
+    // https://github.com/jomjol/AI-on-the-edge-device/pull/2887
+    // Edge cases
+    std::vector<float> digits = {4.0, 1.0, 7.9};  
+    std::vector<float> analogs = {1.4, 5.8, 7.7, 9.0};
+    
+    UnderTestPost* undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+    setAnalogdigitTransistionStart(undertestPost, 3.5);
+    std::string result = process_doFlow(undertestPost);
+    TEST_ASSERT_EQUAL_STRING("418.1579", result.c_str());
+    delete undertestPost;
+
+    // https://github.com/jomjol/AI-on-the-edge-device/pull/2887
+    // Edge cases
+    digits = {4.0, 1.0, 7.9};  
+    analogs = {3.4, 5.8, 7.7, 9.0};
+    
+    undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+    setAnalogdigitTransistionStart(undertestPost, 3.5);
+    result = process_doFlow(undertestPost);
+    TEST_ASSERT_EQUAL_STRING("418.3579", result.c_str());
+    delete undertestPost;
+
+    // https://github.com/jomjol/AI-on-the-edge-device/pull/2887
+    // Edge cases
+    digits = {4.0, 1.0, 8.5};  
+    analogs = {3.7, 5.8, 7.7, 9.0};
+    
+    undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+    setAnalogdigitTransistionStart(undertestPost, 3.5);
+    result = process_doFlow(undertestPost);
+    TEST_ASSERT_EQUAL_STRING("418.3579", result.c_str());
+    delete undertestPost;
+
+    // https://github.com/jomjol/AI-on-the-edge-device/pull/2887
+    // Edge cases
+    digits = {4.0, 1.0, 8.9};  
+    analogs = {4.0, 5.8, 7.7, 9.0};
+    
+    undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+    setAnalogdigitTransistionStart(undertestPost, 3.5);
+    result = process_doFlow(undertestPost);
+    TEST_ASSERT_EQUAL_STRING("418.4579", result.c_str());
+    delete undertestPost;
+}

code/test/test_suite_flowcontroll.cpp

@@ -138,6 +138,21 @@ void task_UnityTesting(void *pvParameter)
         RUN_TEST(test_doFlowPP3);
         printf("---------------------------------------------------------------------------\n");
         RUN_TEST(test_doFlowPP4);
+        printf("---------------------------------------------------------------------------\n");
+        RUN_TEST(test_doFlowLateTransition);
+        printf("---------------------------------------------------------------------------\n");
+        RUN_TEST(test_doFlowEarlyTransition);
+        printf("---------------------------------------------------------------------------\n");
+        RUN_TEST(test_doFlowEarlyTransitionEdgeCase);
+        printf("---------------------------------------------------------------------------\n");
+        RUN_TEST(test_doFlowIssue2857);
+        printf("---------------------------------------------------------------------------\n");
+        RUN_TEST(test_doFlowLateTransitionHanging);
+        printf("---------------------------------------------------------------------------\n");
+        RUN_TEST(test_doFlowPP_rainman110);
+        printf("---------------------------------------------------------------------------\n");
+        RUN_TEST(test_doFlowPP_rainman110_transition);
+
     UNITY_END();
 
     while(1);
@@ -151,24 +166,9 @@ extern "C" void app_main()
 {
   initGPIO();
   Init_NVS_SDCard();
-  esp_log_level_set("*", ESP_LOG_DEBUG);        // set all components to ERROR level
+  esp_log_level_set("*", ESP_LOG_ERROR);        // set all components to ERROR level
 
-  UNITY_BEGIN();
-    RUN_TEST(testNegative_Issues);
-   RUN_TEST(testNegative);
-   /*
-    RUN_TEST(test_analogToDigit_Standard);
-    RUN_TEST(test_analogToDigit_Transition);
-    RUN_TEST(test_doFlowPP);
-    RUN_TEST(test_doFlowPP1);
-    RUN_TEST(test_doFlowPP2);
-    RUN_TEST(test_doFlowPP3);
-    RUN_TEST(test_doFlowPP4);
-    RUN_TEST(test_doFlowLateTransition);
-    RUN_TEST(test_doFlowEarlyTransition);
-
-    // getReadoutRawString test
-    RUN_TEST(test_getReadoutRawString);
-  */
-  UNITY_END();
+    // Create dedicated testing task (heap size can be configured - large enough to handle a lot of testing cases)
+    // ********************************************
+    xTaskCreate(&task_UnityTesting, "task_UnityTesting", 12 * 1024, NULL, tskIDLE_PRIORITY+2, NULL);
 }

param-docs/expert-params.txt

@@ -1,17 +1,32 @@
-demo
 WaitBeforeTakingPicture
-ImageQuality
-ImageSize
-LEDIntensity
-Brightness
-Contrast
-Saturation
-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
-InitialMirror
-FlipImageSize
 CNNGoodThreshold
 PreValueAgeStartup
 ErrorMessage

param-docs/parameter-pages/Alignment/FlipImageSize.md

@@ -1,11 +1,11 @@
 # Parameter `FlipImageSize`
 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
-    This parameter can also be set on the Reference Image configuration.
+    After changing this parameter you need to update your reference image and alignment markers!
 
 This parameter can be used to rotate the viewport together with the alignment rotation:
 ![](img/flipImageSize.png) 

param-docs/parameter-pages/Alignment/InitialMirror.md

@@ -1,10 +1,10 @@
 # Parameter `InitialMirror`
 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
-    This parameter can also be set on the Reference Image configuration.
+    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/Alignment/InitialRotate.md

@@ -1,9 +1,12 @@
 # Parameter `InitialRotate`
-Default Value: `179`
+Default Value: `0`
 
 Unit: Degrees
 
-Initial rotation of image before alignment in degree (0 .. 359)
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
 
 !!! Note
-    This parameter is accessible on the Reference Image Page but not on the Config page!
+    After changing this parameter you need to update your reference image and alignment markers!
+
+Initial rotation of image before alignment in degree (`-360` .. `+360`)

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

@@ -0,0 +1,13 @@
+# Parameter `Aec2`
+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/AutoExposureLevel.md

@@ -0,0 +1,15 @@
+# Parameter `AutoExposureLevel`
+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!
+
+Exposure compensation. Lower values produce darker image.
+
+Range (`-2` .. `2`)

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

@@ -1,10 +1,10 @@
 # Parameter `Brightness`
 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
-    This parameter can also be set on the Reference Image configuration.
+    After changing this parameter you need to update your reference image and alignment markers!
 
 Image Brightness (`-2` .. `2`) 

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.

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

@@ -1,11 +1,11 @@
 # Parameter `Contrast`
 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
-    This parameter can also be set on the Reference Image configuration.
+    After changing this parameter you need to update your reference image and alignment markers!
 
 Image Contrast (`-2` .. `2`)
 

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

@@ -1,6 +1,9 @@
 # Parameter `Demo`
 Default Value: `false`
 
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
 Enable to use demo images instead of the real camera images.
 Make sure to have a `/demo` folder on your SD-Card and make sure it contains the expected files!
 Check [here](../Demo-Mode) for details. 

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

@@ -4,4 +4,10 @@ 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!
+
 Fixes the illumination setting of camera at the startup and uses this later -> Individual round is faster.

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

@@ -0,0 +1,13 @@
+# Parameter `Grayscale`
+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!
+
+Produces black and white image.

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

@@ -1,8 +1,10 @@
 # Parameter `LEDIntensity`
 Default Value: `50`
 
-!!! Warning
-    This is an **Expert Parameter**! Only change it if you understand what it does!
-    This parameter can also be set on the Reference Image configuration.
+!!! 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 the Flash LED Intensity: (`0` .. `100`)

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

@@ -0,0 +1,13 @@
+# Parameter `Negative`
+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!
+
+Inverts the colors.

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

@@ -1,11 +1,11 @@
 # Parameter `Saturation`
 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
-    This parameter can also be set on the Reference Image configuration.
+    After changing this parameter you need to update your reference image and alignment markers!
 
 Image Saturation (`-2` .. `2`)
 

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

@@ -0,0 +1,15 @@
+# Parameter `Sharpness`
+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!
+
+Changes the sharpness of the image. Set to `-4` for auto-sharpness. 
+
+Range (`-4` .. `3`)

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

@@ -0,0 +1,13 @@
+# Parameter `Zoom`
+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/ZoomMode.md

@@ -0,0 +1,15 @@
+# Parameter `ZoomMode`
+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!
+
+`ZoomMode` only applies when `Zoom` is enabled.
+Value 0: Crop the camera sensor frame to `ImageSize` resolution.
+Value 1: Scale the camera sensor frame to 800 x 600 pixels then crop it to `ImageSize` resolution.

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

@@ -0,0 +1,14 @@
+# Parameter `ZoomOffsetX`
+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/ZoomOffsetY.md

@@ -0,0 +1,14 @@
+# Parameter `ZoomOffsetY`
+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.

sd-card/config/config.ini

@@ -1,14 +1,36 @@
 [TakeImage]
 ;RawImagesLocation = /log/source
-WaitBeforeTakingPicture = 5
 ;RawImagesRetention = 15
-Brightness = 0
-Contrast = 0
-Saturation = 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
-FixedExposure = false
 Demo = false
 
 [Alignment]
@@ -22,7 +44,7 @@ FlipImageSize = false
 /config/ref1.jpg 442 142
 
 [Digits]
-Model = /config/dig-cont_0620_s3_q.tflite
+Model = /config/dig-cont_0700_s3_q.tflite
 CNNGoodThreshold = 0.5
 ;ROIImagesLocation = /log/digit
 ;ROIImagesRetention = 3
@@ -31,7 +53,7 @@ main.dig2 343 126 30 54 false
 main.dig3 391 126 30 54 false
 
 [Analog]
-Model = /config/ana-cont_1208_s2_q.tflite
+Model = /config/ana-cont_1300_s2.tflite
 CNNGoodThreshold = 0.5
 ;ROIImagesLocation = /log/analog
 ;ROIImagesRetention = 3

sd-card/html/.gitignore

@@ -1 +1 @@
-edit_config_param.html 
+edit_config.html 

sd-card/html/edit_alignment.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xml:lang="en"> 
 <head>
-    <title>Alignment marker</title>
+    <title>Alignment markers</title>
     <meta charset="UTF-8" />
         
     <style>
@@ -86,16 +86,16 @@
 
 <body style="font-family: arial; padding: 0px 10px;">
     <div id="overlay">
-        <div id="overlaytext">Device is busy with digitalization round. Waiting until it completes...</div>
+        <div id="overlaytext"></div>
     </div>
 	
-	<h2>Alignment Marker</h2>
+	<h2>Alignment Markers</h2>
     <details id="desc_details" style="font-size:16px">
         <summary><b>CLICK HERE</b> for usage description. More infos in documentation:   
             <a href=https://jomjol.github.io/AI-on-the-edge-device-docs/Alignment/ target=_blank>Alignment</a>
         </summary>
         <p>
-            Two alignment marker with clear contour and proper contrast are needed to identify unique "fix points" on the image. 
+            Two alignment markers with clear contour and proper contrast are needed to identify unique "fix points" on the image. 
             The marker area should be not be part of the variable area of ROI evaluation. Please find more information in documenation:
             <a href=https://jomjol.github.io/AI-on-the-edge-device-docs/Alignment/ target=_blank>Alignment</a>
         </p>
@@ -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>  
@@ -170,8 +177,10 @@
     aktindex = 0,
     refInfo,
     enhanceCon = false,
-            param;
-            domainname = getDomainname();
+    domainname = getDomainname(),
+	neueref1,
+	neueref2,
+	cofcat,	
     param;
     
 function doReboot() {
@@ -186,13 +195,38 @@ function doReboot() {
     
 function ChangeSelection(){
     aktindex = parseInt(document.getElementById("index").value);
+	
+	if (aktindex == 0 && neueref1 == 1) {
 		UpdateReference();
 	}
+	else if (aktindex == 1 && neueref2 == 1) {
+		UpdateReference();
+	}
+    else
+	{
+		LoadReference();
+	}
+}
 
 function SaveToConfig(){
     if (confirm("Are you sure you want to save the new alignment marker configuration?")) {
         WriteConfigININew();
-        UpdateConfigReference(domainname)
+		
+		if (neueref1 == 1 && neueref2 == 1) {
+			UpdateConfigReferences(domainname);
+		}
+		
+		else if (neueref1 == 1) {
+			var anzneueref = 1;
+			UpdateConfigReference(anzneueref, domainname);
+		}
+		
+		else if (neueref2 == 1) {
+			var anzneueref = 2;
+			UpdateConfigReference(anzneueref, domainname);
+		}
+		
+        //UpdateConfigReference(domainname)
         SaveConfigToServer(domainname);
         document.getElementById("savemarker").disabled = true;
         document.getElementById("enhancecontrast").disabled = true;
@@ -208,7 +242,7 @@ function EnhanceContrast(){
     refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
     refInfo[aktindex]["dy"] = document.getElementById("refdy").value;       
 
-    enhanceCon = true;
+    var enhanceCon = true;
 
     document.getElementById("overlay").style.display = "block";
     document.getElementById("overlaytext").innerHTML = "Enhancing Image Contrast...";
@@ -219,11 +253,17 @@ function EnhanceContrast(){
 
     async function task() {
         while (true) {
-            var ret = MakeContrastImageZW(refInfo[aktindex], enhanceCon, domainname);
+			var ret = MakeRefImageZW(refInfo[aktindex], enhanceCon, domainname);
         	if (ret) {
                 UpdateReference();
                 //document.getElementById("enhancecontrast").disabled = true;
                 document.getElementById("overlay").style.display = "none";
+				if (aktindex == 0) {
+					neueref1 = 1;
+				}
+				else if (aktindex == 1) {
+					neueref2 = 1;
+				}				
                 return;
             }
             else {
@@ -258,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;
 
@@ -276,15 +315,19 @@ function UpdateReference(){
 }
 			
 function dataURLtoBlob(dataurl) {
-    var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
-        bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
+    var arr = dataurl.split(',');
+	var mime = arr[0].match(/:(.*?);/)[1];
+    var bstr = atob(arr[1]);
+	var n = bstr.length;
+	var u8arr = new Uint8Array(n);
+	
     while(n--){
         u8arr[n] = bstr.charCodeAt(n);
     }
+	
     return new Blob([u8arr], {type:mime});
 }			
 			
-    
 function loadCanvas(dataURL) {
     var canvas = document.getElementById('canvas');
     var context = canvas.getContext('2d');
@@ -298,7 +341,6 @@ function dataURLtoBlob(dataurl) {
     imageObj.src = dataURL;
 }
     
-    
 function getCoords(elem) { // crossbrowser version
     var box = elem.getBoundingClientRect();
     var body = document.body;
@@ -312,23 +354,55 @@ function dataURLtoBlob(dataurl) {
     return { top: Math.round(top), left: Math.round(left) };
 }
    
-
 /* hash #description open the details part of the page */
 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;
+        if(hash == 'description') {
+            document.getElementById("desc_details").open = false;
+		}
     }
 }
 
+function LoadReference(){
+    document.getElementById("img_ref").onload = function () {
+        document.getElementById("refdx").value = this.width;
+        document.getElementById("refdy").value = this.height;
+        refInfo[aktindex]["dx"] = this.width;
+        refInfo[aktindex]["dy"] = this.height;
+        rect.w = document.getElementById("refdx").value;
+        rect.h = document.getElementById("refdy").value;
+        draw();
+    }
+
+    var _filenameurl = refInfo[aktindex]["name"];
+    var url = domainname + "/fileserver" + _filenameurl + "?"  + Date.now();
+    document.getElementById("img_ref").src = url;
+	
+    _filenameurl = _filenameurl.replace(".jpg", "_org.jpg");
+    var url = domainname + "/fileserver" + _filenameurl +  "?" + Date.now();
+    document.getElementById("img_ref_org").src = url;
+
+    document.getElementById("name").value = refInfo[aktindex]["name"];
+    document.getElementById("refx").value = refInfo[aktindex]["x"];
+    document.getElementById("refy").value = refInfo[aktindex]["y"];
+    rect.startX = document.getElementById("refx").value;
+    rect.startY = document.getElementById("refy").value;
+    draw();
+}	
 	
 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;
@@ -338,15 +412,15 @@ function dataURLtoBlob(dataurl) {
     canvas.addEventListener('mousemove', mouseMove, false);
     loadCanvas(domainname + "/fileserver/config/reference.jpg");	
 
-            CopyReferenceToImgTmp(domainname);
+    //CopyReferenceToImgTmp(domainname);
     refInfo = GetReferencesInfo();
 
-            UpdateReference();
-
+    //UpdateReference();
+	LoadReference();
     drawImage();
+	draw();
 }
 
-
 function drawImage(){
     var canvas = document.getElementById('canvas');
     var context = canvas.getContext('2d');
@@ -357,13 +431,14 @@ function dataURLtoBlob(dataurl) {
 	// context.restore();
 }  
 
-
 function CutOutReference(){
     refInfo[aktindex]["x"] = document.getElementById("refx").value;
     refInfo[aktindex]["y"] = document.getElementById("refy").value; 
     refInfo[aktindex]["dx"] = document.getElementById("refdx").value;
     refInfo[aktindex]["dy"] = document.getElementById("refdy").value;
 
+	var enhanceCon = false;
+
     document.getElementById("overlay").style.display = "block";
     document.getElementById("overlaytext").innerHTML = "Updating marker...";
 
@@ -373,12 +448,20 @@ function dataURLtoBlob(dataurl) {
 
     async function task() {
         while (true) {
-                    var ret = MakeRefZW(refInfo[aktindex], domainname);
+			var ret = MakeRefImageZW(refInfo[aktindex], enhanceCon, domainname);
+            
 			if (ret) {
                 UpdateReference();
                 document.getElementById("enhancecontrast").disabled = false;
                 document.getElementById("savemarker").disabled = false;
                 document.getElementById("overlay").style.display = "none";
+				
+				if (aktindex == 0) {
+					neueref1 = 1;
+				}
+				else if (aktindex == 1) {
+					neueref2 = 1;
+				}					
                 return;
             }
             else {
@@ -405,13 +488,12 @@ function dataURLtoBlob(dataurl) {
 function drawGrid(){
     var canvas = document.getElementById('canvas');
     var ctx = canvas.getContext('2d');
-            w = canvas.width;
-            h = canvas.height;
+    var w = canvas.width;
+    var h = canvas.height;
     ctx.save();
     ctx.strokeStyle = '#00FF00';
 
-            for (i = h/2; i < h; i += 100) 
-                {
+    for (i = h/2; i < h; i += 100) {
         ctx.moveTo(0, i);
         ctx.lineTo(w, i);
         ctx.stroke();
@@ -419,23 +501,23 @@ function dataURLtoBlob(dataurl) {
         ctx.lineTo(w, h-i);
         ctx.stroke();
 	}
-            for (i = w/2; i < w; i += 100) 
-                {
+	
+    for (i = w/2; i < w; i += 100) {
         ctx.moveTo(i, 0);
         ctx.lineTo(i, h);
         ctx.stroke();
         ctx.moveTo(w-i, 0);
         ctx.lineTo(w-i, h);
-                ctx.stroke();                }
+        ctx.stroke();                
+	}
 	// ctx.restore();
 }
 
-
 function draw() {
     var canvas = document.getElementById('canvas');
     var context = canvas.getContext('2d');
     context.drawImage(imageObj, 0, 0);
-        lw = 4
+    var lw = 4
     context.lineWidth = lw;
     context.strokeStyle = "#FF0000";
     var x0 = parseInt(rect.startX) - parseInt(lw/2);
@@ -445,21 +527,8 @@ function dataURLtoBlob(dataurl) {
     context.strokeRect(x0, y0, dx, dy);           
 }
 
-    function getCoords(elem) { // crossbrowser version
-        var box = elem.getBoundingClientRect();
-        var body = document.body;
-        var docEl = document.documentElement;
-        var scrollTop = window.pageYOffset || docEl.scrollTop || body.scrollTop;
-        var scrollLeft = window.pageXOffset || docEl.scrollLeft || body.scrollLeft;
-        var clientTop = docEl.clientTop || body.clientTop || 0;
-        var clientLeft = docEl.clientLeft || body.clientLeft || 0;
-        var top  = box.top +  scrollTop - clientTop;
-        var left = box.left + scrollLeft - clientLeft;
-    return { top: Math.round(top), left: Math.round(left) };
-}
-
 function mouseDown(e) {
-        zw = getCoords(this)
+    var zw = getCoords(this)
     rect.startX = e.pageX - zw.left;
     rect.startY = e.pageY - zw.top;
     document.getElementById("refx").value =  rect.startX;
@@ -469,14 +538,17 @@ function dataURLtoBlob(dataurl) {
 
 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;
@@ -485,7 +557,7 @@ function dataURLtoBlob(dataurl) {
 
 function mouseMove(e) {
     if (drag) {
-            zw = getCoords(this)        
+        var zw = getCoords(this)        
         rect.w = (e.pageX - zw.left) - rect.startX;
         rect.h = (e.pageY - zw.top) - rect.startY ;
         document.getElementById("refdx").value = rect.w;
@@ -497,9 +569,9 @@ function dataURLtoBlob(dataurl) {
         var canvas = document.getElementById('canvas');
         var context = canvas.getContext('2d');
 
-            zw = getCoords(this);
-            x = e.pageX - zw.left;
-            y = e.pageY - zw.top;
+        var zw = getCoords(this);
+        var x = e.pageX - zw.left;
+        var y = e.pageY - zw.top;
             
         context.lineWidth = 2;
         context.strokeStyle = "#00FF00";
@@ -512,8 +584,7 @@ function dataURLtoBlob(dataurl) {
     }
 }
 
-    function namechanged()
-    {
+function namechanged() {
     _name = document.getElementById("name").value;
     refInfo[aktindex]["name"] = _name;
 }
@@ -528,7 +599,6 @@ function dataURLtoBlob(dataurl) {
     }
 }
     
-    
 init();
     </script>
 </body>

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,23 +187,30 @@
             <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>
-            <td><input type="checkbox" id="lockAspectRatio" name="lockAspectRatio" value="1" onclick="changelockAspectRatio()" checked tabindex=6><label for="lockAspectRatio"> Lock aspect ratio </label></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>
-            <td><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></td>
         </tr>
+		
         <tr>
-            <td colspan="2"></td>
-            <td><input type="checkbox" id="CCW" name="CCW" value="0" onclick="changeCCW()" unchecked tabindex=8><label for="CCW">Counter clockwise rotation (CCW)</label></td>
+            <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>		
     </table>		 
 </div>
 
+<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=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>
         <colgroup>
             <col span="1" style="width: 22%;">
@@ -207,20 +218,23 @@
             <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'),
@@ -254,12 +268,10 @@ function EnDisableAnalog() {
         $("#div2").attr("disabled", "disabled").off('click');
         var x1=$("#div2").hasClass("disabledDiv");
         
-        if (isEnabled)
-        {
+        if (isEnabled) {
             $("#div2").removeClass("disabledDiv");
         }
-        else
-        {
+        else {
             $("#div2").addClass("disabledDiv");
         }
 		
@@ -268,8 +280,7 @@ function EnDisableAnalog() {
         cofcat["Analog"]["enabled"] = isEnabled;
         document.getElementById("saveroi").disabled = false;
                 
-        if (isEnabled)
-        {
+        if (isEnabled) {
             UpdateROIs();
         }
     }
@@ -278,6 +289,7 @@ function sah1(el, _target) {
         try {
             el.disabled = _target;
         } catch (E) {}
+	    
         if (el.childNodes && el.childNodes.length > 0) {
             for (var x = 0; x < el.childNodes.length; x++) {
                 sah1(el.childNodes[x], _target);
@@ -296,9 +308,11 @@ function deleteROI(){
         }
 
         ROIInfo.splice(aktindex, 1);
+	    
         if (aktindex > ROIInfo.length - 1){
             aktindex = ROIInfo.length - 1;
         }
+	    
         UpdateROIs();
         draw();
     }
@@ -321,16 +335,20 @@ function newROI() {
             return; //break out of the function early because prompt was aborted
         }
 
-    if (ROIInfo.length > 0)
+        if (ROIInfo.length > 0) {
             erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 15, 30, ROIInfo[aktindex]["dx"], ROIInfo[aktindex]["dy"], ROIInfo[aktindex]["CCW"]=="true");
-    else
+        }
+        else {
             erg = CreateROI(_number, "analog", sel.selectedIndex, _roinew, 15, 30, 30, 30, false);
+        }
 
-    if (erg != "")
+        if (erg != "") {
             firework.launch(erg, 'danger', 30000);
-    else
+        }
+        else {
             UpdateROIs(_roinew);
         }
+    }
 
     function movePrevious() {
         var zw = ROIInfo[aktindex];
@@ -364,13 +382,14 @@ function changeCCW(){
         ROIInfo = getROIInfo("analog", _number);
         aktindex = parseInt(document.getElementById("index").value);
 
-    if (document.getElementById("CCW").checked)
+        if (document.getElementById("CCW").checked) {
             ROIInfo[aktindex]["CCW"] = "true";
-    else
+        }
+        else {
             ROIInfo[aktindex]["CCW"] = "false";
+        }
 	
         UpdateROIs();
-
     }
 
     function ChangeSelection() {
@@ -392,9 +411,7 @@ function SaveToConfig(){
         }
     }
 
-
-function ShowMultiplier()
-{
+    function ShowMultiplier() {
         var decimalShift = 0;
         var multiplier;
         var multiplier_decshift;
@@ -406,6 +423,7 @@ function ShowMultiplier()
         var sel = document.getElementById("Numbers_value1");
         var _number= sel.options[sel.selectedIndex].text;
         document.getElementById("decimalShift").value = 0;
+        
         for (var i = 0; i < NumberInfo.length; ++i) {
             if (NumberInfo[i]["name"] == _number) {
                 if (NumberInfo[i]["PostProcessing"]["DecimalShift"]["enabled"]) {
@@ -419,11 +437,13 @@ function ShowMultiplier()
             multiplier = fixedDecimals = aktindex + 1;
             multiplier_decshift = fixedDecimals_decshift = multiplier - Number(decimalShift);
 
-        if (multiplier < 0)
+            if (multiplier < 0) {
                 fixedDecimals = 0;
+            }
 
-        if (multiplier_decshift < 0)
+            if (multiplier_decshift < 0) {
                 fixedDecimals_decshift = 0;
+            }
 
             document.getElementById("multiplier").value="x" + Number(10 ** (-1*multiplier)).toFixed(fixedDecimals);
             document.getElementById("multiplier_decshift").value="x" + Number(10 ** (-1*multiplier_decshift)).toFixed(fixedDecimals_decshift);
@@ -432,8 +452,9 @@ function ShowMultiplier()
             multiplier = ROIInfo.length - 1 - aktindex;
             multiplier_decshift = fixedDecimals_decshift = multiplier + Number(decimalShift);
         
-        if (multiplier_decshift > 0)
+            if (multiplier_decshift > 0) {
                 fixedDecimals_decshift = 0;
+            }
         
             if (fixedDecimals_decshift < 0) {
                 fixedDecimals_decshift = -1 * fixedDecimals_decshift;
@@ -453,8 +474,7 @@ function UpdateROIs(_sel){
         ROIInfo = getROIInfo("analog", _number);
         // _catzw = getConfigCategory();
 
-    if (cofcat["Analog"]["enabled"] == false) 
-    {
+        if (cofcat["Analog"]["enabled"] == false) {
             document.getElementById("Category_Analog_enabled").checked = false;
             EnDisableAnalog();
             firework.launch('Analog ROI processing is disabled. Activate with checkbox if needed', 'warning', 10000);
@@ -474,6 +494,7 @@ function UpdateROIs(_sel){
             document.getElementById("refy").disabled = true;
             document.getElementById("refdy").disabled = true;
             document.getElementById("lockSizes").disabled = true;
+            document.getElementById("showall").disabled = true;    
             document.getElementById("lockAspectRatio").disabled = true;
             document.getElementById("CCW").disabled = true;
             document.getElementById("moveNext").disabled = true;
@@ -481,8 +502,7 @@ function UpdateROIs(_sel){
             document.getElementById("saveroi").disabled = false;
             return;
         }
-    else
-    {
+        else {
             document.getElementById("newROI").disabled = false;
             document.getElementById("deleteROI").disabled = false;
             document.getElementById("renameROI").disabled = false;
@@ -494,6 +514,7 @@ function UpdateROIs(_sel){
             document.getElementById("refy").disabled = false;
             document.getElementById("refdy").disabled = false;
             document.getElementById("lockSizes").disabled = false;
+            document.getElementById("showall").disabled = false;    
             document.getElementById("lockAspectRatio").disabled = false;
             document.getElementById("CCW").disabled = false;
             document.getElementById("saveroi").disabled = false;
@@ -504,8 +525,9 @@ function UpdateROIs(_sel){
             _index.remove(0);
         }
 
-    if (aktindex > ROIInfo.length)
+        if (aktindex > ROIInfo.length) {
             aktindex = ROIInfo.length-1;
+        }
 
         for (var i = 0; i < ROIInfo.length; ++i){
             var option = document.createElement("option");
@@ -513,12 +535,13 @@ function UpdateROIs(_sel){
             option.value = i;
             _index.add(option);
             if (typeof _sel !== 'undefined') {
-            if (option.text == _sel)
+                if (option.text == _sel) {
                     aktindex = i;
                 }
             }
-    _index.selectedIndex = aktindex; 
+        }
 	
+        _index.selectedIndex = aktindex; 
 
         document.getElementById("movePrevious").disabled = false;
         if (aktindex == 0){
@@ -562,8 +585,8 @@ function UpdateROIs(_sel){
         imageObj.src = dataURL;
     }
     
-    
-        function getCoords(elem) { // crossbrowser version
+    function getCoords(elem) { 
+        // crossbrowser version
         var box = elem.getBoundingClientRect();
         var body = document.body;
         var docEl = document.documentElement;
@@ -576,36 +599,42 @@ function UpdateROIs(_sel){
         return { top: Math.round(top), left: Math.round(left) };
     }
 
-
     /* hash #description open the details part of the page */
     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;
+            if(hash == 'description') {
+                document.getElementById("desc_details").open = false;
+            }
         }
     }
-    
     
     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)) { 
+                if (parseInt(ROIInfo[i].dx) != parseInt(ROIInfo[0].dx) || parseInt(ROIInfo[i].dy) != parseInt(ROIInfo[0].dy)) { 
                     all_dx_dy_Identical = false;
                     break;
                 }
@@ -639,7 +668,6 @@ function UpdateROIs(_sel){
 
     function UpdateNUMBERS(_sel) {
         zw = getNUMBERInfo();
-
         index = 0;
 
         var _index = document.getElementById("Numbers_value1");
@@ -654,8 +682,9 @@ function UpdateNUMBERS(_sel){
             _index.add(option); 
 
             if (typeof _sel !== 'undefined') {
-            if (zw[i]["name"] == _sel)
-                index = i
+                if (zw[i]["name"] == _sel) {
+                   index = i;
+                }
             }
         }
         _index.selectedIndex = index;
@@ -672,11 +701,14 @@ function renameNumber(){
         }
 
         erg = RenameNUMBER(_delete, _numbernew);
-    if (erg != "")
+	    
+        if (erg != "") {
             firework.launch(erg, 'danger', 30000);
-    else
+        }
+        else {
             UpdateNUMBERS(_numbernew);
         }
+    }
 
     function newNumber() {
         var _numbernew = prompt("Please enter a name for the new number sequence", "name");
@@ -685,28 +717,29 @@ function newNumber(){
         }
 
         erg = CreateNUMBER(_numbernew);
-    if (erg != "")
+	    
+        if (erg != "") {
             firework.launch(erg, 'danger', 30000);
-    else
+        }
+        else {
             UpdateNUMBERS(_numbernew);
         }
-
+    }
 
     function removeNumber() {
         if (confirm("The entire number sequence will be removed (digit + analog parts). " +
                 "To remove single ROI of the number sequence, use \"Delete ROI\" instead.\n" +
-                "Do you really want to proceed?")) 
-    {
+                "Do you really want to proceed?")) {
             var sel = document.getElementById("Numbers_value1");
             var _delete= sel.options[sel.selectedIndex].text;
             erg = DeleteNUMBER(_delete);
-        if (erg != "")
+            if (erg != "") {
                 firework.launch(erg, 'danger', 30000);
+            }
             UpdateNUMBERS();
         }	    
     }
 
-
     function drawTextBG(context, txt, x, y, padding) {
         context.font = "15px Arial";
         context.textAlign = "center";
@@ -720,7 +753,8 @@ function drawTextBG(context, txt, x, y, padding) {
     }
 
     function draw() {
-    if (typeof ROIInfo === 'undefined') { // During init, ROIInfo is not defined yet
+        if (typeof ROIInfo === 'undefined') { 
+            // During init, ROIInfo is not defined yet
             return;
         }
     
@@ -736,27 +770,23 @@ function drawTextBG(context, txt, x, y, padding) {
         context.fillStyle = "red";
         context.textAlign = "center";
 
-        if (document.getElementById("Category_Analog_enabled").checked)
-        {
+        if (document.getElementById("Category_Analog_enabled").checked) {
             var sel = document.getElementById("index");
             var _number = sel.selectedIndex;
 
             if (lockSizes) {
                 // Synchronize dx and dy
-                for (var _nb = 0; _nb < ROIInfo.length; _nb++)
-                {
-                    if (_nb != _number)
-                    {
+                for (var _nb = 0; _nb < ROIInfo.length; _nb++) {
+                    if (_nb != _number) {
                         ROIInfo[_nb].dy = rect.h;
                         ROIInfo[_nb].dx = rect.w;
                     }
                 }
             }
 
-            for (var _nb = 0; _nb < ROIInfo.length; _nb++)
-            {
-                if (_nb != _number)
-                {
+            if (document.getElementById("showall").checked) {		
+                for (var _nb = 0; _nb < ROIInfo.length; _nb++) {
+                    if (_nb != _number) {
                         lw = 2;
                         context.lineWidth = lw;
                         context.strokeStyle = "#990000";
@@ -766,10 +796,12 @@ function drawTextBG(context, txt, x, y, padding) {
                         var dy = parseInt(ROIInfo[_nb].dy) + parseInt(lw);
                         context.strokeRect(x0, y0, dx, dy);
                     
-                    if (ROIInfo[_nb]["CCW"] != "true")
+                        if (ROIInfo[_nb]["CCW"] != "true") {
                            drawTextBG(context, ROIInfo[_nb]["name"], x0+dx/2-0.5, y0-13, 5);
-                    else
+                        }
+                        else {
                            drawTextBG(context, ROIInfo[_nb]["name"]+" (CCW)", x0+dx/2-0.5, y0-13, 5);
+                        }
                     
                         lw = 1;
                         var x0 = parseInt(ROIInfo[_nb].x) - parseInt(lw/2);
@@ -788,6 +820,7 @@ function drawTextBG(context, txt, x, y, padding) {
                         context.stroke();  
                     }
                 }
+            }
 
             lw = 4
             context.lineWidth = lw;
@@ -798,10 +831,12 @@ function drawTextBG(context, txt, x, y, padding) {
             var dy = parseInt(rect.h) + parseInt(lw);
             context.strokeRect(x0, y0, dx, dy);
 
-            if (ROIInfo[aktindex]["CCW"] != "true")
+            if (ROIInfo[aktindex]["CCW"] != "true") {
                 drawTextBG(context, ROIInfo[aktindex]["name"], x0+dx/2, y0-11, 5);
-            else
+            }
+            else {
                 drawTextBG(context, ROIInfo[aktindex]["name"] + " (CCW)", x0+dx/2, y0-11, 5);
+            }
 
             context.lineWidth = 1;
             context.beginPath();
@@ -819,7 +854,6 @@ function drawTextBG(context, txt, x, y, padding) {
         }
     }
 
-
     function mouseDown(e) {
         zw = getCoords(this)
         rect.startX = e.pageX - zw.left;
@@ -849,10 +883,10 @@ function drawTextBG(context, txt, x, y, padding) {
         if (drag) {
             zw = getCoords(this)        
 
-
             if (lockAspectRatio) {
                 rect.h = (e.pageY - zw.top) - rect.startY;
-                rect.w = Math.round(rect.h * ROIInfo[aktindex]["ar"]);            }
+                rect.w = Math.round(rect.h * ROIInfo[aktindex]["ar"]);            
+            }
             else {
                 rect.w = (e.pageX - zw.left) - rect.startX;
                 rect.h = (e.pageY - zw.top) - rect.startY;
@@ -913,7 +947,6 @@ function drawTextBG(context, txt, x, y, padding) {
         document.getElementById("saveroi").disabled = false;
     }
 
-
     function renameROI() {
         var sel = document.getElementById("Numbers_value1");
         var _number= sel.options[sel.selectedIndex].text;
@@ -926,23 +959,21 @@ function drawTextBG(context, txt, x, y, padding) {
         }
 
         erg = RenameROI(_number, "analog", _roialt, _roinew);
-        if (erg != "")
+        if (erg != "") {
             firework.launch(erg, 'danger', 30000);
-        else
+        }
+        else {
             UpdateROIs(_roinew);
         }
+    }
 
-    function numberChanged()
-    {
+    function numberChanged() {
         aktindex = 0;
         UpdateROIs();
     }    
 
-
-
     init();
 
 </script>
-
 </body>
 </html>

sd-card/html/edit_digits.html

@@ -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,25 +196,29 @@
             <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>
-            <td><input type="checkbox" id="lockAspectRatio" name="lockAspectRatio" value="1" onclick="changelockAspectRatio()" checked tabindex=6><label for="lockAspectRatio"> Lock aspect ratio </label></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>
-            <td><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></td>
-        </tr>
-        <tr>
-            <td colspan="2"></td>
-            <td><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" step=1 onchange="valuemanualchangedspace()" tabindex=9> between all ROIs</label>
-            </td>
         </tr>
     </table>	
 </div>
 
+
+<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>
+    <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>
+
     <table>
         <colgroup>
             <col span="1" style="width: 22%;">
@@ -199,10 +226,14 @@
             <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=10></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>
@@ -247,12 +278,10 @@ function EnDisableDigits() {
         $("#div2").attr("disabled", "disabled").off('click');
         var x1=$("#div2").hasClass("disabledDiv");
         
-        if (isEnabled)
-        {
+        if (isEnabled) {
             $("#div2").removeClass("disabledDiv");
         }
-        else
-        {
+        else {
             $("#div2").addClass("disabledDiv");
         }
 		
@@ -261,8 +290,7 @@ function EnDisableDigits() {
         cofcat["Digits"]["enabled"] = isEnabled;
         document.getElementById("saveroi").disabled = false;
                 
-        if (isEnabled)
-        {
+        if (isEnabled) {
             UpdateROIs();
         }
     }
@@ -271,6 +299,7 @@ function EnDisableDigits() {
         try {
             el.disabled = _target;
         } catch (E) {}
+	    
         if (el.childNodes && el.childNodes.length > 0) {
             for (var x = 0; x < el.childNodes.length; x++) {
                 sah1(el.childNodes[x], _target);
@@ -278,7 +307,6 @@ function EnDisableDigits() {
         }
     }
 
-
     function onNameChange() {
         ROIInfo[aktindex]["name"] = document.getElementById("name").value;
         UpdateROIs();
@@ -290,6 +318,7 @@ function deleteROI(){
         }
 
         ROIInfo.splice(aktindex, 1);
+	    
         if (aktindex > ROIInfo.length - 1){
             aktindex = ROIInfo.length - 1;
         }
@@ -322,11 +351,13 @@ function newROI() {
             erg = CreateROI(_number, "digit", sel.selectedIndex, _roinew, parseInt(ROIInfo[sel.selectedIndex].x) + parseInt(ROIInfo[sel.selectedIndex].dx) + space,
                 parseInt(ROIInfo[sel.selectedIndex].y), ROIInfo[aktindex]["dx"], ROIInfo[aktindex]["dy"], 0);
         }
-    else
+        else {
             erg = CreateROI(_number, "digit", sel.selectedIndex, _roinew, 15, 30, 30, 51, 0);
+        }
 
-    if (erg != "")
+        if (erg != "") {
             firework.launch(erg, 'danger', 30000);
+        }
         else {
             UpdateROIs(_roinew);
             // Shift all ROIs on right side to the right
@@ -399,9 +430,7 @@ function SaveToConfig(){
         }
     }
 
-
-function ShowMultiplier()
-{
+    function ShowMultiplier() {
         var decimalShift = 0;
         var multiplier;
         var multiplier_decshift;
@@ -411,6 +440,7 @@ function ShowMultiplier()
         var sel = document.getElementById("Numbers_value1");
         var _number= sel.options[sel.selectedIndex].text;
         document.getElementById("decimalShift").value = 0;
+        
         for (var i = 0; i < NumberInfo.length; ++i) {
             if (NumberInfo[i]["name"] == _number) {
                 if (NumberInfo[i]["PostProcessing"]["DecimalShift"]["enabled"]) {
@@ -423,8 +453,9 @@ function ShowMultiplier()
         multiplier = ROIInfo.length - 1 - aktindex;
         multiplier_decshift = fixedDecimals_decshift = multiplier + Number(decimalShift);
 
-    if (multiplier_decshift > 0)
+        if (multiplier_decshift > 0) {
             fixedDecimals_decshift = 0;
+        }
 
         if (fixedDecimals_decshift < 0) {
             fixedDecimals_decshift = -1*fixedDecimals_decshift;
@@ -434,7 +465,6 @@ function ShowMultiplier()
         document.getElementById("multiplier_decshift").value="x" + Number(10 ** multiplier_decshift).toFixed(fixedDecimals_decshift);
     }
 
-
     function UpdateROIs(_sel){
         document.getElementById("Category_Digits_enabled").checked = true;
         var sel = document.getElementById("Numbers_value1");
@@ -443,8 +473,7 @@ function UpdateROIs(_sel){
         ROIInfo = getROIInfo("digit", _number);
         // _catzw = getConfigCategory();
 
-    if (cofcat["Digits"]["enabled"] == false) 
-    {
+        if (cofcat["Digits"]["enabled"] == false)  {
             document.getElementById("Category_Digits_enabled").checked = false;
             EnDisableDigits();
             firework.launch('Digit ROI processing is disabled. Activate with checkbox if needed', 'warning', 10000);
@@ -465,14 +494,14 @@ function UpdateROIs(_sel){
             document.getElementById("refdy").disabled = true;
             document.getElementById("lockSizes").disabled = true;
             document.getElementById("lockAspectRatio").disabled = true;
+            document.getElementById("showall").disabled = true;   
             document.getElementById("lockSpaceEquidistant").disabled = true;
             document.getElementById("moveNext").disabled = true;
             document.getElementById("movePrevious").disabled = true;
             document.getElementById("saveroi").disabled = false;
             return;
         }
-    else
-    {
+        else {
             document.getElementById("newROI").disabled = false;
             document.getElementById("deleteROI").disabled = false;
             document.getElementById("renameROI").disabled = false;
@@ -484,31 +513,36 @@ function UpdateROIs(_sel){
             document.getElementById("refy").disabled = false;
             document.getElementById("refdy").disabled = false;
             document.getElementById("lockSizes").disabled = false;
+            document.getElementById("showall").disabled = false;    
             document.getElementById("lockAspectRatio").disabled = false;
             document.getElementById("lockSpaceEquidistant").disabled = false;
             document.getElementById("saveroi").disabled = false;
         }
 
         var _index = document.getElementById("index");
+		
         while (_index.length){
             _index.remove(0);
         }
 
-    if (aktindex > ROIInfo.length)
+        if (aktindex > ROIInfo.length) {
             aktindex = ROIInfo.length-1;
+        }
 
         for (var i = 0; i < ROIInfo.length; ++i){
             var option = document.createElement("option");
             option.text = ROIInfo[i]["name"];
             option.value = i;
             _index.add(option);
+		
             if (typeof _sel !== 'undefined') {
-            if (option.text == _sel)
+                if (option.text == _sel) {
                     aktindex = i;
                 }
             }
-    _index.selectedIndex = aktindex; 
+        }
 	    
+        _index.selectedIndex = aktindex; 
 
         document.getElementById("movePrevious").disabled = false;
         if (aktindex == 0){
@@ -526,6 +560,7 @@ function UpdateROIs(_sel){
         document.getElementById("lockSizes").checked = lockSizes;
         document.getElementById("lockSpaceEquidistant").checked = lockSpaceEquidistant;
         document.getElementById("space").value = space;
+	    
         if (!lockSpaceEquidistant) {
             document.getElementById("space").disabled = true;
         }
@@ -558,8 +593,8 @@ function UpdateROIs(_sel){
         imageObj.src = dataURL;
     }
     
-    
-        function getCoords(elem) { // crossbrowser version
+    function getCoords(elem) { 
+        // crossbrowser version
         var box = elem.getBoundingClientRect();
         var body = document.body;
         var docEl = document.documentElement;
@@ -572,30 +607,35 @@ function UpdateROIs(_sel){
         return { top: Math.round(top), left: Math.round(left) };
     }
 
-
     /* hash #description open the details part of the page */
     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;
+            if(hash == 'description') {
+                document.getElementById("desc_details").open = false;
+            }
         }
     }
-    
     
     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();
 		
+        UpdateNUMBERS();
 
         /* Check if the ROIs are equidistant. Only if not, untick the checkbox */
         if (ROIInfo.length > 1) {
@@ -617,8 +657,10 @@ function UpdateROIs(_sel){
                 }
             }
         }
+	    
         /* Check if the ROIs have same y, dy and dx. If so, tick the sync checkbox */
         var all_y_dx_dy_Identical = true;
+	    
         if (ROIInfo.length > 1) {
             for (var i = 1; i < (ROIInfo.length); ++i) { // 2nd .. last ROI
                 if (parseInt(ROIInfo[i].y) != parseInt(ROIInfo[0].y) ||
@@ -662,10 +704,10 @@ function UpdateROIs(_sel){
 
     function UpdateNUMBERS(_sel) {
         zw = getNUMBERInfo();
-
         index = 0;
 
         var _index = document.getElementById("Numbers_value1");
+	    
         while (_index.length){
             _index.remove(0);
         }
@@ -677,12 +719,13 @@ function UpdateNUMBERS(_sel){
             _index.add(option); 
 
             if (typeof _sel !== 'undefined') {
-            if (zw[i]["name"] == _sel)
-                index = i
+                if (zw[i]["name"] == _sel) {
+                    index = i;
+                }
             }
         }
-    _index.selectedIndex = index;
 	    
+        _index.selectedIndex = index;
         UpdateROIs();
     }
 
@@ -690,16 +733,19 @@ function renameNumber(){
         var sel = document.getElementById("Numbers_value1");
         var _delete= sel.options[sel.selectedIndex].text;
         var _numbernew = prompt("Please enter a new name for the selected number sequence", _delete);
+	    
         if (_numbernew === null) {
             return; //break out of the function early because prompt was aborted
         }
 
         erg = RenameNUMBER(_delete, _numbernew);
-    if (erg != "")
+        if (erg != "") {
             firework.launch(erg, 'danger', 30000);
-    else
+        }
+        else {
             UpdateNUMBERS(_numbernew);
         }
+    }
 
     function newNumber() {
         var _numbernew = prompt("Please enter a name for the new number sequence", "name");
@@ -708,28 +754,29 @@ function newNumber(){
         }
 
         erg = CreateNUMBER(_numbernew);
-    if (erg != "")
+		
+        if (erg != "") {
             firework.launch(erg, 'danger', 30000);
-    else
+        }
+        else {
             UpdateNUMBERS(_numbernew);
         }
-
+    }
 
     function removeNumber() {
         if (confirm("The entire number sequence will be removed (digit + analog parts). " +
                 "To remove single ROI of the number sequence, use \"Delete ROI\" instead.\n" +
-                "Do you really want to proceed?")) 
-    {
+                "Do you really want to proceed?")) {
             var sel = document.getElementById("Numbers_value1");
             var _delete= sel.options[sel.selectedIndex].text;
             erg = DeleteNUMBER(_delete);
-        if (erg != "")
+            if (erg != "") {
                 firework.launch(erg, 'danger', 30000);
+            }
             UpdateNUMBERS();
         }	    
     }
 
-
     function drawTextBG(context, txt, x, y, padding) {
         context.font = "15px Arial";
         context.textAlign = "center";
@@ -742,7 +789,6 @@ function drawTextBG(context, txt, x, y, padding) {
         context.fillText(txt, x + padding / 2, y + padding / 2);
     }
 
-
     function draw() {
         if (typeof ROIInfo === 'undefined') { // During init, ROIInfo is not defined yet
             return;
@@ -756,17 +802,14 @@ function draw() {
             return;
         }
 
-        if (document.getElementById("Category_Digits_enabled").checked)
-        {
+        if (document.getElementById("Category_Digits_enabled").checked) {
             var sel = document.getElementById("index");
             var _number = sel.selectedIndex;
 
             if (lockSizes) {
                 // Synchronize Y, dx and dy
-                for (var _nb = 0; _nb < ROIInfo.length; _nb++)
-                {
-                    if (_nb != _number)
-                    {
+                for (var _nb = 0; _nb < ROIInfo.length; _nb++) {
+                    if (_nb != _number) {
                         ROIInfo[_nb].y = rect.startY;
                         ROIInfo[_nb].dy = rect.h;
                         ROIInfo[_nb].dx = rect.w;
@@ -774,10 +817,9 @@ function draw() {
                 }
             }
 
-            for (var _nb = 0; _nb < ROIInfo.length; _nb++)
-            {
-                if (_nb != _number)
-                {
+            if (document.getElementById("showall").checked) {
+                for (var _nb = 0; _nb < ROIInfo.length; _nb++) {
+                    if (_nb != _number) {
                         lw = 2;
                         context.lineWidth = lw;
                         context.strokeStyle = "#990000";
@@ -801,6 +843,7 @@ function draw() {
                         context.strokeRect(x0+dx*0.2, y0+dy*0.2, dx*0.6, dy*0.6);
                     }
                 }
+            }
 
             lw = 4
             context.lineWidth = lw;
@@ -814,7 +857,6 @@ function draw() {
             context.lineWidth = 1;
             context.strokeRect(x0+dx*0.2, y0+dy*0.2, dx*0.6, dy*0.6);
 
-
             context.lineWidth = 2;
             context.beginPath();
             context.moveTo(x0, y0+dy/2);
@@ -840,14 +882,17 @@ function draw() {
 
     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;
@@ -864,17 +909,20 @@ function draw() {
 
             if (lockAspectRatio) {
                 rect.h = (e.pageY - zw.top) - rect.startY;
-                rect.w = Math.round(rect.h * ROIInfo[aktindex]["ar"]);            }
+                rect.w = Math.round(rect.h * ROIInfo[aktindex]["ar"]);            
+            }
             else {
                 rect.w = (e.pageX - zw.left) - rect.startX;
                 rect.h = (e.pageY - zw.top) - rect.startY;
             }
             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');
 
@@ -910,10 +958,10 @@ function draw() {
             rect.startX = document.getElementById("refx").value;
             rect.startY = document.getElementById("refy").value; 
 
-            draw();   
             if (lockSpaceEquidistant) {
                 makeX_SpaceEquidistant();
             }
+			
             draw();      
         }
         document.getElementById("saveroi").disabled = false;
@@ -985,27 +1033,28 @@ function draw() {
         _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 != "")
+		
+        if (erg != "") {
             firework.launch(erg, 'danger', 30000);
-        else
+        }
+        else {
             UpdateROIs(_roinew);
         }
+    }
 
-    function numberChanged()
-    {
+    function numberChanged() {
         aktindex = 0;
         UpdateROIs();
     }    
 
-
     init();
 
 </script>
-
 </body>
 </html>

sd-card/html/index.html

@@ -24,18 +24,18 @@
             'channelmode=no,directories=no,fullscreen=no,' +
             'location=no,dependent=yes,menubar=no,resizable=no,scrollbars=no,' +
             'status=no,toolbar=no,titlebar=no,' +
-                'left=10,top=250,width=640px,height=480px';
+            'left=10,top=260,width=640px,height=480px';
 
         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);
 				}
@@ -88,21 +89,21 @@
   <ul>
     <li><a href="#" onclick="loadPage('overview.html?v=$COMMIT_HASH');">Overview</a></li>
     <li><a>Settings <i class="arrow down"></i></a>
-      <ul class="submenu">
-        <li><a href="#" onclick="loadPage('prevalue_set.html?v=$COMMIT_HASH');">Set "Previous Value"</a></li>
-        <li><a href="#" onclick="loadPage('edit_config_param.html?v=$COMMIT_HASH');">Configuration</a></li>
-        <li><a>Alignment <i class="arrow right"></i></a>
-            <ul>
-                <li><a href="#" onclick="loadPage('edit_reference.html?v=$COMMIT_HASH');">Reference Image</a></li>
-                <li><a href="#" onclick="loadPage('edit_alignment.html?v=$COMMIT_HASH');">Alignment Marker</a></li>
+      <ul class="submenu" style="width: 260px">
+        <li style="width: 260px"><a href="#" onclick="loadPage('prevalue_set.html?v=$COMMIT_HASH');">Set "Previous Value"</a></li>
+        <li style="width: 260px"><a>References <i class="arrow right"></i></a>
+            <ul style="width: 350px">
+                <li style="width: 350px"><a href="#" onclick="loadPage('edit_reference.html?v=$COMMIT_HASH');">Reference Image and Camera Settings</a></li>
+                <li style="width: 350px"><a href="#" onclick="loadPage('edit_alignment.html?v=$COMMIT_HASH');">Alignment Markers</a></li>
             </ul>
         </li>
-        <li><a><strong>R</strong>egions <strong>O</strong>f <strong>I</strong>nterest <i class="arrow right"></i></a>
+        <li style="width: 260px"><a>Regions of Interest (ROIs)<i class="arrow right"></i></a>
             <ul>
                 <li><a href="#" onclick="loadPage('edit_digits.html?v=$COMMIT_HASH');">Digit ROI</a></li>
                 <li><a href="#" onclick="loadPage('edit_analog.html?v=$COMMIT_HASH');">Analog ROI</a></li>
             </ul>
         </li>
+        <li style="width: 260px"><a href="#" onclick="loadPage('edit_config.html?v=$COMMIT_HASH');">Configuration</a></li>
       </ul>
 
 
@@ -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();
     }