use lower case for MQTT topic rate_per_digitization_round

Allow earlier start for AnalogToDigitTransitionStart
typo
2025-12-07 20:16:55 +03:00 · 2024-10-05 22:32:50 +02:00 · 2024-10-05 22:26:26 +02:00 · 2024-10-05 22:20:24 +02:00 · 2024-10-05 22:18:37 +02:00 · 2024-10-04 23:25:59 +02:00
141 changed files with 4209 additions and 3156 deletions
--- a/.github/label-commenter-config.yaml
+++ b/.github/label-commenter-config.yaml
@@ -115,9 +115,9 @@
    labeled:
      issue:
          body: |
-            See [Digital Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
+            See [Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
            If your type is not contained it can be added to our training material, see [here](https://jomjol.github.io/AI-on-the-edge-device-docs/collect-new-images/).
      discussion:
          body: |
-            See [Digital Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
+            See [Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
            If your type is not contained it can be added to our training material, see [here](https://jomjol.github.io/AI-on-the-edge-device-docs/collect-new-images/).
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -14,7 +14,7 @@ jobs:
      uses: fkirc/skip-duplicate-actions@v5
      with:
        concurrent_skipping: same_content_newer
-    
+
    - uses: actions/checkout@v4
      with:
        submodules: recursive
@@ -37,14 +37,14 @@ jobs:
        path: ~/.platformio
        key: platformio-${{ github.run_id }}
        restore-keys: platformio # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-          
+
    - name: Update Build cache on every commit
      uses: actions/cache@v4
      with:
        path: ./code/.pio/
        key: build-${{ github.run_id }}
        restore-keys: build # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-          
+
    - name: Update generated-files cache on every commit
      uses: actions/cache@v4
      with:
@@ -86,7 +86,7 @@ jobs:

        echo "Replacing variables..."
        cd html; find . -type f -exec sed -i 's/$COMMIT_HASH/${{ steps.vars.outputs.sha_short }}/g' {} \;
-        
+

 #########################################################################################
 ## Pack for Update
@@ -120,7 +120,7 @@ jobs:
        path: update
        key: update-${{ github.run_id }}
        restore-keys: update # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-    
+
    - name: Set Variables
      id: vars
      run: |
@@ -150,7 +150,6 @@ jobs:
        path: ./update/*


-
 #########################################################################################
 ## Pack for Remote Setup 
 #########################################################################################
@@ -176,7 +175,7 @@ jobs:
          ./html/*
        key: generated-files-${{ github.run_id }}
        restore-keys: generated-files # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-          
+
    - name: Update remote_setup cache on every commit
      uses: actions/cache@v4
      with:
@@ -261,7 +260,7 @@ jobs:
        cp -r ./html ./sd-card/ # Overwrite the Web UI with the preprocessed files
        cd sd-card; zip -r ../manual_setup/sd-card.zip *; cd ..
        cd ./manual_setup
-  
+
    - name: Upload manual_setup.zip artifact (Firmware + Bootloader + Partitions + Web UI)
      uses: actions/upload-artifact@v4
      with:
@@ -285,21 +284,21 @@ jobs:

    steps:
    - uses: actions/checkout@v4
-    
+
    - name: Update update cache on every commit
      uses: actions/cache@v4
      with:
        path: update
        key: update-${{ github.run_id }}
        restore-keys: update # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-    
+
    - name: Update remote_setup cache on every commit
      uses: actions/cache@v4
      with:
        path: remote_setup
        key: remote_setup-${{ github.run_id }}
        restore-keys: remote_setup # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-    
+
    - name: Update manual_setup cache on every commit
      uses: actions/cache@v4
      with:
@@ -332,21 +331,18 @@ jobs:

    # extract the version used in next step
    - id: get_version
-      if: startsWith(github.ref, 'refs/tags/') 
-      uses: Simply007/get-version-action@v2
+      uses: dhkatz/get-version-action@v3.0.0

 #    # the changelog [unreleased] will now be changed to the release version
 #    - name: Update changelog
 #      uses: thomaseizinger/keep-a-changelog-new-release@v1
-#      if: startsWith(github.ref, 'refs/tags/') 
 #      with:
 #        changelogPath: Changelog.md
 #        version: ${{ steps.get_version.outputs.version-without-v }}
-            
+
 #    # the release notes will be extracted from changelog 
 #    - name: Extract release notes
 #      id: extract-release-notes
-#      if: startsWith(github.ref, 'refs/tags/') 
 #      uses: ffurrer2/extract-release-notes@v1
 #      with:
 #          changelog_file: Changelog.md
@@ -354,12 +350,11 @@ jobs:
    # Releases should only be created on master by tagging the last commit.
    # all artifacts in firmware folder pushed to the release
    - name: Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2.0.8
      # Note:
      # If you get the error "Resource not accessible by integration",
      # The access rights are not sufficient, see
      # https://github.com/softprops/action-gh-release/issues/232#issuecomment-1131379440
-      if: startsWith(github.ref, 'refs/tags/')
      with:
        name:  ${{ steps.get_version.outputs.version-without-v }}
        body: ${{ steps.extract-release-notes.outputs.release_notes }}
@@ -368,7 +363,6 @@ jobs:

 #    # Commit&Push Changelog to master branch. Must be manually merged back to rolling
 #    - name: Commit changes and push changes
-#      if: startsWith(github.ref, 'refs/tags/') 
 #      run: |
 #        git config user.name github-actions
 #        git config user.email github-actions@github.com
@@ -381,7 +375,8 @@ jobs:
 ## Update the Web Installer on a release
 #########################################################################################
 # Make sure to also update update-webinstaller.yml!
-  update-web-installer:    
+  update-web-installer:
+    if: github.event_name == 'release' && github.event.action == 'published' # Only run on release but not on prerelease
    needs: [release]
    environment:
      name: github-pages
@@ -397,7 +392,7 @@ jobs:
    steps:
    - name: Checkout
      uses: actions/checkout@v4
-      
+
    - name: Get version of last release
      id: last_release
      uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
@@ -405,7 +400,7 @@ jobs:
        myToken: ${{ github.token }}
        exclude_types: "draft|prerelease"
        view_top: 1     
-      
+
    - name: Add binary to Web Installer and update manifest
      run: |
        echo "Updating Web installer to use firmware from ${{ steps.last_release.outputs.tag_name }}..."
--- a/.github/workflows/manual-update-webinstaller.yaml
+++ b/.github/workflows/manual-update-webinstaller.yaml
@@ -12,7 +12,7 @@ on:
 #    - rolling
 #    paths:
 #    - docs # The path filter somehow does not work, so lets run it on every change to rolling
-      
+
 jobs:
  manually-update-web-installer:    
    environment:
@@ -29,7 +29,7 @@ jobs:
    steps:
    - name: Checkout
      uses: actions/checkout@v3
-      
+
    - name: Get version of last release
      id: last_release
      uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
@@ -37,7 +37,7 @@ jobs:
        myToken: ${{ github.token }}
        exclude_types: "draft|prerelease"
        view_top: 1     
-      
+
    - name: Add binary to Web Installer and update manifest
      run: |
        echo "Updating Web installer to use firmware from ${{ steps.last_release.outputs.tag_name }}..."
@@ -60,4 +60,3 @@ jobs:
    - name: Deploy to GitHub Pages
      id: deployment
      uses: actions/deploy-pages@v1   
-  
--- a/.github/workflows/reply-bot.yaml
+++ b/.github/workflows/reply-bot.yaml
@@ -20,9 +20,8 @@ jobs:
  comment:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v3
-      
-      
+      - uses: actions/checkout@v4
+
      ####################################################################
      ## Remove labels again (issues only)
      ## Make sure to also add the reply message to .github/label-commenter-config.yaml!
@@ -69,12 +68,12 @@ jobs:
 #        with:
 #          actions: 'remove-labels'
 #          labels: 'bot-reply Show Trained Digits/Pointers'
-      
+
      ####################################################################
      ## Write the response
      ####################################################################
      - name: Write Response
-        uses: peaceiris/actions-label-commenter@v1
+        uses: peaceiris/actions-label-commenter@c2d00660c86f2b9ed0fb35b372c451558eba85b3
        with:
          github_token: "${{ secrets.GITHUB_TOKEN }}"
          config_file: .github/label-commenter-config.yaml
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,15 +1,52 @@
-## [update] - 2024-03-30
+## [16.0.0-RC2] - 2024-10-04

-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)
+For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.7.0...v16.0.0-RC1)
+
+#### Known issues
+Please check the [issues](https://github.com/jomjol/AI-on-the-edge-device/issues) and
+[discussions](https://github.com/jomjol/AI-on-the-edge-device/discussions) before reporting a new issue.

 #### Core Changes
-
- New tflite-Model for Analog (v13.0.0)
- New tflite-Model for Digital Hybrid (v7.0.0)
+Only changes since RC1 are listed:
+- Updated parameter documentation pages
+- Rename/remove unused parameters (#3291)
+- Migrate-cam-parameters (#3288)

 #### Bug Fixes
+Only changes since RC1 are listed:
+- Reverted TFlite submodule update as certain modules crash with it (#3269)
+- Changed the webhook UploadImg to false (#3279)
+- Changed default value from boolean to numeric value in parameter camDenoise documentation
+- Updated config page

- tbd
+## [16.0.0-RC1] - 2024-09-24
+
+For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.7.0...v16.0.0-RC1)
+
+#### Known issues
+Please check the [issues](https://github.com/jomjol/AI-on-the-edge-device/issues) and
+[discussions](https://github.com/jomjol/AI-on-the-edge-device/discussions) before reporting a new issue.
+
+#### Core Changes
+Those are just the major changes:
+- Add support for OV5640 camera (#3063)
+- New tflite-Models
+- Homeassistant service discovery: derive node_id when using nested topics (#3088)
+- Added Prometheus/OpenMetrics exporter (#3081)
+- Added Webhook (#3148, #3163, #3174)
+- Add rate threshold parameter (#3195)
+- Added a Delay between the WiFi reconnections (#3068)
+- Web UI improvements
+- Various minor changes
+- Update platformIO to 6.9.0 (Contains ESP IDF 5.3.1)
+
+#### Bug Fixes
+Those are just the major changes:
+- Handle crash on corrupted model (#3220)
+- Bugfix for boot loop (#3175)
+- Bugfix for time stamp (#3180)
+- Handle empty prevalue.ini gracefully (#3162)
+- Added note about only TLS 1.2 is supported (#3213)

 ## [15.7.0] - 2024-02-17

@@ -23,7 +60,7 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
 - 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.
+- Reverted "Implemented late analog / digit 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
@@ -42,7 +79,7 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/

 - Update PlattformIO to v6.5.0, which means esp-idf to v5.1
 - Enhance busy notification
- - Implemented late analog / digital transition
+ - Implemented late analog / digit transition

 #### Fixed

@@ -202,7 +239,7 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
  :bangbang: **Attention:** Update your configuration!
    -   Hybrid CNN network to `dig-cont_0611_s3` 
    -   Analog CNN network to `ana-cont-11.0.5` and `ana-clas100-1.5.7`
-    -   Digital CNN network to `dig-class100-1.6.0`
+    -   Digit CNN network to `dig-class100-1.6.0`
 -   Various Web interface Improvements/Enhancements:
    - Restructured Menu (Needs cache clearing to be applied)
    - Enhanced `Previous Value` page
@@ -338,7 +375,7 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
 -   Improved OTA Update mechanism (only working after installation for next update)
 -   Added data logging in `/log/data` - One day per file and each measurement is on one line
    -   Format: csv - comma separated
-    -   Content: `time`, `name-of-number`, `raw-value`, `return-value`, `pre-value`, `change-rate`, `change-absolute`, `error-text`, `cnn-digital`, `cnn-analog`
+    -   Content: `time`, `name-of-number`, `raw-value`, `return-value`, `pre-value`, `change-rate`, `change-absolute`, `error-text`, `cnn-digit`, `cnn-analog`
 -   Show graph of values direct in the user interface (thanks to [@rdmueller](https://github.com/rdmueller))

    -   Using new data logging (see above)
@@ -356,10 +393,10 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
 -   Updated OTA functionality (more robust, but not fully bullet prove yet)
 -   Updated Espressif library to `espressif32@v5.2.0`
 -   [#1176](https://github.com/jomjol/AI-on-the-edge-device/discussions/1176) accept minor negative values (-0.2) if extended resolution is enabled
-   [#1143](https://github.com/jomjol/AI-on-the-edge-device/issues/1143) added config parameter `AnalogDigitalTransitionStart`. It can setup very early and very late digit transition starts.
+-   [#1143](https://github.com/jomjol/AI-on-the-edge-device/issues/1143) added config parameter `AnalogDigTransitionStart`. It can setup very early and very late digit transition starts.
 -   New version of `dig-class100` (v1.4.0): added images of heliowatt powermeter 
 -   NEW v13.0.2: Update Tool "Logfile downloader and combiner" to handle the new csv file format.
-   NEW v13.0.2: MQTT: Added MQTT topic `status` (Digitalization Status), Timezone to MQTT topic `timestamp`.#
+-   NEW v13.0.2: MQTT: Added MQTT topic `status` (Digitization Status), Timezone to MQTT topic `timestamp`.#
 -   NEW v13.0.2: Logging: Disable heap logs by default, cleanup
 -   NEW v13.0.7:
    -   log NTP server name
@@ -484,7 +521,7 @@ Intermediate Digits

 -   Updated analog neural network file (`ana-cont_11.3.0_s2.tflite` - default, `ana-class100_0120_s1_q.tflite`)

-   Updated digital neural network file (`dig-cont_0570_s3.tflite` - default, `dig-class100_0120_s2_q.tflite`)
+-   Updated digit neural network file (`dig-cont_0570_s3.tflite` - default, `dig-class100_0120_s2_q.tflite`)

 -   Added automated filtering of tflite-file in the graphical configuration (thanks to @**[caco3](https://github.com/caco3)**)

@@ -496,8 +533,8 @@ Intermediate Digits

 Intermediate Digits

-   New and improved consistency check (especially with analog and digital counters mixed)
-   Bug Fix: digital counter algorithm
+-   New and improved consistency check (especially with analog and digit counters mixed)
+-   Bug Fix: digit counter algorithm

 ## [11.0.1](https://github.com/jomjol/AI-on-the-edge-device/releases/tag/v11.0.1), 2022-08-18

@@ -537,7 +574,7 @@ Stability Increase

 -   `config.ini`: removal of modelsize (readout from tflite)

-   Updated analog neural network file (`ana1000s2.tflite`) & digital neural network file (`dig1400s2q.tflite`)
+-   Updated analog neural network file (`ana1000s2.tflite`) & digit neural network file (`dig1400s2q.tflite`)

 -   TFMicro/Lite: Update (espressif Version 20220716)

@@ -573,7 +610,7 @@ Stability Increase
    -   In the future the new files will also be copied to the `firmware` directory of the repository
 -   Added Wifi RSSI to MQTT information
 -   Updated analog neural network file (`ana-s3-q-20220105.tflite`)
-   Updated digital neural network file (`dig-s1-q-20220102.tflite`)
+-   Updated digit neural network file (`dig-s1-q-20220102.tflite`)
 -   Updated build environment to `Espressif 3.5.0`

 ## [10.3.0] - (2022-01-29)
@@ -639,7 +676,7 @@ Stability Increase

 -   Update analog neural network (ana-s3-q-20220105.tflite)

-   Update digital neural network (dig-s1-q-20220102.tflite)
+-   Update digit neural network (dig-s1-q-20220102.tflite)

 -   Increased web-server buffers

@@ -676,7 +713,7 @@ External Illumination
 -   Direct JSON access: `http://IP-ADRESS/json`
 -   Error message in log file in case camera error during startup
 -   Upgrade analog CNN to v9.1.0
-   Upgrade digital CNN to v13.3.0 (added new images)
+-   Upgrade digit CNN to v13.3.0 (added new images)
 -   html: support of different ports

 ## [9.1.1] - External Illumination (2021-11-16)
@@ -701,7 +738,7 @@ External Illumination

 ### Changed

-   Upgrade digital CNN to v13.1.0 (added new images)
+-   Upgrade digit CNN to v13.1.0 (added new images)
 -   bug fix: wlan password with space, double digit output

 ## [8.4.0] - Multi Meter Support (2021-09-25)
@@ -731,7 +768,7 @@ External Illumination

 ### Changed

-   Upgrade digital CNN to v12.1.0 (added new images)
+-   Upgrade digit CNN to v12.1.0 (added new images)
 -   Dedicated NaN handling, internal refactoring (CNN-Handling)
 -   HTML: confirmation after config.ini update
 -   Bug fixing
@@ -753,7 +790,7 @@ External Illumination
 -   GPIO: using the general mqtt main topic for GPIO


-   Upgrade digital CNN to v12.0.0  (added new images)
+-   Upgrade digit CNN to v12.0.0  (added new images)
 -   Update tfmicro to new master (2021-08-07)
 -   Bug fix: remove text in mqtt value, remove connect limit in wlan reconnet

@@ -789,7 +826,7 @@ External Illumination

 -   Update wlan handling to esp-idf 4.1

-   Upgrade digital CNN to v8.7.0  (added new images)
+-   Upgrade digit CNN to v8.7.0  (added new images)

 -   Bug fix: MQTT, WLAN, LED-Controll, GPIO usage, fixed IP, calculation flow rate

@@ -800,7 +837,7 @@ External Illumination
 -   NEW: 7.0.1: bug fix wlan password with "="


-   Upgrade digital CNN to v8.5.0  (added new images)
+-   Upgrade digit CNN to v8.5.0  (added new images)

 -   New MQTT topics: flow rate (units/minute), time stamp (last correct read readout)

@@ -817,7 +854,7 @@ External Illumination

 -   NEW 6.7.1: Improved stability of camera (back to v6.6.1) - remove black strips and areas

-   Upgrade digital CNN to v8.3.0  (added new type of digits)
+-   Upgrade digit CNN to v8.3.0  (added new type of digits)

 -   Internal update: TFlite (v2.5), esp32cam, startup sequence

@@ -838,7 +875,7 @@ External Illumination

 ### Changed

-   Upgrade digital CNN to v8.2.0  (added new type of digits)
+-   Upgrade digit CNN to v8.2.0  (added new type of digits)


 -   Supporting alignment structures in ROI definition
@@ -874,7 +911,7 @@ External Illumination

 -   Determination of fixed illumination settings during startup - speed up of 5s in each run

-   Update digital CNN to v8.1.1 (additional digital images trained)
+-   Update digit CNN to v8.1.1 (additional digit images trained)

 -   Extended error message in MQTT error message

@@ -886,7 +923,7 @@ External Illumination

 ### Changed

-   Disabling of analog / digital counters in configuration
+-   Disabling of analog / digit counters in configuration


 -   Improved Alignment Algorithm (`AlignmentAlgo`  = `Default`,  `Accurate` , `Fast`)
@@ -906,7 +943,7 @@ External Illumination

 -   MQTT: Last Will Testament (LWT) implemented: "connection lost" in case of connection lost to `TopicError`
 -   Disabled `CheckDigitIncreaseConsistency` in default configuration - must now be explicit enabled if needed
-   Update digital CNN to v7.2.1 (additional digital images trained)
+-   Update digit CNN to v7.2.1 (additional digit images trained)
 -   Setting of arbitrary time server in `config.ini`
 -   Option for fixed IP-, DNS-Settings in `wlan.ini`
 -   Increased stability (internal image and camera handling)
@@ -940,7 +977,7 @@ External Illumination

 -   standardized access to current logfile via `http://IP-ADRESS/logfileact`

-   Update digital CNN to v7.2.0, analog CNN to 6.3.0
+-   Update digit CNN to v7.2.0, analog CNN to 6.3.0

 -   Bug fixing: truncation error,  CheckDigitConsistency & PreValue implementation

@@ -959,7 +996,7 @@ External Illumination

 ### Changed

-   Update digital CNN to v6.5.0 and HTML (Info to hostname, IP, ssid)
+-   Update digit CNN to v6.5.0 and HTML (Info to hostname, IP, ssid)

 -   New implementation of "checkDigitConsistency" also for digits

--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ The latest available version can be found on the [Releases page](https://github.
 Initially you will have to flash the ESP32 via a USB connection. Later updates are possible directly over the air (OTA using WIFI).

 There are different ways to flash your ESP32:
- The prefered way is the [Web Installer and Console](https://jomjol.github.io/AI-on-the-edge-device/index.html) which is a browser-based tool to flash the ESP32 and extract the log over USB:
+- The preferred way is the [Web Installer and Console](https://jomjol.github.io/AI-on-the-edge-device/index.html) which is a browser-based tool to flash the ESP32 and extract the log over USB:
 ![](images/web-installer.png)
 - Flash Tool from Espressif
 - ESPtool (command-line tool)
--- a/code/components/jomjol_controlcamera/ClassControllCamera.cpp
+++ b/code/components/jomjol_controlcamera/ClassControllCamera.cpp
@@ -142,8 +142,10 @@ esp_err_t CCamera::InitCam(void)

    if (s != NULL)
    {
+        CCstatus.CamSensor_id = s->id.PID;
+
        // Dump camera module, warn for unsupported modules.
-        switch (s->id.PID)
+        switch (CCstatus.CamSensor_id)
        {
        case OV2640_PID:
            ESP_LOGI(TAG, "OV2640 camera module detected");
@@ -151,6 +153,9 @@ esp_err_t CCamera::InitCam(void)
        case OV3660_PID:
            ESP_LOGI(TAG, "OV3660 camera module detected");
            break;
+        case OV5640_PID:
+            ESP_LOGI(TAG, "OV5640 camera module detected");
+            break;
        default:
            ESP_LOGE(TAG, "Camera module is unknown and not properly supported!");
            CCstatus.CameraInitSuccessful = false;
@@ -237,8 +242,6 @@ esp_err_t CCamera::setSensorDatenFromCCstatus(void)
    if (s != NULL)
    {
        s->set_framesize(s, CCstatus.ImageFrameSize);
-        s->set_gainceiling(s, CCstatus.ImageGainceiling); // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)
-
        s->set_quality(s, CCstatus.ImageQuality); // 0 - 63

        s->set_brightness(s, CCstatus.ImageBrightness); // -2 to 2
@@ -247,34 +250,37 @@ esp_err_t CCamera::setSensorDatenFromCCstatus(void)
        // s->set_sharpness(s, CCstatus.ImageSharpness);   // auto-sharpness is not officially supported, default to 0
        SetCamSharpness(CCstatus.ImageAutoSharpness, CCstatus.ImageSharpness);

-        s->set_exposure_ctrl(s, CCstatus.ImageAec);  // 0 = disable , 1 = enable
+        s->set_denoise(s, CCstatus.ImageDenoiseLevel); // The OV2640 does not support it, OV3660 and OV5640 (0 to 8)
+
+        s->set_special_effect(s, CCstatus.ImageSpecialEffect); // 0 to 6 (0 - No Effect, 1 - Negative, 2 - Grayscale, 3 - Red Tint, 4 - Green Tint, 5 - Blue Tint, 6 - Sepia)
+        s->set_wb_mode(s, CCstatus.ImageWbMode);               // 0 to 4 - if awb_gain enabled (0 - Auto, 1 - Sunny, 2 - Cloudy, 3 - Office, 4 - Home)
+
        s->set_ae_level(s, CCstatus.ImageAeLevel);   // -2 to 2
        s->set_aec_value(s, CCstatus.ImageAecValue); // 0 to 1200
+        s->set_agc_gain(s, CCstatus.ImageAgcGain);   // 0 to 30

-        s->set_aec2(s, CCstatus.ImageAec2); // 0 = disable , 1 = enable
+        // s->set_gainceiling(s, CCstatus.ImageGainceiling); // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)
+        ov5640_set_gainceiling(s, CCstatus.ImageGainceiling);

-        s->set_gain_ctrl(s, CCstatus.ImageAgc);    // 0 = disable , 1 = enable
-        s->set_agc_gain(s, CCstatus.ImageAgcGain); // 0 to 30
+        s->set_lenc(s, CCstatus.ImageLenc);         // 0 = disable , 1 = enable
+        s->set_gain_ctrl(s, CCstatus.ImageAgc);     // 0 = disable , 1 = enable
+        s->set_exposure_ctrl(s, CCstatus.ImageAec); // 0 = disable , 1 = enable
+
+        s->set_hmirror(s, CCstatus.ImageHmirror); // 0 = disable , 1 = enable
+        s->set_vflip(s, CCstatus.ImageVflip);     // 0 = disable , 1 = enable
+        s->set_aec2(s, CCstatus.ImageAec2);       // 0 = disable , 1 = enable

        s->set_bpc(s, CCstatus.ImageBpc); // 0 = disable , 1 = enable
        s->set_wpc(s, CCstatus.ImageWpc); // 0 = disable , 1 = enable

        s->set_raw_gma(s, CCstatus.ImageRawGma); // 0 = disable , 1 = enable
-        s->set_lenc(s, CCstatus.ImageLenc);      // 0 = disable , 1 = enable

-        s->set_hmirror(s, CCstatus.ImageHmirror); // 0 = disable , 1 = enable
-        s->set_vflip(s, CCstatus.ImageVflip);     // 0 = disable , 1 = enable
-
-        s->set_dcw(s, CCstatus.ImageDcw); // 0 = disable , 1 = enable
-
-        s->set_wb_mode(s, CCstatus.ImageWbMode);   // 0 to 4 - if awb_gain enabled (0 - Auto, 1 - Sunny, 2 - Cloudy, 3 - Office, 4 - Home)
        s->set_awb_gain(s, CCstatus.ImageAwbGain); // 0 = disable , 1 = enable
        s->set_whitebal(s, CCstatus.ImageAwb);     // 0 = disable , 1 = enable

-        // special_effect muß als Letztes gesetzt werden, sonst geht es nicht
-        s->set_special_effect(s, CCstatus.ImageSpecialEffect); // 0 to 6 (0 - No Effect, 1 - Negative, 2 - Grayscale, 3 - Red Tint, 4 - Green Tint, 5 - Blue Tint, 6 - Sepia)
+        s->set_dcw(s, CCstatus.ImageDcw); // 0 = disable , 1 = enable

-        TickType_t xDelay2 = 1000 / portTICK_PERIOD_MS;
+        TickType_t xDelay2 = 100 / portTICK_PERIOD_MS;
        vTaskDelay(xDelay2);

        return ESP_OK;
@@ -291,6 +297,8 @@ esp_err_t CCamera::getSensorDatenToCCstatus(void)

    if (s != NULL)
    {
+        CCstatus.CamSensor_id = s->id.PID;
+
        CCstatus.ImageFrameSize = (framesize_t)s->status.framesize;
        CCstatus.ImageGainceiling = (gainceiling_t)s->status.gainceiling;

@@ -316,6 +324,7 @@ esp_err_t CCamera::getSensorDatenToCCstatus(void)
        CCstatus.ImageHmirror = s->status.hmirror;
        CCstatus.ImageVflip = s->status.vflip;
        CCstatus.ImageDcw = s->status.dcw;
+        CCstatus.ImageDenoiseLevel = s->status.denoise;

        return ESP_OK;
    }
@@ -325,7 +334,93 @@ esp_err_t CCamera::getSensorDatenToCCstatus(void)
    }
 }

-void CCamera::SetZoomSize(bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, int imageSize)
+// on the OV5640, gainceiling must be set with the real value (x2>>>level = 2, .... x128>>>level = 128)
+int CCamera::ov5640_set_gainceiling(sensor_t *s, gainceiling_t level)
+{
+	int ret = 0;
+		
+    if (CCstatus.CamSensor_id == OV2640_PID)
+    {
+        ret = s->set_gainceiling(s, CCstatus.ImageGainceiling); // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)
+    }
+    else
+    {
+		int _level = (1 << ((int)level + 1));
+
+		ret = s->set_reg(s, 0x3A18, 0xFF, (_level >> 8) & 3) || s->set_reg(s, 0x3A19, 0xFF, _level & 0xFF);
+
+		if (ret == 0)
+		{
+			// ESP_LOGD(TAG, "Set gainceiling to: %d", level);
+			s->status.gainceiling = level;
+		}
+    }
+
+    return ret;
+}
+
+// - It always zooms to the image center when offsets are zero
+// - if imageSize = 0 then the image is not zoomed
+// - if imageSize = max value, then the image is fully zoomed in
+// - a zoom step is >>> Width + 32 px / Height + 24 px
+void CCamera::SanitizeZoomParams(int imageSize, int frameSizeX, int frameSizeY, int &imageWidth, int &imageHeight, int &zoomOffsetX, int &zoomOffsetY)
+{
+    // for OV2640, This works only if the aspect ratio of 4:3 is preserved in the window size.
+    // use only values divisible by 8 without remainder
+    imageWidth = CCstatus.ImageWidth + (imageSize * 4 * 8);
+    imageHeight = CCstatus.ImageHeight + (imageSize * 3 * 8);
+
+    int _maxX = frameSizeX - imageWidth;
+    int _maxY = frameSizeY - imageHeight;
+
+    if ((abs(zoomOffsetX) * 2) > _maxX)
+    {
+        if (zoomOffsetX > 0)
+        {
+            zoomOffsetX = _maxX;
+        }
+        else
+        {
+            zoomOffsetX = 0;
+        }
+    }
+    else
+    {
+        if (zoomOffsetX > 0)
+        {
+            zoomOffsetX = ((_maxX / 2) + zoomOffsetX);
+        }
+        else
+        {
+            zoomOffsetX = ((_maxX / 2) + zoomOffsetX);
+        }
+    }
+
+    if ((abs(zoomOffsetY) * 2) > _maxY)
+    {
+        if (zoomOffsetY > 0)
+        {
+            zoomOffsetY = _maxY;
+        }
+        else
+        {
+            zoomOffsetY = 0;
+        }
+    }
+    else
+    {
+        if (zoomOffsetY > 0)
+        {
+            zoomOffsetY = ((_maxY / 2) + zoomOffsetY);
+        }
+        else
+        {
+            zoomOffsetY = ((_maxY / 2) + zoomOffsetY);
+        }
+    }
+}
+
+void CCamera::SetZoomSize(bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, int imageSize, int imageVflip)
 {
    sensor_t *s = esp_camera_sensor_get();

@@ -333,89 +428,59 @@ void CCamera::SetZoomSize(bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, in
    {
        if (zoomEnabled)
        {
-            // ov2640_sensor_mode_t _mode = OV2640_MODE_UXGA; // 1600x1200
-            // ov2640_sensor_mode_t _mode = OV2640_MODE_SVGA; // 800x600
-            // ov2640_sensor_mode_t _mode = OV2640_MODE_CIF;  // 400x296
-            int _mode = 0;
-
+            int _imageSize_temp = 0;
+            int _imageWidth = CCstatus.ImageWidth;
+            int _imageHeight = CCstatus.ImageHeight;
            int _offsetx = zoomOffsetX;
            int _offsety = zoomOffsetY;
-            int _imageSize_temp = 0;
-            int _maxX = 0;
-            int _maxY = 0;
+            int frameSizeX;
+            int frameSizeY;

-            if (imageSize < 29)
+            switch (CCstatus.CamSensor_id)
            {
-                _imageSize_temp = (29 - imageSize);
-            }
+            case OV5640_PID:
+                frameSizeX = 2592;
+                frameSizeY = 1944;
+                // max imageSize = ((frameSizeX - CCstatus.ImageWidth) / 8 / 4) - 1
+                // 59 = ((2560 - 640) / 8 / 4) - 1
+                if (imageSize < 59)
+                {
+                    _imageSize_temp = (59 - imageSize);
+                }
+                SanitizeZoomParams(_imageSize_temp, frameSizeX, frameSizeY, _imageWidth, _imageHeight, _offsetx, _offsety);
+                SetCamWindow(s, frameSizeX, frameSizeY, _offsetx, _offsety, _imageWidth, _imageHeight, CCstatus.ImageWidth, CCstatus.ImageHeight, imageVflip);
+                break;

-            // This works only if the aspect ratio of 4:3 is preserved in the window size.
-            // use values divisible by 8 without remainder
-            int _imageWidth = CCstatus.ImageWidth + (_imageSize_temp * 4 * 8);
-            int _imageHeight = CCstatus.ImageHeight + (_imageSize_temp * 3 * 8);
+            case OV3660_PID:
+                frameSizeX = 2048;
+                frameSizeY = 1536;
+                // max imageSize = ((frameSizeX - CCstatus.ImageWidth) / 8 / 4) -1
+                // 43 = ((2048 - 640) / 8 / 4) - 1
+                if (imageSize < 43)
+                {
+                    _imageSize_temp = (43 - imageSize);
+                }
+                SanitizeZoomParams(_imageSize_temp, frameSizeX, frameSizeY, _imageWidth, _imageHeight, _offsetx, _offsety);
+                SetCamWindow(s, frameSizeX, frameSizeY, _offsetx, _offsety, _imageWidth, _imageHeight, CCstatus.ImageWidth, CCstatus.ImageHeight, imageVflip);
+                break;

-            _maxX = 1600 - _imageWidth;
-            _maxY = 1200 - _imageHeight;
+            case OV2640_PID:
+                frameSizeX = 1600;
+                frameSizeY = 1200;
+                // max imageSize = ((frameSizeX - CCstatus.ImageWidth) / 8 / 4) -1
+                // 29 = ((1600 - 640) / 8 / 4) - 1
+                if (imageSize < 29)
+                {
+                    _imageSize_temp = (29 - imageSize);
+                }
+                SanitizeZoomParams(_imageSize_temp, frameSizeX, frameSizeY, _imageWidth, _imageHeight, _offsetx, _offsety);
+                SetCamWindow(s, frameSizeX, frameSizeY, _offsetx, _offsety, _imageWidth, _imageHeight, CCstatus.ImageWidth, CCstatus.ImageHeight, imageVflip);
+                break;

-            if ((abs(_offsetx) * 2) > _maxX)
-            {
-                if (_offsetx > 0)
-                {
-                    _offsetx = _maxX;
-                }
-                else
-                {
-                    _offsetx = 0;
-                }
+            default:
+                // do nothing
+                break;
            }
-            else
-            {
-                if (_offsetx > 0)
-                {
-                    // wenn der Wert von _offsetx nicht durch 8 teilbar ist,
-                    // werden die Farben sehr oft vertauscht(insbesondere Rot mit Blau)
-                    _offsetx = ((_maxX / 2) + _offsetx);
-                }
-                else
-                {
-                    // wenn der Wert von _offsetx nicht durch 8 teilbar ist,
-                    // werden die Farben sehr oft vertauscht(insbesondere Rot mit Blau)
-                    _offsetx = ((_maxX / 2) + _offsetx);
-                }
-            }
-
-            if ((abs(_offsety) * 2) > _maxY)
-            {
-                if (_offsety > 0)
-                {
-                    _offsety = _maxY;
-                }
-                else
-                {
-                    _offsety = 0;
-                }
-            }
-            else
-            {
-                if (_offsety > 0)
-                {
-                    // wenn der Wert von _offsety nicht durch 8 teilbar ist,
-                    // werden die Farben sehr oft vertauscht(insbesondere Rot mit Blau)
-                    _offsety = ((_maxY / 2) + _offsety);
-                }
-                else
-                {
-                    // wenn der Wert von _offsety nicht durch 8 teilbar ist,
-                    // werden die Farben sehr oft vertauscht(insbesondere Rot mit Blau)
-                    _offsety = ((_maxY / 2) + _offsety);
-                }
-            }
-
-            // _mode sets the sensor resolution (3 options available),
-            // _offsetx and _offsety set the start of the ROI,
-            // _imageWidth and _imageHeight set the size of the ROI,
-            // CCstatus.ImageWidth and CCstatus.ImageHeight set the output window size.
-            SetCamWindow(s, _mode, _offsetx, _offsety, _imageWidth, _imageHeight, CCstatus.ImageWidth, CCstatus.ImageHeight);
        }
        else
        {
@@ -424,18 +489,22 @@ void CCamera::SetZoomSize(bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, in
    }
 }

-void CCamera::SetQualityZoomSize(int qual, framesize_t resol, bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, int imageSize)
+void CCamera::SetQualityZoomSize(int qual, framesize_t resol, bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, int imageSize, int imageVflip)
 {
-    qual = min(63, max(8, qual)); // Limit quality from 8..63 (values lower than 8 tent to be unstable)
+    sensor_t *s = esp_camera_sensor_get();
+
+    // OV2640 has no lower limit on jpeg quality
+    if (CCstatus.CamSensor_id == OV5640_PID)
+    {
+        qual = min(63, max(8, qual));
+    }

    SetImageWidthHeightFromResolution(resol);

-    sensor_t *s = esp_camera_sensor_get();
-
    if (s != NULL)
    {
        s->set_quality(s, qual);
-        SetZoomSize(zoomEnabled, zoomOffsetX, zoomOffsetY, imageSize);
+        SetZoomSize(zoomEnabled, zoomOffsetX, zoomOffsetY, imageSize, imageVflip);
    }
    else
    {
@@ -445,21 +514,36 @@ void CCamera::SetQualityZoomSize(int qual, framesize_t resol, bool zoomEnabled,

 void CCamera::SetCamSharpness(bool _autoSharpnessEnabled, int _sharpnessLevel)
 {
-    _sharpnessLevel = min(2, max(-2, _sharpnessLevel));
-
    sensor_t *s = esp_camera_sensor_get();

    if (s != NULL)
    {
-        // post processing
-        if (_autoSharpnessEnabled)
+        if (CCstatus.CamSensor_id == OV2640_PID)
        {
-            s->set_sharpness(s, 0);
-            ov2640_enable_auto_sharpness(s);
+            _sharpnessLevel = min(2, max(-2, _sharpnessLevel));
+            // The OV2640 does not officially support sharpness, so the detour is made with the ov2640_sharpness.cpp.
+            if (_autoSharpnessEnabled)
+            {
+                ov2640_enable_auto_sharpness(s);
+            }
+            else
+            {
+                ov2640_set_sharpness(s, _sharpnessLevel);
+            }
        }
        else
        {
-            ov2640_set_sharpness(s, _sharpnessLevel);
+            _sharpnessLevel = min(3, max(-3, _sharpnessLevel));
+            // for CAMERA_OV5640 and CAMERA_OV3660
+            if (_autoSharpnessEnabled)
+            {
+                // autoSharpness is not supported, default to zero
+                s->set_sharpness(s, 0);
+            }
+            else
+            {
+                s->set_sharpness(s, _sharpnessLevel);
+            }
        }
    }
    else
@@ -468,47 +552,27 @@ void CCamera::SetCamSharpness(bool _autoSharpnessEnabled, int _sharpnessLevel)
    }
 }

-/*
- * resolution = 0 \\ OV2640_MODE_UXGA -> 1600 x 1200
- * resolution = 1 \\ OV2640_MODE_SVGA -> 800  x 600
- * resolution = 2 \\ OV2640_MODE_CIF  -> 400  x 296
- * resolution = 3 \\ OV2640_MODE_MAX
- */
-void CCamera::SetCamWindow(sensor_t *s, int resolution, int xOffset, int yOffset, int xTotal, int yTotal, int xOutput, int yOutput)
+void CCamera::SetCamWindow(sensor_t *s, int frameSizeX, int frameSizeY, int xOffset, int yOffset, int xTotal, int yTotal, int xOutput, int yOutput, int imageVflip)
 {
-    // - (xOffset,yOffset) is the origin of the window in pixels and (xLength,yLength) is the size of the window in pixels.
-    // - (xOffset,yOffset) ist der Ursprung des Fensters in Pixel und (xLength,yLength) ist die Größe des Fensters in Pixel.
+    if (CCstatus.CamSensor_id == OV2640_PID)
+    {
+        s->set_res_raw(s, 0, 0, 0, 0, xOffset, yOffset, xTotal, yTotal, xOutput, yOutput, false, false);
+    }
+    else
+    {
+        // for CAMERA_OV5640 and CAMERA_OV3660
+        bool scale = !(xOutput == xTotal && yOutput == yTotal);
+        bool binning = (xTotal >= (frameSizeX >> 1));

-    // - Be aware that changing the resolution will effectively overwrite these settings.
-    // - Beachten Sie, dass eine Änderung der Auflösung diese Einstellungen effektiv überschreibt.
-
-    // - This works only if the aspect ratio of 4:3 is preserved in the window size.
-    // - Dies funktioniert nur, wenn das Seitenverhältnis von 4:3 in der Fenstergröße beibehalten wird.
-
-    // - total_x and total_y defines the size on the sensor
-    // - total_x und total_y definieren die Größe des Sensors
-
-    // - width and height defines the resulting image(may be smaller than the size on the sensor)
-    // - width und height definieren das resultierende Bild (kann kleiner sein als die Größe des Sensor)
-
-    // - keep the aspect total_x : total_y == width : height
-    // - Behalten Sie den Aspekt total_x : total_y == width : height bei
-
-    // - use values divisible by 8 without remainder
-    // - Verwenden Sie Werte, die ohne Rest durch 8 teilbar sind
-
-    // - start with total_x = width and total_y = height, reduce both values by eg.32 pixels
-    // - Beginnen Sie mit total_x = width und total_y = height und reduzieren Sie beide Werte um z.B.32 Pixel
-
-    // - next try moving with offset_x or offset_y by 8 pixels
-    // - Versuchen Sie als Nächstes, mit offset_x oder offset_y um 8 Pixel zu verschieben
-
-    // set_res_raw(sensor_t *sensor, int startX, int startY, int endX, int endY, int offsetX, int offsetY, int totalX, int totalY, int outputX, int outputY, bool scale, bool binning)
-    // set_window(sensor, (ov2640_sensor_mode_t)startX, offsetX, offsetY, totalX, totalY, outputX, outputY);
-    // set_window(sensor, mode, offset_x, offset_y, max_x, max_y, w, h);
-
-    int unused = 0;
-    s->set_res_raw(s, resolution, unused, unused, unused, xOffset, yOffset, xTotal, yTotal, xOutput, yOutput, unused, unused);
+        if (imageVflip == true)
+        {
+            s->set_res_raw(s, xOffset, yOffset, xOffset + xTotal - 1, yOffset + yTotal - 1, 0, 0, frameSizeX, frameSizeY, xOutput, yOutput, scale, binning);
+        }
+        else
+        {
+            s->set_res_raw(s, xOffset, yOffset, xOffset + xTotal, yOffset + yTotal, 0, 0, frameSizeX, frameSizeY, xOutput, yOutput, scale, binning);
+        }
+    }
 }

 static size_t jpg_encode_stream(void *arg, size_t index, const void *data, size_t len)
@@ -839,7 +903,7 @@ esp_err_t CCamera::CaptureToStream(httpd_req_t *req, bool FlashlightOn)
    if (CFstatus.changedCameraSettings)
    {
        Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
-        Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+        Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);
        CFstatus.changedCameraSettings = false;
    }

--- a/code/components/jomjol_controlcamera/ClassControllCamera.h
+++ b/code/components/jomjol_controlcamera/ClassControllCamera.h
@@ -15,15 +15,10 @@
 #include "CImageBasis.h"
 #include "../../include/defines.h"

-typedef enum
-{
-    OV2640_MODE_UXGA,
-    OV2640_MODE_SVGA,
-    OV2640_MODE_CIF
-} ov2640_sensor_mode_t;
-
 typedef struct
 {
+    uint16_t CamSensor_id;
+
    framesize_t ImageFrameSize = FRAMESIZE_VGA; // 0 - 10
    gainceiling_t ImageGainceiling;             // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)

@@ -51,13 +46,14 @@ typedef struct
    int ImageVflip;         // Invert image (0 or 1)
    int ImageDcw;           // downsize enable (1 or 0)

+    int ImageDenoiseLevel; // The OV2640 does not support it, OV3660 and OV5640 (0 to 8)
+
    int ImageWidth;
    int ImageHeight;

    int ImageLedIntensity;

    bool ImageZoomEnabled;
-    int ImageZoomMode;
    int ImageZoomOffsetX;
    int ImageZoomOffsetY;
    int ImageZoomSize;
@@ -79,33 +75,36 @@ protected:
    void ledc_init(void);
    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 SetCamWindow(sensor_t *s, int frameSizeX, int frameSizeY, int xOffset, int yOffset, int xTotal, int yTotal, int xOutput, int yOutput, int imageVflip);
    void SetImageWidthHeightFromResolution(framesize_t resol);
+    void SanitizeZoomParams(int imageSize, int frameSizeX, int frameSizeY, int &imageWidth, int &imageHeight, int &zoomOffsetX, int &zoomOffsetY);

 public:
    CCamera(void);
    esp_err_t InitCam(void);
-	
+
    void LightOnOff(bool status);
    void LEDOnOff(bool status);

    esp_err_t setSensorDatenFromCCstatus(void);
    esp_err_t getSensorDatenToCCstatus(void);

+    int ov5640_set_gainceiling(sensor_t *s, gainceiling_t level);
+
    esp_err_t CaptureToHTTP(httpd_req_t *req, int delay = 0);
    esp_err_t CaptureToStream(httpd_req_t *req, bool FlashlightOn);

-    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 SetQualityZoomSize(int qual, framesize_t resol, bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, int imageSize, int imageVflip);
+    void SetZoomSize(bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, int imageSize, int imageVflip);
    void SetCamSharpness(bool _autoSharpnessEnabled, int _sharpnessLevel);
-    
-	void SetLEDIntensity(float _intrel);
+
+    void SetLEDIntensity(float _intrel);
    bool testCamera(void);
    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);
 };
--- a/code/components/jomjol_controlcamera/server_camera.cpp
+++ b/code/components/jomjol_controlcamera/server_camera.cpp
@@ -16,20 +16,24 @@ static const char *TAG = "server_cam";

 void PowerResetCamera()
 {
+#if CAM_PIN_PWDN == GPIO_NUM_NC // Use reset only if pin is available
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "No power down pin availbale to reset camera");
+#else
    ESP_LOGD(TAG, "Resetting camera by power down line");
    gpio_config_t conf;
    conf.intr_type = GPIO_INTR_DISABLE;
-    conf.pin_bit_mask = 1LL << GPIO_NUM_32;
+    conf.pin_bit_mask = 1LL << CAM_PIN_PWDN;
    conf.mode = GPIO_MODE_OUTPUT;
    conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
    conf.pull_up_en = GPIO_PULLUP_DISABLE;
    gpio_config(&conf);

    // carefull, logic is inverted compared to reset pin
-    gpio_set_level(GPIO_NUM_32, 1);
+    gpio_set_level(CAM_PIN_PWDN, 1);
    vTaskDelay(1000 / portTICK_PERIOD_MS);
-    gpio_set_level(GPIO_NUM_32, 0);
+    gpio_set_level(CAM_PIN_PWDN, 0);
    vTaskDelay(1000 / portTICK_PERIOD_MS);
+#endif
 }

 esp_err_t handler_lightOn(httpd_req_t *req)
@@ -92,18 +96,18 @@ esp_err_t handler_capture(httpd_req_t *req)

    if (Camera.getCameraInitSuccessful())
    {
-#ifdef DEBUG_DETAIL_ON
-        ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-#endif
-
-        // wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
+        // If the camera settings were changed by creating a new reference image, they must be reset
        if (CFstatus.changedCameraSettings)
        {
            Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
-            Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+            Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);
            CFstatus.changedCameraSettings = false;
        }

+#ifdef DEBUG_DETAIL_ON
+        ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
+#endif        
+
        esp_err_t result;
        result = Camera.CaptureToHTTP(req);

@@ -150,18 +154,18 @@ esp_err_t handler_capture_with_light(httpd_req_t *req)
            }
        }

-#ifdef DEBUG_DETAIL_ON
-        ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-#endif
-
-        // wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
+        // If the camera settings were changed by creating a new reference image, they must be reset
        if (CFstatus.changedCameraSettings)
        {
            Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
-            Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+            Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);
            CFstatus.changedCameraSettings = false;
        }

+#ifdef DEBUG_DETAIL_ON
+        ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
+#endif        
+
        Camera.LightOnOff(true);
        const TickType_t xDelay = delay / portTICK_PERIOD_MS;
        vTaskDelay(xDelay);
@@ -232,18 +236,18 @@ esp_err_t handler_capture_save_to_file(httpd_req_t *req)
            fn.append("noname.jpg");
        }

-#ifdef DEBUG_DETAIL_ON
-        ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-#endif
-
-        // wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
+        // If the camera settings were changed by creating a new reference image, they must be reset
        if (CFstatus.changedCameraSettings)
        {
            Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
-            Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+            Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);
            CFstatus.changedCameraSettings = false;
        }

+#ifdef DEBUG_DETAIL_ON
+        ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
+#endif        
+
        esp_err_t result;
        result = Camera.CaptureToFile(fn, delay);

--- a/code/components/jomjol_fileserver_ota/miniz/readme2.md
+++ b/code/components/jomjol_fileserver_ota/miniz/readme2.md
@@ -4,5 +4,5 @@ It should be possible to include the repo directly as a submodule, how ever it c
 - https://github.com/richgel999/miniz/issues/145
 - https://github.com/espressif/esptool/pull/500#issuecomment-574879468

- For sumplicity we therefore use the release files as suggested in the readme.
- Additionally we added the CMakeLists.txt and this readme.
+ For simplicity we therefore use the release files as suggested in the readme.
+ Additionally we added the CMakeLists.txt and this readme.
--- a/code/components/jomjol_flowcontroll/CMakeLists.txt
+++ b/code/components/jomjol_flowcontroll/CMakeLists.txt
@@ -2,6 +2,6 @@ FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*)

 idf_component_register(SRCS ${app_sources}
                    INCLUDE_DIRS "."
-                    REQUIRES esp_timer esp_wifi jomjol_tfliteclass jomjol_helper jomjol_controlcamera jomjol_mqtt jomjol_influxdb jomjol_fileserver_ota jomjol_image_proc jomjol_wlan)
+                    REQUIRES esp_timer esp_wifi jomjol_tfliteclass jomjol_helper jomjol_controlcamera jomjol_mqtt jomjol_influxdb jomjol_webhook jomjol_fileserver_ota jomjol_image_proc jomjol_wlan openmetrics)


--- a/code/components/jomjol_flowcontroll/ClassFlow.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlow.cpp
@@ -67,11 +67,6 @@ string ClassFlow::getHTMLSingleStep(string host){
 	return "";
 }

-string ClassFlow::getReadout()
-{
-	return string();
-}
-
 std::string ClassFlow::GetParameterName(std::string _input)
 {
    string _param;
--- a/code/components/jomjol_flowcontroll/ClassFlow.h
+++ b/code/components/jomjol_flowcontroll/ClassFlow.h
@@ -46,7 +46,6 @@ public:
 	virtual bool ReadParameter(FILE* pfile, string &aktparamgraph);
 	virtual bool doFlow(string time);
 	virtual string getHTMLSingleStep(string host);
-	virtual string getReadout();
 	virtual string name(){return "ClassFlow";};

 };
--- a/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp
@@ -40,16 +40,14 @@ ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow *> *lfc)
    SetInitialParameter();
    ListFlowControll = lfc;

-    for (int i = 0; i < ListFlowControll->size(); ++i)
-    {
-        if (((*ListFlowControll)[i])->name().compare("ClassFlowTakeImage") == 0)
-        {
+    for (int i = 0; i < ListFlowControll->size(); ++i) {
+        if (((*ListFlowControll)[i])->name().compare("ClassFlowTakeImage") == 0) {
            ImageBasis = ((ClassFlowTakeImage *)(*ListFlowControll)[i])->rawImage;
        }
    }

-    if (!ImageBasis) // the function take pictures does not exist --> must be created first ONLY FOR TEST PURPOSES
-    {
+    // the function take pictures does not exist --> must be created first ONLY FOR TEST PURPOSES
+    if (!ImageBasis)  {
        ESP_LOGD(TAG, "CImageBasis had to be created");
        ImageBasis = new CImageBasis("ImageBasis", namerawimage);
    }
@@ -66,8 +64,7 @@ bool ClassFlowAlignment::ReadParameter(FILE *pfile, string &aktparamgraph)

    if (aktparamgraph.size() == 0)
    {
-        if (!this->GetNextParagraph(pfile, aktparamgraph))
-        {
+        if (!this->GetNextParagraph(pfile, aktparamgraph)) {
            return false;
        }
    }
@@ -82,71 +79,66 @@ bool ClassFlowAlignment::ReadParameter(FILE *pfile, string &aktparamgraph)
    {
        splitted = ZerlegeZeile(aktparamgraph);

-        if ((toUpper(splitted[0]) == "FLIPIMAGESIZE") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                initialflip = true;
+        if ((toUpper(splitted[0]) == "FLIPIMAGESIZE") && (splitted.size() > 1)) {
+            initialflip = alphanumericToBoolean(splitted[1]);
+        }
+        else if (((toUpper(splitted[0]) == "initialrotate") || (toUpper(splitted[0]) == "INITIALROTATE")) && (splitted.size() > 1)) {
+            if (isStringNumeric(splitted[1])) {
+                this->initialrotate = std::stod(splitted[1]);
            }
        }
-        else if (((toUpper(splitted[0]) == "initialrotate") || (toUpper(splitted[0]) == "INITIALROTATE")) && (splitted.size() > 1))
-        {
-            this->initialrotate = std::stod(splitted[1]);
-        }
-        else if ((toUpper(splitted[0]) == "SEARCHFIELDX") && (splitted.size() > 1))
-        {
-            suchex = std::stod(splitted[1]);
-        }
-        else if ((toUpper(splitted[0]) == "SEARCHFIELDY") && (splitted.size() > 1))
-        {
-            suchey = std::stod(splitted[1]);
-        }
-        else if ((toUpper(splitted[0]) == "ANTIALIASING") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                use_antialiasing = true;
+        else if ((toUpper(splitted[0]) == "SEARCHFIELDX") && (splitted.size() > 1)) {
+            if (isStringNumeric(splitted[1])) {
+                suchex = std::stod(splitted[1]);
            }
        }
-        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]);
-            References[anz_ref].target_y = std::stod(splitted[2]);
-            anz_ref++;
+        else if ((toUpper(splitted[0]) == "SEARCHFIELDY") && (splitted.size() > 1)) {
+            if (isStringNumeric(splitted[1])) {
+                suchey = std::stod(splitted[1]);
+            }
+        }
+        else if ((toUpper(splitted[0]) == "ANTIALIASING") && (splitted.size() > 1)) {
+            use_antialiasing = alphanumericToBoolean(splitted[1]);
+        }
+        else if ((splitted.size() == 3) && (anz_ref < 2)) {
+            if ((isStringNumeric(splitted[1])) && (isStringNumeric(splitted[2])))
+            {
+                References[anz_ref].image_file = FormatFileName("/sdcard" + splitted[0]);
+                References[anz_ref].target_x = std::stod(splitted[1]);
+                References[anz_ref].target_y = std::stod(splitted[2]);
+                anz_ref++;
+            }
+            else
+            {
+                References[anz_ref].image_file = FormatFileName("/sdcard" + splitted[0]);
+                References[anz_ref].target_x = 10;
+                References[anz_ref].target_y = 10;
+                anz_ref++;
+            }
        }

-        else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                SaveAllFiles = true;
-            }
+        else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1)) {
+            SaveAllFiles = alphanumericToBoolean(splitted[1]);
        }
-        else 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")
-            {
+            if (toUpper(splitted[1]) == "HIGHACCURACY") {
                alg_algo = 1;
            }
-            if (toUpper(splitted[1]) == "FAST")
-            {
+            if (toUpper(splitted[1]) == "FAST") {
                alg_algo = 2;
            }
-            if (toUpper(splitted[1]) == "OFF")
-            {
+            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)
-    {
+    for (int i = 0; i < anz_ref; ++i) {
        References[i].search_x = suchex;
        References[i].search_y = suchey;
        References[i].fastalg_SAD_criteria = SAD_criteria;
@@ -158,9 +150,8 @@ 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)
-    {
-        LoadReferenceAlignmentValues();
+    if (References[0].alignment_algo != 3) {
+        return LoadReferenceAlignmentValues();
    }

    return true;
@@ -179,29 +170,25 @@ string ClassFlowAlignment::getHTMLSingleStep(string host)
 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 needs to be allocated before ImageTMP to avoid heap fragmentation
+    if (!AlgROI)  {
        AlgROI = (ImageData *)heap_caps_realloc(AlgROI, sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);

-        if (!AlgROI)
-        {
+        if (!AlgROI) {
            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlgROI");
            LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
        }
    }

-    if (AlgROI)
-    {
+    if (AlgROI) {
        ImageBasis->writeToMemoryAsJPG((ImageData *)AlgROI, 90);
    }
 #endif

-    if (!ImageTMP)
-    {
+    if (!ImageTMP) {
        ImageTMP = new CImageBasis("tmpImage", ImageBasis); // Make sure the name does not get change, it is relevant for the PSRAM allocation!

-        if (!ImageTMP)
-        {
+        if (!ImageTMP) {
            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate tmpImage -> Exec this round aborted!");
            LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
            return false;
@@ -211,8 +198,7 @@ bool ClassFlowAlignment::doFlow(string time)
    delete AlignAndCutImage;
    AlignAndCutImage = new CAlignAndCutImage("AlignAndCutImage", ImageBasis, ImageTMP);

-    if (!AlignAndCutImage)
-    {
+    if (!AlignAndCutImage) {
        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlignAndCutImage -> Exec this round aborted!");
        LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
        return false;
@@ -220,8 +206,7 @@ bool ClassFlowAlignment::doFlow(string time)

    CRotateImage rt("rawImage", AlignAndCutImage, ImageTMP, initialflip);

-    if (initialflip)
-    {
+    if (initialflip) {
        int _zw = ImageBasis->height;
        ImageBasis->height = ImageBasis->width;
        ImageBasis->width = _zw;
@@ -231,49 +216,40 @@ bool ClassFlowAlignment::doFlow(string time)
        ImageTMP->height = _zw;
    }

-    if ((initialrotate != 0) || initialflip)
-    {
-        if (use_antialiasing)
-        {
+    if ((initialrotate != 0) || initialflip) {
+        if (use_antialiasing) {
            rt.RotateAntiAliasing(initialrotate);
        }
-        else
-        {
+        else {
            rt.Rotate(initialrotate);
        }

-        if (SaveAllFiles)
-        {
+        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 (!AlignAndCutImage->Align(&References[0], &References[1]))
-        {
+    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.DigitDrawROI(ImageTMP);
        flowctrl.AnalogDrawROI(ImageTMP);
        ImageTMP->writeToMemoryAsJPG((ImageData *)AlgROI, 90);
    }
 #endif

-    if (SaveAllFiles)
-    {
+    if (SaveAllFiles) {
        AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/alg.jpg"));
        ImageTMP->SaveToFile(FormatFileName("/sdcard/img_tmp/alg_roi.jpg"));
    }
@@ -283,9 +259,8 @@ 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)
-    {
-        LoadReferenceAlignmentValues();
+    if (References[0].alignment_algo != 3) {
+        return LoadReferenceAlignmentValues();
    }

    return true;
@@ -298,8 +273,7 @@ void ClassFlowAlignment::SaveReferenceAlignmentValues()

    pFile = fopen(FileStoreRefAlignment.c_str(), "w");

-    if (strlen(zwtime.c_str()) == 0)
-    {
+    if (strlen(zwtime.c_str()) == 0) {
        time_t rawtime;
        struct tm *timeinfo;
        char buffer[80];
@@ -338,8 +312,9 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)

    pFile = fopen(FileStoreRefAlignment.c_str(), "r");

-    if (pFile == NULL)
+    if (pFile == NULL) {
        return false;
+    }

    fgets(zw, 1024, pFile);
    ESP_LOGD(TAG, "%s", zw);
@@ -347,8 +322,7 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
    fgets(zw, 1024, pFile);
    splitted = ZerlegeZeile(std::string(zw), " \t");

-    if (splitted.size() < 6)
-    {
+    if (splitted.size() < 6) {
        fclose(pFile);
        return false;
    }
@@ -363,8 +337,7 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
    fgets(zw, 1024, pFile);
    splitted = ZerlegeZeile(std::string(zw));

-    if (splitted.size() < 6)
-    {
+    if (splitted.size() < 6) {
        fclose(pFile);
        return false;
    }
@@ -394,8 +367,7 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)

 void ClassFlowAlignment::DrawRef(CImageBasis *_zw)
 {
-    if (_zw->ImageOkay())
-    {
+    if (_zw->ImageOkay()) {
        _zw->drawRect(References[0].target_x, References[0].target_y, References[0].width, References[0].height, 255, 0, 0, 2);
        _zw->drawRect(References[1].target_x, References[1].target_y, References[1].width, References[1].height, 255, 0, 0, 2);
    }
--- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
@@ -19,7 +19,6 @@ static const char* TAG = "CNN";
    static heap_trace_record_t trace_record[NUM_RECORDS]; // This buffer must be in internal RAM
 #endif

-
 ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNType _cnntype) : ClassFlowImage(NULL, TAG) {
    string cnnmodelfile = "";
    modelxsize = 1;
@@ -36,8 +35,7 @@ ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNTy
    imagesRetention = 5;
 }

-
-string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution, int prev, float _before_narrow_Analog, float analogDigitalTransitionStart) {
+string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution, int prev, float _before_narrow_Analog, float AnalogToDigitTransitionStart) {
    string result = "";    

    if (GENERAL[_analog]->ROI.size() == 0) {
@@ -65,7 +63,7 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution
        return result;
    }

-    if (CNNType == Digital) {
+    if (CNNType == Digit) {
        for (int i = 0; i < GENERAL[_analog]->ROI.size(); ++i) {
            if (GENERAL[_analog]->ROI[i]->result_klasse >= 10) {
                result = result + "N";
@@ -77,7 +75,7 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution
        return result;
    }

-    if ((CNNType == DoubleHyprid10) || (CNNType == Digital100)) {
+    if ((CNNType == DoubleHyprid10) || (CNNType == Digit100)) {
        float number = GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float;
        // NaN?
        if (number >= 0) {
@@ -92,7 +90,7 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution
            }
            else {
                if (_before_narrow_Analog >= 0) {
-                    prev = PointerEvalHybridNew(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float, _before_narrow_Analog, prev, true, analogDigitalTransitionStart);
+                    prev = PointerEvalHybridNew(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float, _before_narrow_Analog, prev, true, AnalogToDigitTransitionStart);
                }
                else {
                    prev = PointerEvalHybridNew(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float, prev, prev);
@@ -103,7 +101,7 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution
        }
        else {
            result = "N";
-            if (_extendedResolution && (CNNType != Digital)) {
+            if (_extendedResolution && (CNNType != Digit)) {
                result = "NN";
            }
        }
@@ -137,13 +135,13 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution
 *                          0.1 => 0 (eval_predecessors)
 *                          The 0 makes a 9.9 to 0 (eval_predecessors)
 *                          The 0 makes a 9.8 to 0 
- * @param Analog_Predecessors false/true if the last ROI is an analog or digital ROI (default=false)
+ * @param Analog_Predecessors false/true if the last ROI is an analog or digit ROI (default=false)
 *                              runs in special handling because analog is much less precise
- * @param digitalAnalogTransitionStart start of the transitionlogic begins on number_of_predecessor (default=9.2)
+ * @param digitAnalogTransitionStart start of the transitionlogic begins on number_of_predecessor (default=9.2)
 *
 * @return int the determined number of the current ROI
 */
-int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors, float digitalAnalogTransitionStart) {
+int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors, float digitAnalogTransitionStart) {
    int result;
    int result_after_decimal_point = ((int) floor(number * 10)) % 10;
    int result_before_decimal_point = ((int) floor(number) + 10) % 10;
@@ -155,22 +153,21 @@ int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_pred
        result = (int) ((int) trunc(round((number+10 % 10)*100)) )  / 100;

        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - No predecessor - Result = " + std::to_string(result) +
-                                                    " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digital_Uncertainty = " +  std::to_string(Digital_Uncertainty));
+                                                    " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " +  std::to_string(Digit_Uncertainty));
        return result;
    }

    if (Analog_Predecessors) {
-        result = PointerEvalAnalogToDigitNew(number, number_of_predecessors, eval_predecessors, digitalAnalogTransitionStart);
+        result = PointerEvalAnalogToDigitNew(number, number_of_predecessors, eval_predecessors, digitAnalogTransitionStart);
        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - Analog predecessor, evaluation over PointerEvalAnalogNew = " + std::to_string(result) +
-                                                    " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digital_Uncertainty = " +  std::to_string(Digital_Uncertainty));
+                                                    " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " +  std::to_string(Digit_Uncertainty));
        return result;
    }

-    if ((number_of_predecessors > Digital_Transition_Area_Predecessor ) && (number_of_predecessors < (10.0 - Digital_Transition_Area_Predecessor)))
-    {
-        // no digit change, because predecessor is far enough away (0+/-DigitalTransitionRangePredecessor) --> number is rounded
+    if ((number_of_predecessors >= Digit_Transition_Area_Predecessor ) && (number_of_predecessors <= (10.0 - Digit_Transition_Area_Predecessor))) {
+        // no digit change, because predecessor is far enough away (0+/-DigitTransitionRangePredecessor) --> number is rounded
        // Band around the digit --> Round off, as digit reaches inaccuracy in the frame
-        if ((result_after_decimal_point <= DigitalBand) || (result_after_decimal_point >= (10-DigitalBand))) {
+        if ((result_after_decimal_point <= DigitBand) || (result_after_decimal_point >= (10-DigitBand))) {
            result = ((int) round(number) + 10) % 10;
        }
        else {
@@ -178,7 +175,7 @@ int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_pred
        }

        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - NO analogue predecessor, no change of digits, as pre-decimal point far enough away = " + std::to_string(result) +
-                                                    " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digital_Uncertainty = " +  std::to_string(Digital_Uncertainty));
+                                                    " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " +  std::to_string(Digit_Uncertainty));
        return result;
    }  

@@ -195,18 +192,16 @@ int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_pred
            result =  result_before_decimal_point % 10;
        }
        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - NO analogue predecessor, zero crossing has taken placen = " + std::to_string(result) +
-                                                    " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digital_Uncertainty = " +  std::to_string(Digital_Uncertainty));
+                                                    " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " +  std::to_string(Digit_Uncertainty));
        return result;
    }

-    
    // remains only >= 9.x --> no zero crossing yet --> 2.8 --> 2, 
-    // and from 9.7(DigitalTransitionRangeLead) 3.1 --> 2
+    // and from 9.7(DigitTransitionRangeLead) 3.1 --> 2
    // everything >=x.4 can be considered as current number in transition. With 9.x predecessor the current
    // number can still be x.6 - x.7. 
    // Preceding (else - branch) does not already happen from 9.
-    if (((Digital_Transition_Area_Forward>=number_of_predecessors) && (eval_predecessors == (int)number_of_predecessors)) 
-        || result_after_decimal_point >= 4) {
+    if (Digit_Transition_Area_Forward>=number_of_predecessors || result_after_decimal_point >= 4) {
        // The current digit, like the previous digit, does not yet have a zero crossing. 
        result =  result_before_decimal_point % 10;
    }
@@ -217,50 +212,41 @@ int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_pred
    }

    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - O analogue predecessor, >= 9.5 --> no zero crossing yet = " + std::to_string(result) +
-                                                " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digital_Uncertainty = " +  std::to_string(Digital_Uncertainty) + " result_after_decimal_point = " + std::to_string(result_after_decimal_point));
+                                                " number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " +  std::to_string(Digit_Uncertainty) + " result_after_decimal_point = " + std::to_string(result_after_decimal_point));
    return result;
 }

-
-int ClassFlowCNNGeneral::PointerEvalAnalogToDigitNew(float number, float numeral_preceder,  int eval_predecessors, float analogDigitalTransitionStart) {
+int ClassFlowCNNGeneral::PointerEvalAnalogToDigitNew(float number, float numeral_preceder,  int eval_predecessors, float AnalogToDigitTransitionStart) {
    int result;
    int result_after_decimal_point = ((int) floor(number * 10)) % 10;
    int result_before_decimal_point = ((int) floor(number) + 10) % 10;
    bool roundedUp = false;

-    // Within the digital inequalities 
-    if ((result_after_decimal_point >= (10-Digital_Uncertainty * 10) && ((int)numeral_preceder == eval_predecessors))     // Band around the digit --> Round off, as digit reaches inaccuracy in the frame
-        || (eval_predecessors <= 4 && result_after_decimal_point>=6)) {   // or digit runs after (analogue =0..4, digit >=6)
+    // Within the digit inequalities 
+    if ((result_after_decimal_point >= (10-Digit_Uncertainty * 10))     // Band around the digit --> Round off, as digit reaches inaccuracy in the frame
+        || (eval_predecessors <= 4 && result_after_decimal_point>=6))  {   // or digit runs after (analogue =0..4, digit >=6)
        result = (int) (round(number) + 10) % 10;
        roundedUp = true;
        // before/ after decimal point, because we adjust the number based on the uncertainty.
        result_after_decimal_point = ((int) floor(result * 10)) % 10;
        result_before_decimal_point = ((int) floor(result) + 10) % 10;
-        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - Digital Uncertainty - Result = " + std::to_string(result) +
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - Digit Uncertainty - Result = " + std::to_string(result) +
                                                    " number: " + std::to_string(number) + " numeral_preceder: " + std::to_string(numeral_preceder) +
                                                    " erg before comma: " + std::to_string(result_before_decimal_point) + 
                                                    " erg after comma: " + std::to_string(result_after_decimal_point));
-    }
-    else if (result_after_decimal_point < Digital_Uncertainty && numeral_preceder > analogDigitalTransitionStart) {
-        result = ((result_before_decimal_point+10) - 1) % 10;
-        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - Digital Uncertainty - Too early zero crossing - Result = " + std::to_string(result) +
-                                            " number: " + std::to_string(number) + " numeral_preceder: " + std::to_string(numeral_preceder) +
-                                            " erg before comma: " + std::to_string(result_before_decimal_point) + 
-                                            " erg after comma: " + std::to_string(result_after_decimal_point)); 
-    }
+    } 
    else {
        result = (int) ((int) trunc(number) + 10) % 10;
-        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - NO digital Uncertainty - Result = " + std::to_string(result) +
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - NO digit Uncertainty - Result = " + std::to_string(result) +
                                                    " number: " + std::to_string(number) + " numeral_preceder = " + std::to_string(numeral_preceder));
    }

    // No zero crossing has taken place.
    // Only eval_predecessors used because numeral_preceder could be wrong here.
    // numeral_preceder<=0.1 & eval_predecessors=9 corresponds to analogue was reset because of previous analogue that are not yet at 0.
-    if ((eval_predecessors >= 3 && (numeral_preceder > analogDigitalTransitionStart) && roundedUp))
-    {
-        result = ((result_before_decimal_point+10) - 1) % 10;
-        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - No correction = " + std::to_string(result) +
+    if ((eval_predecessors>=6 && (numeral_preceder>AnalogToDigitTransitionStart || numeral_preceder<=0.2) && roundedUp)) {
+        result =  ((result_before_decimal_point+10) - 1) % 10;
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - Nulldurchgang noch nicht stattgefunden = " + std::to_string(result) +
                                    " number: " + std::to_string(number) + 
                                    " numeral_preceder = " + std::to_string(numeral_preceder) + 
                                    " eerg after comma = " +  std::to_string(result_after_decimal_point));
@@ -269,7 +255,6 @@ int ClassFlowCNNGeneral::PointerEvalAnalogToDigitNew(float number, float numeral
    return result;
 }

-
 int ClassFlowCNNGeneral::PointerEvalAnalogNew(float number, int numeral_preceder) {
    float number_min, number_max;
    int result;
@@ -306,7 +291,6 @@ int ClassFlowCNNGeneral::PointerEvalAnalogNew(float number, int numeral_preceder
    return result;
 }

-
 bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
    std::vector<string> splitted;

@@ -332,7 +316,6 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
        return true;
    }

-
    while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph)) {
        splitted = ZerlegeZeile(aktparamgraph);
        if ((toUpper(splitted[0]) == "ROIIMAGESLOCATION") && (splitted.size() > 1)) {
@@ -346,7 +329,9 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
        }

        if ((toUpper(splitted[0]) == "ROIIMAGESRETENTION") && (splitted.size() > 1)) {
-            this->imagesRetention = std::stoi(splitted[1]);
+            if (isStringNumeric(splitted[1])) {
+                this->imagesRetention = std::stoi(splitted[1]);
+            }
        }

        if ((toUpper(splitted[0]) == "MODEL") && (splitted.size() > 1)) {
@@ -354,7 +339,9 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
        }
        
        if ((toUpper(splitted[0]) == "CNNGOODTHRESHOLD") && (splitted.size() > 1)) {
-            CNNGoodThreshold = std::stof(splitted[1]);
+            if (isStringNumeric(splitted[1])) {
+                CNNGoodThreshold = std::stof(splitted[1]);
+            }
        }
        
        if (splitted.size() >= 5) {
@@ -376,9 +363,7 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
        }

        if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1)) {
-            if (toUpper(splitted[1]) == "TRUE") {
-                SaveAllFiles = true;
-            }
+            SaveAllFiles = alphanumericToBoolean(splitted[1]);
        }
    }

@@ -388,7 +373,6 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
        return false;
    }

-
    for (int _ana = 0; _ana < GENERAL.size(); ++_ana) {
        for (int i = 0; i < GENERAL[_ana]->ROI.size(); ++i) {
            GENERAL[_ana]->ROI[i]->image = new CImageBasis("ROI " + GENERAL[_ana]->ROI[i]->name, 
@@ -401,7 +385,6 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
    return true;
 }

-
 general* ClassFlowCNNGeneral::FindGENERAL(string _name_number) {
    for (int i = 0; i < GENERAL.size(); ++i) {
        if (GENERAL[i]->name == _name_number) {
@@ -412,7 +395,6 @@ general* ClassFlowCNNGeneral::FindGENERAL(string _name_number) {
    return NULL;
 }

-
 general* ClassFlowCNNGeneral::GetGENERAL(string _name, bool _create = true) {
    string _analog, _roi;
    int _pospunkt = _name.find_first_of(".");
@@ -455,7 +437,6 @@ general* ClassFlowCNNGeneral::GetGENERAL(string _name, bool _create = true) {
    return _ret;
 }

-
 string ClassFlowCNNGeneral::getHTMLSingleStep(string host) {
    string result, zw;
    std::vector<HTMLInfo*> htmlinfo;
@@ -479,7 +460,6 @@ string ClassFlowCNNGeneral::getHTMLSingleStep(string host) {
    return result;
 }

-
 bool ClassFlowCNNGeneral::doFlow(string time) {
 #ifdef HEAP_TRACING_CLASS_FLOW_CNN_GENERAL_DO_ALING_AND_CUT
    //register a buffer to record the memory trace
@@ -510,7 +490,6 @@ bool ClassFlowCNNGeneral::doFlow(string time) {
    return true;
 }

-
 bool ClassFlowCNNGeneral::doAlignAndCut(string time) {
    if (disabled) {
        return true;
@@ -547,7 +526,6 @@ bool ClassFlowCNNGeneral::doAlignAndCut(string time) {
    return true;
 } 

-
 void ClassFlowCNNGeneral::DrawROI(CImageBasis *_zw) {
    if (_zw->ImageOkay()) { 
        if (CNNType == Analogue || CNNType == Analogue100) {
@@ -574,7 +552,6 @@ void ClassFlowCNNGeneral::DrawROI(CImageBasis *_zw) {
    }
 } 

-
 bool ClassFlowCNNGeneral::getNetworkParameter() {
    if (disabled) {
        return true;
@@ -616,17 +593,17 @@ bool ClassFlowCNNGeneral::getNetworkParameter() {
                ESP_LOGD(TAG, "TFlite-Type set to DoubleHyprid10");
                break;
            case 11:
-                CNNType = Digital;
-                ESP_LOGD(TAG, "TFlite-Type set to Digital");
+                CNNType = Digit;
+                ESP_LOGD(TAG, "TFlite-Type set to Digit");
                break;
 /*            case 20:
-                CNNType = DigitalHyprid10;
-                ESP_LOGD(TAG, "TFlite-Type set to DigitalHyprid10");
+                CNNType = DigitHyprid10;
+                ESP_LOGD(TAG, "TFlite-Type set to DigitHyprid10");
                break;
 */
 //            case 22:
-//                CNNType = DigitalHyprid;
-//                ESP_LOGD(TAG, "TFlite-Type set to DigitalHyprid");
+//                CNNType = DigitHyprid;
+//                ESP_LOGD(TAG, "TFlite-Type set to DigitHyprid");
 //                break;
             case 100:
                if (modelxsize==32 && modelysize == 32) {
@@ -634,8 +611,8 @@ bool ClassFlowCNNGeneral::getNetworkParameter() {
                    ESP_LOGD(TAG, "TFlite-Type set to Analogue100");
                } 
                else {
-                    CNNType = Digital100;
-                    ESP_LOGD(TAG, "TFlite-Type set to Digital");
+                    CNNType = Digit100;
+                    ESP_LOGD(TAG, "TFlite-Type set to Digit");
                }
                break;
            default:
@@ -647,7 +624,6 @@ bool ClassFlowCNNGeneral::getNetworkParameter() {
    return true;
 }

-
 bool ClassFlowCNNGeneral::doNeuralNetwork(string time) {
    if (disabled) {
        return true;
@@ -710,8 +686,8 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) {
                        }
                    } break;

-                case Digital:
-                    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CNN Type: Digital");
+                case Digit:
+                    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CNN Type: Digit");
                    {
                        GENERAL[n]->ROI[roi]->result_klasse = 0;
                        GENERAL[n]->ROI[roi]->result_klasse = tflite->GetClassFromImageBasis(GENERAL[n]->ROI[roi]->image);
@@ -802,10 +778,10 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) {
                            }
                        }
                    } break;
-                case Digital100:
+                case Digit100:
                case Analogue100:
                    {
-                    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CNN Type: Digital100 or Analogue100");
+                    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CNN Type: Digit100 or Analogue100");
                        int _num;
                        float _result_save_file;
                        
@@ -852,16 +828,14 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) {
    return true;
 }

-
 bool ClassFlowCNNGeneral::isExtendedResolution(int _number) {
-    if (CNNType == Digital) {
+    if (CNNType == Digit) {
        return false;
    }
    
    return true;
 }

-
 std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo() {
    std::vector<HTMLInfo*> result;

@@ -887,7 +861,7 @@ std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo() {
                zw->filename_org = GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg";
            }

-            if (CNNType == Digital) {
+            if (CNNType == Digit) {
                zw->val = GENERAL[_ana]->ROI[i]->result_klasse;
            }
            else {
@@ -904,12 +878,10 @@ std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo() {
    return result;
 }

-
 int ClassFlowCNNGeneral::getNumberGENERAL() {
    return GENERAL.size();
 }

-
 string ClassFlowCNNGeneral::getNameGENERAL(int _analog) {
    if (_analog < GENERAL.size()) {
        return GENERAL[_analog]->name;
@@ -918,7 +890,6 @@ string ClassFlowCNNGeneral::getNameGENERAL(int _analog) {
    return "GENERAL DOES NOT EXIST";
 }

-
 general* ClassFlowCNNGeneral::GetGENERAL(int _analog) {
    if (_analog < GENERAL.size()) {
        return GENERAL[_analog];
@@ -927,7 +898,6 @@ general* ClassFlowCNNGeneral::GetGENERAL(int _analog) {
    return NULL;
 }

-
 void ClassFlowCNNGeneral::UpdateNameNumbers(std::vector<std::string> *_name_numbers) {
    for (int _dig = 0; _dig < GENERAL.size(); _dig++) {
        std::string _name = GENERAL[_dig]->name;
@@ -944,7 +914,6 @@ void ClassFlowCNNGeneral::UpdateNameNumbers(std::vector<std::string> *_name_numb
    }
 }

-
 string ClassFlowCNNGeneral::getReadoutRawString(int _analog) 
 {
    string rt = "";
@@ -958,7 +927,7 @@ string ClassFlowCNNGeneral::getReadoutRawString(int _analog)
            rt = rt + "," + RundeOutput(GENERAL[_analog]->ROI[i]->result_float, 1);
        }

-        if (CNNType == Digital) {
+        if (CNNType == Digit) {
            if (GENERAL[_analog]->ROI[i]->result_klasse >= 10) {
                rt = rt + ",N";
            }
@@ -967,10 +936,9 @@ string ClassFlowCNNGeneral::getReadoutRawString(int _analog)
            }
        }

-        if ((CNNType == DoubleHyprid10) || (CNNType == Digital100)) {
+        if ((CNNType == DoubleHyprid10) || (CNNType == Digit100)) {
            rt = rt + "," + RundeOutput(GENERAL[_analog]->ROI[i]->result_float, 1);
        }
    }
    return rt;
 }
-
--- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h
+++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h
@@ -11,10 +11,10 @@ enum t_CNNType {
    AutoDetect,
    Analogue,
    Analogue100,
-    Digital,
-    DigitalHyprid10,
+    Digit,
+    DigitHyprid10,
    DoubleHyprid10,
-    Digital100,
+    Digit100,
    None
 };

@@ -26,15 +26,6 @@ protected:
    std::vector<general*> GENERAL;
    float CNNGoodThreshold;

-	//moved to define.h
-    //float Analog_error = 3.0;
-    //float AnalogToDigtalFehler = 0.8;
-    //float Digital_Uncertainty = 0.2;
-    //int DigitalBand = 3;
-    //float Digital_Transition_Range_Predecessor = 2;
-    //float Digital_Transition_Area_Predecessor = 0.7; // 9.3 - 0.7
-    //float Digital_Transition_Area_Forward = 9.7; // Pre-run zero crossing only happens from approx. 9.7 onwards
-
    string cnnmodelfile;
    int modelxsize, modelysize, modelchannel;
    bool isLogImageSelect;
@@ -44,8 +35,8 @@ protected:
    bool SaveAllFiles;   

    int PointerEvalAnalogNew(float zahl, int numeral_preceder);
-    int PointerEvalAnalogToDigitNew(float zahl, float numeral_preceder,  int eval_predecessors, float analogDigitalTransitionStart);
-    int PointerEvalHybridNew(float zahl, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors = false, float analogDigitalTransitionStart=9.2);
+    int PointerEvalAnalogToDigitNew(float zahl, float numeral_preceder,  int eval_predecessors, float AnalogToDigitTransitionStart);
+    int PointerEvalHybridNew(float zahl, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors = false, float AnalogToDigitTransitionStart=9.2);



@@ -61,7 +52,7 @@ public:
    bool doFlow(string time);

    string getHTMLSingleStep(string host);
-    string getReadout(int _analog, bool _extendedResolution = false, int prev = -1, float _before_narrow_Analog = -1, float analogDigitalTransitionStart=9.2); 
+    string getReadout(int _analog, bool _extendedResolution = false, int prev = -1, float _before_narrow_Analog = -1, float AnalogToDigitTransitionStart=9.2); 

    string getReadoutRawString(int _analog);  

--- a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
@@ -32,7 +32,6 @@ static const char* TAG = "FLOWCTRL";

 //#define DEBUG_DETAIL_ON

-
 std::string ClassFlowControll::doSingleStep(std::string _stepname, std::string _host){
    std::string _classname = "";
    std::string result = "";
@@ -65,11 +64,19 @@ std::string ClassFlowControll::doSingleStep(std::string _stepname, std::string _
        _classname = "ClassFlowInfluxDBv2";
    }
    #endif //ENABLE_INFLUXDB
+    #ifdef ENABLE_WEBHOOK
+    if ((_stepname.compare("[Webhook]") == 0) || (_stepname.compare(";[Webhook]") == 0)){
+        _classname = "ClassFlowWebhook";
+    }
+    #endif //ENABLE_WEBHOOK

    for (int i = 0; i < FlowControll.size(); ++i)
        if (FlowControll[i]->name().compare(_classname) == 0){
-            if (!(FlowControll[i]->name().compare("ClassFlowTakeImage") == 0))      // if it is a TakeImage, the image does not need to be included, this happens automatically with the html query.
+            if (!(FlowControll[i]->name().compare("ClassFlowTakeImage") == 0)) {
+                // if it is a TakeImage, the image does not need to be included, this happens automatically with the html query.
                FlowControll[i]->doFlow("");
+            }
+		
            result = FlowControll[i]->getHTMLSingleStep(_host);
        }

@@ -78,37 +85,51 @@ std::string ClassFlowControll::doSingleStep(std::string _stepname, std::string _
    return result;
 }

-
 std::string ClassFlowControll::TranslateAktstatus(std::string _input)
 {
-    if (_input.compare("ClassFlowTakeImage") == 0)
+    if (_input.compare("ClassFlowTakeImage") == 0) {
        return ("Take Image");
-    if (_input.compare("ClassFlowAlignment") == 0)
+    }
+
+    if (_input.compare("ClassFlowAlignment") == 0) {
        return ("Aligning");
-    if (_input.compare("ClassFlowCNNGeneral") == 0)
-        return ("Digitalization of ROIs");
+    }
+
+    if (_input.compare("ClassFlowCNNGeneral") == 0) {
+        return ("Digitization of ROIs");
+    }
+
    #ifdef ENABLE_MQTT
-        if (_input.compare("ClassFlowMQTT") == 0)
+        if (_input.compare("ClassFlowMQTT") == 0) {
            return ("Sending MQTT");
+        }
    #endif //ENABLE_MQTT
+		
    #ifdef ENABLE_INFLUXDB
-        if (_input.compare("ClassFlowInfluxDB") == 0)
+        if (_input.compare("ClassFlowInfluxDB") == 0) {
            return ("Sending InfluxDB");
-        if (_input.compare("ClassFlowInfluxDBv2") == 0)
+        }
+		
+        if (_input.compare("ClassFlowInfluxDBv2") == 0) {
            return ("Sending InfluxDBv2");
+        }
    #endif //ENABLE_INFLUXDB
-    if (_input.compare("ClassFlowPostProcessing") == 0)
+    #ifdef ENABLE_WEBHOOK
+    if (_input.compare("ClassFlowWebhook") == 0) {
+        return ("Sending Webhook");
+    }
+    #endif //ENABLE_WEBHOOK
+    if (_input.compare("ClassFlowPostProcessing") == 0) {
        return ("Post-Processing");
+    }

    return "Unkown Status";
 }

-
-std::vector<HTMLInfo*> ClassFlowControll::GetAllDigital() 
+std::vector<HTMLInfo*> ClassFlowControll::GetAllDigit() 
 {
-    if (flowdigit)
-    {
-        ESP_LOGD(TAG, "ClassFlowControll::GetAllDigital - flowdigit != NULL");
+    if (flowdigit) {
+        ESP_LOGD(TAG, "ClassFlowControll::GetAllDigit - flowdigit != NULL");
        return flowdigit->GetHTMLInfo();
    }

@@ -116,65 +137,63 @@ std::vector<HTMLInfo*> ClassFlowControll::GetAllDigital()
    return empty;
 }

-
 std::vector<HTMLInfo*> ClassFlowControll::GetAllAnalog()
 {
-    if (flowanalog)
+    if (flowanalog) {
        return flowanalog->GetHTMLInfo();
+    }

    std::vector<HTMLInfo*> empty;
    return empty;
 }

-
-t_CNNType ClassFlowControll::GetTypeDigital()
+t_CNNType ClassFlowControll::GetTypeDigit()
 {
-    if (flowdigit)
+    if (flowdigit) {
        return flowdigit->getCNNType();
+    }

    return t_CNNType::None;
 }

-
 t_CNNType ClassFlowControll::GetTypeAnalog()
 {
-    if (flowanalog)
+    if (flowanalog) {
        return flowanalog->getCNNType();
+    }

    return t_CNNType::None;
 }

-
 #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-void ClassFlowControll::DigitalDrawROI(CImageBasis *_zw)
+void ClassFlowControll::DigitDrawROI(CImageBasis *_zw)
 {
-    if (flowdigit)
+    if (flowdigit) {
        flowdigit->DrawROI(_zw);
+    }
 }

-
 void ClassFlowControll::AnalogDrawROI(CImageBasis *_zw)
 {
-    if (flowanalog)
+    if (flowanalog) {
        flowanalog->DrawROI(_zw);
+    }
 }
 #endif

-
 #ifdef ENABLE_MQTT
 bool ClassFlowControll::StartMQTTService() 
 {
    /* Start the MQTT service */
-        for (int i = 0; i < FlowControll.size(); ++i) {
-            if (FlowControll[i]->name().compare("ClassFlowMQTT") == 0) {
-                return ((ClassFlowMQTT*) (FlowControll[i]))->Start(AutoInterval);
-            }  
-        } 
+    for (int i = 0; i < FlowControll.size(); ++i) {
+        if (FlowControll[i]->name().compare("ClassFlowMQTT") == 0) {
+            return ((ClassFlowMQTT*) (FlowControll[i]))->Start(AutoInterval);
+        }  
+    } 
    return false;
 }
 #endif //ENABLE_MQTT

-
 void ClassFlowControll::SetInitialParameter(void)
 {
    AutoStart = false;
@@ -189,7 +208,6 @@ void ClassFlowControll::SetInitialParameter(void)
    aktstatusWithTime = aktstatus;
 }

-
 bool ClassFlowControll::getIsAutoStart(void)
 {
    return AutoStart;
@@ -201,69 +219,81 @@ void ClassFlowControll::setAutoStartInterval(long &_interval)
    _interval = AutoInterval * 60 * 1000; // AutoInterval: minutes -> ms
 }

-
 ClassFlow* ClassFlowControll::CreateClassFlow(std::string _type)
 {
    ClassFlow* cfc = NULL;

    _type = trim(_type);

-    if (toUpper(_type).compare("[TAKEIMAGE]") == 0)
-    {
+    if (toUpper(_type).compare("[TAKEIMAGE]") == 0) {
        cfc = new ClassFlowTakeImage(&FlowControll);
        flowtakeimage = (ClassFlowTakeImage*) cfc;
    }
-    if (toUpper(_type).compare("[ALIGNMENT]") == 0)
-    {
+	
+    if (toUpper(_type).compare("[ALIGNMENT]") == 0) {
        cfc = new ClassFlowAlignment(&FlowControll);
        flowalignment = (ClassFlowAlignment*) cfc;
    }
-    if (toUpper(_type).compare("[ANALOG]") == 0)
-    {
+	
+    if (toUpper(_type).compare("[ANALOG]") == 0) {
        cfc = new ClassFlowCNNGeneral(flowalignment);
        flowanalog = (ClassFlowCNNGeneral*) cfc;
    }
-    if (toUpper(_type).compare(0, 7, "[DIGITS") == 0)
-    {
+	
+    if (toUpper(_type).compare(0, 7, "[DIGITS") == 0) {
        cfc = new ClassFlowCNNGeneral(flowalignment);
        flowdigit = (ClassFlowCNNGeneral*) cfc;
    }
+	
    #ifdef ENABLE_MQTT
-    if (toUpper(_type).compare("[MQTT]") == 0)
+    if (toUpper(_type).compare("[MQTT]") == 0) {
        cfc = new ClassFlowMQTT(&FlowControll);
+    }
    #endif //ENABLE_MQTT
+	
    #ifdef ENABLE_INFLUXDB
-    if (toUpper(_type).compare("[INFLUXDB]") == 0)
+    if (toUpper(_type).compare("[INFLUXDB]") == 0) {
        cfc = new ClassFlowInfluxDB(&FlowControll);
-    if (toUpper(_type).compare("[INFLUXDBV2]") == 0)
-        cfc = new ClassFlowInfluxDBv2(&FlowControll);
-    #endif //ENABLE_INFLUXDB  
+    }

-    if (toUpper(_type).compare("[POSTPROCESSING]") == 0)
-    {
+    if (toUpper(_type).compare("[INFLUXDBV2]") == 0) {
+        cfc = new ClassFlowInfluxDBv2(&FlowControll);
+    }
+    #endif //ENABLE_INFLUXDB  
+    #ifdef ENABLE_WEBHOOK
+    if (toUpper(_type).compare("[WEBHOOK]") == 0)
+        cfc = new ClassFlowWebhook(&FlowControll);
+    #endif //ENABLE_WEBHOOK
+
+    if (toUpper(_type).compare("[POSTPROCESSING]") == 0) {
        cfc = new ClassFlowPostProcessing(&FlowControll, flowanalog, flowdigit); 
        flowpostprocessing = (ClassFlowPostProcessing*) cfc;
    }

-    if (cfc)                            // Attached only if it is not [AutoTimer], because this is for FlowControll
+    if (cfc) {                           
+        // Attached only if it is not [AutoTimer], because this is for FlowControll
        FlowControll.push_back(cfc);
+    }

-    if (toUpper(_type).compare("[AUTOTIMER]") == 0)
-        cfc = this;    
+    if (toUpper(_type).compare("[AUTOTIMER]") == 0) {
+        cfc = this;
+    }

-    if (toUpper(_type).compare("[DATALOGGING]") == 0)
-        cfc = this;  
+    if (toUpper(_type).compare("[DATALOGGING]") == 0) {
+        cfc = this;
+    }

-    if (toUpper(_type).compare("[DEBUG]") == 0)
-        cfc = this;  
+    if (toUpper(_type).compare("[DEBUG]") == 0) {
+        cfc = this;
+    }

-    if (toUpper(_type).compare("[SYSTEM]") == 0)
-        cfc = this;          
+    if (toUpper(_type).compare("[SYSTEM]") == 0) {
+        cfc = this;
+    }

    return cfc;
 }

-
 void ClassFlowControll::InitFlow(std::string config)
 {
    aktstatus = "Initialization";
@@ -284,62 +314,55 @@ void ClassFlowControll::InitFlow(std::string config)
    line = "";

    char zw[1024];
-    if (pFile != NULL)
-    {
+	
+    if (pFile != NULL) {
        fgets(zw, 1024, pFile);
        ESP_LOGD(TAG, "%s", zw);
        line = std::string(zw);
    }

-    while ((line.size() > 0) && !(feof(pFile)))
-    {
+    while ((line.size() > 0) && !(feof(pFile))) {
        cfc = CreateClassFlow(line);
-//        printf("Name: %s\n", cfc->name().c_str());
-        if (cfc)
-        {
-            ESP_LOGD(TAG, "Start ReadParameter (%s)", line.c_str());
+        // printf("Name: %s\n", cfc->name().c_str());
+	    
+        if (cfc) {
+            ESP_LOGE(TAG, "Start ReadParameter (%s)", line.c_str());
            cfc->ReadParameter(pFile, line);
        }
-        else
-        {
+        else {
            line = "";
-            if (fgets(zw, 1024, pFile) && !feof(pFile))
-                {
-                    ESP_LOGD(TAG, "Read: %s", zw);
-                    line = std::string(zw);
-                }
+		
+            if (fgets(zw, 1024, pFile) && !feof(pFile)) {
+                ESP_LOGD(TAG, "Read: %s", zw);
+                line = std::string(zw);
+            }
        }
    }

    fclose(pFile);
 }

-
 std::string* ClassFlowControll::getActStatusWithTime()
 {
    return &aktstatusWithTime;
 }

-
 std::string* ClassFlowControll::getActStatus()
 {
    return &aktstatus;
 }

-
 void ClassFlowControll::setActStatus(std::string _aktstatus)
 {
    aktstatus = _aktstatus;
    aktstatusWithTime = aktstatus;
 }

-
 void ClassFlowControll::doFlowTakeImageOnly(string time)
 {
    std::string zw_time;

-    for (int i = 0; i < FlowControll.size(); ++i)
-    {
+    for (int i = 0; i < FlowControll.size(); ++i) {
        if (FlowControll[i]->name() == "ClassFlowTakeImage") {
            zw_time = getCurrentTimeString("%H:%M:%S");
            aktstatus = TranslateAktstatus(FlowControll[i]->name());
@@ -353,7 +376,6 @@ void ClassFlowControll::doFlowTakeImageOnly(string time)
    }
 }

-
 bool ClassFlowControll::doFlow(string time)
 {
    bool result = true;
@@ -373,8 +395,7 @@ bool ClassFlowControll::doFlow(string time)

    //checkNtpStatus(0);

-    for (int i = 0; i < FlowControll.size(); ++i)
-    {
+    for (int i = 0; i < FlowControll.size(); ++i) {
        zw_time = getCurrentTimeString("%H:%M:%S");
        aktstatus = TranslateAktstatus(FlowControll[i]->name());
        aktstatusWithTime = aktstatus + " (" + zw_time + ")";
@@ -391,7 +412,7 @@ bool ClassFlowControll::doFlow(string time)
        if (!FlowControll[i]->doFlow(time)){
            repeat++;
            LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Fehler im vorheriger Schritt - wird zum " + to_string(repeat) + ". Mal wiederholt");
-            if (i) i -= 1;    // vPrevious step must be repeated (probably take pictures)
+            if (i) { i -= 1; }   // vPrevious step must be repeated (probably take pictures)
            result = false;
            if (repeat > 5) {
                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Wiederholung 5x nicht erfolgreich --> reboot");
@@ -399,8 +420,7 @@ bool ClassFlowControll::doFlow(string time)
                //Step was repeated 5x --> reboot
            }
        }
-        else
-        {
+        else {
            result = true;
        }
        
@@ -424,27 +444,29 @@ bool ClassFlowControll::doFlow(string time)
 string ClassFlowControll::getReadoutAll(int _type)
 {
    std::string out = "";
-    if (flowpostprocessing)
-    {
+	
+    if (flowpostprocessing) {
        std::vector<NumberPost*> *numbers = flowpostprocessing->GetNumbers();

-        for (int i = 0; i < (*numbers).size(); ++i)
-        {
+        for (int i = 0; i < (*numbers).size(); ++i) {
            out = out + (*numbers)[i]->name + "\t";
+		
            switch (_type) {
                case READOUT_TYPE_VALUE:
                    out = out + (*numbers)[i]->ReturnValue;
                    break;
                case READOUT_TYPE_PREVALUE:
-                    if (flowpostprocessing->PreValueUse)
-                    {
-                        if ((*numbers)[i]->PreValueOkay)
+                    if (flowpostprocessing->PreValueUse) {
+                        if ((*numbers)[i]->PreValueOkay) {
                            out = out + (*numbers)[i]->ReturnPreValue;
-                        else
-                            out = out + "PreValue too old";                
+			}
+                        else {
+                            out = out + "PreValue too old"; 
+			}
                    }
-                    else
+                    else {
                        out = out + "PreValue deactivated";
+		    }
                    break;
                case READOUT_TYPE_RAWVALUE:
                    out = out + (*numbers)[i]->ReturnRawValue;
@@ -453,8 +475,10 @@ string ClassFlowControll::getReadoutAll(int _type)
                    out = out + (*numbers)[i]->ErrorMessageText;
                    break;
            }
-            if (i < (*numbers).size()-1)
+		
+            if (i < (*numbers).size()-1) {
                out = out + "\r\n";
+	    }
        }
    //    ESP_LOGD(TAG, "OUT: %s", out.c_str());
    }
@@ -462,43 +486,24 @@ string ClassFlowControll::getReadoutAll(int _type)
    return out;
 }	

-
 string ClassFlowControll::getReadout(bool _rawvalue = false, bool _noerror = false, int _number = 0)
 {
-    if (flowpostprocessing)
+    if (flowpostprocessing) {
        return flowpostprocessing->getReadoutParam(_rawvalue, _noerror, _number);
-
-    string zw = "";
-    string result = "";
-
-    for (int i = 0; i < FlowControll.size(); ++i)
-    {
-        zw = FlowControll[i]->getReadout();
-        if (zw.length() > 0)
-        {
-            if (result.length() == 0)
-                result = zw;
-            else
-                result = result + "\t" + zw;
-        }
    }

-    return result;
+    return std::string("");
 }

-
 string ClassFlowControll::GetPrevalue(std::string _number)	
 {
-    if (flowpostprocessing)
-    {
+    if (flowpostprocessing) {
        return flowpostprocessing->GetPreValue(_number);   
    }

-
    return std::string("");    
 }

-
 bool ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string _numbers, bool _extern)
 {
    double newvalueAsDouble;
@@ -519,10 +524,12 @@ bool ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string _numbe
    }
    
    if (flowpostprocessing) {
-        if (flowpostprocessing->SetPreValue(newvalueAsDouble, _numbers, _extern))
+        if (flowpostprocessing->SetPreValue(newvalueAsDouble, _numbers, _extern)) {
            return true;
-        else
+	}
+        else {
            return false;
+	}
    }
    else {
        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "UpdatePrevalue: ERROR - Class Post-Processing not initialized");
@@ -530,93 +537,85 @@ bool ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string _numbe
    }
 }

-
 bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
 {
    std::vector<string> splitted;

    aktparamgraph = trim(aktparamgraph);

-    if (aktparamgraph.size() == 0)
-        if (!this->GetNextParagraph(pfile, aktparamgraph))
+    if (aktparamgraph.size() == 0) {
+        if (!this->GetNextParagraph(pfile, aktparamgraph)) {
            return false;
-
+	}
+    }

    if ((toUpper(aktparamgraph).compare("[AUTOTIMER]") != 0) && (toUpper(aktparamgraph).compare("[DEBUG]") != 0) &&
-        (toUpper(aktparamgraph).compare("[SYSTEM]") != 0 && (toUpper(aktparamgraph).compare("[DATALOGGING]") != 0)))      // Paragraph passt nicht zu Debug oder DataLogging
+        (toUpper(aktparamgraph).compare("[SYSTEM]") != 0 && (toUpper(aktparamgraph).compare("[DATALOGGING]") != 0))) {     
+        // Paragraph passt nicht zu Debug oder DataLogging
        return false;
+    }

-    while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
-    {
+    while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph)) {
        splitted = ZerlegeZeile(aktparamgraph, " =");
-        if ((toUpper(splitted[0]) == "AUTOSTART") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
+	    
+        if ((toUpper(splitted[0]) == "AUTOSTART") && (splitted.size() > 1)) {
+            AutoStart = alphanumericToBoolean(splitted[1]);
+        }
+
+        if ((toUpper(splitted[0]) == "INTERVAL") && (splitted.size() > 1)) {
+            if (isStringNumeric(splitted[1]))
            {
-                AutoStart = true;
+                AutoInterval = std::stof(splitted[1]);
            }
        }

-        if ((toUpper(splitted[0]) == "INTERVAL") && (splitted.size() > 1))
-        {
-            AutoInterval = std::stof(splitted[1]);
+        if ((toUpper(splitted[0]) == "DATALOGACTIVE") && (splitted.size() > 1)) {
+            LogFile.SetDataLogToSD(alphanumericToBoolean(splitted[1]));
        }

-        if ((toUpper(splitted[0]) == "DATALOGACTIVE") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
+        if ((toUpper(splitted[0]) == "DATAFILESRETENTION") && (splitted.size() > 1)) {
+            if (isStringNumeric(splitted[1]))
            {
-                LogFile.SetDataLogToSD(true);
-            }
-            else {
-                LogFile.SetDataLogToSD(false);
+                LogFile.SetDataLogRetention(std::stoi(splitted[1]));
            }
        }

-        if ((toUpper(splitted[0]) == "DATAFILESRETENTION") && (splitted.size() > 1))
-        {
-            LogFile.SetDataLogRetention(std::stoi(splitted[1]));
-        }
-
-        if ((toUpper(splitted[0]) == "LOGLEVEL") && (splitted.size() > 1))
-        {
+        if ((toUpper(splitted[0]) == "LOGLEVEL") && (splitted.size() > 1)) {
            /* matches esp_log_level_t */
-            if ((toUpper(splitted[1]) == "TRUE") || (toUpper(splitted[1]) == "2"))
-            {
+            if ((toUpper(splitted[1]) == "TRUE") || (toUpper(splitted[1]) == "2")) {
                LogFile.setLogLevel(ESP_LOG_WARN);
            }
-            else if ((toUpper(splitted[1]) == "FALSE") || (toUpper(splitted[1]) == "0") || (toUpper(splitted[1]) == "1"))
-            {
+            else if ((toUpper(splitted[1]) == "FALSE") || (toUpper(splitted[1]) == "0") || (toUpper(splitted[1]) == "1")) {
                LogFile.setLogLevel(ESP_LOG_ERROR);
            }
-            else if (toUpper(splitted[1]) == "3")
-            {
+            else if (toUpper(splitted[1]) == "3") {
                LogFile.setLogLevel(ESP_LOG_INFO);
            }
-            else if (toUpper(splitted[1]) == "4")
-            {
+            else if (toUpper(splitted[1]) == "4") {
                LogFile.setLogLevel(ESP_LOG_DEBUG);
            }

            /* If system reboot was not triggered by user and reboot was caused by execption -> keep log level to DEBUG */
-            if (!getIsPlannedReboot() && (esp_reset_reason() == ESP_RST_PANIC))
+            if (!getIsPlannedReboot() && (esp_reset_reason() == ESP_RST_PANIC)) {
                LogFile.setLogLevel(ESP_LOG_DEBUG);
+	    }
        }
-        if ((toUpper(splitted[0]) == "LOGFILESRETENTION") && (splitted.size() > 1))
-        {
-            LogFile.SetLogFileRetention(std::stoi(splitted[1]));
+	    
+        if ((toUpper(splitted[0]) == "LOGFILESRETENTION") && (splitted.size() > 1)) {
+            if (isStringNumeric(splitted[1]))
+            {
+                LogFile.SetLogFileRetention(std::stoi(splitted[1]));
+            }
        }

        /* TimeServer and TimeZone got already read from the config, see setupTime () */
        
        #if (defined WLAN_USE_ROAMING_BY_SCANNING || (defined WLAN_USE_MESH_ROAMING && defined WLAN_USE_MESH_ROAMING_ACTIVATE_CLIENT_TRIGGERED_QUERIES))
-        if ((toUpper(splitted[0]) == "RSSITHRESHOLD") && (splitted.size() > 1))
-        {
+        if ((toUpper(splitted[0]) == "RSSITHRESHOLD") && (splitted.size() > 1)) {
            int RSSIThresholdTMP = atoi(splitted[1].c_str());
            RSSIThresholdTMP = min(0, max(-100, RSSIThresholdTMP)); // Verify input limits (-100 - 0)
            
-            if (ChangeRSSIThreshold(WLAN_CONFIG_FILE, RSSIThresholdTMP))
-            {
+            if (ChangeRSSIThreshold(WLAN_CONFIG_FILE, RSSIThresholdTMP)) {
                // reboot necessary so that the new wlan.ini is also used !!!
                fclose(pfile);
                LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Rebooting to activate new RSSITHRESHOLD ...");
@@ -625,10 +624,8 @@ bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
        }
        #endif

-        if ((toUpper(splitted[0]) == "HOSTNAME") && (splitted.size() > 1))
-        {
-            if (ChangeHostName(WLAN_CONFIG_FILE, splitted[1]))
-            {
+        if ((toUpper(splitted[0]) == "HOSTNAME") && (splitted.size() > 1)) {
+            if (ChangeHostName(WLAN_CONFIG_FILE, splitted[1])) {
                // reboot necessary so that the new wlan.ini is also used !!!
                fclose(pfile);
                LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Rebooting to activate new HOSTNAME...");             
@@ -636,23 +633,19 @@ bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
            }
        }

-        if ((toUpper(splitted[0]) == "SETUPMODE") && (splitted.size() > 1))
-        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                SetupModeActive = true;
-            }        
+        if ((toUpper(splitted[0]) == "SETUPMODE") && (splitted.size() > 1)) {
+            SetupModeActive = alphanumericToBoolean(splitted[1]);        
        }
    }
    return true;
 }

-
 int ClassFlowControll::CleanTempFolder() {
    const char* folderPath = "/sdcard/img_tmp";
    
    ESP_LOGD(TAG, "Clean up temporary folder to avoid damage of sdcard sectors: %s", folderPath);
    DIR *dir = opendir(folderPath);
+	
    if (!dir) {
        ESP_LOGE(TAG, "Failed to stat dir: %s", folderPath);
        return -1;
@@ -660,31 +653,33 @@ int ClassFlowControll::CleanTempFolder() {

    struct dirent *entry;
    int deleted = 0;
+	
    while ((entry = readdir(dir)) != NULL) {
        std::string path = string(folderPath) + "/" + entry->d_name;
-		if (entry->d_type == DT_REG) {
-			if (unlink(path.c_str()) == 0) {
-				deleted ++;
-			} else {
-				ESP_LOGE(TAG, "can't delete file: %s", path.c_str());
-			}
-        } else if (entry->d_type == DT_DIR) {
-			deleted += removeFolder(path.c_str(), TAG);
-		}
+	if (entry->d_type == DT_REG) {
+	    if (unlink(path.c_str()) == 0) {
+		deleted ++;
+	    } 
+	    else {
+		ESP_LOGE(TAG, "can't delete file: %s", path.c_str());
+	    }
+        } 
+	else if (entry->d_type == DT_DIR) {
+	    deleted += removeFolder(path.c_str(), TAG);
+	}
    }
+	
    closedir(dir);
    ESP_LOGD(TAG, "%d files deleted", deleted);
    
    return 0;
 }

-
 esp_err_t ClassFlowControll::SendRawJPG(httpd_req_t *req)
 {
    return flowtakeimage != NULL ? flowtakeimage->SendRawJPG(req) : ESP_FAIL;
 }

-
 esp_err_t ClassFlowControll::GetJPGStream(std::string _fn, httpd_req_t *req)
 {
    ESP_LOGD(TAG, "ClassFlowControll::GetJPGStream %s", _fn.c_str());
@@ -846,8 +841,8 @@ esp_err_t ClassFlowControll::GetJPGStream(std::string _fn, httpd_req_t *req)
    else {
        std::vector<HTMLInfo*> htmlinfo;
    
-        htmlinfo = GetAllDigital();
-        ESP_LOGD(TAG, "After getClassFlowControll::GetAllDigital");
+        htmlinfo = GetAllDigit();
+        ESP_LOGD(TAG, "After getClassFlowControll::GetAllDigit");

        for (int i = 0; i < htmlinfo.size(); ++i)
        {
@@ -916,14 +911,20 @@ esp_err_t ClassFlowControll::GetJPGStream(std::string _fn, httpd_req_t *req)
    return result;
 }

-
 string ClassFlowControll::getNumbersName()
 {
    return flowpostprocessing->getNumbersName();
 }

-
 string ClassFlowControll::getJSON()
 {
    return flowpostprocessing->GetJSON();
 }
+
+/** 
+ * @returns a vector of all current sequences
+ **/
+const std::vector<NumberPost*> &ClassFlowControll::getNumbers()
+{
+    return *flowpostprocessing->GetNumbers();
+}
--- a/code/components/jomjol_flowcontroll/ClassFlowControll.h
+++ b/code/components/jomjol_flowcontroll/ClassFlowControll.h
@@ -17,6 +17,9 @@
 	#include "ClassFlowInfluxDB.h"
 	#include "ClassFlowInfluxDBv2.h"
 #endif //ENABLE_INFLUXDB
+#ifdef ENABLE_WEBHOOK
+	#include "ClassFlowWebhook.h"
+#endif //ENABLE_WEBHOOK
 #include "ClassFlowCNNGeneral.h"

 class ClassFlowControll :
@@ -52,12 +55,13 @@ public:
 	string GetPrevalue(std::string _number = "");	
 	bool ReadParameter(FILE* pfile, string& aktparamgraph);	
 	string getJSON();
+	const std::vector<NumberPost*> &getNumbers();
 	string getNumbersName();

 	string TranslateAktstatus(std::string _input);

 	#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-	void DigitalDrawROI(CImageBasis *_zw);
+	void DigitDrawROI(CImageBasis *_zw);
 	void AnalogDrawROI(CImageBasis *_zw);
 	#endif

@@ -73,10 +77,10 @@ public:
 	std::string* getActStatus();
 	void setActStatus(std::string _aktstatus);

-	std::vector<HTMLInfo*> GetAllDigital();
+	std::vector<HTMLInfo*> GetAllDigit();
 	std::vector<HTMLInfo*> GetAllAnalog();	

-	t_CNNType GetTypeDigital();
+	t_CNNType GetTypeDigit();
 	t_CNNType GetTypeAnalog();
 	
 	#ifdef ENABLE_MQTT
--- a/code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h
+++ b/code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h
@@ -5,6 +5,10 @@

 #include "ClassFlowImage.h"

+/**
+ * Properties of one ROI
+ * FIXME: naming of members could use some refactoring to comply with common C++ coding style guidelines
+ */
 struct roi {
    int posx, posy, deltax, deltay;
    float result_float;
@@ -14,56 +18,66 @@ struct roi {
    CImageBasis *image, *image_org;
 };

+/**
+ * FIXME: Why is this additional layer needed?
+ */
 struct general {
    string name;
    std::vector<roi*> ROI;
 };

 enum t_RateType {
-    AbsoluteChange,
-    RateChange
+    AbsoluteChange, // ignores the time difference; only the value difference is used comparison with NumberPost.maxRate
+    RateChange      // time difference is considered and a normalized rate is used for comparison with NumberPost.maxRate
 };


+/**
+ * Holds all properties and settings of a sequence. A sequence is a set of digit and/or analog ROIs that are combined to 
+ * provide one meter reading (value).
+ * FIXME: can be renamed to `Sequence`
+ */
 struct NumberPost {
-    float MaxRateValue;
-    bool useMaxRateValue;
-    t_RateType RateType;
-    bool ErrorMessage;
-    bool PreValueOkay;
-    bool AllowNegativeRates;
-    bool checkDigitIncreaseConsistency;
-    time_t lastvalue;
-    time_t timeStampTimeUTC;
-    string timeStamp;
-    double FlowRateAct; // m3 / min
-    double PreValue; // last value that was read out well
-    double Value; // last value read out, incl. corrections
-    string ReturnRateValue; // return value rate
-    string ReturnChangeAbsolute; // return value rate
-    string ReturnRawValue; // Raw value (with N & leading 0)    
-    string ReturnValue; // corrected return value, if necessary with error message
-    string ReturnPreValue; // corrected return value without error message
-    string ErrorMessageText; // Error message for consistency check
-    int AnzahlAnalog;
-    int AnzahlDigital;
-    int DecimalShift;
-    int DecimalShiftInitial;
-    float AnalogDigitalTransitionStart; // When is the digit > x.1, i.e. when does it start to tilt?
-    int Nachkomma;
+    float MaxRateValue;         // maxRate; upper bound for the difference between two consecutive readings; affected by maxRateType;
+    bool useMaxRateValue;       // consistencyChecksEnabled; enables consistency checks; uses maxRate and maxRateType
+    t_RateType MaxRateType;        // maxRateType; affects how the value of maxRate is used for comparing the current and previous value
+    bool ErrorMessage;          // FIXME: not used; can be removed
+    int ChangeRateThreshold;  // threshold parameter for negative rate detection
+    bool PreValueOkay;          // previousValueValid; indicates that the reading of the previous round has no errors
+    bool AllowNegativeRates;    // allowNegativeRate; defines if the consistency checks allow negative rates between consecutive meter readings.
+    bool checkDigitIncreaseConsistency; // extendedConsistencyCheck; performs an additional consistency check to avoid wrong readings
+    time_t timeStampLastValue;     // Timestamp for the last read value; is used for the log
+    time_t timeStampLastPreValue;  // Timestamp for the last PreValue set; is used for useMaxRateValue
+    time_t timeStampTimeUTC;    // FIXME: not used; can be removed.
+    string timeStamp;           // localTimeStr; timestamp of last valid reading formatted as local time
+    double FlowRateAct;         // currentRate; ΔValue/min; since usage is not limited to water meters, the physical unit is not known.
+    double PreValue;            // lastValidValue; most recent value that could be read w/o any errors
+    double Value;               // value; most recent readout; may include corrections
+    string ReturnRateValue;     // currentRateStr; current normalized rate; ΔValue/min
+    string ReturnChangeAbsolute; // currentChangeStr; absolute difference between current and previous measurement
+    string ReturnRawValue;      // rawValueStr; Raw value (with N & leading 0)    
+    string ReturnValue;         // valueStr; corrected return value, if necessary with error message
+    string ReturnPreValue;      // lastValidValueStr; corrected return value without error message
+    string ErrorMessageText;    // errorMessage; Error message for consistency checks
+    int AnzahlAnalog;           // numAnalogRoi; number of analog ROIs used in this sequence
+    int AnzahlDigit;          // numDigitRoi; number of digit ROIs used in this sequence
+    int DecimalShift;           // decimalShift; each increment shifts the decimal separator by one digit; value=value*10^decimalShift; pos. value shifts to the right
+    int DecimalShiftInitial;    // decimalShiftInitial; same as decimalShift but is a const to reset decimalShift after calculations
+    float AnalogToDigitTransitionStart; // AnalogToDigitTransitionStartValue; FIXME: need a better description; When is the digit > x.1, i.e. when does it start to tilt?
+    int Nachkomma;              // decimalPlaces; usually defined by the number of analog ROIs; affected by DecimalShift

-    string FieldV1; // Fieldname in InfluxDBv1  
-    string MeasurementV1;   // Measurement in InfluxDBv1
+    string FieldV1;             // influxdbFieldName_v1; Name of the Field in InfluxDBv1
+    string MeasurementV1;       // influxdbMeasurementName_v1; Name of the Measurement in InfluxDBv1

-    string FieldV2;         // Fieldname in InfluxDBv2  
-    string MeasurementV2;   // Measurement in InfluxDBv2
+    string FieldV2;             // influxdbFieldName_v2; Name of the Field in InfluxDBv2
+    string MeasurementV2;       // influxdbMeasurementName_v2; Name of the Measurement in InfluxDBv2

-    bool isExtendedResolution;
+    bool isExtendedResolution;  // extendResolution; Adds the decimal place of the least significant analog ROI to the value

-    general *digit_roi;
-    general *analog_roi;
+    general *digit_roi;         // digitRoi; set of digit ROIs for the sequence
+    general *analog_roi;        // analogRoi; set of analog ROIs for the sequence

-    string name;
+    string name;                // name; Designation for the sequence 
 };

 #endif
--- a/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
@@ -286,7 +286,7 @@ bool ClassFlowMQTT::doFlow(string zwtime)

            if (resultchangabs.length() > 0) {
                success |= MQTTPublish(namenumber + "changeabsolut", resultchangabs, qos, SetRetainFlag); // Legacy API
-                success |= MQTTPublish(namenumber + "rate_per_digitalization_round", resultchangabs, qos, SetRetainFlag);
+                success |= MQTTPublish(namenumber + "rate_per_digitization_round", resultchangabs, qos, SetRetainFlag);
            }

            if (resultraw.length() > 0)   
--- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
@@ -128,8 +128,8 @@ bool ClassFlowPostProcessing::SetPreValue(double _newvalue, string _numbers, boo
            NUMBERS[j]->PreValueOkay = true;

            if (_extern) {
-                time(&(NUMBERS[j]->lastvalue));
-                localtime(&(NUMBERS[j]->lastvalue));
+                time(&(NUMBERS[j]->timeStampLastPreValue));
+                localtime(&(NUMBERS[j]->timeStampLastPreValue));
            }

            //ESP_LOGD(TAG, "Found %d! - set to %.8f", j,  NUMBERS[j]->PreValue);
@@ -161,6 +161,9 @@ bool ClassFlowPostProcessing::LoadPreValue(void) {
        return false;
    }

+    // Makes sure that an empty file is treated as such.
+    zw[0] = '\0';
+
    fgets(zw, 1024, pFile);
    ESP_LOGD(TAG, "Read line Prevalue.ini: %s", zw);
    zwtime = trim(std::string(zw));
@@ -196,11 +199,11 @@ bool ClassFlowPostProcessing::LoadPreValue(void) {
                    whenStart.tm_sec = ss;
                    whenStart.tm_isdst = -1;

-                    NUMBERS[j]->lastvalue = mktime(&whenStart);
+                    NUMBERS[j]->timeStampLastPreValue = mktime(&whenStart);

                    time(&tStart);
                    localtime(&tStart);
-                    double difference = difftime(tStart, NUMBERS[j]->lastvalue);
+                    double difference = difftime(tStart, NUMBERS[j]->timeStampLastPreValue);
                    difference /= 60;
 			
                    if (difference > PreValueAgeStartup) {
@@ -251,11 +254,11 @@ bool ClassFlowPostProcessing::LoadPreValue(void) {

        ESP_LOGD(TAG, "TIME: %d, %d, %d, %d, %d, %d", whenStart.tm_year, whenStart.tm_mon, whenStart.tm_wday, whenStart.tm_hour, whenStart.tm_min, whenStart.tm_sec);

-        NUMBERS[0]->lastvalue = mktime(&whenStart);
+        NUMBERS[0]->timeStampLastPreValue = mktime(&whenStart);

        time(&tStart);
        localtime(&tStart);
-        double difference = difftime(tStart, NUMBERS[0]->lastvalue);
+        double difference = difftime(tStart, NUMBERS[0]->timeStampLastPreValue);
        difference /= 60;
 			
        if (difference > PreValueAgeStartup) {
@@ -289,10 +292,10 @@ void ClassFlowPostProcessing::SavePreValue() {

    for (int j = 0; j < NUMBERS.size(); ++j) {
        char buffer[80];
-        struct tm* timeinfo = localtime(&NUMBERS[j]->lastvalue);
+        struct tm* timeinfo = localtime(&NUMBERS[j]->timeStampLastPreValue);
        strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
        NUMBERS[j]->timeStamp = std::string(buffer);
-        NUMBERS[j]->timeStampTimeUTC = NUMBERS[j]->lastvalue;
+        NUMBERS[j]->timeStampTimeUTC = NUMBERS[j]->timeStampLastPreValue;
        // ESP_LOGD(TAG, "SaverPreValue %d, Value: %f, Nachkomma %d", j, NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);

        _zw = NUMBERS[j]->name + "\t" + NUMBERS[j]->timeStamp + "\t" + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + "\n";
@@ -341,11 +344,7 @@ void ClassFlowPostProcessing::handleDecimalExtendedResolution(string _decsep, st
    }

    for (int j = 0; j < NUMBERS.size(); ++j) {
-        bool _zwdc = false;
-
-        if (toUpper(_value) == "TRUE") {
-            _zwdc = true;
-        }
+        bool _zwdc = alphanumericToBoolean(_value);

        // Set to default first (if nothing else is set)
        if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
@@ -368,7 +367,10 @@ void ClassFlowPostProcessing::handleDecimalSeparator(string _decsep, string _val

    for (int j = 0; j < NUMBERS.size(); ++j) {
        int _zwdc = 0;
-        _zwdc = stoi(_value);
+	    
+        if (isStringNumeric(_value)) {
+            _zwdc = std::stoi(_value);
+        }

        //  Set to default first (if nothing else is set)
        if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
@@ -380,7 +382,7 @@ void ClassFlowPostProcessing::handleDecimalSeparator(string _decsep, string _val
    }
 }

-void ClassFlowPostProcessing::handleAnalogDigitalTransitionStart(string _decsep, string _value) {
+void ClassFlowPostProcessing::handleAnalogToDigitTransitionStart(string _decsep, string _value) {
    string _digit, _decpos;
    int _pospunkt = _decsep.find_first_of(".");
    // ESP_LOGD(TAG, "Name: %s, Pospunkt: %d", _decsep.c_str(), _pospunkt);
@@ -394,11 +396,14 @@ void ClassFlowPostProcessing::handleAnalogDigitalTransitionStart(string _decsep,

    for (int j = 0; j < NUMBERS.size(); ++j) {
        float _zwdc = 9.2;
-        _zwdc = stof(_value);
+	    
+        if (isStringNumeric(_value)) {
+            _zwdc = std::stof(_value);
+        }

        // Set to default first (if nothing else is set)
        if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
-            NUMBERS[j]->AnalogDigitalTransitionStart = _zwdc;
+            NUMBERS[j]->AnalogToDigitTransitionStart = _zwdc;

        }
    }
@@ -417,15 +422,11 @@ void ClassFlowPostProcessing::handleAllowNegativeRate(string _decsep, string _va
    }
  
    for (int j = 0; j < NUMBERS.size(); ++j) {
-        bool _rt = false;
-
-        if (toUpper(_value) == "TRUE") {
-            _rt = true;
-        }
+        bool _zwdc = alphanumericToBoolean(_value);

        // Set to default first (if nothing else is set)
        if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
-            NUMBERS[j]->AllowNegativeRates = _rt;
+            NUMBERS[j]->AllowNegativeRates = _zwdc;
        }
    }
 }
@@ -443,15 +444,15 @@ void ClassFlowPostProcessing::handleMaxRateType(string _decsep, string _value) {
    }

    for (int j = 0; j < NUMBERS.size(); ++j) {
-        t_RateType _rt = AbsoluteChange;
+        t_RateType _zwdc = AbsoluteChange;

        if (toUpper(_value) == "RATECHANGE") {
-            _rt = RateChange;
+            _zwdc = RateChange;
        }

        // Set to default first (if nothing else is set)			
        if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
-            NUMBERS[j]->RateType = _rt;
+            NUMBERS[j]->MaxRateType = _zwdc;
        }
    }
 }
@@ -470,7 +471,10 @@ void ClassFlowPostProcessing::handleMaxRateValue(string _decsep, string _value)
 	
    for (int j = 0; j < NUMBERS.size(); ++j) {
        float _zwdc = 1;
-        _zwdc = stof(_value);
+	    
+        if (isStringNumeric(_value)) {
+            _zwdc = std::stof(_value);
+        }

        // Set to default first (if nothing else is set)			
        if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
@@ -480,6 +484,55 @@ void ClassFlowPostProcessing::handleMaxRateValue(string _decsep, string _value)
    }
 }

+void ClassFlowPostProcessing::handleChangeRateThreshold(string _decsep, string _value) {
+    string _digit, _decpos;
+    int _pospunkt = _decsep.find_first_of(".");
+    // ESP_LOGD(TAG, "Name: %s, Pospunkt: %d", _decsep.c_str(), _pospunkt);
+
+    if (_pospunkt > -1) {
+        _digit = _decsep.substr(0, _pospunkt);
+    }
+    else {
+        _digit = "default";
+    }
+
+    for (int j = 0; j < NUMBERS.size(); ++j) {
+        int _zwdc = 2;
+
+        if (isStringNumeric(_value)) {
+            _zwdc = std::stof(_value);
+        }
+
+        // Set to default first (if nothing else is set)
+        if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
+            NUMBERS[j]->ChangeRateThreshold = _zwdc;
+        }
+    }
+}
+/*
+void ClassFlowPostProcessing::handlecheckDigitIncreaseConsistency(std::string _decsep, std::string _value)
+{
+    std::string _digit;
+    int _pospunkt = _decsep.find_first_of(".");
+    // ESP_LOGD(TAG, "Name: %s, Pospunkt: %d", _decsep.c_str(), _pospunkt);
+
+    if (_pospunkt > -1) {
+        _digit = _decsep.substr(0, _pospunkt);
+    }
+    else {
+        _digit = "default";
+    }
+
+    for (int j = 0; j < NUMBERS.size(); ++j) {
+        bool _rt = alphanumericToBoolean(_value);
+
+        // Set to default first (if nothing else is set)
+        if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
+            NUMBERS[j]->checkDigitIncreaseConsistency = _rt;
+        }
+    }
+}
+*/
 bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph) {
    std::vector<string> splitted;
    int _n;
@@ -511,8 +564,8 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
            handleDecimalSeparator(splitted[0], splitted[1]);
        }
 	    
-        if ((toUpper(_param) == "ANALOGDIGITALTRANSITIONSTART") && (splitted.size() > 1)) {
-            handleAnalogDigitalTransitionStart(splitted[0], splitted[1]);
+        if ((toUpper(_param) == "AnalogToDigitTransitionStart") && (splitted.size() > 1)) {
+            handleAnalogToDigitTransitionStart(splitted[0], splitted[1]);
        }
 	    
        if ((toUpper(_param) == "MAXRATEVALUE") && (splitted.size() > 1)) {
@@ -524,13 +577,16 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
        }
 	    
        if ((toUpper(_param) == "PREVALUEUSE") && (splitted.size() > 1)) {
-            if (toUpper(splitted[1]) == "TRUE") {
-                PreValueUse = true;
-            }
+            PreValueUse = alphanumericToBoolean(splitted[1]);
+        }
+		
+        if ((toUpper(_param) == "CHANGERATETHRESHOLD") && (splitted.size() > 1)) {
+            handleChangeRateThreshold(splitted[0], splitted[1]);
        }
 	    
        if ((toUpper(_param) == "CHECKDIGITINCREASECONSISTENCY") && (splitted.size() > 1)) {
-            if (toUpper(splitted[1]) == "TRUE") {
+            // handlecheckDigitIncreaseConsistency(splitted[0], splitted[1]);
+            if (alphanumericToBoolean(splitted[1])) {
                for (_n = 0; _n < NUMBERS.size(); ++_n) {
                    NUMBERS[_n]->checkDigitIncreaseConsistency = true;
                }
@@ -542,24 +598,22 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
        }
 			
        if ((toUpper(_param) == "ERRORMESSAGE") && (splitted.size() > 1)) {
-            if (toUpper(splitted[1]) == "TRUE") {
-                ErrorMessage = true;
-            }
+            ErrorMessage = alphanumericToBoolean(splitted[1]);
        }
 			
        if ((toUpper(_param) == "IGNORELEADINGNAN") && (splitted.size() > 1)) {
-            if (toUpper(splitted[1]) == "TRUE") {
-                IgnoreLeadingNaN = true;
-            }
+            IgnoreLeadingNaN = alphanumericToBoolean(splitted[1]);
        }

        if ((toUpper(_param) == "PREVALUEAGESTARTUP") && (splitted.size() > 1)) {
-            PreValueAgeStartup = std::stoi(splitted[1]);
+            if (isStringNumeric(splitted[1])) {
+                PreValueAgeStartup = std::stoi(splitted[1]);
+            }
        }
    }

    if (PreValueUse) {
-        LoadPreValue();
+        return LoadPreValue();
    }

    return true;
@@ -594,10 +648,10 @@ void ClassFlowPostProcessing::InitNUMBERS() {
        }
        
        if (_number->digit_roi) {
-            _number->AnzahlDigital = _number->digit_roi->ROI.size();
+            _number->AnzahlDigit = _number->digit_roi->ROI.size();
        }
        else {
-            _number->AnzahlDigital = 0;
+            _number->AnzahlDigit = 0;
        }

        _number->analog_roi = NULL;
@@ -613,26 +667,24 @@ void ClassFlowPostProcessing::InitNUMBERS() {
            _number->AnzahlAnalog = 0;
        }

-        _number->ReturnRawValue = ""; // Raw value (with N & leading 0).    
-        _number->ReturnValue = ""; // corrected return value, possibly with error message
-        _number->ErrorMessageText = ""; // Error message for consistency check
-        _number->ReturnPreValue = "";
+        _number->FlowRateAct = 0; // m3 / min
        _number->PreValueOkay = false;
        _number->AllowNegativeRates = false;
        _number->MaxRateValue = 0.1;
-        _number->RateType = AbsoluteChange;
+        _number->MaxRateType = AbsoluteChange;
        _number->useMaxRateValue = false;
        _number->checkDigitIncreaseConsistency = false;
        _number->DecimalShift = 0;
        _number->DecimalShiftInitial = 0;
        _number->isExtendedResolution = false;
-        _number->AnalogDigitalTransitionStart=9.2;
+        _number->AnalogToDigitTransitionStart=9.2;
+        _number->ChangeRateThreshold = 2;

-        _number->FlowRateAct = 0; // m3 / min
-        _number->PreValue = 0; // last value read out well
        _number->Value = 0; // last value read out, incl. corrections
-        _number->ReturnRawValue = ""; // raw value (with N & leading 0)    
        _number->ReturnValue = ""; // corrected return value, possibly with error message
+        _number->ReturnRawValue = ""; // raw value (with N & leading 0)    
+        _number->PreValue = 0; // last value read out well
+        _number->ReturnPreValue = "";
        _number->ErrorMessageText = ""; // Error message for consistency check

        _number->Nachkomma = _number->AnzahlAnalog;
@@ -641,7 +693,7 @@ void ClassFlowPostProcessing::InitNUMBERS() {
    }

    for (int i = 0; i < NUMBERS.size(); ++i) {
-        ESP_LOGD(TAG, "Number %s, Anz DIG: %d, Anz ANA %d", NUMBERS[i]->name.c_str(), NUMBERS[i]->AnzahlDigital, NUMBERS[i]->AnzahlAnalog);
+        ESP_LOGD(TAG, "Number %s, Anz DIG: %d, Anz ANA %d", NUMBERS[i]->name.c_str(), NUMBERS[i]->AnzahlDigit, NUMBERS[i]->AnzahlAnalog);
    }
 }

@@ -722,12 +774,9 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
        NUMBERS[j]->ErrorMessageText = "";
        NUMBERS[j]->Value = -1;

-        // calculate time difference BEFORE we overwrite the 'lastvalue'
-        double difference = difftime(imagetime, NUMBERS[j]->lastvalue);      // in seconds
-
-        // TODO:
-        // We could call `NUMBERS[j]->lastvalue = imagetime;` here and remove all other such calls further down.
-        // But we should check nothing breaks!
+        // calculate time difference
+        // double LastValueTimeDifference = difftime(imagetime, NUMBERS[j]->timeStampLastValue);         // in seconds
+        double LastPreValueTimeDifference = difftime(imagetime, NUMBERS[j]->timeStampLastPreValue);   // in seconds

        UpdateNachkommaDecimalShift();

@@ -755,7 +804,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {

        if (NUMBERS[j]->digit_roi) {
            if (NUMBERS[j]->analog_roi) {
-                NUMBERS[j]->ReturnRawValue = flowDigit->getReadout(j, false, previous_value, NUMBERS[j]->analog_roi->ROI[0]->result_float, NUMBERS[j]->AnalogDigitalTransitionStart) + NUMBERS[j]->ReturnRawValue;
+                NUMBERS[j]->ReturnRawValue = flowDigit->getReadout(j, false, previous_value, NUMBERS[j]->analog_roi->ROI[0]->result_float, NUMBERS[j]->AnalogToDigitTransitionStart) + NUMBERS[j]->ReturnRawValue;
            }
            else {
                NUMBERS[j]->ReturnRawValue = flowDigit->getReadout(j, NUMBERS[j]->isExtendedResolution, previous_value);        // Extended Resolution only if there are no analogue digits
@@ -763,7 +812,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
        }
 	    
        #ifdef SERIAL_DEBUG
-            ESP_LOGD(TAG, "After digital->getReadout: ReturnRaw %s", NUMBERS[j]->ReturnRawValue.c_str());
+            ESP_LOGD(TAG, "After digit->getReadout: ReturnRaw %s", NUMBERS[j]->ReturnRawValue.c_str());
        #endif
 	    
        NUMBERS[j]->ReturnRawValue = ShiftDecimal(NUMBERS[j]->ReturnRawValue, NUMBERS[j]->DecimalShift);
@@ -791,9 +840,8 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
            else {
                string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText;
                LogFile.WriteToFile(ESP_LOG_INFO, TAG, _zw);
-               /* TODO to be discussed, see https://github.com/jomjol/AI-on-the-edge-device/issues/1617 */
-                NUMBERS[j]->lastvalue = imagetime;
-
+                NUMBERS[j]->ReturnValue = "";
+                NUMBERS[j]->timeStampLastValue = imagetime;
                WriteDataLog(j);
                continue; // there is no number because there is still an N.
            }
@@ -820,8 +868,8 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {

        if (NUMBERS[j]->checkDigitIncreaseConsistency) {
            if (flowDigit) {
-                if (flowDigit->getCNNType() != Digital) {
-                    ESP_LOGD(TAG, "checkDigitIncreaseConsistency = true - ignored due to wrong CNN-Type (not Digital Classification)");
+                if (flowDigit->getCNNType() != Digit) {
+                    ESP_LOGD(TAG, "checkDigitIncreaseConsistency = true - ignored due to wrong CNN-Type (not Digit Classification)");
                }
                else {
                    NUMBERS[j]->Value = checkDigitConsistency(NUMBERS[j]->Value, NUMBERS[j]->DecimalShift, NUMBERS[j]->analog_roi != NULL, NUMBERS[j]->PreValue);
@@ -829,7 +877,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
            }
            else {
                #ifdef SERIAL_DEBUG
-                    ESP_LOGD(TAG, "checkDigitIncreaseConsistency = true - no digital numbers defined!");
+                    ESP_LOGD(TAG, "checkDigitIncreaseConsistency = true - no digit numbers defined!");
                #endif
            }
        }
@@ -838,29 +886,32 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
            ESP_LOGD(TAG, "After checkDigitIncreaseConsistency: Value %f", NUMBERS[j]->Value);
        #endif

-        if (!NUMBERS[j]->AllowNegativeRates) {
-            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handleAllowNegativeRate for device: " + NUMBERS[j]->name);
+        if (PreValueUse && NUMBERS[j]->PreValueOkay) {
+            if (NUMBERS[j]->Nachkomma > 0) {
+                double _difference1 = (NUMBERS[j]->PreValue - (NUMBERS[j]->ChangeRateThreshold / pow(10, NUMBERS[j]->Nachkomma)));
+                double _difference2 = (NUMBERS[j]->PreValue + (NUMBERS[j]->ChangeRateThreshold / pow(10, NUMBERS[j]->Nachkomma)));
+
+                if ((NUMBERS[j]->Value >= _difference1) && (NUMBERS[j]->Value <= _difference2)) {
+                    NUMBERS[j]->Value = NUMBERS[j]->PreValue;
+                    NUMBERS[j]->ReturnValue = std::to_string(NUMBERS[j]->PreValue);
+                }
+            }
+
+            if ((!NUMBERS[j]->AllowNegativeRates) && (NUMBERS[j]->Value < NUMBERS[j]->PreValue)) {
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handleAllowNegativeRate for device: " + NUMBERS[j]->name);
 					
-            if ((NUMBERS[j]->Value < NUMBERS[j]->PreValue)) {
-                // more debug if extended resolution is on, see #2447
-                if (NUMBERS[j]->isExtendedResolution) {
-                    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Neg: value=" + std::to_string(NUMBERS[j]->Value) 
+                if ((NUMBERS[j]->Value < NUMBERS[j]->PreValue)) {
+                    // more debug if extended resolution is on, see #2447
+                    if (NUMBERS[j]->isExtendedResolution) {
+                        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Neg: value=" + std::to_string(NUMBERS[j]->Value) 
                                                    + ", preValue=" + std::to_string(NUMBERS[j]->PreValue) 
                                                    + ", preToll=" + std::to_string(NUMBERS[j]->PreValue-(2/pow(10, NUMBERS[j]->Nachkomma))));
-                } 
+                    } 

-                // Include inaccuracy of 0.2 for isExtendedResolution.
-                if ((NUMBERS[j]->Value >= (NUMBERS[j]->PreValue-(2/pow(10, NUMBERS[j]->Nachkomma))) && NUMBERS[j]->isExtendedResolution)
-                    // not extended resolution allows -1 on the lowest digit  
-                   || (NUMBERS[j]->Value >= (NUMBERS[j]->PreValue-(1/pow(10, NUMBERS[j]->Nachkomma))) && !NUMBERS[j]->isExtendedResolution)) {
-                        NUMBERS[j]->Value = NUMBERS[j]->PreValue;
-                        NUMBERS[j]->ReturnValue = to_string(NUMBERS[j]->PreValue);
-                } 
-                else {
                    NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " "; 
                    NUMBERS[j]->Value = NUMBERS[j]->PreValue;
                    NUMBERS[j]->ReturnValue = "";
-                    NUMBERS[j]->lastvalue = imagetime;
+                    NUMBERS[j]->timeStampLastValue = imagetime;

                    string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText;
                    LogFile.WriteToFile(ESP_LOG_ERROR, TAG, _zw);
@@ -868,48 +919,55 @@ bool ClassFlowPostProcessing::doFlow(string zwtime) {
                    continue;
                }
            }
-        }

-        #ifdef SERIAL_DEBUG
-            ESP_LOGD(TAG, "After AllowNegativeRates: Value %f", NUMBERS[j]->Value);
-        #endif
+            #ifdef SERIAL_DEBUG
+                ESP_LOGD(TAG, "After AllowNegativeRates: Value %f", NUMBERS[j]->Value);
+            #endif

-        difference /= 60;  
-        NUMBERS[j]->FlowRateAct = (NUMBERS[j]->Value - NUMBERS[j]->PreValue) / difference;
-        NUMBERS[j]->ReturnRateValue =  to_string(NUMBERS[j]->FlowRateAct);
+            // LastValueTimeDifference = LastValueTimeDifference / 60;       // in minutes
+            LastPreValueTimeDifference = LastPreValueTimeDifference / 60; // in minutes
+            NUMBERS[j]->FlowRateAct = (NUMBERS[j]->Value - NUMBERS[j]->PreValue) / LastPreValueTimeDifference;
+            NUMBERS[j]->ReturnRateValue =  to_string(NUMBERS[j]->FlowRateAct);

-        if (NUMBERS[j]->useMaxRateValue && PreValueUse && NUMBERS[j]->PreValueOkay) {
-            double _ratedifference;
+            if ((NUMBERS[j]->useMaxRateValue) && (NUMBERS[j]->Value != NUMBERS[j]->PreValue)) {
+                double _ratedifference;
 					
-            if (NUMBERS[j]->RateType == RateChange) {
-                _ratedifference = NUMBERS[j]->FlowRateAct;
-            }
-            else {
-                _ratedifference = (NUMBERS[j]->Value - NUMBERS[j]->PreValue);
-            }
+                if (NUMBERS[j]->MaxRateType == RateChange) {
+                    _ratedifference = NUMBERS[j]->FlowRateAct;
+                }
+                else {
+                    // TODO:
+                    // Since I don't know if this is desired, I'll comment it out first.
+                    // int roundDifference = (int)(round(LastPreValueTimeDifference / LastValueTimeDifference)); // calculate how many rounds have passed since NUMBERS[j]->timeLastPreValue was set
+                    // _ratedifference = ((NUMBERS[j]->Value - NUMBERS[j]->PreValue) / ((int)(round(LastPreValueTimeDifference / LastValueTimeDifference)))); // Difference per round, as a safeguard in case a reading error(Neg. Rate - Read: or Rate too high - Read:) occurs in the meantime
+                    _ratedifference = (NUMBERS[j]->Value - NUMBERS[j]->PreValue);
+                }

-            if (abs(_ratedifference) > abs(NUMBERS[j]->MaxRateValue)) {
-                NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Rate too high - Read: " + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " - Rate: " + RundeOutput(_ratedifference, NUMBERS[j]->Nachkomma);
-                NUMBERS[j]->Value = NUMBERS[j]->PreValue;
-                NUMBERS[j]->ReturnValue = "";
-                NUMBERS[j]->ReturnRateValue = "";
-                NUMBERS[j]->lastvalue = imagetime;
+                if (abs(_ratedifference) > abs(NUMBERS[j]->MaxRateValue)) {
+                    NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Rate too high - Read: " + RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma) + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " - Rate: " + RundeOutput(_ratedifference, NUMBERS[j]->Nachkomma);
+                    NUMBERS[j]->Value = NUMBERS[j]->PreValue;
+                    NUMBERS[j]->ReturnValue = "";
+                    NUMBERS[j]->ReturnRateValue = "";
+                    NUMBERS[j]->timeStampLastValue = imagetime;

-                string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText;
-                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, _zw);
-                WriteDataLog(j);
-                continue;
+                    string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText;
+                    LogFile.WriteToFile(ESP_LOG_ERROR, TAG, _zw);
+                    WriteDataLog(j);
+                    continue;
+                }
            }
-        }

        #ifdef SERIAL_DEBUG
           ESP_LOGD(TAG, "After MaxRateCheck: Value %f", NUMBERS[j]->Value);
        #endif
+        }
        
        NUMBERS[j]->ReturnChangeAbsolute = RundeOutput(NUMBERS[j]->Value - NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);
        NUMBERS[j]->PreValue = NUMBERS[j]->Value;
        NUMBERS[j]->PreValueOkay = true;
-        NUMBERS[j]->lastvalue = imagetime;
+
+        NUMBERS[j]->timeStampLastValue = imagetime;    
+        NUMBERS[j]->timeStampLastPreValue = imagetime;

        NUMBERS[j]->ReturnValue = RundeOutput(NUMBERS[j]->Value, NUMBERS[j]->Nachkomma);
        NUMBERS[j]->ReturnPreValue = RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma);
@@ -932,10 +990,10 @@ void ClassFlowPostProcessing::WriteDataLog(int _index) {
    }
    
    string analog = "";
-    string digital = "";
+    string digit = "";
    string timezw = "";
    char buffer[80];
-    struct tm* timeinfo = localtime(&NUMBERS[_index]->lastvalue);
+    struct tm* timeinfo = localtime(&NUMBERS[_index]->timeStampLastValue);
    strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
    timezw = std::string(buffer);
    
@@ -944,22 +1002,20 @@ void ClassFlowPostProcessing::WriteDataLog(int _index) {
    }

    if (flowDigit) {
-        digital = flowDigit->getReadoutRawString(_index);
+        digit = flowDigit->getReadoutRawString(_index);
    }
 	
-    LogFile.WriteToData(timezw, NUMBERS[_index]->name, 
-                        NUMBERS[_index]->ReturnRawValue, NUMBERS[_index]->ReturnValue, NUMBERS[_index]->ReturnPreValue, 
-                        NUMBERS[_index]->ReturnRateValue, NUMBERS[_index]->ReturnChangeAbsolute,
-                        NUMBERS[_index]->ErrorMessageText, 
-                        digital, analog);
-    ESP_LOGD(TAG, "WriteDataLog: %s, %s, %s, %s, %s", NUMBERS[_index]->ReturnRawValue.c_str(), NUMBERS[_index]->ReturnValue.c_str(), NUMBERS[_index]->ErrorMessageText.c_str(), digital.c_str(), analog.c_str());
+    LogFile.WriteToData(timezw, NUMBERS[_index]->name, NUMBERS[_index]->ReturnRawValue, NUMBERS[_index]->ReturnValue, NUMBERS[_index]->ReturnPreValue, 
+        NUMBERS[_index]->ReturnRateValue, NUMBERS[_index]->ReturnChangeAbsolute, NUMBERS[_index]->ErrorMessageText, digit, analog);
+
+    ESP_LOGD(TAG, "WriteDataLog: %s, %s, %s, %s, %s", NUMBERS[_index]->ReturnRawValue.c_str(), NUMBERS[_index]->ReturnValue.c_str(), NUMBERS[_index]->ErrorMessageText.c_str(), digit.c_str(), analog.c_str());
 }

 void ClassFlowPostProcessing::UpdateNachkommaDecimalShift() {
    for (int j = 0; j < NUMBERS.size(); ++j) {
-        // There are only digital digits
+        // There are only digits
        if (NUMBERS[j]->digit_roi && !NUMBERS[j]->analog_roi) {
-            // ESP_LOGD(TAG, "Nurdigital");
+            // ESP_LOGD(TAG, "Nurdigit");
            NUMBERS[j]->DecimalShift = NUMBERS[j]->DecimalShiftInitial;

            // Extended resolution is on and should also be used for this digit.
@@ -981,9 +1037,9 @@ void ClassFlowPostProcessing::UpdateNachkommaDecimalShift() {
            NUMBERS[j]->Nachkomma = -NUMBERS[j]->DecimalShift;
        }

-        // digital + analog
+        // digit + analog
        if (NUMBERS[j]->digit_roi && NUMBERS[j]->analog_roi) {
-            // ESP_LOGD(TAG, "Nur digital + analog");
+            // ESP_LOGD(TAG, "Nur digit + analog");

            NUMBERS[j]->DecimalShift = NUMBERS[j]->DecimalShiftInitial;
            NUMBERS[j]->Nachkomma = NUMBERS[j]->analog_roi->ROI.size() - NUMBERS[j]->DecimalShift;
--- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h
+++ b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h
@@ -21,11 +21,9 @@ protected:
    bool ErrorMessage;
    bool IgnoreLeadingNaN;          // SPECIAL CASE for User Gustl ???

-
    ClassFlowCNNGeneral* flowAnalog;
    ClassFlowCNNGeneral* flowDigit;    

-
    string FilePreValue;

    ClassFlowTakeImage *flowTakeImage;
@@ -41,21 +39,18 @@ protected:
    void handleMaxRateValue(string _decsep, string _value);
    void handleDecimalExtendedResolution(string _decsep, string _value); 
    void handleMaxRateType(string _decsep, string _value);
-    void handleAnalogDigitalTransitionStart(string _decsep, string _value);
+    void handleAnalogToDigitTransitionStart(string _decsep, string _value);
    void handleAllowNegativeRate(string _decsep, string _value);
+    void handleChangeRateThreshold(string _decsep, string _value);
    
    std::string GetStringReadouts(general);

    void WriteDataLog(int _index);

-
-
-
 public:
    bool PreValueUse;
    std::vector<NumberPost*> NUMBERS;

-
    ClassFlowPostProcessing(std::vector<ClassFlow*>* lfc, ClassFlowCNNGeneral *_analog, ClassFlowCNNGeneral *_digit);
    virtual ~ClassFlowPostProcessing(){};
    bool ReadParameter(FILE* pfile, string& aktparamgraph);
--- a/code/components/jomjol_flowcontroll/ClassFlowTakeImage.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowTakeImage.cpp
@@ -96,406 +96,426 @@ bool ClassFlowTakeImage::ReadParameter(FILE *pfile, string &aktparamgraph)

        else if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
        {
-            this->imagesRetention = std::stod(splitted[1]);
+            if (isStringNumeric(splitted[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;
-            }
+            CCstatus.SaveAllFiles = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1))
        {
-            int _WaitBeforePicture = std::stoi(splitted[1]);
-            if (_WaitBeforePicture != 0)
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.WaitBeforePicture = _WaitBeforePicture;
-            }
-            else
-            {
-                CCstatus.WaitBeforePicture = 2;
+                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")
+
+            if (isStringNumeric(_ImageGainceiling))
            {
-                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;
+                int _ImageGainceiling_ = std::stoi(_ImageGainceiling);
+                switch (_ImageGainceiling_)
+                {
+                case 1:
+                    CFstatus.ImageGainceiling = GAINCEILING_4X;
+                    break;
+                case 2:
+                    CFstatus.ImageGainceiling = GAINCEILING_8X;
+                    break;
+                case 3:
+                    CFstatus.ImageGainceiling = GAINCEILING_16X;
+                    break;
+                case 4:
+                    CFstatus.ImageGainceiling = GAINCEILING_32X;
+                    break;
+                case 5:
+                    CFstatus.ImageGainceiling = GAINCEILING_64X;
+                    break;
+                case 6:
+                    CFstatus.ImageGainceiling = GAINCEILING_128X;
+                    break;
+                default:
+                    CFstatus.ImageGainceiling = GAINCEILING_2X;
+                }
            }
            else
            {
-                CCstatus.ImageGainceiling = GAINCEILING_2X;
+                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))
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageQuality = _ImageQuality;
+                int _ImageQuality = std::stoi(splitted[1]);
+                CCstatus.ImageQuality = clipInt(_ImageQuality, 63, 6);
            }
        }

        else if ((toUpper(splitted[0]) == "CAMBRIGHTNESS") && (splitted.size() > 1))
        {
-            int _ImageBrightness = std::stoi(splitted[1]);
-            if ((_ImageBrightness >= -2) && (_ImageBrightness <= 2))
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageBrightness = _ImageBrightness;
+                int _ImageBrightness = std::stoi(splitted[1]);
+                CCstatus.ImageBrightness = clipInt(_ImageBrightness, 2, -2);
            }
        }

        else if ((toUpper(splitted[0]) == "CAMCONTRAST") && (splitted.size() > 1))
        {
-            int _ImageContrast = std::stoi(splitted[1]);
-            if ((_ImageContrast >= -2) && (_ImageContrast <= 2))
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageContrast = _ImageContrast;
+                int _ImageContrast = std::stoi(splitted[1]);
+                CCstatus.ImageContrast = clipInt(_ImageContrast, 2, -2);
            }
        }

        else if ((toUpper(splitted[0]) == "CAMSATURATION") && (splitted.size() > 1))
        {
-            int _ImageSaturation = std::stoi(splitted[1]);
-            if ((_ImageSaturation >= -2) && (_ImageSaturation <= 2))
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageSaturation = _ImageSaturation;
+                int _ImageSaturation = std::stoi(splitted[1]);
+                CCstatus.ImageSaturation = clipInt(_ImageSaturation, 2, -2);
            }
        }

        else if ((toUpper(splitted[0]) == "CAMSHARPNESS") && (splitted.size() > 1))
        {
-            int _ImageSharpness = std::stoi(splitted[1]);
-            if ((_ImageSharpness >= -2) && (_ImageSharpness <= 2))
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageSharpness = _ImageSharpness;
+                int _ImageSharpness = std::stoi(splitted[1]);
+                if (CCstatus.CamSensor_id == OV2640_PID)
+                {
+                    CCstatus.ImageSharpness = clipInt(_ImageSharpness, 2, -2);
+                }
+                else
+                {
+                    CCstatus.ImageSharpness = clipInt(_ImageSharpness, 3, -3);
+                }
            }
        }

        else if ((toUpper(splitted[0]) == "CAMAUTOSHARPNESS") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageAutoSharpness = 1;
-            }
-            else
-            {
-                CCstatus.ImageAutoSharpness = 0;
-            }
+            CCstatus.ImageAutoSharpness = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMSPECIALEFFECT") && (splitted.size() > 1))
        {
            std::string _ImageSpecialEffect = toUpper(splitted[1]);
-            if (_ImageSpecialEffect == "NEGATIVE")
+
+            if (isStringNumeric(_ImageSpecialEffect))
            {
-                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;
+                int _ImageSpecialEffect_ = std::stoi(_ImageSpecialEffect);
+                CFstatus.ImageSpecialEffect = clipInt(_ImageSpecialEffect_, 6, 0);
            }
            else
            {
-                CCstatus.ImageSpecialEffect = 0;
+                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")
+
+            if (isStringNumeric(_ImageWbMode))
            {
-                CCstatus.ImageWbMode = 1;
-            }
-            else if (_ImageWbMode == "CLOUDY")
-            {
-                CCstatus.ImageWbMode = 2;
-            }
-            else if (_ImageWbMode == "OFFICE")
-            {
-                CCstatus.ImageWbMode = 3;
-            }
-            else if (_ImageWbMode == "HOME")
-            {
-                CCstatus.ImageWbMode = 4;
+                int _ImageWbMode_ = std::stoi(_ImageWbMode);
+                CFstatus.ImageWbMode = clipInt(_ImageWbMode_, 4, 0);
            }
            else
            {
-                CCstatus.ImageWbMode = 0;
+                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;
-            }
+            CCstatus.ImageAwb = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMAWBGAIN") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageAwbGain = 1;
-            }
-            else
-            {
-                CCstatus.ImageAwbGain = 0;
-            }
+            CCstatus.ImageAwbGain = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMAEC") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageAec = 1;
-            }
-            else
-            {
-                CCstatus.ImageAec = 0;
-            }
+            CCstatus.ImageAec = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMAEC2") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageAec2 = 1;
-            }
-            else
-            {
-                CCstatus.ImageAec2 = 0;
-            }
+            CCstatus.ImageAec2 = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMAELEVEL") && (splitted.size() > 1))
        {
-            int _ImageAeLevel = std::stoi(splitted[1]);
-            if ((_ImageAeLevel >= -2) && (_ImageAeLevel <= 2))
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageAeLevel = _ImageAeLevel;
+                int _ImageAeLevel = std::stoi(splitted[1]);
+                if (CCstatus.CamSensor_id == OV2640_PID)
+                {
+                    CCstatus.ImageAeLevel = clipInt(_ImageAeLevel, 2, -2);
+                }
+                else
+                {
+                    CCstatus.ImageAeLevel = clipInt(_ImageAeLevel, 5, -5);
+                }
            }
        }

        else if ((toUpper(splitted[0]) == "CAMAECVALUE") && (splitted.size() > 1))
        {
-            int _ImageAecValue = std::stoi(splitted[1]);
-            if ((_ImageAecValue >= 0) && (_ImageAecValue <= 1200))
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageAecValue = _ImageAecValue;
+                int _ImageAecValue = std::stoi(splitted[1]);
+                CCstatus.ImageAecValue = clipInt(_ImageAecValue, 1200, 0);
            }
        }

        else if ((toUpper(splitted[0]) == "CAMAGC") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageAgc = 1;
-            }
-            else
-            {
-                CCstatus.ImageAgc = 0;
-            }
+            CCstatus.ImageAgc = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMAGCGAIN") && (splitted.size() > 1))
        {
-            int _ImageAgcGain = std::stoi(splitted[1]);
-            if ((_ImageAgcGain >= 0) && (_ImageAgcGain <= 30))
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageAgcGain = _ImageAgcGain;
+                int _ImageAgcGain = std::stoi(splitted[1]);
+                CCstatus.ImageAgcGain = clipInt(_ImageAgcGain, 30, 0);
            }
        }

        else if ((toUpper(splitted[0]) == "CAMBPC") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageBpc = 1;
-            }
-            else
-            {
-                CCstatus.ImageBpc = 0;
-            }
+            CCstatus.ImageBpc = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMWPC") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageWpc = 1;
-            }
-            else
-            {
-                CCstatus.ImageWpc = 0;
-            }
+            CCstatus.ImageWpc = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMRAWGMA") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageRawGma = 1;
-            }
-            else
-            {
-                CCstatus.ImageRawGma = 0;
-            }
+            CCstatus.ImageRawGma = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMLENC") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageLenc = 1;
-            }
-            else
-            {
-                CCstatus.ImageLenc = 0;
-            }
+            CCstatus.ImageLenc = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMHMIRROR") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageHmirror = 1;
-            }
-            else
-            {
-                CCstatus.ImageHmirror = 0;
-            }
+            CCstatus.ImageHmirror = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMVFLIP") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageVflip = 1;
-            }
-            else
-            {
-                CCstatus.ImageVflip = 0;
-            }
+            CCstatus.ImageVflip = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMDCW") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
+            CCstatus.ImageDcw = alphanumericToBoolean(splitted[1]);
+        }
+
+        else if ((toUpper(splitted[0]) == "CAMDENOISE") && (splitted.size() > 1))
+        {
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageDcw = 1;
-            }
-            else
-            {
-                CCstatus.ImageDcw = 0;
+                int _ImageDenoiseLevel = std::stoi(splitted[1]);
+                if (CCstatus.CamSensor_id == OV2640_PID)
+                {
+                    CCstatus.ImageDenoiseLevel = 0;
+                }
+                else
+                {
+                    CCstatus.ImageDenoiseLevel = clipInt(_ImageDenoiseLevel, 8, 0);
+                }
            }
        }

        else if ((toUpper(splitted[0]) == "CAMZOOM") && (splitted.size() > 1))
        {
-            if (toUpper(splitted[1]) == "TRUE")
-            {
-                CCstatus.ImageZoomEnabled = 1;
-            }
-            else
-            {
-                CCstatus.ImageZoomEnabled = 0;
-            }
+            CCstatus.ImageZoomEnabled = alphanumericToBoolean(splitted[1]);
        }

        else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETX") && (splitted.size() > 1))
        {
-            CCstatus.ImageZoomOffsetX = std::stoi(splitted[1]);
+            if (isStringNumeric(splitted[1]))
+            {
+                int _ImageZoomOffsetX = std::stoi(splitted[1]);
+                if (CCstatus.CamSensor_id == OV2640_PID)
+                {
+                    CCstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 480, -480);
+                }
+                else if (CCstatus.CamSensor_id == OV3660_PID)
+                {
+                    CCstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 704, -704);
+                }
+                else if (CCstatus.CamSensor_id == OV5640_PID)
+                {
+                    CCstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 960, -960);
+                }
+            }
        }

        else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETY") && (splitted.size() > 1))
        {
-            CCstatus.ImageZoomOffsetY = std::stoi(splitted[1]);
+            if (isStringNumeric(splitted[1]))
+            {
+                int _ImageZoomOffsetY = std::stoi(splitted[1]);
+                if (CCstatus.CamSensor_id == OV2640_PID)
+                {
+                    CCstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 360, -360);
+                }
+                else if (CCstatus.CamSensor_id == OV3660_PID)
+                {
+                    CCstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 528, -528);
+                }
+                else if (CCstatus.CamSensor_id == OV5640_PID)
+                {
+                    CCstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 720, -720);
+                }
+            }
        }

        else if ((toUpper(splitted[0]) == "CAMZOOMSIZE") && (splitted.size() > 1))
        {
-            int _ImageZoomSize = std::stoi(splitted[1]);
-            if (_ImageZoomSize >= 0)
+            if (isStringNumeric(splitted[1]))
            {
-                CCstatus.ImageZoomSize = _ImageZoomSize;
+                int _ImageZoomSize = std::stoi(splitted[1]);
+                if (CCstatus.CamSensor_id == OV2640_PID)
+                {
+                    CCstatus.ImageZoomSize = clipInt(_ImageZoomSize, 29, 0);
+                }
+                else if (CCstatus.CamSensor_id == OV3660_PID)
+                {
+                    CCstatus.ImageZoomSize = clipInt(_ImageZoomSize, 43, 0);
+                }
+                else if (CCstatus.CamSensor_id == OV5640_PID)
+                {
+                    CCstatus.ImageZoomSize = clipInt(_ImageZoomSize, 59, 0);
+                }
            }
        }

        else if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1))
        {
-            float ledintensity = std::stof(splitted[1]);
-            Camera.SetLEDIntensity(ledintensity);
+            if (isStringNumeric(splitted[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 = alphanumericToBoolean(splitted[1]);
+            if (CCstatus.DemoMode == 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);
+    Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);

    rawImage = new CImageBasis("rawImage");
    rawImage->CreateEmptyImage(CCstatus.ImageWidth, CCstatus.ImageHeight, 3);
@@ -538,7 +558,7 @@ bool ClassFlowTakeImage::doFlow(string zwtime)
    if (CFstatus.changedCameraSettings)
    {
        Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
-        Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize);
+        Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);
        CFstatus.changedCameraSettings = false;
    }

--- a/code/components/jomjol_flowcontroll/ClassFlowWebhook.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowWebhook.cpp
@@ -0,0 +1,171 @@
+#ifdef ENABLE_WEBHOOK
+#include <sstream>
+#include "ClassFlowWebhook.h"
+#include "Helper.h"
+#include "connect_wlan.h"
+
+#include "time_sntp.h"
+#include "interface_webhook.h"
+
+#include "ClassFlowPostProcessing.h"
+#include "ClassFlowAlignment.h"
+#include "esp_log.h"
+#include "../../include/defines.h"
+
+#include "ClassLogFile.h"
+
+#include <time.h>
+
+static const char* TAG = "WEBHOOK";
+
+void ClassFlowWebhook::SetInitialParameter(void)
+{
+    uri = "";
+    flowpostprocessing = NULL;
+    flowAlignment = NULL;
+    previousElement = NULL;
+    ListFlowControll = NULL; 
+    disabled = false;
+    WebhookEnable = false;
+    WebhookUploadImg = 0;
+}       
+
+ClassFlowWebhook::ClassFlowWebhook()
+{
+    SetInitialParameter();
+}
+
+ClassFlowWebhook::ClassFlowWebhook(std::vector<ClassFlow*>* lfc)
+{
+    SetInitialParameter();
+
+    ListFlowControll = lfc;
+    for (int i = 0; i < ListFlowControll->size(); ++i)
+    {
+        if (((*ListFlowControll)[i])->name().compare("ClassFlowPostProcessing") == 0)
+        {
+            flowpostprocessing = (ClassFlowPostProcessing*) (*ListFlowControll)[i];
+        }
+        if (((*ListFlowControll)[i])->name().compare("ClassFlowAlignment") == 0)
+        {
+            flowAlignment = (ClassFlowAlignment*) (*ListFlowControll)[i];
+        }
+
+    }
+}
+
+ClassFlowWebhook::ClassFlowWebhook(std::vector<ClassFlow*>* lfc, ClassFlow *_prev)
+{
+    SetInitialParameter();
+
+    previousElement = _prev;
+    ListFlowControll = lfc;
+
+    for (int i = 0; i < ListFlowControll->size(); ++i)
+    {
+        if (((*ListFlowControll)[i])->name().compare("ClassFlowPostProcessing") == 0)
+        {
+            flowpostprocessing = (ClassFlowPostProcessing*) (*ListFlowControll)[i];
+        }
+        if (((*ListFlowControll)[i])->name().compare("ClassFlowAlignment") == 0)
+        {
+            flowAlignment = (ClassFlowAlignment*) (*ListFlowControll)[i];
+        }
+    }
+}
+
+
+bool ClassFlowWebhook::ReadParameter(FILE* pfile, string& aktparamgraph)
+{
+    std::vector<string> splitted;
+
+    aktparamgraph = trim(aktparamgraph);
+    printf("akt param: %s\n", aktparamgraph.c_str());
+
+    if (aktparamgraph.size() == 0)
+        if (!this->GetNextParagraph(pfile, aktparamgraph))
+            return false;
+
+    if (toUpper(aktparamgraph).compare("[WEBHOOK]") != 0) 
+        return false;
+
+    
+
+    while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
+    {
+        ESP_LOGD(TAG, "while loop reading line: %s", aktparamgraph.c_str());
+        splitted = ZerlegeZeile(aktparamgraph);
+        std::string _param = GetParameterName(splitted[0]);
+            
+        if ((toUpper(_param) == "URI") && (splitted.size() > 1))
+        {
+            this->uri = splitted[1];
+        }
+        if (((toUpper(_param) == "APIKEY")) && (splitted.size() > 1))
+        {
+            this->apikey = splitted[1];
+        }
+        if (((toUpper(_param) == "UPLOADIMG")) && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "1")
+            {
+                this->WebhookUploadImg = 1;
+            } else if (toUpper(splitted[1]) == "2")
+            {
+                this->WebhookUploadImg = 2;
+            }
+        }
+    }
+    
+    WebhookInit(uri,apikey);
+    WebhookEnable = true;
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Webhook Enabled for Uri " + uri);
+
+    printf("uri:         %s\n", uri.c_str());   
+    return true;
+}
+
+
+void ClassFlowWebhook::handleMeasurement(string _decsep, string _value)
+{
+    string _digit, _decpos;
+    int _pospunkt = _decsep.find_first_of(".");
+//    ESP_LOGD(TAG, "Name: %s, Pospunkt: %d", _decsep.c_str(), _pospunkt);
+    if (_pospunkt > -1)
+        _digit = _decsep.substr(0, _pospunkt);
+    else
+        _digit = "default";
+    for (int j = 0; j < flowpostprocessing->NUMBERS.size(); ++j)
+    {
+        if (_digit == "default")                        //  Set to default first (if nothing else is set)
+        {
+            flowpostprocessing->NUMBERS[j]->MeasurementV2 = _value;
+        }
+        if (flowpostprocessing->NUMBERS[j]->name == _digit)
+        {
+            flowpostprocessing->NUMBERS[j]->MeasurementV2 = _value;
+        }
+    }
+}
+
+
+bool ClassFlowWebhook::doFlow(string zwtime)
+{
+    if (!WebhookEnable)
+        return true;
+
+    if (flowpostprocessing)
+    {
+        printf("vor sende WebHook");
+        bool numbersWithError = WebhookPublish(flowpostprocessing->GetNumbers());
+
+        #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
+            if ((WebhookUploadImg == 1 || (WebhookUploadImg != 0 && numbersWithError)) && flowAlignment && flowAlignment->AlgROI) {
+                WebhookUploadPic(flowAlignment->AlgROI);
+            }
+        #endif
+    }
+       
+    return true;
+}
+#endif //ENABLE_WEBHOOK
--- a/code/components/jomjol_flowcontroll/ClassFlowWebhook.h
+++ b/code/components/jomjol_flowcontroll/ClassFlowWebhook.h
@@ -0,0 +1,43 @@
+#ifdef ENABLE_WEBHOOK
+
+#pragma once
+
+#ifndef CLASSFWEBHOOK_H
+#define CLASSFWEBHOOK_H
+
+#include "ClassFlow.h"
+
+#include "ClassFlowPostProcessing.h"
+#include "ClassFlowAlignment.h"
+
+#include <string>
+
+class ClassFlowWebhook :
+    public ClassFlow
+{
+protected:
+    std::string uri, apikey;
+	ClassFlowPostProcessing* flowpostprocessing;
+    ClassFlowAlignment* flowAlignment;
+
+    bool WebhookEnable;
+    int WebhookUploadImg;
+
+    void SetInitialParameter(void); 
+
+    void handleFieldname(string _decsep, string _value);   
+    void handleMeasurement(string _decsep, string _value);
+
+
+public:
+    ClassFlowWebhook();
+    ClassFlowWebhook(std::vector<ClassFlow*>* lfc);
+    ClassFlowWebhook(std::vector<ClassFlow*>* lfc, ClassFlow *_prev);
+
+    bool ReadParameter(FILE* pfile, string& aktparamgraph);
+    bool doFlow(string time);
+    string name(){return "ClassFlowWebhook";};
+};
+
+#endif //CLASSFWEBHOOK_H
+#endif //ENABLE_WEBHOOK
--- a/code/components/jomjol_flowcontroll/MainFlowControl.cpp
+++ b/code/components/jomjol_flowcontroll/MainFlowControl.cpp
@@ -145,6 +145,8 @@ bool doflow(void)

 esp_err_t setCCstatusToCFstatus(void)
 {
+    CFstatus.CamSensor_id = CCstatus.CamSensor_id;
+
    CFstatus.ImageFrameSize = CCstatus.ImageFrameSize;
    CFstatus.ImageGainceiling = CCstatus.ImageGainceiling;

@@ -171,11 +173,11 @@ esp_err_t setCCstatusToCFstatus(void)
    CFstatus.ImageHmirror = CCstatus.ImageHmirror;
    CFstatus.ImageVflip = CCstatus.ImageVflip;
    CFstatus.ImageDcw = CCstatus.ImageDcw;
+    CFstatus.ImageDenoiseLevel = CCstatus.ImageDenoiseLevel;

    CFstatus.ImageLedIntensity = CCstatus.ImageLedIntensity;

    CFstatus.ImageZoomEnabled = CCstatus.ImageZoomEnabled;
-    CFstatus.ImageZoomMode = CCstatus.ImageZoomMode;
    CFstatus.ImageZoomOffsetX = CCstatus.ImageZoomOffsetX;
    CFstatus.ImageZoomOffsetY = CCstatus.ImageZoomOffsetY;
    CFstatus.ImageZoomSize = CCstatus.ImageZoomSize;
@@ -187,6 +189,8 @@ esp_err_t setCCstatusToCFstatus(void)

 esp_err_t setCFstatusToCCstatus(void)
 {
+    // CCstatus.CamSensor_id = CFstatus.CamSensor_id;
+
    CCstatus.ImageFrameSize = CFstatus.ImageFrameSize;
    CCstatus.ImageGainceiling = CFstatus.ImageGainceiling;

@@ -213,11 +217,11 @@ esp_err_t setCFstatusToCCstatus(void)
    CCstatus.ImageHmirror = CFstatus.ImageHmirror;
    CCstatus.ImageVflip = CFstatus.ImageVflip;
    CCstatus.ImageDcw = CFstatus.ImageDcw;
+    CCstatus.ImageDenoiseLevel = CFstatus.ImageDenoiseLevel;

    CCstatus.ImageLedIntensity = CFstatus.ImageLedIntensity;

    CCstatus.ImageZoomEnabled = CFstatus.ImageZoomEnabled;
-    CCstatus.ImageZoomMode = CFstatus.ImageZoomMode;
    CCstatus.ImageZoomOffsetX = CFstatus.ImageZoomOffsetX;
    CCstatus.ImageZoomOffsetY = CFstatus.ImageZoomOffsetY;
    CCstatus.ImageZoomSize = CFstatus.ImageZoomSize;
@@ -234,8 +238,6 @@ esp_err_t setCFstatusToCam(void)
    if (s != NULL)
    {
        s->set_framesize(s, CFstatus.ImageFrameSize);
-        s->set_gainceiling(s, CFstatus.ImageGainceiling);
-
        s->set_quality(s, CFstatus.ImageQuality); // 0 - 63

        s->set_brightness(s, CFstatus.ImageBrightness); // -2 to 2
@@ -244,33 +246,37 @@ esp_err_t setCFstatusToCam(void)
        // s->set_sharpness(s, CFstatus.ImageSharpness);   // auto-sharpness is not officially supported, default to 0
        Camera.SetCamSharpness(CFstatus.ImageAutoSharpness, CFstatus.ImageSharpness);

-        s->set_exposure_ctrl(s, CFstatus.ImageAec);  // 0 = disable , 1 = enable
+        s->set_denoise(s, CFstatus.ImageDenoiseLevel); // The OV2640 does not support it, OV3660 and OV5640 (0 to 8)
+
+        s->set_special_effect(s, CFstatus.ImageSpecialEffect); // 0 to 6 (0 - No Effect, 1 - Negative, 2 - Grayscale, 3 - Red Tint, 4 - Green Tint, 5 - Blue Tint, 6 - Sepia)
+        s->set_wb_mode(s, CFstatus.ImageWbMode);               // 0 to 4 - if awb_gain enabled (0 - Auto, 1 - Sunny, 2 - Cloudy, 3 - Office, 4 - Home)
+
        s->set_ae_level(s, CFstatus.ImageAeLevel);   // -2 to 2
        s->set_aec_value(s, CFstatus.ImageAecValue); // 0 to 1200
-        s->set_aec2(s, CFstatus.ImageAec2);          // 0 = disable , 1 = enable
+        s->set_agc_gain(s, CFstatus.ImageAgcGain);   // 0 to 30

-        s->set_gain_ctrl(s, CFstatus.ImageAgc);    // 0 = disable , 1 = enable
-        s->set_agc_gain(s, CFstatus.ImageAgcGain); // 0 to 30
+        // s->set_gainceiling(s, CFstatus.ImageGainceiling); // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)
+        Camera.ov5640_set_gainceiling(s, CFstatus.ImageGainceiling);
+
+        s->set_lenc(s, CFstatus.ImageLenc);         // 0 = disable , 1 = enable
+        s->set_gain_ctrl(s, CFstatus.ImageAgc);     // 0 = disable , 1 = enable
+        s->set_exposure_ctrl(s, CFstatus.ImageAec); // 0 = disable , 1 = enable
+
+        s->set_hmirror(s, CFstatus.ImageHmirror); // 0 = disable , 1 = enable
+        s->set_vflip(s, CFstatus.ImageVflip);     // 0 = disable , 1 = enable
+        s->set_aec2(s, CFstatus.ImageAec2);       // 0 = disable , 1 = enable

        s->set_bpc(s, CFstatus.ImageBpc); // 0 = disable , 1 = enable
        s->set_wpc(s, CFstatus.ImageWpc); // 0 = disable , 1 = enable

        s->set_raw_gma(s, CFstatus.ImageRawGma); // 0 = disable , 1 = enable
-        s->set_lenc(s, CFstatus.ImageLenc);      // 0 = disable , 1 = enable

-        s->set_hmirror(s, CFstatus.ImageHmirror); // 0 = disable , 1 = enable
-        s->set_vflip(s, CFstatus.ImageVflip);     // 0 = disable , 1 = enable
-
-        s->set_dcw(s, CFstatus.ImageDcw); // 0 = disable , 1 = enable
-
-        s->set_wb_mode(s, CFstatus.ImageWbMode);   // 0 to 4 - if awb_gain enabled (0 - Auto, 1 - Sunny, 2 - Cloudy, 3 - Office, 4 - Home)
        s->set_awb_gain(s, CFstatus.ImageAwbGain); // 0 = disable , 1 = enable
        s->set_whitebal(s, CFstatus.ImageAwb);     // 0 = disable , 1 = enable

-        // special_effect muß als Letztes gesetzt werden, sonst geht es nicht
-        s->set_special_effect(s, CFstatus.ImageSpecialEffect); // 0 to 6 (0 - No Effect, 1 - Negative, 2 - Grayscale, 3 - Red Tint, 4 - Green Tint, 5 - Blue Tint, 6 - Sepia)
+        s->set_dcw(s, CFstatus.ImageDcw); // 0 = disable , 1 = enable

-        TickType_t xDelay2 = 1000 / portTICK_PERIOD_MS;
+        TickType_t xDelay2 = 100 / portTICK_PERIOD_MS;
        vTaskDelay(xDelay2);

        return ESP_OK;
@@ -474,6 +480,71 @@ esp_err_t handler_json(httpd_req_t *req)
    return ESP_OK;
 }

+/**
+ * Generates a http response containing the OpenMetrics (https://openmetrics.io/) text wire format 
+ * according to https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#text-format.
+ * 
+ * A MetricFamily with a Metric for each Sequence is provided. If no valid value is available, the metric is not provided.
+ * MetricPoints are provided without a timestamp. Additional metrics with some device information is also provided.
+ * 
+ * The metric name prefix is 'ai_on_the_edge_device_'.
+ * 
+ * example configuration for Prometheus (`prometheus.yml`):
+ * 
+ *    - job_name: watermeter
+ *      static_configs:
+ *        - targets: ['watermeter.fritz.box']
+ * 
+*/
+esp_err_t handler_openmetrics(httpd_req_t *req)
+{
+#ifdef DEBUG_DETAIL_ON
+    LogFile.WriteHeapInfo("handler_openmetrics - Start");
+#endif
+
+    ESP_LOGD(TAG, "handler_openmetrics uri: %s", req->uri);
+
+    if (bTaskAutoFlowCreated)
+    {
+        httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
+        httpd_resp_set_type(req, "text/plain"); // application/openmetrics-text is not yet supported by prometheus so we use text/plain for now
+
+        const string metricNamePrefix = "ai_on_the_edge_device";
+
+        // get current measurement (flow)
+        string response = createSequenceMetrics(metricNamePrefix, flowctrl.getNumbers());
+
+        // CPU Temperature
+        response += createMetric(metricNamePrefix + "_cpu_temperature_celsius", "current cpu temperature in celsius", "gauge", std::to_string((int)temperatureRead())); 
+
+        // WiFi signal strength
+        response += createMetric(metricNamePrefix + "_rssi_dbm", "current WiFi signal strength in dBm", "gauge", std::to_string(get_WIFI_RSSI())); 
+
+        // memory info
+        response += createMetric(metricNamePrefix + "_memory_heap_free_bytes", "available heap memory", "gauge", std::to_string(getESPHeapSize())); 
+
+        // device uptime
+        response += createMetric(metricNamePrefix + "_uptime_seconds", "device uptime in seconds", "gauge", std::to_string((long)getUpTime())); 
+
+        // data aquisition round
+        response += createMetric(metricNamePrefix + "_rounds_total", "data aquisition rounds since device startup", "counter", std::to_string(countRounds));
+
+        // the response always contains at least the metadata (HELP, TYPE) for the MetricFamily so no length check is needed
+        httpd_resp_send(req, response.c_str(), response.length());
+    }
+    else
+    {
+        httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Flow not (yet) started: REST API /metrics not yet available!");
+        return ESP_ERR_NOT_FOUND;
+    }
+
+#ifdef DEBUG_DETAIL_ON
+    LogFile.WriteHeapInfo("handler_openmetrics - Done");
+#endif
+
+    return ESP_OK;
+}
+
 esp_err_t handler_wasserzaehler(httpd_req_t *req)
 {
 #ifdef DEBUG_DETAIL_ON
@@ -486,7 +557,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
        bool _noerror = false;
        bool _all = false;
        std::string _type = "value";
-        string zw;
+        std::string zw;

        ESP_LOGD(TAG, "handler water counter uri: %s", req->uri);

@@ -564,12 +635,12 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
        }

        std::string *status = flowctrl.getActStatus();
-        string query = std::string(_query);
+        std::string query = std::string(_query);
        //    ESP_LOGD(TAG, "Query: %s, query.c_str());

        if (query.find("full") != std::string::npos)
        {
-            string txt;
+            std::string txt;
            txt = "<body style=\"font-family: arial\">";

            if ((countRounds <= 1) && (*status != std::string("Flow finished")))
@@ -594,7 +665,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)

        if (query.find("full") != std::string::npos)
        {
-            string txt, zw;
+            std::string txt, zw;

            if ((countRounds <= 1) && (*status != std::string("Flow finished")))
            {
@@ -603,25 +674,26 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
            }
            else
            {
-                /* Digital ROIs */
+                /* Digit ROIs */
                txt = "<body style=\"font-family: arial\">";
                txt += "<hr><h3>Recognized Digit ROIs (previous round)</h3>\n";
                txt += "<table style=\"border-spacing: 5px\"><tr style=\"text-align: center; vertical-align: top;\">\n";

                std::vector<HTMLInfo *> htmlinfodig;
-                htmlinfodig = flowctrl.GetAllDigital();
+                htmlinfodig = flowctrl.GetAllDigit();

                for (int i = 0; i < htmlinfodig.size(); ++i)
                {
-                    if (flowctrl.GetTypeDigital() == Digital)
+                    if (flowctrl.GetTypeDigit() == Digit)
                    {
-                        if (htmlinfodig[i]->val >= 10)
+                        // Numbers greater than 10 and less than 0 indicate NaN, since a Roi can only have values from 0 to 9.
+                        if ((htmlinfodig[i]->val >= 10) || (htmlinfodig[i]->val < 0))
                        {
                            zw = "NaN";
                        }
                        else
                        {
-                            zw = to_string((int)htmlinfodig[i]->val);
+                            zw = std::to_string((int)htmlinfodig[i]->val);
                        }

                        txt += "<td style=\"width: 100px\"><h4>" + zw + "</h4><p><img src=\"/img_tmp/" + htmlinfodig[i]->filename + "\"></p></td>\n";
@@ -632,7 +704,8 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
                        stream << std::fixed << std::setprecision(1) << htmlinfodig[i]->val;
                        zw = stream.str();

-                        if (std::stod(zw) >= 10)
+                        // Numbers greater than 10 and less than 0 indicate NaN, since a Roi can only have values from 0 to 9.
+                        if ((std::stod(zw) >= 10) || (std::stod(zw) < 0))
                        {
                            zw = "NaN";
                        }
@@ -659,8 +732,9 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
                    std::stringstream stream;
                    stream << std::fixed << std::setprecision(1) << htmlinfoana[i]->val;
                    zw = stream.str();
-
-                    if (std::stod(zw) >= 10)
+                    
+                    // Numbers greater than 10 and less than 0 indicate NaN, since a Roi can only have values from 0 to 9.
+                    if ((std::stod(zw) >= 10) || (std::stod(zw) < 0))
                    {
                        zw = "NaN";
                    }
@@ -675,8 +749,8 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
                httpd_resp_sendstr_chunk(req, txt.c_str());

                /* Full Image
-                 * Only show it after the image got taken and aligned */
-                txt = "<hr><h3>Aligned Image (current round)</h3>\n";
+                 * Only show it after the image got taken */
+                txt = "<hr><h3>Full Image (current round)</h3>\n";

                if ((*status == std::string("Initialization")) ||
                    (*status == std::string("Initialization (delayed)")) ||
@@ -716,18 +790,18 @@ esp_err_t handler_editflow(httpd_req_t *req)

    ESP_LOGD(TAG, "handler_editflow uri: %s", req->uri);

-    char _query[200];
+    char _query[512];
    char _valuechar[30];
-    string _task;
+    std::string _task;

-    if (httpd_req_get_url_query_str(req, _query, 200) == ESP_OK)
+    if (httpd_req_get_url_query_str(req, _query, 512) == ESP_OK)
    {
        if (httpd_query_key_value(_query, "task", _valuechar, 30) == ESP_OK)
        {
 #ifdef DEBUG_DETAIL_ON
            ESP_LOGD(TAG, "task is found: %s", _valuechar);
 #endif
-            _task = string(_valuechar);
+            _task = std::string(_valuechar);
        }
    }

@@ -751,12 +825,12 @@ esp_err_t handler_editflow(httpd_req_t *req)

    if (_task.compare("copy") == 0)
    {
-        string in, out, zw;
+        std::string in, out, zw;

        httpd_query_key_value(_query, "in", _valuechar, 30);
-        in = string(_valuechar);
+        in = std::string(_valuechar);
        httpd_query_key_value(_query, "out", _valuechar, 30);
-        out = string(_valuechar);
+        out = std::string(_valuechar);

 #ifdef DEBUG_DETAIL_ON
        ESP_LOGD(TAG, "in: %s", in.c_str());
@@ -774,31 +848,43 @@ esp_err_t handler_editflow(httpd_req_t *req)

    if (_task.compare("cutref") == 0)
    {
-        string in, out, zw;
-        int x, y, dx, dy;
+        std::string in, out, zw;
+        int x = 0, y = 0, dx = 20, dy = 20;
        bool enhance = false;

        httpd_query_key_value(_query, "in", _valuechar, 30);
-        in = string(_valuechar);
+        in = std::string(_valuechar);

        httpd_query_key_value(_query, "out", _valuechar, 30);
-        out = string(_valuechar);
+        out = std::string(_valuechar);

        httpd_query_key_value(_query, "x", _valuechar, 30);
-        string _x = string(_valuechar);
-        x = stoi(_x);
+        std::string _x = std::string(_valuechar);
+        if (isStringNumeric(_x))
+        {
+            x = std::stoi(_x);
+        }

        httpd_query_key_value(_query, "y", _valuechar, 30);
-        string _y = string(_valuechar);
-        y = stoi(_y);
+        std::string _y = std::string(_valuechar);
+        if (isStringNumeric(_y))
+        {
+            y = std::stoi(_y);
+        }

        httpd_query_key_value(_query, "dx", _valuechar, 30);
-        string _dx = string(_valuechar);
-        dx = stoi(_dx);
+        std::string _dx = std::string(_valuechar);
+        if (isStringNumeric(_dx))
+        {
+            dx = std::stoi(_dx);
+        }

        httpd_query_key_value(_query, "dy", _valuechar, 30);
-        string _dy = string(_valuechar);
-        dy = stoi(_dy);
+        std::string _dy = std::string(_valuechar);
+        if (isStringNumeric(_dy))
+        {
+            dy = std::stoi(_dy);
+        }

 #ifdef DEBUG_DETAIL_ON
        ESP_LOGD(TAG, "in: %s", in.c_str());
@@ -811,7 +897,7 @@ esp_err_t handler_editflow(httpd_req_t *req)

        if (httpd_query_key_value(_query, "enhance", _valuechar, 10) == ESP_OK)
        {
-            string _enhance = string(_valuechar);
+            string _enhance = std::string(_valuechar);

            if (_enhance.compare("true") == 0)
            {
@@ -822,7 +908,7 @@ esp_err_t handler_editflow(httpd_req_t *req)
        in = "/sdcard" + in;
        out = "/sdcard" + out;

-        string out2 = out.substr(0, out.length() - 4) + "_org.jpg";
+        std::string out2 = out.substr(0, out.length() - 4) + "_org.jpg";

        if ((flowctrl.SetupModeActive || (*flowctrl.getActStatus() == std::string("Flow finished"))) && psram_init_shared_memory_for_take_image_step())
        {
@@ -874,295 +960,398 @@ esp_err_t handler_editflow(httpd_req_t *req)

            if (httpd_query_key_value(_query, "waitb", _valuechar, 30) == ESP_OK)
            {
-                int _waitb = std::stoi(_valuechar);
-                if (_waitb != 0)
+                std::string _waitb = std::string(_valuechar);
+                if (isStringNumeric(_waitb))
                {
-                    CFstatus.WaitBeforePicture = _waitb;
+                    CFstatus.WaitBeforePicture = std::stoi(_valuechar);
+                }
+            }
+
+            if (httpd_query_key_value(_query, "aecgc", _valuechar, 30) == ESP_OK)
+            {
+                std::string _aecgc = std::string(_valuechar);
+                if (isStringNumeric(_aecgc))
+                {
+                    int _aecgc_ = std::stoi(_valuechar);
+                    switch (_aecgc_)
+                    {
+                        case 1:
+                            CFstatus.ImageGainceiling = GAINCEILING_4X; 
+                            break;
+                        case 2:
+                            CFstatus.ImageGainceiling = GAINCEILING_8X; 
+                            break;
+                        case 3:
+                            CFstatus.ImageGainceiling = GAINCEILING_16X; 
+                            break;
+                        case 4:
+                            CFstatus.ImageGainceiling = GAINCEILING_32X; 
+                            break;
+                        case 5:
+                            CFstatus.ImageGainceiling = GAINCEILING_64X; 
+                            break;
+                        case 6:
+                            CFstatus.ImageGainceiling = GAINCEILING_128X; 
+                            break;
+                        default:
+                            CFstatus.ImageGainceiling = GAINCEILING_2X;
+                    }
+                }
+                else
+                {
+                    if (_aecgc == "X4") {
+                        CFstatus.ImageGainceiling = GAINCEILING_4X;
+                    }
+                    else if (_aecgc == "X8") {
+                        CFstatus.ImageGainceiling = GAINCEILING_8X;
+                    }
+                    else if (_aecgc == "X16") {
+                        CFstatus.ImageGainceiling = GAINCEILING_16X;
+                    }
+                    else if (_aecgc == "X32") {
+                        CFstatus.ImageGainceiling = GAINCEILING_32X;
+                    }
+                    else if (_aecgc == "X64") {
+                        CFstatus.ImageGainceiling = GAINCEILING_64X;
+                    }
+                    else if (_aecgc == "X128") {
+                        CFstatus.ImageGainceiling = GAINCEILING_128X;
+                    }
+                    else {
+                        CFstatus.ImageGainceiling = GAINCEILING_2X;
+                    }
                }
            }

            if (httpd_query_key_value(_query, "qual", _valuechar, 30) == ESP_OK)
            {
-                int _qual = std::stoi(_valuechar);
-                if ((_qual >= 0) && (_qual <= 63))
+                std::string _qual = std::string(_valuechar);
+                if (isStringNumeric(_qual))
                {
-                    CFstatus.ImageQuality = _qual;
+                    int _qual_ = std::stoi(_valuechar);
+                    CFstatus.ImageQuality = clipInt(_qual_, 63, 6);
                }
            }

            if (httpd_query_key_value(_query, "bri", _valuechar, 30) == ESP_OK)
            {
-                int _bri = std::stoi(_valuechar);
-                if ((_bri >= -2) && (_bri <= 2))
+                std::string _bri = std::string(_valuechar);
+                if (isStringNumeric(_bri))
                {
-                    CFstatus.ImageBrightness = _bri;
+                    int _bri_ = std::stoi(_valuechar);
+                    CFstatus.ImageBrightness = clipInt(_bri_, 2, -2);
                }
            }

            if (httpd_query_key_value(_query, "con", _valuechar, 30) == ESP_OK)
            {
-                int _con = std::stoi(_valuechar);
-                if ((_con >= -2) && (_con <= 2))
+                std::string _con = std::string(_valuechar);
+                if (isStringNumeric(_con))
                {
-                    CFstatus.ImageContrast = _con;
+                    int _con_ = std::stoi(_valuechar);
+                    CFstatus.ImageContrast = clipInt(_con_, 2, -2);
                }
            }

            if (httpd_query_key_value(_query, "sat", _valuechar, 30) == ESP_OK)
            {
-                int _sat = std::stoi(_valuechar);
-                if ((_sat >= -2) && (_sat <= 2))
+                std::string _sat = std::string(_valuechar);
+                if (isStringNumeric(_sat))
                {
-                    CFstatus.ImageSaturation = _sat;
+                    int _sat_ = std::stoi(_valuechar);
+                    CFstatus.ImageSaturation = clipInt(_sat_, 2, -2);
                }
            }

            if (httpd_query_key_value(_query, "shp", _valuechar, 30) == ESP_OK)
            {
-                int _shp = std::stoi(_valuechar);
-                if ((_shp >= -2) && (_shp <= 2))
+                std::string _shp = std::string(_valuechar);
+                if (isStringNumeric(_shp))
                {
-                    CFstatus.ImageSharpness = _shp;
+                    int _shp_ = std::stoi(_valuechar);
+                    if (CCstatus.CamSensor_id == OV2640_PID)
+                    {
+                        CFstatus.ImageSharpness = clipInt(_shp_, 2, -2);
+                    }
+                    else
+                    {
+                        CFstatus.ImageSharpness = clipInt(_shp_, 3, -3);
+                    }
                }
            }

            if (httpd_query_key_value(_query, "ashp", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageAutoSharpness = 1;
-                }
-                else
-                {
-                    CFstatus.ImageAutoSharpness = 0;
-                }
+                std::string _ashp = std::string(_valuechar);
+                CFstatus.ImageAutoSharpness = alphanumericToBoolean(_ashp);
            }

            if (httpd_query_key_value(_query, "spe", _valuechar, 30) == ESP_OK)
            {
-                int _spe = std::stoi(_valuechar);
-                if ((_spe >= 0) && (_spe <= 6))
+                std::string _spe = std::string(_valuechar);
+                if (isStringNumeric(_spe))
                {
-                    CFstatus.ImageSpecialEffect = _spe;
+                    int _spe_ = std::stoi(_valuechar);
+                    CFstatus.ImageSpecialEffect = clipInt(_spe_, 6, 0);
+                }
+                else
+                {
+                    if (_spe == "negative") {
+                        CFstatus.ImageSpecialEffect = 1;
+                    }
+                    else if (_spe == "grayscale") {
+                        CFstatus.ImageSpecialEffect = 2;
+                    }
+                    else if (_spe == "red") {
+                        CFstatus.ImageSpecialEffect = 3;
+                    }
+                    else if (_spe == "green") {
+                        CFstatus.ImageSpecialEffect = 4;
+                    }
+                    else if (_spe == "blue") {
+                        CFstatus.ImageSpecialEffect = 5;
+                    }
+                    else if (_spe == "retro") {
+                        CFstatus.ImageSpecialEffect = 6;
+                    }
+                    else {
+                        CFstatus.ImageSpecialEffect = 0;
+                    }
                }
            }

            if (httpd_query_key_value(_query, "wbm", _valuechar, 30) == ESP_OK)
            {
-                int _wbm = std::stoi(_valuechar);
-                if ((_wbm >= 0) && (_wbm <= 4))
+                std::string _wbm = std::string(_valuechar);
+                if (isStringNumeric(_wbm))
                {
-                    CFstatus.ImageWbMode = _wbm;
+                    int _wbm_ = std::stoi(_valuechar);
+                    CFstatus.ImageWbMode = clipInt(_wbm_, 4, 0);
+                }
+                else
+                {
+                    if (_wbm == "sunny") {
+                        CFstatus.ImageWbMode = 1;
+                    }
+                    else if (_wbm == "cloudy") {
+                        CFstatus.ImageWbMode = 2;
+                    }
+                    else if (_wbm == "office") {
+                        CFstatus.ImageWbMode = 3;
+                    }
+                    else if (_wbm == "home") {
+                        CFstatus.ImageWbMode = 4;
+                    }
+                    else {
+                        CFstatus.ImageWbMode = 0;
+                    }
                }
            }

            if (httpd_query_key_value(_query, "awb", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageAwb = 1;
-                }
-                else
-                {
-                    CFstatus.ImageAwb = 0;
-                }
+                std::string _awb = std::string(_valuechar);
+                CFstatus.ImageAwb = alphanumericToBoolean(_awb);
            }

            if (httpd_query_key_value(_query, "awbg", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageAwbGain = 1;
-                }
-                else
-                {
-                    CFstatus.ImageAwbGain = 0;
-                }
+                std::string _awbg = std::string(_valuechar);
+                CFstatus.ImageAwbGain = alphanumericToBoolean(_awbg);
            }

            if (httpd_query_key_value(_query, "aec", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageAec = 1;
-                }
-                else
-                {
-                    CFstatus.ImageAec = 0;
-                }
+                std::string _aec = std::string(_valuechar);
+                CFstatus.ImageAec = alphanumericToBoolean(_aec);
            }

            if (httpd_query_key_value(_query, "aec2", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageAec2 = 1;
-                }
-                else
-                {
-                    CFstatus.ImageAec2 = 0;
-                }
+                std::string _aec2 = std::string(_valuechar);
+                CFstatus.ImageAec2 = alphanumericToBoolean(_aec2);
            }

            if (httpd_query_key_value(_query, "ael", _valuechar, 30) == ESP_OK)
            {
-                int _ael = std::stoi(_valuechar);
-                if ((_ael >= -2) && (_ael <= 2))
+                std::string _ael = std::string(_valuechar);
+                if (isStringNumeric(_ael))
                {
-                    CFstatus.ImageAeLevel = _ael;
+                    int _ael_ = std::stoi(_valuechar);
+                    if (CCstatus.CamSensor_id == OV2640_PID)
+                    {
+                        CFstatus.ImageAeLevel = clipInt(_ael_, 2, -2);
+                    }
+                    else
+                    {
+                        CFstatus.ImageAeLevel = clipInt(_ael_, 5, -5);
+                    }
                }
            }

            if (httpd_query_key_value(_query, "aecv", _valuechar, 30) == ESP_OK)
            {
-                int _aecv = std::stoi(_valuechar);
-                if ((_aecv >= 0) && (_aecv <= 1200))
+                std::string _aecv = std::string(_valuechar);
+                if (isStringNumeric(_aecv))
                {
-                    CFstatus.ImageAecValue = _aecv;
+                    int _aecv_ = std::stoi(_valuechar);
+                    CFstatus.ImageAecValue = clipInt(_aecv_, 1200, 0);
                }
            }

            if (httpd_query_key_value(_query, "agc", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageAgc = 1;
-                }
-                else
-                {
-                    CFstatus.ImageAgc = 0;
-                }
+                std::string _agc = std::string(_valuechar);
+                CFstatus.ImageAgc = alphanumericToBoolean(_agc);
            }

            if (httpd_query_key_value(_query, "agcg", _valuechar, 30) == ESP_OK)
            {
-                int _agcg = std::stoi(_valuechar);
-                if ((_agcg >= 0) && (_agcg <= 30))
+                std::string _agcg = std::string(_valuechar);
+                if (isStringNumeric(_agcg))
                {
-                    CFstatus.ImageAgcGain = _agcg;
+                    int _agcg_ = std::stoi(_valuechar);
+                    CFstatus.ImageAgcGain = clipInt(_agcg_, 30, 0);
                }
            }

            if (httpd_query_key_value(_query, "bpc", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageBpc = 1;
-                }
-                else
-                {
-                    CFstatus.ImageBpc = 0;
-                }
+                std::string _bpc = std::string(_valuechar);
+                CFstatus.ImageBpc = alphanumericToBoolean(_bpc);
            }

            if (httpd_query_key_value(_query, "wpc", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageWpc = 1;
-                }
-                else
-                {
-                    CFstatus.ImageWpc = 0;
-                }
+                std::string _wpc = std::string(_valuechar);
+                CFstatus.ImageWpc = alphanumericToBoolean(_wpc);
            }

            if (httpd_query_key_value(_query, "rgma", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageRawGma = 1;
-                }
-                else
-                {
-                    CFstatus.ImageRawGma = 0;
-                }
+                std::string _rgma = std::string(_valuechar);
+                CFstatus.ImageRawGma = alphanumericToBoolean(_rgma);
            }

            if (httpd_query_key_value(_query, "lenc", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageLenc = 1;
-                }
-                else
-                {
-                    CFstatus.ImageLenc = 0;
-                }
+                std::string _lenc = std::string(_valuechar);
+                CFstatus.ImageLenc = alphanumericToBoolean(_lenc);
            }

            if (httpd_query_key_value(_query, "mirror", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageHmirror = 1;
-                }
-                else
-                {
-                    CFstatus.ImageHmirror = 0;
-                }
+                std::string _mirror = std::string(_valuechar);
+                CFstatus.ImageHmirror = alphanumericToBoolean(_mirror);
            }

            if (httpd_query_key_value(_query, "flip", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageVflip = 1;
-                }
-                else
-                {
-                    CFstatus.ImageVflip = 0;
-                }
+                std::string _flip = std::string(_valuechar);
+                CFstatus.ImageVflip = alphanumericToBoolean(_flip);
            }

            if (httpd_query_key_value(_query, "dcw", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
+                std::string _dcw = std::string(_valuechar);
+                CFstatus.ImageDcw = alphanumericToBoolean(_dcw);
+            }
+
+            if (httpd_query_key_value(_query, "den", _valuechar, 30) == ESP_OK)
+            {
+                std::string _idlv = std::string(_valuechar);
+                if (isStringNumeric(_idlv))
                {
-                    CFstatus.ImageDcw = 1;
-                }
-                else
-                {
-                    CFstatus.ImageDcw = 0;
+                    int _ImageDenoiseLevel = std::stoi(_valuechar);
+                    if (CCstatus.CamSensor_id == OV2640_PID)
+                    {
+                        CCstatus.ImageDenoiseLevel = 0;
+                    }
+                    else
+                    {
+                        CFstatus.ImageDenoiseLevel = clipInt(_ImageDenoiseLevel, 8, 0);
+                    }
                }
            }

            if (httpd_query_key_value(_query, "zoom", _valuechar, 30) == ESP_OK)
            {
-                if (std::stoi(_valuechar) != 0)
-                {
-                    CFstatus.ImageZoomEnabled = 1;
-                }
-                else
-                {
-                    CFstatus.ImageZoomEnabled = 0;
-                }
+                std::string _zoom = std::string(_valuechar);
+                CFstatus.ImageZoomEnabled = alphanumericToBoolean(_zoom);
            }

            if (httpd_query_key_value(_query, "zoomx", _valuechar, 30) == ESP_OK)
            {
-                CFstatus.ImageZoomOffsetX = std::stoi(_valuechar);
+                std::string _zoomx = std::string(_valuechar);
+                if (isStringNumeric(_zoomx))
+                {
+                    int _ImageZoomOffsetX = std::stoi(_valuechar);
+                    if (CCstatus.CamSensor_id == OV2640_PID)
+                    {
+                        CFstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 480, -480);
+                    }
+                    else if (CCstatus.CamSensor_id == OV3660_PID)
+                    {
+                        CFstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 704, -704);
+                    }
+                    else if (CCstatus.CamSensor_id == OV5640_PID)
+                    {
+                        CFstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 960, -960);
+                    }
+                }
            }

            if (httpd_query_key_value(_query, "zoomy", _valuechar, 30) == ESP_OK)
            {
-                CFstatus.ImageZoomOffsetY = std::stoi(_valuechar);
+                std::string _zoomy = std::string(_valuechar);
+                if (isStringNumeric(_zoomy))
+                {
+                    int _ImageZoomOffsetY = std::stoi(_valuechar);
+                    if (CCstatus.CamSensor_id == OV2640_PID)
+                    {
+                        CFstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 360, -360);
+                    }
+                    else if (CCstatus.CamSensor_id == OV3660_PID)
+                    {
+                        CFstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 528, -528);
+                    }
+                    else if (CCstatus.CamSensor_id == OV5640_PID)
+                    {
+                        CFstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 720, -720);
+                    }
+                }
            }

            if (httpd_query_key_value(_query, "zooms", _valuechar, 30) == ESP_OK)
            {
-                int _ImageZoomSize = std::stoi(_valuechar);
-                if (_ImageZoomSize >= 0)
+                std::string _zooms = std::string(_valuechar);
+                if (isStringNumeric(_zooms))
                {
-                    CFstatus.ImageZoomSize = _ImageZoomSize;
+                    int _ImageZoomSize = std::stoi(_valuechar);
+                    if (CCstatus.CamSensor_id == OV2640_PID)
+                    {
+                        CFstatus.ImageZoomSize = clipInt(_ImageZoomSize, 29, 0);
+                    }
+                    else if (CCstatus.CamSensor_id == OV3660_PID)
+                    {
+                        CFstatus.ImageZoomSize = clipInt(_ImageZoomSize, 43, 0);
+                    }
+                    else if (CCstatus.CamSensor_id == OV5640_PID)
+                    {
+                        CFstatus.ImageZoomSize = clipInt(_ImageZoomSize, 59, 0);
+                    }
                }
            }

            if (httpd_query_key_value(_query, "ledi", _valuechar, 30) == ESP_OK)
            {
-                float _ImageLedIntensity = std::stof(_valuechar);
-                Camera.SetLEDIntensity(_ImageLedIntensity);
-                CFstatus.ImageLedIntensity = CCstatus.ImageLedIntensity;
+                std::string _ledi = std::string(_valuechar);
+                if (isStringNumeric(_ledi))
+                {
+                    float _ImageLedIntensity = std::stof(_valuechar);
+                    Camera.SetLEDIntensity(_ImageLedIntensity);
+                    CFstatus.ImageLedIntensity = CCstatus.ImageLedIntensity;
+                }
            }

            if (_task.compare("cam_settings") == 0)
@@ -1184,8 +1373,8 @@ esp_err_t handler_editflow(httpd_req_t *req)
                // CFstatus >>> Kamera
                setCFstatusToCam();

-                Camera.SetQualityZoomSize(CFstatus.ImageQuality, CFstatus.ImageFrameSize, CFstatus.ImageZoomEnabled, CFstatus.ImageZoomOffsetX, CFstatus.ImageZoomOffsetY, CFstatus.ImageZoomSize);
-                // Camera.SetZoomSize(CFstatus.ImageZoomEnabled, CFstatus.ImageZoomOffsetX, CFstatus.ImageZoomOffsetY, CFstatus.ImageZoomSize);
+                Camera.SetQualityZoomSize(CFstatus.ImageQuality, CFstatus.ImageFrameSize, CFstatus.ImageZoomEnabled, CFstatus.ImageZoomOffsetX, CFstatus.ImageZoomOffsetY, CFstatus.ImageZoomSize, CFstatus.ImageVflip);
+                // Camera.SetZoomSize(CFstatus.ImageZoomEnabled, CFstatus.ImageZoomOffsetX, CFstatus.ImageZoomOffsetY, CFstatus.ImageZoomSize, CFstatus.ImageVflip);

                // Kameraeinstellungen wurden verädert
                CFstatus.changedCameraSettings = true;
@@ -1650,4 +1839,12 @@ void register_server_main_flow_task_uri(httpd_handle_t server)
    camuri.handler = handler_stream;
    camuri.user_ctx = (void *)"stream";
    httpd_register_uri_handler(server, &camuri);
+
+    /** will handle metrics requests */
+    camuri.uri = "/metrics";
+    camuri.handler = handler_openmetrics;
+    camuri.user_ctx = (void *)"metrics";
+    httpd_register_uri_handler(server, &camuri);
+
+    /** when adding a new handler, make sure to increment the value for config.max_uri_handlers in `main/server_main.cpp` */
 }
--- a/code/components/jomjol_flowcontroll/MainFlowControl.h
+++ b/code/components/jomjol_flowcontroll/MainFlowControl.h
@@ -9,11 +9,14 @@
 #include <esp_http_server.h>
 #include "CImageBasis.h"
 #include "ClassFlowControll.h"
+#include "openmetrics.h"

 typedef struct
 {
+    uint16_t CamSensor_id;
+
    framesize_t ImageFrameSize = FRAMESIZE_VGA; // 0 - 10
-    gainceiling_t ImageGainceiling; // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)
+    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
@@ -39,13 +42,14 @@ typedef struct
    int ImageVflip;         // Invert image (0 or 1)
    int ImageDcw;           // downsize enable (1 or 0)

+    int ImageDenoiseLevel; // The OV2640 does not support it, OV3660 and OV5640 (0 to 8)
+
    int ImageWidth;
    int ImageHeight;

    int ImageLedIntensity;

    bool ImageZoomEnabled;
-    int ImageZoomMode;
    int ImageZoomOffsetX;
    int ImageZoomOffsetY;
    int ImageZoomSize;
--- a/code/components/jomjol_helper/Helper.cpp
+++ b/code/components/jomjol_helper/Helper.cpp
@@ -1198,7 +1198,7 @@ bool isInString(std::string &s, std::string const &toFind)
 {
 	std::size_t pos = s.find(toFind);

-	if (pos == std::string::npos)
+	if (pos == std::string::npos) 
 	{
 		// Not found
 		return false;
@@ -1206,3 +1206,112 @@ bool isInString(std::string &s, std::string const &toFind)

 	return true;
 }
+
+// from https://stackoverflow.com/a/14678800
+void replaceAll(std::string& s, const std::string& toReplace, const std::string& replaceWith)
+{
+	size_t pos = 0;
+	
+	while ((pos = s.find(toReplace, pos)) != std::string::npos) 
+	{
+		s.replace(pos, toReplace.length(), replaceWith);
+		pos += replaceWith.length();
+	}
+}
+
+bool isStringNumeric(std::string &input)
+{
+	if (input.size() <= 0)
+	{
+		return false;
+	}
+    
+	// Replace comma with a dot
+	replaceString(input, ",", ".", false);
+	
+	int start = 0;
+	int punkt_existiert_schon = 0;
+
+	if (input[0] == '-')
+	{
+		start = 1;
+	}
+
+	for (int i = start; i < input.size(); i++)
+	{
+		if ((input[i] == '.') && (i > 0) && (punkt_existiert_schon == 0))
+		{
+			punkt_existiert_schon = 1;
+			i++;
+		}
+		else if (!isdigit(input[i]))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool isStringAlphabetic(std::string &input)
+{
+	for (int i = 0; i < input.size(); i++)
+	{
+		if (!isalpha(input[i]))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool isStringAlphanumeric(std::string &input)
+{
+	for (int i = 0; i < input.size(); i++)
+	{
+		if (!isalnum(input[i]))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool alphanumericToBoolean(std::string &input)
+{
+	if (isStringAlphabetic(input))
+	{
+		return stringToBoolean(toUpper(input));
+	}
+	else if (isStringNumeric(input))
+	{
+		return numericStrToBool(input);
+	}
+
+	return false;
+}
+
+int clipInt(int input, int high, int low)
+{
+	if (input < low)
+	{
+		input = low;
+	}
+	else if (input > high)
+	{
+		input = high;
+	}
+	return input;
+}
+
+bool numericStrToBool(std::string input)
+{
+	return (std::stoi(input) != 0);
+}
+
+bool stringToBoolean(std::string input)
+{
+	return (input == "TRUE");
+}
--- a/code/components/jomjol_helper/Helper.h
+++ b/code/components/jomjol_helper/Helper.h
@@ -21,7 +21,6 @@ bool RenameFile(string from, string to);
 bool MakeDir(std::string _what);
 bool FileExists(string filename);

-
 string RundeOutput(double _in, int _anzNachkomma);

 size_t findDelimiterPos(string input, string delimiter);
@@ -33,7 +32,6 @@ string getFileType(string filename);
 string getFileFullFileName(string filename);
 string getDirectory(string filename);

-
 int mkdir_r(const char *dir, const mode_t mode);
 int removeFolder(const char* folderPath, const char* logTag);

@@ -68,7 +66,6 @@ string getSDCardSectorSize();

 string getMac(void);

-
 /* Error bit fields
   One bit per error
   Make sure it matches https://jomjol.github.io/AI-on-the-edge-device-docs/Error-Codes */
@@ -98,8 +95,18 @@ const char* get404(void);

 std::string UrlDecode(const std::string& value);

+void replaceAll(std::string& s, const std::string& toReplace, const std::string& replaceWith);
 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, bool logIt);
 bool isInString(std::string& s, std::string const& toFind);

+bool isStringNumeric(std::string &input);
+bool isStringAlphabetic(std::string &input);
+bool isStringAlphanumeric(std::string &input);
+bool alphanumericToBoolean(std::string &input);
+
+int clipInt(int input, int high, int low);
+bool numericStrToBool(std::string input);
+bool stringToBoolean(std::string input);
+
 #endif //HELPER_H
--- a/code/components/jomjol_helper/psram.cpp
+++ b/code/components/jomjol_helper/psram.cpp
@@ -120,15 +120,15 @@ void psram_free_shared_temp_image_memory(void) {


 /*******************************************************************
- * Memory used in Digitalization Steps
+ * Memory used in Digitization Steps
 * During this step we only use the shared part of the PSRAM for the
 * Tensor Arena and one of the Models.
 * The shared memory is large enough for the largest model and the
 * Tensor Arena. Therefore we do not need to monitor the usage.
 *******************************************************************/
 void *psram_get_shared_tensor_arena_memory(void) {
-    if ((sharedMemoryInUseFor == "") || (sharedMemoryInUseFor == "Digitalization_Model")) {
-        sharedMemoryInUseFor = "Digitalization_Tensor";
+    if ((sharedMemoryInUseFor == "") || (sharedMemoryInUseFor == "Digitization_Model")) {
+        sharedMemoryInUseFor = "Digitization_Tensor";
        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocating Tensor Arena (" + std::to_string(TENSOR_ARENA_SIZE) + " bytes, use shared memory in PSRAM)...");
        return shared_region; // Use 1th part of the shared memory for Tensor
    }
@@ -140,8 +140,8 @@ void *psram_get_shared_tensor_arena_memory(void) {


 void *psram_get_shared_model_memory(void) {
-    if ((sharedMemoryInUseFor == "") || (sharedMemoryInUseFor == "Digitalization_Tensor")) {
-        sharedMemoryInUseFor = "Digitalization_Model";
+    if ((sharedMemoryInUseFor == "") || (sharedMemoryInUseFor == "Digitization_Tensor")) {
+        sharedMemoryInUseFor = "Digitization_Model";
        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Allocating Model memory (" + std::to_string(MAX_MODEL_SIZE) + " bytes, use shared memory in PSRAM)...");
        return (uint8_t *)shared_region + TENSOR_ARENA_SIZE; // Use 2nd part of the shared memory (after Tensor Arena) for the model
    }
--- a/code/components/jomjol_helper/psram.h
+++ b/code/components/jomjol_helper/psram.h
@@ -20,7 +20,7 @@ void psram_free_shared_stbi_memory(void *p);
 void *psram_reserve_shared_tmp_image_memory(void);
 void psram_free_shared_temp_image_memory(void);

-/* Memory used in Digitalization Steps */
+/* Memory used in Digitization Steps */
 void *psram_get_shared_tensor_arena_memory(void);
 void *psram_get_shared_model_memory(void);
 void psram_free_shared_tensor_arena_and_model_memory(void);
--- a/code/components/jomjol_helper/sdcard_init.c
+++ b/code/components/jomjol_helper/sdcard_init.c
@@ -35,15 +35,15 @@ static const char* TAG = "sdcard_init";
    } \
    } while(0)

-typedef struct vfs_fat_sd_ctx_t {
+typedef struct mh_vfs_fat_sd_ctx_t {
    BYTE pdrv;                                  //Drive number that is mounted
    esp_vfs_fat_mount_config_t mount_config;    //Mount configuration
    FATFS *fs;                                  //FAT structure pointer that is registered
    sdmmc_card_t *card;                         //Card info
    char *base_path;                            //Path where partition is registered
-} vfs_fat_sd_ctx_t;
+} mh_vfs_fat_sd_ctx_t;

-static vfs_fat_sd_ctx_t *s_ctx[FF_VOLUMES] = {};
+static mh_vfs_fat_sd_ctx_t *s_ctx[FF_VOLUMES] = {};

 /**
 * This `s_saved_ctx_id` is only used by `esp_vfs_fat_sdmmc_unmount`, which is deprecated.
@@ -185,14 +185,9 @@ BYTE ff_diskio_get_pdrv_card_mh(const sdmmc_card_t* card)
    return 0xff;
 }

-
-
-
-
-
 static bool s_get_context_id_by_card_mh(const sdmmc_card_t *card, uint32_t *out_id)
 {
-    vfs_fat_sd_ctx_t *p_ctx = NULL;
+    mh_vfs_fat_sd_ctx_t *p_ctx = NULL;
    for (int i = 0; i < FF_VOLUMES; i++) {
        p_ctx = s_ctx[i];
        if (p_ctx) {
@@ -378,7 +373,7 @@ static esp_err_t init_sdmmc_host_mh(int slot, const void *slot_config, int *out_
 esp_err_t esp_vfs_fat_sdmmc_mount_mh(const char* base_path, const sdmmc_host_t* host_config, const void* slot_config, const esp_vfs_fat_mount_config_t* mount_config, sdmmc_card_t** out_card)
 {
    esp_err_t err;
-    vfs_fat_sd_ctx_t *ctx = NULL;
+    mh_vfs_fat_sd_ctx_t *ctx = NULL;
    uint32_t ctx_id = FF_VOLUMES;
    FATFS *fs = NULL;
    int card_handle = -1;   //uninitialized
@@ -419,7 +414,7 @@ esp_err_t esp_vfs_fat_sdmmc_mount_mh(const char* base_path, const sdmmc_host_t*
        s_saved_ctx_id = 0;
    }

-    ctx = calloc(sizeof(vfs_fat_sd_ctx_t), 1);
+    ctx = calloc(sizeof(mh_vfs_fat_sd_ctx_t), 1);

    if (!ctx) {
        CHECK_EXECUTE_RESULT(ESP_ERR_NO_MEM, "no mem");
@@ -462,7 +457,7 @@ esp_err_t esp_vfs_fat_sdspi_mount_mh(const char* base_path, const sdmmc_host_t*
 {
    const sdmmc_host_t* host_config = host_config_input;
    esp_err_t err;
-    vfs_fat_sd_ctx_t *ctx = NULL;
+    mh_vfs_fat_sd_ctx_t *ctx = NULL;
    uint32_t ctx_id = FF_VOLUMES;
    FATFS *fs = NULL;
    int card_handle = -1;   //uninitialized
@@ -514,7 +509,7 @@ esp_err_t esp_vfs_fat_sdspi_mount_mh(const char* base_path, const sdmmc_host_t*
        s_saved_ctx_id = 0;
    }

-    ctx = calloc(sizeof(vfs_fat_sd_ctx_t), 1);
+    ctx = calloc(sizeof(mh_vfs_fat_sd_ctx_t), 1);

    if (!ctx) {
        CHECK_EXECUTE_RESULT(ESP_ERR_NO_MEM, "no mem");
--- a/code/components/jomjol_logfile/ClassLogFile.cpp
+++ b/code/components/jomjol_logfile/ClassLogFile.cpp
@@ -32,7 +32,7 @@ void ClassLogFile::WriteHeapInfo(std::string _id)
 }


-void ClassLogFile::WriteToData(std::string _timestamp, std::string _name, std::string  _ReturnRawValue, std::string  _ReturnValue, std::string  _ReturnPreValue, std::string  _ReturnRateValue, std::string  _ReturnChangeAbsolute, std::string  _ErrorMessageText, std::string  _digital, std::string  _analog)
+void ClassLogFile::WriteToData(std::string _timestamp, std::string _name, std::string  _ReturnRawValue, std::string  _ReturnValue, std::string  _ReturnPreValue, std::string  _ReturnRateValue, std::string  _ReturnChangeAbsolute, std::string  _ErrorMessageText, std::string  _digit, std::string  _analog)
 {
    ESP_LOGD(TAG, "Start WriteToData");
    time_t rawtime;
@@ -67,7 +67,7 @@ void ClassLogFile::WriteToData(std::string _timestamp, std::string _name, std::s
        fputs(_ReturnChangeAbsolute.c_str(), pFile);
        fputs(",", pFile);
        fputs(_ErrorMessageText.c_str(), pFile);
-        fputs(_digital.c_str(), pFile);
+        fputs(_digit.c_str(), pFile);
        fputs(_analog.c_str(), pFile);
        fputs("\n", pFile);

--- a/code/components/jomjol_logfile/ClassLogFile.h
+++ b/code/components/jomjol_logfile/ClassLogFile.h
@@ -39,8 +39,8 @@ public:
    void RemoveOldLogFile();
    void RemoveOldDataLog();

-//    void WriteToData(std::string _ReturnRawValue, std::string _ReturnValue, std::string _ReturnPreValue, std::string _ErrorMessageText, std::string _digital, std::string _analog);
-    void WriteToData(std::string _timestamp, std::string _name, std::string  _ReturnRawValue, std::string  _ReturnValue, std::string  _ReturnPreValue, std::string  _ReturnRateValue, std::string  _ReturnChangeAbsolute, std::string  _ErrorMessageText, std::string  _digital, std::string  _analog);
+//    void WriteToData(std::string _ReturnRawValue, std::string _ReturnValue, std::string _ReturnPreValue, std::string _ErrorMessageText, std::string _digit, std::string _analog);
+    void WriteToData(std::string _timestamp, std::string _name, std::string  _ReturnRawValue, std::string  _ReturnValue, std::string  _ReturnPreValue, std::string  _ReturnRateValue, std::string  _ReturnChangeAbsolute, std::string  _ErrorMessageText, std::string  _digit, std::string  _analog);


    std::string GetCurrentFileName();
--- a/code/components/jomjol_mqtt/server_mqtt.cpp
+++ b/code/components/jomjol_mqtt/server_mqtt.cpp
@@ -49,6 +49,15 @@ void mqttServer_setMeterType(std::string _meterType, std::string _valueUnit, std
    rateUnit = _rateUnit;
 }

+/**
+ * Takes any multi-level MQTT-topic and returns the last topic level as nodeId
+ * see https://www.hivemq.com/blog/mqtt-essentials-part-5-mqtt-topics-best-practices/ for details about MQTT topics
+*/
+std::string createNodeId(std::string &topic) {
+    auto splitPos = topic.find_last_of('/');
+    return (splitPos == std::string::npos) ? topic : topic.substr(splitPos + 1);
+}
+
 bool sendHomeAssistantDiscoveryTopic(std::string group, std::string field,
    std::string name, std::string icon, std::string unit, std::string deviceClass, std::string stateClass, std::string entityCategory,
    int qos) {
@@ -69,11 +78,18 @@ bool sendHomeAssistantDiscoveryTopic(std::string group, std::string field,
        name = group + " " + name;
    }    

+    /** 
+     * homeassistant needs the MQTT discovery topic according to the following structure:
+     *      <discovery_prefix>/<component>/[<node_id>/]<object_id>/config
+     * if the main topic is embedded in a nested structure, we just use the last part as node_id 
+     * This means a maintopic "home/test/watermeter" is transformed to the discovery topic "homeassistant/sensor/watermeter/..."
+    */
+    std::string node_id = createNodeId(maintopic);
    if (field == "problem") { // Special binary sensor which is based on error topic
-        topicFull = "homeassistant/binary_sensor/" + maintopic + "/" + configTopic + "/config";
+        topicFull = "homeassistant/binary_sensor/" + node_id + "/" + configTopic + "/config";
    }
    else {
-        topicFull = "homeassistant/sensor/" + maintopic + "/" + configTopic + "/config";
+        topicFull = "homeassistant/sensor/" + node_id + "/" + configTopic + "/config";
    }

    /* See https://www.home-assistant.io/docs/mqtt/discovery/ */
@@ -172,10 +188,10 @@ bool MQTThomeassistantDiscovery(int qos) {
        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "value",                      "Value",                            "gauge",                 valueUnit,             meterType,      "total_increasing", "", qos);
        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "raw",                        "Raw Value",                        "raw",                   "",                    "",             "",                 "diagnostic", qos);
        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "error",                      "Error",                            "alert-circle-outline",  "",                    "",             "",                 "diagnostic", qos);
-        /* Not announcing "rate" as it is better to use rate_per_time_unit resp. rate_per_digitalization_round */
+        /* Not announcing "rate" as it is better to use rate_per_time_unit resp. rate_per_digitization_round */
        // allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "rate",               "Rate (Unit/Minute)",               "swap-vertical",         "",        "",            "",                 ""); // Legacy, always Unit per Minute
        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "rate_per_time_unit",         "Rate (" + rateUnit + ")",          "swap-vertical",         rateUnit,              "",             "measurement",      "", qos);
-        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "rate_per_digitalization_round",  "Change since last digitalization round",  "arrow-expand-vertical", valueUnit,  "",             "measurement",      "", qos); // correctly the Unit is Unit/Interval!
+        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "rate_per_digitization_round",  "Change since last Digitization round",  "arrow-expand-vertical", valueUnit,  "",             "measurement",      "", qos); // correctly the Unit is Unit/Interval!
        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "timestamp",                  "Timestamp",                     "clock-time-eight-outline", "",                    "timestamp",    "",                 "diagnostic", qos);
        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "json",                       "JSON",                             "code-json",             "",                    "",             "",                 "diagnostic", qos);
        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "problem",                    "Problem",                          "alert-outline",         "",                    "problem",      "",                 "", qos); // Special binary sensor which is based on error topic
--- a/code/components/jomjol_mqtt/server_mqtt.h
+++ b/code/components/jomjol_mqtt/server_mqtt.h
@@ -22,6 +22,7 @@ std::string getTimeUnit(void);
 void GotConnected(std::string maintopic, bool SetRetainFlag);
 esp_err_t sendDiscovery_and_static_Topics(void);

+std::string createNodeId(std::string &topic);

 #endif //SERVERMQTT_H
 #endif //ENABLE_MQTT
--- a/code/components/jomjol_tfliteclass/CTfLiteClass.cpp
+++ b/code/components/jomjol_tfliteclass/CTfLiteClass.cpp
@@ -206,6 +206,7 @@ bool CTfLiteClass::MakeAllocate()

    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CTfLiteClass::MakeAllocate");
    this->interpreter = new tflite::MicroInterpreter(this->model, resolver, this->tensor_arena, this->kTensorArenaSize);
+    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Trying to load the model. If it crashes here, it ist most likely due to a corrupted model!");

    if (this->interpreter) 
    {
@@ -333,17 +334,3 @@ 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
- 
--- a/code/components/jomjol_webhook/CMakeLists.txt
+++ b/code/components/jomjol_webhook/CMakeLists.txt
@@ -0,0 +1,7 @@
+FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*)
+
+idf_component_register(SRCS ${app_sources}
+                    INCLUDE_DIRS "."
+                    REQUIRES esp_http_client jomjol_logfile jomjol_flowcontroll json)
+
+
--- a/code/components/jomjol_webhook/interface_webhook.cpp
+++ b/code/components/jomjol_webhook/interface_webhook.cpp
@@ -0,0 +1,170 @@
+#ifdef ENABLE_WEBHOOK
+#include "interface_webhook.h"
+
+#include "esp_log.h"
+#include <time.h>
+#include "ClassLogFile.h"
+#include "esp_http_client.h"
+#include "time_sntp.h"
+#include "../../include/defines.h"
+#include <cJSON.h>
+#include <ClassFlowDefineTypes.h>
+
+
+static const char *TAG = "WEBHOOK";
+
+std::string _webhookURI;
+std::string _webhookApiKey;
+long _lastTimestamp;
+
+static esp_err_t http_event_handler(esp_http_client_event_t *evt);
+
+void WebhookInit(std::string _uri, std::string _apiKey)
+{
+    _webhookURI = _uri;
+    _webhookApiKey = _apiKey;
+    _lastTimestamp = 0L;
+}
+
+bool WebhookPublish(std::vector<NumberPost*>* numbers)
+{
+    bool numbersWithError = false;
+    cJSON *jsonArray = cJSON_CreateArray();
+
+    for (int i = 0; i < (*numbers).size(); ++i)
+    {
+        string timezw = "";
+        char buffer[80];
+        time_t &lastPreValue = (*numbers)[i]->timeStampLastPreValue;
+        struct tm* timeinfo = localtime(&lastPreValue);
+        _lastTimestamp = static_cast<long>(lastPreValue);
+        strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
+        timezw = std::string(buffer);
+
+        cJSON *json = cJSON_CreateObject();
+        cJSON_AddStringToObject(json, "timestamp", timezw.c_str());
+        cJSON_AddStringToObject(json, "timestampLong", std::to_string(_lastTimestamp).c_str());
+        cJSON_AddStringToObject(json, "name", (*numbers)[i]->name.c_str());
+        cJSON_AddStringToObject(json, "rawValue", (*numbers)[i]->ReturnRawValue.c_str());
+        cJSON_AddStringToObject(json, "value", (*numbers)[i]->ReturnValue.c_str());
+        cJSON_AddStringToObject(json, "preValue", (*numbers)[i]->ReturnPreValue.c_str());
+        cJSON_AddStringToObject(json, "rate", (*numbers)[i]->ReturnRateValue.c_str());
+        cJSON_AddStringToObject(json, "changeAbsolute", (*numbers)[i]->ReturnChangeAbsolute.c_str());
+        cJSON_AddStringToObject(json, "error", (*numbers)[i]->ErrorMessageText.c_str());
+        
+        cJSON_AddItemToArray(jsonArray, json);
+
+        if ((*numbers)[i]->ErrorMessage) {
+            numbersWithError = true;
+        }
+    }
+
+    char *jsonString = cJSON_PrintUnformatted(jsonArray);
+
+    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "sending webhook");
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "sending JSON: " + std::string(jsonString));
+
+    char response_buffer[MAX_HTTP_OUTPUT_BUFFER] = {0};
+    esp_http_client_config_t http_config = {
+        .url = _webhookURI.c_str(),
+        .user_agent = "ESP32 Meter reader",
+        .method = HTTP_METHOD_POST,
+        .event_handler = http_event_handler,
+        .buffer_size = MAX_HTTP_OUTPUT_BUFFER,
+        .user_data = response_buffer
+    };
+
+    esp_http_client_handle_t http_client = esp_http_client_init(&http_config);
+
+    esp_http_client_set_header(http_client, "Content-Type", "application/json");
+    esp_http_client_set_header(http_client, "APIKEY", _webhookApiKey.c_str());
+
+    ESP_ERROR_CHECK(esp_http_client_set_post_field(http_client, jsonString, strlen(jsonString)));
+
+    esp_err_t err = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_http_client_perform(http_client));
+
+    if(err == ESP_OK) {
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP request was performed");
+        int status_code = esp_http_client_get_status_code(http_client);
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP status code: " + std::to_string(status_code));
+    } else {
+        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "HTTP request failed");
+    } 
+
+    esp_http_client_cleanup(http_client);
+    cJSON_Delete(jsonArray);
+    free(jsonString);
+    return numbersWithError;    
+}
+
+void WebhookUploadPic(ImageData *Img) {
+    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Starting WebhookUploadPic");
+
+    std::string fullURI = _webhookURI + "?timestamp=" + std::to_string(_lastTimestamp);
+    char response_buffer[MAX_HTTP_OUTPUT_BUFFER] = {0};
+    esp_http_client_config_t http_config = {
+        .url = fullURI.c_str(),
+        .user_agent = "ESP32 Meter reader",
+        .method = HTTP_METHOD_PUT,
+        .event_handler = http_event_handler,
+        .buffer_size = MAX_HTTP_OUTPUT_BUFFER,
+        .user_data = response_buffer
+    };
+
+    esp_http_client_handle_t http_client = esp_http_client_init(&http_config);
+
+    esp_http_client_set_header(http_client, "Content-Type", "image/jpeg");
+    esp_http_client_set_header(http_client, "APIKEY", _webhookApiKey.c_str());
+
+    esp_err_t err = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_http_client_set_post_field(http_client, (const char *)Img->data, Img->size));
+
+    err = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_http_client_perform(http_client));
+
+    if (err == ESP_OK) {
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP PUT request was performed successfully");
+        int status_code = esp_http_client_get_status_code(http_client);
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP status code: " + std::to_string(status_code));
+    } else {
+        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "HTTP PUT request failed");
+    }
+
+    esp_http_client_cleanup(http_client);
+
+    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "WebhookUploadPic finished");
+}
+
+
+static esp_err_t http_event_handler(esp_http_client_event_t *evt)
+{
+    switch(evt->event_id)
+    {
+        case HTTP_EVENT_ERROR:
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client Error encountered");
+            break;
+        case HTTP_EVENT_ON_CONNECTED:
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client connected");
+            ESP_LOGI(TAG, "HTTP Client Connected");
+            break;
+        case HTTP_EVENT_HEADERS_SENT:
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client sent all request headers");
+            break;
+        case HTTP_EVENT_ON_HEADER:
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Header: key=" + std::string(evt->header_key) + ", value="  + std::string(evt->header_value));
+            break;
+        case HTTP_EVENT_ON_DATA:
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client data recevied: len=" + std::to_string(evt->data_len));
+            break;
+        case HTTP_EVENT_ON_FINISH:
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client finished");
+            break;
+         case HTTP_EVENT_DISCONNECTED:
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Client Disconnected");
+            break;
+        case HTTP_EVENT_REDIRECT:
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "HTTP Redirect");
+            break;
+    }
+    return ESP_OK;
+}
+
+#endif //ENABLE_WEBHOOK
--- a/code/components/jomjol_webhook/interface_webhook.h
+++ b/code/components/jomjol_webhook/interface_webhook.h
@@ -0,0 +1,17 @@
+#ifdef ENABLE_WEBHOOK
+
+#pragma once
+#ifndef INTERFACE_WEBHOOK_H
+#define INTERFACE_WEBHOOK_H
+
+#include <string>
+#include <map>
+#include <functional>
+#include <ClassFlowDefineTypes.h>
+
+void WebhookInit(std::string _webhookURI, std::string _apiKey);
+bool WebhookPublish(std::vector<NumberPost*>* numbers);
+void WebhookUploadPic(ImageData *Img);
+
+#endif //INTERFACE_WEBHOOK_H
+#endif //ENABLE_WEBHOOK
--- a/code/components/jomjol_wlan/connect_wlan.cpp
+++ b/code/components/jomjol_wlan/connect_wlan.cpp
@@ -480,7 +480,8 @@ static void event_handler(void* arg, esp_event_base_t event_base, int32_t event_
 		if (WIFIReconnectCnt >= 10) {
 			WIFIReconnectCnt = 0;
 			LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Disconnected, multiple reconnect attempts failed (" + 
-													 std::to_string(disconn->reason) + "), still retrying...");
+													 std::to_string(disconn->reason) + "), retrying after 5s");
+			vTaskDelay(5000 / portTICK_PERIOD_MS); // Delay between the reconnections
 		}
 	}	
 	else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_CONNECTED) 
--- a/code/components/openmetrics/CMakeLists.txt
+++ b/code/components/openmetrics/CMakeLists.txt
@@ -0,0 +1,7 @@
+FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*)
+
+idf_component_register(SRCS ${app_sources}
+                    INCLUDE_DIRS "."
+                    REQUIRES jomjol_image_proc)
+
+
--- a/code/components/openmetrics/openmetrics.cpp
+++ b/code/components/openmetrics/openmetrics.cpp
@@ -0,0 +1,43 @@
+#include "openmetrics.h"
+
+/**
+ * create a singe metric from the given input
+ **/
+std::string createMetric(const std::string &metricName, const std::string &help, const std::string &type, const std::string &value)
+{
+    return "# HELP " + metricName + " " + help + "\n" +
+           "# TYPE " + metricName + " " + type + "\n" +
+           metricName + " " + value + "\n";
+}
+
+/**
+ * Generate the MetricFamily from all available sequences
+ * @returns the string containing the text wire format of the MetricFamily
+ **/
+std::string createSequenceMetrics(std::string prefix, const std::vector<NumberPost *> &numbers)
+{
+    std::string res;
+
+    for (const auto &number : numbers)
+    {
+        // only valid data is reported (https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#missing-data)
+        if (number->ReturnValue.length() > 0)
+        {
+            auto label = number->name;
+
+            // except newline, double quote, and backslash (https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#abnf)
+            // to keep it simple, these characters are just removed from the label
+            replaceAll(label, "\\", "");
+            replaceAll(label, "\"", "");
+            replaceAll(label, "\n", "");
+            res += prefix + "_flow_value{sequence=\"" + label + "\"} " + number->ReturnValue + "\n";
+        }
+    }
+
+    // prepend metadata if a valid metric was created
+    if (res.length() > 0)
+    {
+        res = "# HELP " + prefix + "_flow_value current value of meter readout\n# TYPE " + prefix + "_flow_value gauge\n" + res;
+    }
+    return res;
+}
--- a/code/components/openmetrics/openmetrics.h
+++ b/code/components/openmetrics/openmetrics.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#ifndef OPENMETRICS_H
+#define OPENMETRICS_H
+
+#include <string>
+#include <fstream>
+#include <vector>
+
+#include "ClassFlowDefineTypes.h"
+
+std::string createMetric(const std::string &metricName, const std::string &help, const std::string &type, const std::string &value);
+std::string createSequenceMetrics(std::string prefix, const std::vector<NumberPost *> &numbers);
+
+#endif // OPENMETRICS_H
--- a/code/dependencies.lock
+++ b/code/dependencies.lock
@@ -1,16 +1,16 @@
-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
+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.3.0
+manifest_hash: 6995555b9b41e897235448c868ca92c0c3401fd2ff90df084be9bb8629958f2c
+target: esp32
+version: 1.0.0
--- a/code/include/defines.h
+++ b/code/include/defines.h
@@ -58,22 +58,11 @@
    //#define CONFIG_IDF_TARGET_ARCH_XTENSA     //not needed with platformio/espressif32 @ 5.2.0


-    //Statusled + ClassControllCamera
-    #define BLINK_GPIO GPIO_NUM_33              // PIN for red board LED
-
-
    //ClassControllCamera
-    #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
-    #define CAMERA_MODEL_AI_THINKER
-    #define BOARD_ESP32CAM_AITHINKER
-
-
    //server_GPIO
    #define __LEDGLOBAL

@@ -105,7 +94,7 @@
    #define LOGFILE_LAST_PART_BYTES 80 * 1024 // 80 kBytes  // Size of partial log file to return 

    #define SERVER_FILER_SCRATCH_BUFSIZE  4096 
-    #define SERVER_HELPER_SCRATCH_BUFSIZE  8192
+    #define SERVER_HELPER_SCRATCH_BUFSIZE  4096
    #define SERVER_OTA_SCRATCH_BUFSIZE  1024 


@@ -187,15 +176,13 @@

    //ClassFlowCNNGeneral
    #define Analog_error 3
+
    #define AnalogToDigtalFehler 0.8
-    #define Digital_Uncertainty 0.2
-    #define DigitalBand 3
-    #define Digital_Transition_Range_Predecessor 2
-    #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
-
-
-
+    #define Digit_Uncertainty 0.2
+    #define DigitBand 3
+    #define Digit_Transition_Range_Predecessor 2
+    #define Digit_Transition_Area_Predecessor 0.7 // 9.3 - 0.7
+    #define Digit_Transition_Area_Forward 9.7 // Pre-run zero crossing only happens from approx. 9.7 onwards

    //#define DEBUG_DETAIL_ON 

@@ -210,117 +197,124 @@
 ////      Conditionnal definitions       ////
 /////////////////////////////////////////////

-//******* camera model 
-#if defined(CAMERA_MODEL_WROVER_KIT)
-    #define PWDN_GPIO_NUM    -1
-    #define RESET_GPIO_NUM   -1
-    #define XCLK_GPIO_NUM    21
-    #define SIOD_GPIO_NUM    26
-    #define SIOC_GPIO_NUM    27
-
-    #define Y9_GPIO_NUM      35
-    #define Y8_GPIO_NUM      34
-    #define Y7_GPIO_NUM      39
-    #define Y6_GPIO_NUM      36
-    #define Y5_GPIO_NUM      19
-    #define Y4_GPIO_NUM      18
-    #define Y3_GPIO_NUM       5
-    #define Y2_GPIO_NUM       4
-    #define VSYNC_GPIO_NUM   25
-    #define HREF_GPIO_NUM    23
-    #define PCLK_GPIO_NUM    22
-
-#elif defined(CAMERA_MODEL_M5STACK_PSRAM)
-    #define PWDN_GPIO_NUM     -1
-    #define RESET_GPIO_NUM    15
-    #define XCLK_GPIO_NUM     27
-    #define SIOD_GPIO_NUM     25
-    #define SIOC_GPIO_NUM     23
-
-    #define Y9_GPIO_NUM       19
-    #define Y8_GPIO_NUM       36
-    #define Y7_GPIO_NUM       18
-    #define Y6_GPIO_NUM       39
-    #define Y5_GPIO_NUM        5
-    #define Y4_GPIO_NUM       34
-    #define Y3_GPIO_NUM       35
-    #define Y2_GPIO_NUM       32
-    #define VSYNC_GPIO_NUM    22
-    #define HREF_GPIO_NUM     26
-    #define PCLK_GPIO_NUM     21
-
-#elif defined(CAMERA_MODEL_AI_THINKER)
-    #define PWDN_GPIO_NUM     GPIO_NUM_32
-    #define RESET_GPIO_NUM    -1
-    #define XCLK_GPIO_NUM      GPIO_NUM_0
-    #define SIOD_GPIO_NUM     GPIO_NUM_26
-    #define SIOC_GPIO_NUM     GPIO_NUM_27
-
-    #define Y9_GPIO_NUM       GPIO_NUM_35
-    #define Y8_GPIO_NUM       GPIO_NUM_34
-    #define Y7_GPIO_NUM       GPIO_NUM_39
-    #define Y6_GPIO_NUM       GPIO_NUM_36
-    #define Y5_GPIO_NUM       GPIO_NUM_21
-    #define Y4_GPIO_NUM       GPIO_NUM_19
-    #define Y3_GPIO_NUM       GPIO_NUM_18
-    #define Y2_GPIO_NUM        GPIO_NUM_5
-    #define VSYNC_GPIO_NUM    GPIO_NUM_25
-    #define HREF_GPIO_NUM     GPIO_NUM_23
-    #define PCLK_GPIO_NUM     GPIO_NUM_22
-
-#else
-    #error "Camera model not selected"
-#endif  //camera model

 // ******* Board type   
-#ifdef BOARD_WROVER_KIT // WROVER-KIT PIN Map
+#if defined(BOARD_WROVER_KIT) // WROVER-KIT PIN Map
+	// SD card (operated with SDMMC peripheral)
+	//-------------------------------------------------
+	#define GPIO_SDCARD_CLK GPIO_NUM_14
+	#define GPIO_SDCARD_CMD GPIO_NUM_15
+	#define GPIO_SDCARD_D0  GPIO_NUM_2
+	#ifndef __SD_USE_ONE_LINE_MODE__
+		#define GPIO_SDCARD_D1 GPIO_NUM_4
+		#define GPIO_SDCARD_D2 GPIO_NUM_12
+		#define GPIO_SDCARD_D3 GPIO_NUM_13
+	#else
+		#define GPIO_SDCARD_D1 GPIO_NUM_NC
+		#define GPIO_SDCARD_D2 GPIO_NUM_NC
+		#define GPIO_SDCARD_D3 GPIO_NUM_13
+	#endif

-    #define CAM_PIN_PWDN -1  //power down is not used
-    #define CAM_PIN_RESET -1 //software reset will be performed
-    #define CAM_PIN_XCLK 21
-    #define CAM_PIN_SIOD 26
-    #define CAM_PIN_SIOC 27
+    #define CAM_PIN_PWDN     GPIO_NUM_NC  //power down is not used
+    #define CAM_PIN_RESET    GPIO_NUM_NC  //software reset will be performed
+    #define CAM_PIN_XCLK     GPIO_NUM_21
+    #define CAM_PIN_SIOD     GPIO_NUM_26
+    #define CAM_PIN_SIOC     GPIO_NUM_27

-    #define CAM_PIN_D7 35
-    #define CAM_PIN_D6 34
-    #define CAM_PIN_D5 39
-    #define CAM_PIN_D4 36
-    #define CAM_PIN_D3 19
-    #define CAM_PIN_D2 18
-    #define CAM_PIN_D1 5
-    #define CAM_PIN_D0 4
-    #define CAM_PIN_VSYNC 25
-    #define CAM_PIN_HREF 23
-    #define CAM_PIN_PCLK 22
+    #define CAM_PIN_D7       GPIO_NUM_35
+    #define CAM_PIN_D6       GPIO_NUM_34
+    #define CAM_PIN_D5       GPIO_NUM_39
+    #define CAM_PIN_D4       GPIO_NUM_36
+    #define CAM_PIN_D3       GPIO_NUM_19
+    #define CAM_PIN_D2       GPIO_NUM_18
+    #define CAM_PIN_D1       GPIO_NUM_5
+    #define CAM_PIN_D0       GPIO_NUM_4
+    #define CAM_PIN_VSYNC    GPIO_NUM_25
+    #define CAM_PIN_HREF     GPIO_NUM_23
+    #define CAM_PIN_PCLK     GPIO_NUM_22

-#endif //// WROVER-KIT PIN Map
+    //Statusled + ClassControllCamera
+    #define BLINK_GPIO GPIO_NUM_33              // PIN for red board LED, On the board the LED is on the IO2, but it is used for the SD
+	
+    //ClassControllCamera
+    #define FLASH_GPIO GPIO_NUM_12              // 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

-    
-#ifdef BOARD_ESP32CAM_AITHINKER // ESP32Cam (AiThinker) PIN Map
+#elif defined(BOARD_M5STACK_PSRAM) // M5STACK PSRAM PIN Map
+    #define CAM_PIN_PWDN     GPIO_NUM_NC
+    #define CAM_PIN_RESET    GPIO_NUM_15
+    #define CAM_PIN_XCLK     GPIO_NUM_27
+    #define CAM_PIN_SIOD     GPIO_NUM_25
+    #define CAM_PIN_SIOC     GPIO_NUM_23

-    #define CAM_PIN_PWDN 32
-    #define CAM_PIN_RESET -1 //software reset will be performed
-    #define CAM_PIN_XCLK 0
-    #define CAM_PIN_SIOD 26
-    #define CAM_PIN_SIOC 27
+    #define CAM_PIN_D7       GPIO_NUM_19
+    #define CAM_PIN_D6       GPIO_NUM_36
+    #define CAM_PIN_D5       GPIO_NUM_18
+    #define CAM_PIN_D4       GPIO_NUM_39
+    #define CAM_PIN_D3       GPIO_NUM_5
+    #define CAM_PIN_D2       GPIO_NUM_34
+    #define CAM_PIN_D1       GPIO_NUM_35
+    #define CAM_PIN_D0       GPIO_NUM_32
+    #define CAM_PIN_VSYNC    GPIO_NUM_22
+    #define CAM_PIN_HREF     GPIO_NUM_26
+    #define CAM_PIN_PCLK     GPIO_NUM_21

-    #define CAM_PIN_D7 35
-    #define CAM_PIN_D6 34
-    #define CAM_PIN_D5 39
-    #define CAM_PIN_D4 36
-    #define CAM_PIN_D3 21
-    #define CAM_PIN_D2 19
-    #define CAM_PIN_D1 18
-    #define CAM_PIN_D0 5
-    #define CAM_PIN_VSYNC 25
-    #define CAM_PIN_HREF 23
-    #define CAM_PIN_PCLK 22
+    //Statusled + ClassControllCamera
+    #define BLINK_GPIO GPIO_NUM_33              // PIN for red board LED
+	
+    //ClassControllCamera
+    #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
+
+
+#elif defined(BOARD_ESP32CAM_AITHINKER) // ESP32Cam (AiThinker) PIN Map
+	// SD card (operated with SDMMC peripheral)
+	//-------------------------------------------------
+	#define GPIO_SDCARD_CLK GPIO_NUM_14
+	#define GPIO_SDCARD_CMD GPIO_NUM_15
+	#define GPIO_SDCARD_D0  GPIO_NUM_2
+	#ifndef __SD_USE_ONE_LINE_MODE__
+		#define GPIO_SDCARD_D1 GPIO_NUM_4
+		#define GPIO_SDCARD_D2 GPIO_NUM_12
+		#define GPIO_SDCARD_D3 GPIO_NUM_13
+	#else
+		#define GPIO_SDCARD_D1 GPIO_NUM_NC
+		#define GPIO_SDCARD_D2 GPIO_NUM_NC
+		#define GPIO_SDCARD_D3 GPIO_NUM_13
+	#endif
+
+    #define CAM_PIN_PWDN     GPIO_NUM_32
+    #define CAM_PIN_RESET    GPIO_NUM_NC  //software reset will be performed
+    #define CAM_PIN_XCLK     GPIO_NUM_0
+    #define CAM_PIN_SIOD     GPIO_NUM_26
+    #define CAM_PIN_SIOC     GPIO_NUM_27
+
+    #define CAM_PIN_D7       GPIO_NUM_35
+    #define CAM_PIN_D6       GPIO_NUM_34
+    #define CAM_PIN_D5       GPIO_NUM_39
+    #define CAM_PIN_D4       GPIO_NUM_36
+    #define CAM_PIN_D3       GPIO_NUM_21
+    #define CAM_PIN_D2       GPIO_NUM_19
+    #define CAM_PIN_D1       GPIO_NUM_18
+    #define CAM_PIN_D0       GPIO_NUM_5
+    #define CAM_PIN_VSYNC    GPIO_NUM_25
+    #define CAM_PIN_HREF     GPIO_NUM_23
+    #define CAM_PIN_PCLK     GPIO_NUM_22
+
+    //Statusled + ClassControllCamera
+    #define BLINK_GPIO GPIO_NUM_33              // PIN for red board LED
+	
+    //ClassControllCamera
+    #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
+
+#else
+    #error "Board not selected"
+#endif  //Board PIN Map

-#endif // ESP32Cam (AiThinker) PIN Map

 // ******* LED definition
 #ifdef USE_PWM_LEDFLASH
-
    //// PWM für Flash-LED
    #define LEDC_TIMER              LEDC_TIMER_1 // LEDC_TIMER_0
    #define LEDC_MODE               LEDC_LOW_SPEED_MODE
@@ -332,6 +326,7 @@

 #endif //USE_PWM_LEDFLASH

+
 //softAP
 #ifdef ENABLE_SOFTAP
    #define EXAMPLE_ESP_WIFI_SSID      "AI-on-the-Edge"
--- a/code/main/main.cpp
+++ b/code/main/main.cpp
@@ -11,10 +11,13 @@
 #include "esp_chip_info.h"

 // SD-Card ////////////////////
-#include "sdcard_init.h"
 #include "esp_vfs_fat.h"
 #include "ffconf.h"
 #include "driver/sdmmc_host.h"
+
+#if (ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(5, 1, 2))
+#include "sdcard_init.h"
+#endif
 ///////////////////////////////

 #include "ClassLogFile.h"
@@ -91,10 +94,10 @@ static const char *TAG = "MAIN";

 #define MOUNT_POINT "/sdcard"

-
 bool Init_NVS_SDCard()
 {
    esp_err_t ret = nvs_flash_init();
+	
    if (ret == ESP_ERR_NVS_NO_FREE_PAGES) {
        ESP_ERROR_CHECK(nvs_flash_erase());
        ret = nvs_flash_init();
@@ -108,12 +111,23 @@ bool Init_NVS_SDCard()
    // Modify slot_config.gpio_cd and slot_config.gpio_wp if your board has these signals.
    sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();

-   // Set bus width to use:
-   #ifdef __SD_USE_ONE_LINE_MODE__
-      slot_config.width = 1;
-   #else
-      slot_config.width = 4;
-   #endif
+    // Set bus width to use:
+#ifdef __SD_USE_ONE_LINE_MODE__
+    slot_config.width = 1;
+#ifdef SOC_SDMMC_USE_GPIO_MATRIX
+    slot_config.clk = GPIO_SDCARD_CLK;
+    slot_config.cmd = GPIO_SDCARD_CMD;
+    slot_config.d0 = GPIO_SDCARD_D0;
+#endif
+
+#else
+    slot_config.width = 4;
+#ifdef SOC_SDMMC_USE_GPIO_MATRIX
+    slot_config.d1 = GPIO_SDCARD_D1;
+    slot_config.d2 = GPIO_SDCARD_D2;
+    slot_config.d3 = GPIO_SDCARD_D3;
+#endif
+#endif

    // Enable internal pullups on enabled pins. The internal pullups
    // are insufficient however, please make sure 10k external pullups are
@@ -125,7 +139,7 @@ bool Init_NVS_SDCard()
    // dies führt jedoch bei schlechten Kopien des AI_THINKER Boards
    // zu Problemen mit der SD Initialisierung und eventuell sogar zur reboot-loops.
    // Um diese Probleme zu kompensieren, wird der PullUp manuel gesetzt.
-    gpio_set_pull_mode(GPIO_NUM_13, GPIO_PULLUP_ONLY); // HS2_D3	
+    gpio_set_pull_mode(GPIO_SDCARD_D3, GPIO_PULLUP_ONLY); // HS2_D3	

    // Options for mounting the filesystem.
    // If format_if_mount_failed is set to true, SD card will be partitioned and
@@ -144,7 +158,11 @@ bool Init_NVS_SDCard()
    // Note: esp_vfs_fat_sdmmc_mount is an all-in-one convenience function.
    // Please check its source code and implement error recovery when developing
    // production applications.
+#if (ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(5, 1, 2))
    ret = esp_vfs_fat_sdmmc_mount_mh(mount_point, &host, &slot_config, &mount_config, &card);
+#else
+    ret = esp_vfs_fat_sdmmc_mount(mount_point, &host, &slot_config, &mount_config, &card);
+#endif

    if (ret != ESP_OK) {
        if (ret == ESP_FAIL) {
@@ -167,7 +185,6 @@ bool Init_NVS_SDCard()
    return true;
 }

-
 extern "C" void app_main(void)
 {
    //#ifdef CONFIG_HEAP_TRACING_STANDALONE
@@ -191,7 +208,6 @@ extern "C" void app_main(void)
    // ********************************************
    ESP_LOGI(TAG, "\n\n\n\n================ Start app_main =================");
 
-
    // Init SD card
    // ********************************************
    if (!Init_NVS_SDCard())
@@ -212,7 +228,6 @@ extern "C" void app_main(void)
    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "==================== Start ======================");
    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=================================================");

-
    // Init external PSRAM
    // ********************************************
    esp_err_t PSRAMStatus = esp_psram_init();
@@ -261,7 +276,6 @@ extern "C" void app_main(void)
                    ESP_LOGD(TAG, "After camera initialization: sleep for: %ldms", (long) xDelay * CONFIG_FREERTOS_HZ/portTICK_PERIOD_MS);
                    vTaskDelay( xDelay );

-
                    // Check camera init
                    // ********************************************
                    if (camStatus != ESP_OK) { // Camera init failed, retry to init
@@ -310,7 +324,6 @@ extern "C" void app_main(void)
        }
    }

-
    // SD card: basic R/W check
    // ********************************************
    int iSDCardStatus = SDCardCheckRW();
@@ -335,12 +348,10 @@ extern "C" void app_main(void)
    // ********************************************
    setupTime();    // NTP time service: Status of time synchronization will be checked after every round (server_tflite.cpp)

-
    // Set CPU Frequency
    // ********************************************
    setCpuFrequency();

-
    // SD card: Create further mandatory directories (if not already existing)
    // Correct creation of these folders will be checked with function "SDCardCheckFolderFilePresence"
    // ********************************************
@@ -432,7 +443,6 @@ extern "C" void app_main(void)
    ESP_LOGD(TAG, "main: sleep for: %ldms", (long) xDelay * CONFIG_FREERTOS_HZ/portTICK_PERIOD_MS);
    vTaskDelay( xDelay );

-
    // manual reset the time
    // ********************************************
    if (!time_manual_reset_sync())
@@ -440,8 +450,6 @@ extern "C" void app_main(void)
        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Manual Time Sync failed during startup" );
    }

-
-
    // Set log level for wifi component to WARN level (default: INFO; only relevant for serial console)
    // ********************************************
    esp_log_level_set("wifi", ESP_LOG_WARN);
@@ -465,8 +473,6 @@ extern "C" void app_main(void)
        #endif
    #endif
   
-
-
    // Print Device info
    // ********************************************
    esp_chip_info_t chipInfo;
@@ -522,30 +528,44 @@ extern "C" void app_main(void)
    }
 }

-
 void migrateConfiguration(void) {
+    std::vector<string> splitted;
    bool migrated = false;

+    bool CamZoom_found = false;
+    int CamZoom_lines = 0;
+    bool CamZoom_value = false;
+    int CamZoomSize_lines = 0;
+    int CamZoomSize_value = 0;
+    int CamZoomOffsetX_lines = 0;
+    int CamZoomOffsetX_value = 0;
+    int CamZoomOffsetY_lines = 0;
+    int CamZoomOffsetY_value = 0;
+
    if (!FileExists(CONFIG_FILE)) {
        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Config file seems to be missing!");
-        return;	
+        return;
    }

    std::string section = "";
-	std::ifstream ifs(CONFIG_FILE);
-  	std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
-	
+    std::ifstream ifs(CONFIG_FILE);
+    std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
+
    /* Split config file it array of lines */
    std::vector<std::string> configLines = splitString(content);

    /* Process each line */
    for (int i = 0; i < configLines.size(); i++) {
-        //ESP_LOGI(TAG, "Line %d: %s", i, configLines[i].c_str());
+        // ESP_LOGI(TAG, "Line %d: %s", i, configLines[i].c_str());

-        if (configLines[i].find("[") != std::string::npos) { // Start of new section
+        if (configLines[i].find("[") != std::string::npos) {
+            // Start of new section
            section = configLines[i];
            replaceString(section, ";", "", false); // Remove possible semicolon (just for the string comparison)
-            //ESP_LOGI(TAG, "New section: %s", section.c_str());
+            // ESP_LOGI(TAG, "New section: %s", section.c_str());
+        }
+        else {
+            splitted = ZerlegeZeile(configLines[i]);
        }

        /* Migrate parameters as needed
@@ -563,115 +583,154 @@ void migrateConfiguration(void) {
        }

        if (section == "[MakeImage]" || section == "[TakeImage]") {
-            migrated = migrated | replaceString(configLines[i], "LogImageLocation", "RawImagesLocation");
-            migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "RawImagesRetention");
+            if ((isInString(configLines[i], "Brightness")) && (!isInString(configLines[i], "CamBrightness"))) {
+                migrated = migrated | replaceString(configLines[i], "Brightness", "CamBrightness");
+            }
+            else if ((isInString(configLines[i], "Contrast")) && (!isInString(configLines[i], "CamContrast"))) {
+                migrated = migrated | replaceString(configLines[i], "Contrast", "CamContrast");
+            }
+            else if ((isInString(configLines[i], "Saturation")) && (!isInString(configLines[i], "CamSaturation"))) {
+                migrated = migrated | replaceString(configLines[i], "Saturation", "CamSaturation");
+            }
+            else if ((isInString(configLines[i], "Sharpness")) && (!isInString(configLines[i], "CamSharpness")) && (!isInString(configLines[i], "CamAutoSharpness"))) {
+                migrated = migrated | replaceString(configLines[i], "Sharpness", "CamSharpness");
+            }
+            else if ((isInString(configLines[i], "Aec2")) && (!isInString(configLines[i], "CamAec")) && (!isInString(configLines[i], "CamAec2"))) {
+                migrated = migrated | replaceString(configLines[i], "Aec2", "CamAec2");
+            }
+            else if ((isInString(configLines[i], "Zoom")) && (!isInString(configLines[i], "CamZoom")) && (!isInString(configLines[i], "ZoomMode")) && (!isInString(configLines[i], "ZoomOffsetX")) && (!isInString(configLines[i], "ZoomOffsetY"))) {
+                CamZoom_lines = i;
+                CamZoom_value = alphanumericToBoolean(splitted[1]);
+                CamZoom_found = true;
+            }
+            else if ((isInString(configLines[i], "ZoomMode")) && (!isInString(configLines[i], "CamZoom"))) {
+                CamZoomSize_lines = i;
+                if (isStringNumeric(splitted[1])) {
+                    CamZoomSize_value = std::stof(splitted[1]);
+                }
+                CamZoom_found = true;
+            }
+            else if ((isInString(configLines[i], "ZoomOffsetX")) && (!isInString(configLines[i], "CamZoom")) && (!isInString(configLines[i], "ZoomOffsetY"))) {
+                CamZoomOffsetX_lines = i;
+                if (isStringNumeric(splitted[1])) {
+                    CamZoomOffsetX_value = std::stof(splitted[1]);
+                }
+                CamZoom_found = true;
+            }
+            else if ((isInString(configLines[i], "ZoomOffsetY")) && (!isInString(configLines[i], "CamZoom")) && (!isInString(configLines[i], "ZoomOffsetX"))) {
+                CamZoomOffsetY_lines = i;
+                if (isStringNumeric(splitted[1])) {
+                    CamZoomOffsetY_value = std::stof(splitted[1]);
+                }
+                CamZoom_found = true;
+            }
+            else {
+                migrated = migrated | replaceString(configLines[i], "LogImageLocation", "RawImagesLocation");
+                migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "RawImagesRetention");

-            migrated = migrated | replaceString(configLines[i], ";Demo = true", ";Demo = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";Demo", "Demo"); // Enable it
+                migrated = migrated | replaceString(configLines[i], ";Demo = true", ";Demo = false"); // Set it to its default value
+                migrated = migrated | replaceString(configLines[i], ";Demo", "Demo");                 // Enable it

-            migrated = migrated | replaceString(configLines[i], ";FixedExposure = true", ";FixedExposure = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";FixedExposure", "FixedExposure"); // Enable it
+                migrated = migrated | replaceString(configLines[i], "ImageQuality", "CamQuality");
+                migrated = migrated | replaceString(configLines[i], "AutoExposureLevel", "CamAeLevel");
+                migrated = migrated | replaceString(configLines[i], "FixedExposure", "CamAec");
+
+                migrated = migrated | replaceString(configLines[i], "ImageSize", ";UNUSED_PARAMETER"); // This parameter is no longer used
+                migrated = migrated | replaceString(configLines[i], "Grayscale", ";UNUSED_PARAMETER"); // This parameter is no longer used
+                migrated = migrated | replaceString(configLines[i], "Negative", ";UNUSED_PARAMETER");  // This parameter is no longer used
+            }
        }
-
-        if (section == "[Alignment]") {
-            migrated = migrated | replaceString(configLines[i], ";InitialMirror = true", ";InitialMirror = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";InitialMirror", "InitialMirror"); // Enable it
-
-            migrated = migrated | replaceString(configLines[i], ";FlipImageSize = true", ";FlipImageSize = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";FlipImageSize", "FlipImageSize"); // Enable it
+        else if (section == "[Alignment]") {
+            migrated = migrated | replaceString(configLines[i], "InitialMirror", ";UNUSED_PARAMETER");  // This parameter is no longer used
+            migrated = migrated | replaceString(configLines[i], ";InitialMirror", ";UNUSED_PARAMETER"); // This parameter is no longer used
+            migrated = migrated | replaceString(configLines[i], "FlipImageSize", ";UNUSED_PARAMETER");  // This parameter is no longer used
+            migrated = migrated | replaceString(configLines[i], ";FlipImageSize", ";UNUSED_PARAMETER"); // This parameter is no longer used
        }
-
-        if (section == "[Digits]") {
+        else if (section == "[Digits]") {
            migrated = migrated | replaceString(configLines[i], "LogImageLocation", "ROIImagesLocation");
            migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "ROIImagesRetention");
        }
-
-        if (section == "[Analog]") {
+        else if (section == "[Analog]") {
            migrated = migrated | replaceString(configLines[i], "LogImageLocation", "ROIImagesLocation");
            migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "ROIImagesRetention");
            migrated = migrated | replaceString(configLines[i], "ExtendedResolution", ";UNUSED_PARAMETER"); // This parameter is no longer used
        }
-
-        if (section == "[PostProcessing]") {
-            migrated = migrated | replaceString(configLines[i], ";PreValueUse = true", ";PreValueUse = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";PreValueUse", "PreValueUse"); // Enable it
-
+        else if (section == "[PostProcessing]") {
            /* AllowNegativeRates has a <NUMBER> as prefix! */
-            if (isInString(configLines[i], "AllowNegativeRates") && isInString(configLines[i], ";")) { // It is the parameter "AllowNegativeRates" and it is commented out
+            if (isInString(configLines[i], "AllowNegativeRates") && isInString(configLines[i], ";")) {                                                                         
+                // It is the parameter "AllowNegativeRates" and it is commented out
                migrated = migrated | replaceString(configLines[i], "true", "false"); // Set it to its default value
-                migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
+                migrated = migrated | replaceString(configLines[i], ";", "");         // Enable it
            }
-
            /* IgnoreLeadingNaN has a <NUMBER> as prefix! */
-            if (isInString(configLines[i], "IgnoreLeadingNaN") && isInString(configLines[i], ";")) { // It is the parameter "IgnoreLeadingNaN" and it is commented out
+            else if (isInString(configLines[i], "IgnoreLeadingNaN") && isInString(configLines[i], ";")) {                                                                         
+                // It is the parameter "IgnoreLeadingNaN" and it is commented out
                migrated = migrated | replaceString(configLines[i], "true", "false"); // Set it to its default value
-                migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
+                migrated = migrated | replaceString(configLines[i], ";", "");         // Enable it
            }
-
            /* ExtendedResolution has a <NUMBER> as prefix! */
-            if (isInString(configLines[i], "ExtendedResolution") && isInString(configLines[i], ";")) { // It is the parameter "ExtendedResolution" and it is commented out
+            else if (isInString(configLines[i], "ExtendedResolution") && isInString(configLines[i], ";")) {                                                                         
+                // It is the parameter "ExtendedResolution" and it is commented out
                migrated = migrated | replaceString(configLines[i], "true", "false"); // Set it to its default value
-                migrated = migrated | replaceString(configLines[i], ";", ""); // Enable it
+                migrated = migrated | replaceString(configLines[i], ";", "");         // Enable it
            }
+            else {
+                migrated = migrated | replaceString(configLines[i], ";PreValueUse = true", ";PreValueUse = false"); // Set it to its default value
+                migrated = migrated | replaceString(configLines[i], ";PreValueUse", "PreValueUse");                 // Enable it

-            migrated = migrated | replaceString(configLines[i], ";ErrorMessage = true", ";ErrorMessage = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";ErrorMessage", "ErrorMessage"); // Enable it
+                migrated = migrated | replaceString(configLines[i], ";ErrorMessage = true", ";ErrorMessage = false"); // Set it to its default value
+                migrated = migrated | replaceString(configLines[i], ";ErrorMessage", "ErrorMessage");                 // Enable it

-            migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency = true", ";CheckDigitIncreaseConsistency = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency", "CheckDigitIncreaseConsistency"); // Enable it
+                migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency = true", ";CheckDigitIncreaseConsistency = false"); // Set it to its default value
+                migrated = migrated | replaceString(configLines[i], ";CheckDigitIncreaseConsistency", "CheckDigitIncreaseConsistency");                 // Enable it
+            }
        }
-
-        if (section == "[MQTT]") {
-            migrated = migrated | replaceString(configLines[i], "SetRetainFlag", "RetainMessages"); // First rename it, enable it with its default value
+        else if (section == "[MQTT]") {
+            migrated = migrated | replaceString(configLines[i], "SetRetainFlag", "RetainMessages");                   // First rename it, enable it with its default value
            migrated = migrated | replaceString(configLines[i], ";RetainMessages = true", ";RetainMessages = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";RetainMessages", "RetainMessages"); // Enable it
+            migrated = migrated | replaceString(configLines[i], ";RetainMessages", "RetainMessages");                 // Enable it

            migrated = migrated | replaceString(configLines[i], ";HomeassistantDiscovery = true", ";HomeassistantDiscovery = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";HomeassistantDiscovery", "HomeassistantDiscovery"); // Enable it
+            migrated = migrated | replaceString(configLines[i], ";HomeassistantDiscovery", "HomeassistantDiscovery");                 // Enable it

-            if (configLines[i].rfind("Topic", 0) != std::string::npos)  // only if string starts with "Topic" (Was the naming in very old version)
-            {
+            // only if string starts with "Topic" (Was the naming in very old version)
+            if (configLines[i].rfind("Topic", 0) != std::string::npos) {
                migrated = migrated | replaceString(configLines[i], "Topic", "MainTopic");
            }
        }
-
-        if (section == "[InfluxDB]") {
+        else if (section == "[InfluxDB]") {
            /* Fieldname has a <NUMBER> as prefix! */
-            if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname"
+            if (isInString(configLines[i], "Fieldname")) {
+                // It is the parameter "Fieldname"
                migrated = migrated | replaceString(configLines[i], "Fieldname", "Field"); // Rename it to Field
            }
        }
-
-        if (section == "[InfluxDBv2]") {
+        else if (section == "[InfluxDBv2]") {
            /* Fieldname has a <NUMBER> as prefix! */
-            if (isInString(configLines[i], "Fieldname")) { // It is the parameter "Fieldname"
+            if (isInString(configLines[i], "Fieldname")) {
+                // It is the parameter "Fieldname"
                migrated = migrated | replaceString(configLines[i], "Fieldname", "Field"); // Rename it to Field
            }
            /* Database got renamed to Bucket! */
-            if (isInString(configLines[i], "Database")) { // It is the parameter "Database"
+            else if (isInString(configLines[i], "Database")) {
+                // It is the parameter "Database"
                migrated = migrated | replaceString(configLines[i], "Database", "Bucket"); // Rename it to Bucket
            }
        }
-
-        if (section == "[GPIO]") {
-
+        else if (section == "[GPIO]") {
        }
-
-        if (section == "[DataLogging]") {
+        else if (section == "[DataLogging]") {
            migrated = migrated | replaceString(configLines[i], "DataLogRetentionInDays", "DataFilesRetention");
            /* DataLogActive is true by default! */
            migrated = migrated | replaceString(configLines[i], ";DataLogActive = false", ";DataLogActive = true"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";DataLogActive", "DataLogActive"); // Enable it
+            migrated = migrated | replaceString(configLines[i], ";DataLogActive", "DataLogActive");                 // Enable it
        }
-
-        if (section == "[AutoTimer]") {
+        else if (section == "[AutoTimer]") {
            migrated = migrated | replaceString(configLines[i], "Intervall", "Interval");
            migrated = migrated | replaceString(configLines[i], ";AutoStart = true", ";AutoStart = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";AutoStart", "AutoStart"); // Enable it
-
+            migrated = migrated | replaceString(configLines[i], ";AutoStart", "AutoStart");                 // Enable it
        }
-
-        if (section == "[Debug]") {
+        else if (section == "[Debug]") {
            migrated = migrated | replaceString(configLines[i], "Logfile ", "LogLevel "); // Whitespace needed so it does not match `LogfileRetentionInDays`
            /* LogLevel (resp. LogFile) was originally a boolean, but we switched it to an int
             * For both cases (true/false), we set it to level 2 (WARNING) */
@@ -679,33 +738,107 @@ void migrateConfiguration(void) {
            migrated = migrated | replaceString(configLines[i], "LogLevel = false", "LogLevel = 2");
            migrated = migrated | replaceString(configLines[i], "LogfileRetentionInDays", "LogfilesRetention");
        }
-
-        if (section == "[System]") {
+        else if (section == "[System]") {
            migrated = migrated | replaceString(configLines[i], "RSSIThreashold", "RSSIThreshold");
            migrated = migrated | replaceString(configLines[i], "AutoAdjustSummertime", ";UNUSED_PARAMETER"); // This parameter is no longer used

            migrated = migrated | replaceString(configLines[i], ";SetupMode = true", ";SetupMode = false"); // Set it to its default value
-            migrated = migrated | replaceString(configLines[i], ";SetupMode", "SetupMode"); // Enable it
+            migrated = migrated | replaceString(configLines[i], ";SetupMode", "SetupMode");                 // Enable it
        }
    }

-    if (migrated) { // At least one replacement happened
-        if (! RenameFile(CONFIG_FILE, CONFIG_FILE_BACKUP)) {
+    if (CamZoom_found == true) {
+        if (CamZoomSize_value == 0) {
+            // mode0
+            // 1600 - 640 = 960 / 2 = max-Offset (+/-) 480
+            // 1200 - 480 = 720 / 2 = max-Offset (+/-) 360
+
+            if (CamZoomOffsetX_value > 960) {
+                CamZoomOffsetX_value = 960;
+            }
+            else {
+                CamZoomOffsetX_value = (floor((CamZoomOffsetX_value - 480) / 8) * 8);
+            }
+
+            if (CamZoomOffsetY_value > 720) {
+                CamZoomOffsetY_value = 720;
+            }
+            else {
+                CamZoomOffsetY_value = (floor((CamZoomOffsetY_value - 360) / 8) * 8);
+            }
+
+            CamZoomSize_value = 29;
+        }
+        else {
+            // mode1
+            // 800 - 640 = 160 / 2 = max-Offset (+/-) 80
+            // 600 - 480 = 120 / 2 = max-Offset (+/-) 60
+
+            if (CamZoomOffsetX_value > 160) {
+                CamZoomOffsetX_value = 160;
+            }
+            else {
+                CamZoomOffsetX_value = (floor(((CamZoomOffsetX_value - 80) * 2) / 8) * 8);
+            }
+
+            if (CamZoomOffsetY_value > 120) {
+                CamZoomOffsetY_value = 120;
+            }
+            else {
+                CamZoomOffsetY_value = (floor(((CamZoomOffsetY_value - 60) * 2) / 8) * 8);
+            }
+
+            CamZoomSize_value = 9;
+        }
+
+        if (CamZoom_lines > 0) {
+            if (CamZoom_value) {
+                configLines[CamZoom_lines] = ("CamZoom = true");
+            }
+            else {
+                configLines[CamZoom_lines] = ("CamZoom = false");
+            }
+            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'Zoom' to 'CamZoom'");
+            migrated = true;
+        }
+        if (CamZoomSize_lines > 0) {
+            configLines[CamZoomSize_lines] = ("CamZoomSize = " + std::to_string(CamZoomSize_value));
+            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'ZoomMode' to 'CamZoomSize'");
+            migrated = true;
+        }
+        if (CamZoomOffsetX_lines > 0) {
+            configLines[CamZoomOffsetX_lines] = ("CamZoomOffsetX = " + std::to_string(CamZoomOffsetX_value));
+            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'ZoomOffsetX' to 'CamZoomOffsetX'");
+            migrated = true;
+        }
+        if (CamZoomOffsetY_lines > 0) {
+            configLines[CamZoomOffsetY_lines] = ("CamZoomOffsetY = " + std::to_string(CamZoomOffsetY_value));
+            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Migrated Configfile line 'ZoomOffsetY' to 'CamZoomOffsetY'");
+            migrated = true;
+        }
+    }
+
+    if (migrated) {
+        // At least one replacement happened
+        if (!RenameFile(CONFIG_FILE, CONFIG_FILE_BACKUP)) {
            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to create backup of Config file!");
            return;
        }

-        FILE* pfile = fopen(CONFIG_FILE, "w");        
+        FILE *pfile = fopen(CONFIG_FILE, "w");
+
        for (int i = 0; i < configLines.size(); i++) {
-            fwrite(configLines[i].c_str() , configLines[i].length(), 1, pfile);
-            fwrite("\n" , 1, 1, pfile);
+            if (!isInString(configLines[i], ";UNUSED_PARAMETER")) {
+                fwrite(configLines[i].c_str(), configLines[i].length(), 1, pfile);
+                fwrite("\n", 1, 1, pfile);
+            }
        }
+
        fclose(pfile);
        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Config file migrated. Saved backup to " + string(CONFIG_FILE_BACKUP));
    }
 }

-
 std::vector<std::string> splitString(const std::string& str) {
    std::vector<std::string> tokens;
 
@@ -719,8 +852,6 @@ std::vector<std::string> splitString(const std::string& str) {
    return tokens;
 }

-
-
 /*bool replace_all(std::string& s, std::string const& toReplace, std::string const& replaceWith) {
    std::string buf;
    std::size_t pos = 0;
@@ -748,11 +879,10 @@ std::vector<std::string> splitString(const std::string& str) {
    return found;
 }*/

-
 bool setCpuFrequency(void) {
    ConfigFile configFile = ConfigFile(CONFIG_FILE); 
    string cpuFrequency = "160";
-    esp_pm_config_esp32_t  pm_config; 
+    esp_pm_config_t  pm_config; 

    if (!configFile.ConfigFileExists()){
        LogFile.WriteToFile(ESP_LOG_WARN, TAG, "No ConfigFile defined - exit setCpuFrequency()!");
@@ -764,7 +894,6 @@ bool setCpuFrequency(void) {
    bool disabledLine = false;
    bool eof = false;

-
    /* Load config from config file */
    while ((!configFile.GetNextParagraph(line, disabledLine, eof) || 
            (line.compare("[System]") != 0)) && !eof) {}
--- a/code/main/server_main.cpp
+++ b/code/main/server_main.cpp
@@ -357,7 +357,7 @@ esp_err_t img_tmp_virtual_handler(httpd_req_t *req)
    if (filetosend == "raw.jpg")
        return GetRawJPG(req); 

-    // Serve alg.jpg, alg_roi.jpg or digital and analog ROIs
+    // Serve alg.jpg, alg_roi.jpg or digit and analog ROIs
    if (ESP_OK == GetJPG(filetosend, req))
        return ESP_OK;

@@ -451,7 +451,7 @@ void register_server_main_uri(httpd_handle_t server, const char *base_path)
 httpd_handle_t start_webserver(void)
 {
    httpd_handle_t server = NULL;
-    httpd_config_t config = { };
+    httpd_config_t config = HTTPD_DEFAULT_CONFIG();

    config.task_priority = tskIDLE_PRIORITY+3; // previously -> 2022-12-11: tskIDLE_PRIORITY+1; 2021-09-24: tskIDLE_PRIORITY+5
    config.stack_size = 12288; // previously -> 2023-01-02: 32768
@@ -459,7 +459,7 @@ httpd_handle_t start_webserver(void)
    config.server_port = 80;
    config.ctrl_port = 32768;
    config.max_open_sockets = 5; //20210921 --> previously 7   
-    config.max_uri_handlers = 39; // previously 24, 20220511: 35, 20221220: 37, 2023-01-02:38             
+    config.max_uri_handlers = 40; // Make sure this fits all URI handlers. Memory usage in bytes: 6*max_uri_handlers
    config.max_resp_headers = 8;                        
    config.backlog_conn = 5;                        
    config.lru_purge_enable = true; // this cuts old connections if new ones are needed.               
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -19,7 +19,8 @@

 [common:esp32-idf]
    extends = common:idf
-    platform = platformio/espressif32 @ 6.5.0
+    ; PlatformIO releases, see https://github.com/platformio/platform-espressif32/releases
+    platform = platformio/espressif32 @ 6.9.0
    framework = espidf
    lib_deps = 
        ${common:idf.lib_deps}
@@ -29,7 +30,6 @@
        -DUSE_ESP32
        -DUSE_ESP32_FRAMEWORK_ESP_IDF

-
 [flags:runtime]
    build_flags = 
        -Wno-nonnull-compare
@@ -46,6 +46,7 @@
        ;-Wshadow-compatible-local
        -fno-exceptions

+
 ; The main env - default
 [env:esp32cam]
 extends = common:esp32-idf
@@ -56,13 +57,14 @@ build_flags =
    ${common:esp32-idf.build_flags}
 	${flags:runtime.build_flags}
    ; ### Sofware options : (can be set in defines.h)
+	-D BOARD_ESP32CAM_AITHINKER
 	-D ENABLE_MQTT 
-    -D ENABLE_INFLUXDB 
+    -D ENABLE_INFLUXDB
+    -D ENABLE_WEBHOOK
    -D ENABLE_SOFTAP 
 board_build.partitions = partitions.csv
 monitor_speed = 115200
-monitor_rts = 0
-monitor_dtr = 0
+

 ; full standalone dev mode
 ; As sample, the board is nod32s instead of esp32cam (do not change nothing in fact :)
@@ -77,8 +79,10 @@ build_flags =
    ${common:esp32-idf.build_flags}
 	${flags:clangtidy.build_flags}
    ; ### Sofware options : (can be set in defines.h)
+	-D BOARD_ESP32CAM_AITHINKER
 	-D ENABLE_MQTT 
-    -D ENABLE_INFLUXDB 
+    -D ENABLE_INFLUXDB
+    -D ENABLE_WEBHOOK
    ;-D ENABLE_SOFTAP 
    ; ### Debug options :
    ;-D DEBUG_DETAIL_ON
@@ -121,8 +125,6 @@ platform_packages =
    ;;;;espressif/toolchain-xtensa-esp32 @ 8.4.0+2021r2-patch5
 board_build.partitions = partitions.csv
 monitor_speed = 115200
-monitor_rts = 0
-monitor_dtr = 0


 ; Activate all debug mode
@@ -210,5 +212,6 @@ build_flags =
 	${flags:clangtidy.build_flags}
    ; ### Sofware options :
 	-D ENABLE_MQTT 
-    -D ENABLE_INFLUXDB 
+    -D ENABLE_INFLUXDB
+    -D ENABLE_WEBHOOK
    ;-D ENABLE_SOFTAP ; disabled
--- a/code/sdkconfig.defaults
+++ b/code/sdkconfig.defaults
@@ -135,7 +135,8 @@ CONFIG_OV7670_SUPPORT=n
 CONFIG_OV7725_SUPPORT=n
 CONFIG_NT99141_SUPPORT=n
 CONFIG_OV3660_SUPPORT=n
-CONFIG_OV5640_SUPPORT=n
+CONFIG_OV2640_SUPPORT=y
+CONFIG_OV5640_SUPPORT=y
 CONFIG_GC2145_SUPPORT=n
 CONFIG_GC032A_SUPPORT=n
 CONFIG_GC0308_SUPPORT=n
--- a/code/test/components/jomjol-flowcontroll/test_PointerEvalAnalogToDigitNew.cpp
+++ b/code/test/components/jomjol-flowcontroll/test_PointerEvalAnalogToDigitNew.cpp
@@ -20,7 +20,7 @@ class UnderTestCNNGeneral : public ClassFlowCNNGeneral {
 */
 void test_analogToDigit_Standard() {

-    UnderTestCNNGeneral* undertest = new UnderTestCNNGeneral(nullptr, Digital100);
+    UnderTestCNNGeneral* undertest = new UnderTestCNNGeneral(nullptr, Digit100);

    // 4.8 is a "hanging" 5, i.e. it has not jumped over to 5.0.
    // A "hanging digit" should still be rounded from Transition.
@@ -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, 8, 9.2));
+    TEST_ASSERT_EQUAL_INT(7,  undertest->PointerEvalAnalogToDigitNew( 6.8, 8.6, 6, 9.2));

    // https://github.com/jomjol/AI-on-the-edge-device/issues/1143#issuecomment-1274434805
    // Also hanging digit () with small pointer after 0 pass.
@@ -59,7 +59,7 @@ void test_analogToDigit_Standard() {
 }

 void test_analogToDigit_Transition() {
-    UnderTestCNNGeneral* undertest = new UnderTestCNNGeneral(nullptr, Digital100);
+    UnderTestCNNGeneral* undertest = new UnderTestCNNGeneral(nullptr, Digit100);
    
    // https://github.com/jomjol/AI-on-the-edge-device/issues/921#issuecomment-1222672175
    // Default: dig=3.9, ana=9.7 => erg=3
@@ -101,4 +101,4 @@ void test_analogToDigit_Transition() {
    // Special feature: Digit runs with analogue. Therefore 1.8 (vs. 7.8)
    TEST_ASSERT_EQUAL_INT(1,  undertest->PointerEvalAnalogToDigitNew( 1.8, 7.8, 7, 7.7));

-}
+}
--- a/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp
+++ b/code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp
@@ -16,7 +16,7 @@ class UnderTestCNN : public ClassFlowCNNGeneral {
 */
 void test_ZeigerEval() 
 {
-    UnderTestCNN undertest = UnderTestCNN(nullptr, Digital100);
+    UnderTestCNN undertest = UnderTestCNN(nullptr, Digit100);

    // the 5.2 is already above 5.0 and the previous digit too (3)
    printf("Test 5.2, 3\n");
@@ -29,11 +29,11 @@ void test_ZeigerEval()
    TEST_ASSERT_EQUAL(4, undertest.PointerEvalAnalogNew(5.2, 9));

    printf("Test 4.4, 9\n");
-    // the 4.4 (digital100) is not above 5  and the previous digit (analog) too (9.3)
+    // the 4.4 (Digit100) is not above 5  and the previous digit (analog) too (9.3)
    TEST_ASSERT_EQUAL(4, undertest.PointerEvalAnalogNew(4.4, 9));

    printf("Test 4.5, 0\n");
-    // the 4.5 (digital100) is not above 5  and the previous digit (analog) too (9.6)
+    // the 4.5 (Digit100) is not above 5  and the previous digit (analog) too (9.6)
    TEST_ASSERT_EQUAL(4, undertest.PointerEvalAnalogNew(4.5, 0));    

 }
@@ -42,7 +42,7 @@ void test_ZeigerEval()
 * @brief test if all combinations of digit 
 * evaluation are running correctly
 * 
- * Desciption on call undertest.PointerEvalHybridNew(float number, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors, float digitalAnalogTransitionStart)
+ * Desciption on call undertest.PointerEvalHybridNew(float number, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors, float digitAnalogTransitionStart)
 * @param number: is the current ROI as float value from recognition
 * @param number_of_predecessors: is the last (lower) ROI as float from recognition
 * @param eval_predecessors: is the evaluated number. Sometimes a much lower value can change higer values
@@ -50,16 +50,16 @@ void test_ZeigerEval()
 *                          0.1 => 0 (eval_predecessors)
 *                          The 0 makes a 9.9 to 0 (eval_predecessors)
 *                          The 0 makes a 9.8 to 0 
- * @param Analog_Predecessors false/true if the last ROI is an analog or digital ROI (default=false)
+ * @param Analog_Predecessors false/true if the last ROI is an analog or digit ROI (default=false)
 *                              runs in special handling because analog is much less precise
- * @param digitalAnalogTransitionStart start of the transitionlogic begins on number_of_predecessor (default=9.2)
+ * @param digitAnalogTransitionStart start of the transitionlogic begins on number_of_predecessor (default=9.2)
 *
 * 
 * 
 * 
 */
 void test_ZeigerEvalHybrid() {
-    UnderTestCNN undertest = UnderTestCNN(nullptr, Digital100);
+    UnderTestCNN undertest = UnderTestCNN(nullptr, Digit100);

    // the 5.2 and no previous should round down
    printf("PointerEvalHybridNew(5.2, 0, -1)\n");
@@ -93,29 +93,25 @@ void test_ZeigerEvalHybrid() {
    // the 5.7 with previous and the previous >=9.5 should trunc to 5
    TEST_ASSERT_EQUAL(5, undertest.PointerEvalHybridNew(5.7, 9.6, 9));

-    // the 4.5 (digital100) is not above 5  and the previous digit (analog) not over Zero (9.6)
+    // the 4.5 (Digit100) is not above 5  and the previous digit (analog) not over Zero (9.6)
    TEST_ASSERT_EQUAL(4, undertest.PointerEvalHybridNew(4.5, 9.6, 0));    

-    // the 4.5 (digital100) is not above 5  and the previous digit (analog) not over Zero (9.6)
+    // the 4.5 (Digit100) is not above 5  and the previous digit (analog) not over Zero (9.6)
    TEST_ASSERT_EQUAL(4, undertest.PointerEvalHybridNew(4.5, 9.6, 9));    
-    // the 4.5 (digital100) is not above 5  and the previous digit (analog) not over Zero (9.5)
+    // the 4.5 (Digit100) is not above 5  and the previous digit (analog) not over Zero (9.5)
    TEST_ASSERT_EQUAL(4, undertest.PointerEvalHybridNew(4.5, 9.5, 9));    

    // 59.96889 - Pre: 58.94888
    // 8.6 : 9.8 : 6.7
-    // the 4.4 (digital100) is not above 5  and the previous digit (analog) not over Zero (9.5)
+    // the 4.4 (Digit100) is not above 5  and the previous digit (analog) not over Zero (9.5)
    TEST_ASSERT_EQUAL(8, undertest.PointerEvalHybridNew(8.6, 9.8, 9));    

    // pre = 9.9 (0.0 raw)
    // zahl = 1.8
-    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)
+    TEST_ASSERT_EQUAL(2, undertest.PointerEvalHybridNew(1.8, 9.0, 9));    
+ 
+    // if a digit have an early transition and the pointer is < 9.0 
+    // prev (pointer) = 6.2, but on digit readout = 6.0 (prev is int parameter)
    // zahl = 4.6
    TEST_ASSERT_EQUAL(4, undertest.PointerEvalHybridNew(4.6, 6.0, 6));    
 
@@ -124,4 +120,5 @@ void test_ZeigerEvalHybrid() {
    //TEST_ASSERT_EQUAL(7, undertest.ZeigerEvalHybrid(6.7, -1.0, -1));    


-}
+}
+
--- a/code/test/components/jomjol-flowcontroll/test_flow_postrocess_helper.cpp
+++ b/code/test/components/jomjol-flowcontroll/test_flow_postrocess_helper.cpp
@@ -37,9 +37,9 @@ std::string process_doFlow(UnderTestPost* _underTestPost) {
 * @brief setup flow like it runs after recognition.
 * 
 * @param analog the analog recognitions as array begins with the highest ROI
- * @param digits the digital regocnitions as array begins with the highest ROI
- * @param digType type of the model defaults do Digital100
- * @param checkConsistency for Digital type only. Not relvant for newer models
+ * @param digits the digit regocnitions as array begins with the highest ROI
+ * @param digType type of the model defaults do Digit100
+ * @param checkConsistency for Digit type only. Not relvant for newer models
 * @param extendedResolution the lowest ROI will directly used (9.7 => 9.7) if false 9.7 => 9
 * @param decimal_shift the decimal point offset. -3 corresponds to x.yyy
 * @return std::string the value result
@@ -162,7 +162,7 @@ void setAnalogdigitTransistionStart(UnderTestPost* _underTestPost, float _analog
        std::vector<NumberPost*>* NUMBERS = _underTestPost->GetNumbers();    
        for (int _n = 0; _n < (*NUMBERS).size(); ++_n) {
            ESP_LOGD(TAG, "Setting decimal shift on number: %d to %f", _n, _analogdigitTransistionStart);
-            (*NUMBERS)[_n]->AnalogDigitalTransitionStart = _analogdigitTransistionStart; 
+            (*NUMBERS)[_n]->AnalogToDigitTransitionStart = _analogdigitTransistionStart; 
        }       
    }
 }
--- a/code/test/components/jomjol-flowcontroll/test_flow_postrocess_helper.h
+++ b/code/test/components/jomjol-flowcontroll/test_flow_postrocess_helper.h
@@ -33,13 +33,13 @@ UnderTestPost* setUpClassFlowPostprocessing(t_CNNType digType, t_CNNType anaType
 * 
 * @param analog the analog recognitions
 * @param digits the digit recognitions
- * @param digType the digit model type (default Digital100)
+ * @param digType the digit model type (default Digit100)
 * @param checkConsistency sets property checkConsistency (default = false)
 * @param extendedResolution sets property extendedResolution (default = false)
 * @param decimal_shift set property decimal_shift (Nachkommastellen, default = 0)
 * @return UnderTestPost* the created testobject
 */
-UnderTestPost* init_do_flow(std::vector<float> analog, std::vector<float> digits, t_CNNType digType = Digital100, 
+UnderTestPost* init_do_flow(std::vector<float> analog, std::vector<float> digits, t_CNNType digType = Digit100, 
                bool checkConsistency=false,  bool extendedResolution=false, int decimal_shift=0);

 /**
@@ -47,13 +47,13 @@ UnderTestPost* init_do_flow(std::vector<float> analog, std::vector<float> digits
 * 
 * @param analog the analog recognitions
 * @param digits the digit recognitions
- * @param digType the digit model type (default Digital100)
+ * @param digType the digit model type (default Digit100)
 * @param checkConsistency sets property checkConsistency (default = false)
 * @param extendedResolution sets property extendedResolution (default = false)
 * @param decimal_shift set property decimal_shift (Nachkommastellen, default = 0)
 * @return std::string the return value of do_Flow is the Value as string
 */
-std::string process_doFlow(std::vector<float> analog, std::vector<float> digits, t_CNNType digType = Digital100, 
+std::string process_doFlow(std::vector<float> analog, std::vector<float> digits, t_CNNType digType = Digit100, 
                bool checkConsistency=false,  bool extendedResolution=false, int decimal_shift=0);

 /**
--- a/code/test/components/jomjol-flowcontroll/test_flow_pp_negative.cpp
+++ b/code/test/components/jomjol-flowcontroll/test_flow_pp_negative.cpp
@@ -20,7 +20,7 @@ void testNegative() {
        
        // extendResolution=false
        // da kein negativ, sollte kein Error auftreten
-        UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+        UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digit100, false, false, 0);
        setAllowNegatives(underTestPost, false);
        setPreValue(underTestPost, preValue);
        std::string result = process_doFlow(underTestPost);
@@ -31,7 +31,7 @@ void testNegative() {
        // extendResolution=true
        // da negativ im Rahmen (letzte Stelle -0.2 > ergebnis), kein Error
        // Aber der PreValue wird gesetzt
-        underTestPost = init_do_flow(analogs, digits, Digital100, false, true, 0);
+        underTestPost = init_do_flow(analogs, digits, Digit100, false, true, 0);
        setAllowNegatives(underTestPost, false);
        setPreValue(underTestPost, preValue_extended);
        result = process_doFlow(underTestPost);
@@ -42,7 +42,7 @@ void testNegative() {
        // extendResolution=true
        // Tolleranz überschritten, Error wird gesetzt, kein ReturnValue
        preValue_extended = 16.988; // zu groß
-        underTestPost = init_do_flow(analogs, digits, Digital100, false, true, 0);
+        underTestPost = init_do_flow(analogs, digits, Digit100, false, true, 0);
        setAllowNegatives(underTestPost, false);
        setPreValue(underTestPost, preValue_extended);
        result = process_doFlow(underTestPost);
@@ -53,7 +53,7 @@ void testNegative() {
        // extendResolution=false
        // value < (preValue -.01)
        preValue = 17.00; // zu groß
-        underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+        underTestPost = init_do_flow(analogs, digits, Digit100, false, false, 0);
        setAllowNegatives(underTestPost, false);
        setPreValue(underTestPost, preValue);
        result = process_doFlow(underTestPost);
@@ -65,7 +65,7 @@ void testNegative() {
        // value > (preValue -.01)
        // ist im Rahmen der Ungenauigkeit (-1 auf letzter Stelle)
        preValue = 16.99; // zu groß
-        underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+        underTestPost = init_do_flow(analogs, digits, Digit100, false, false, 0);
        setAllowNegatives(underTestPost, false);
        setPreValue(underTestPost, preValue);
        result = process_doFlow(underTestPost);
@@ -77,7 +77,7 @@ void testNegative() {
        // value < preValue
        // Aber Prüfung abgeschaltet => kein Fehler
        preValue = 17.99; // zu groß
-        underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
+        underTestPost = init_do_flow(analogs, digits, Digit100, false, false, 0);
        setAllowNegatives(underTestPost, true);
        setPreValue(underTestPost, preValue_extended);
        result = process_doFlow(underTestPost);
@@ -105,7 +105,7 @@ void testNegative_Issues() {
        // value < preValue
        // Prüfung eingeschaltet => Fehler
        preValue = 22018.09; // zu groß
-        UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digital100, false, false, -2);
+        UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digit100, false, false, -2);
        setAllowNegatives(underTestPost, false);
        setPreValue(underTestPost, preValue_extended);
        std::string result = process_doFlow(underTestPost);
--- a/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp
+++ b/code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp
@@ -1,6 +1,7 @@
 #include "test_flow_postrocess_helper.h"

-#include <memory>
+
+

 /**
 * ACHTUNG! Die Test laufen aktuell nur mit ausgeschaltetem Debug in ClassFlowCNNGeneral 
@@ -177,7 +178,7 @@ void test_doFlowPP2() {
        std::vector<float> digits = { 1.0, 9.0, 9.0};  // Übergang wurde um 1 erhöht (200, statt 199)
        std::vector<float> analogs = { 7.1, 4.8, 8.3};
        const char* expected = "199.748";
-        std::string result = process_doFlow(analogs, digits, Digital);
+        std::string result = process_doFlow(analogs, digits, Digit);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // Fehler bei Rolling (2002-09-09)
@@ -190,15 +191,15 @@ void test_doFlowPP2() {
        // expected_extended= "32289.4198";

        // extendResolution=false, checkConsistency=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, false, -3);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, true, -3);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

        // checkConsistency=true und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, true, -3);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

        // Fehler Rolling (2022-09-10)
@@ -209,20 +210,20 @@ void test_doFlowPP2() {
        expected_extended= "83.99401";

        // checkConsistency=false
-        result = process_doFlow(analogs, digits, Digital100, false);
+        result = process_doFlow(analogs, digits, Digit100, false);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());


        // checkConsistency=true
-        result = process_doFlow(analogs, digits, Digital100, true);
+        result = process_doFlow(analogs, digits, Digit100, true);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true);
+        result = process_doFlow(analogs, digits, Digit100, false, true);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

        // checkConsistency=true und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true);
+        result = process_doFlow(analogs, digits, Digit100, false, true);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

        // Fehler Rolling (2022-09-10)
@@ -233,16 +234,16 @@ void test_doFlowPP2() {
        expected_extended= "123235.6";
        
        // checkConsistency=true
-        result = process_doFlow(analogs, digits, Digital100, false, false);
+        result = process_doFlow(analogs, digits, Digit100, false, false);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());


        // checkConsistency=true
-        result = process_doFlow(analogs, digits, Digital100, true, false);
+        result = process_doFlow(analogs, digits, Digit100, true, false);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true);
+        result = process_doFlow(analogs, digits, Digit100, false, true);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

       // Fehler bei V11.2.0 
@@ -253,11 +254,11 @@ void test_doFlowPP2() {
        expected_extended= "3249.4692";

        // checkConsistency=true
-        result = process_doFlow(analogs, digits, Digital100, false, false, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, false, -3);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, true, -3);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

       // Fehler bei V11.2.0 
@@ -268,11 +269,11 @@ void test_doFlowPP2() {
        expected_extended= "269.92272";
        
        // extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, false);
+        result = process_doFlow(analogs, digits, Digit100, false, false);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true);
+        result = process_doFlow(analogs, digits, Digit100, false, true);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

       // Fehler bei V11.3.1 
@@ -283,11 +284,11 @@ void test_doFlowPP2() {
        expected_extended= "169.35935";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, false, -3);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, true, -3);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

       // Fehler bei V12.0.1 
@@ -298,11 +299,11 @@ void test_doFlowPP2() {
        expected_extended= "211.03555";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, false, -3);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, true, -3);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

       // Fehler bei V12.0.1 
@@ -313,11 +314,11 @@ void test_doFlowPP2() {
        expected_extended= "245.9386";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, false, 0);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, true, 0);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

      // Fehler bei V12.0.1 
@@ -328,11 +329,11 @@ void test_doFlowPP2() {
        expected_extended= "245.9386";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, false, 0);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, true, 0);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
 }

@@ -345,11 +346,11 @@ void test_doFlowPP3() {
        const char* expected_extended= "247.2045";
        
        // extendResolution=false
-        std::string result = process_doFlow(analogs, digits, Digital100, false, false, 0);
+        std::string result = process_doFlow(analogs, digits, Digit100, false, false, 0);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, true, 0);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

        
@@ -361,11 +362,11 @@ void test_doFlowPP3() {
        expected_extended= "142.92690";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, false, 0);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, true, 0);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());


@@ -378,14 +379,14 @@ void test_doFlowPP3() {
        expected_extended= "170.05287";
        
        // extendResolution=false
-        UnderTestPost* undertestPost = init_do_flow(analogs, digits, Digital100, false, false, -3);
+        UnderTestPost* undertestPost = init_do_flow(analogs, digits, Digit100, false, false, -3);
        setAnalogdigitTransistionStart(undertestPost, 7.7);
        result = process_doFlow(undertestPost);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
        delete undertestPost;

        // checkConsistency=false und extendResolution=true
-        undertestPost = init_do_flow(analogs, digits, Digital100, false, true, -3);
+        undertestPost = init_do_flow(analogs, digits, Digit100, false, true, -3);
        setAnalogdigitTransistionStart(undertestPost, 7.7);
        result = process_doFlow(undertestPost);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
@@ -399,11 +400,11 @@ void test_doFlowPP3() {
        expected_extended= "91.88174";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, false, 0);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, true, 0);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());


@@ -415,11 +416,11 @@ void test_doFlowPP3() {
        expected_extended= "92.38320";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, false, 0);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, true, 0);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

        // Fehler  V11.3.0 
@@ -430,11 +431,11 @@ void test_doFlowPP3() {
        expected_extended= "7472.7594";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, false, -3);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, true, -3);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

        // Fehler  V12.0.1 
@@ -445,11 +446,11 @@ void test_doFlowPP3() {
        expected_extended= "577.86490";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, false, 0);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, 0);
+        result = process_doFlow(analogs, digits, Digit100, false, true, 0);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());


@@ -461,11 +462,11 @@ void test_doFlowPP3() {
        expected_extended= "211.03580";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, false, -3);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, true, -3);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

       // Fehler  V12.0.1 
@@ -476,18 +477,12 @@ void test_doFlowPP3() {
        expected_extended= "126.9231";
        
        // extendResolution=false
-        undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
-        setAnalogdigitTransistionStart(undertestPost, 9.4); // Extreme late transition
-        result = process_doFlow(undertestPost);
+        result = process_doFlow(analogs, digits, Digit100, false, false, 0);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
-        delete undertestPost;

        // checkConsistency=false und extendResolution=true
-        undertestPost = init_do_flow(analogs, digits, Digital100, false, true, 0);
-        setAnalogdigitTransistionStart(undertestPost, 9.4); // Extreme late transition
-        result = process_doFlow(undertestPost);
+        result = process_doFlow(analogs, digits, Digit100, false, true, 0);
        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
@@ -497,11 +492,11 @@ void test_doFlowPP3() {
        expected_extended= "386.05672";
        
        // extendResolution=false
-        result = process_doFlow(analogs, digits, Digital100, false, false, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, false, -3);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true, -3);
+        result = process_doFlow(analogs, digits, Digit100, false, true, -3);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

        // Fehler  V12.0.1 
@@ -513,14 +508,14 @@ void test_doFlowPP3() {
        expected_extended= "171.24178";
        
        // extendResolution=false
-        undertestPost = init_do_flow(analogs, digits, Digital100, false, false, -3);
+        undertestPost = init_do_flow(analogs, digits, Digit100, false, false, -3);
        setAnalogdigitTransistionStart(undertestPost, 7.7);
        result = process_doFlow(undertestPost);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
        delete undertestPost;

        // checkConsistency=false und extendResolution=true
-        undertestPost = init_do_flow(analogs, digits, Digital100, false, true, -3);
+        undertestPost = init_do_flow(analogs, digits, Digit100, false, true, -3);
        setAnalogdigitTransistionStart(undertestPost, 7.7);
        result = process_doFlow(undertestPost);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
@@ -538,275 +533,13 @@ void test_doFlowPP4() {
        const char* expected_extended= "717.01658";
        
        // extendResolution=false
-        std::string result = process_doFlow(analogs, digits, Digital100, false, false);
+        std::string result = process_doFlow(analogs, digits, Digit100, false, false);
        TEST_ASSERT_EQUAL_STRING(expected, result.c_str());

        // checkConsistency=false und extendResolution=true
-        result = process_doFlow(analogs, digits, Digital100, false, true);
+        result = process_doFlow(analogs, digits, Digit100, false, true);
        TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());

 }

-std::string postProcess(std::vector<float> digits,
-                        std::vector<float> analogs,
-                        float analog2DigitalTransition=0.0,
-                        int decimalShift=0)
-{
-        std::unique_ptr<UnderTestPost> undertestPost(init_do_flow(std::move(analogs),
-                                                                  std::move(digits),
-                                                                  Digital100,
-                                                                  false, false, decimalShift));

-        setAnalogdigitTransistionStart(undertestPost.get(), analog2DigitalTransition);
-        return process_doFlow(undertestPost.get());
-}
-
-void test_doFlowLateTransition()
-{
-        // in these test cases, the last digit before comma turns 3.6 too late
-        float a2dt = 3.4; // value when last digit reaches x.8 region
-
-        // 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("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("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("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("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("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("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.8; // value when last digit reaches x.8 region
-
-        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());
-
-        TEST_ASSERT_EQUAL_STRING("12.7789", postProcess({0.0, 1.0, 2.7}, {7.7, 7.8, 8.9, 9.0}, a2dt).c_str());
-
-        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;
-}
--- a/code/test/components/jomjol-flowcontroll/test_getReadoutRawString.cpp
+++ b/code/test/components/jomjol-flowcontroll/test_getReadoutRawString.cpp
@@ -5,7 +5,7 @@
 void test_getReadoutRawString() {

    // no ROIs setted up
-    UnderTestPost* _undertestPost = setUpClassFlowPostprocessing(Digital100, Analogue100);
+    UnderTestPost* _undertestPost = setUpClassFlowPostprocessing(Digit100, Analogue100);

    string result = _undertestPost->flowAnalog->getReadoutRawString(0);
    TEST_ASSERT_EQUAL_STRING("", result.c_str());
--- a/code/test/components/jomjol_mqtt/test_server_mqtt.cpp
+++ b/code/test/components/jomjol_mqtt/test_server_mqtt.cpp
@@ -0,0 +1,22 @@
+#include <unity.h>
+#include <server_mqtt.h>
+
+void test_createNodeId()
+{
+    std::string topic = "watermeter";
+    TEST_ASSERT_EQUAL_STRING("watermeter", createNodeId(topic).c_str());
+
+    topic = "/watermeter";
+    TEST_ASSERT_EQUAL_STRING("watermeter", createNodeId(topic).c_str());
+
+    topic = "home/test/watermeter";
+    TEST_ASSERT_EQUAL_STRING("watermeter", createNodeId(topic).c_str());
+
+    topic = "home/test/subtopic/something/test/watermeter";
+    TEST_ASSERT_EQUAL_STRING("watermeter", createNodeId(topic).c_str());
+}
+
+void test_mqtt()
+{
+    test_createNodeId();
+}
--- a/code/test/components/openmetrics/test_openmetrics.cpp
+++ b/code/test/components/openmetrics/test_openmetrics.cpp
@@ -0,0 +1,65 @@
+#include <unity.h>
+#include <openmetrics.h>
+
+void test_createMetric()
+{
+    // simple happy path
+    const char *expected = "# HELP metric_name short description\n# TYPE metric_name gauge\nmetric_name 123.456\n";
+    std::string result = createMetric("metric_name", "short description", "gauge", "123.456");
+    TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
+}
+
+/**
+ * test the replaceString function as it's a dependency to sanitize sequence names
+ */
+void test_replaceString()
+{
+    std::string sample = "hello\\world\\";
+    replaceAll(sample, "\\", "");
+    TEST_ASSERT_EQUAL_STRING("helloworld", sample.c_str());
+
+    sample = "hello\"world\"";
+    replaceAll(sample, "\"", "");
+    TEST_ASSERT_EQUAL_STRING("helloworld", sample.c_str());
+
+    sample = "hello\nworld\n";
+    replaceAll(sample, "\n", "");
+    TEST_ASSERT_EQUAL_STRING("helloworld", sample.c_str());
+
+    sample = "\\\\\\\\\\\\\\\\\\hello\\world\\\\\\\\\\\\\\\\\\\\";
+    replaceAll(sample, "\\", "");
+    TEST_ASSERT_EQUAL_STRING("helloworld", sample.c_str());
+}
+
+void test_createSequenceMetrics()
+{
+    std::vector<NumberPost *> NUMBERS;
+    NumberPost *number_1 = new NumberPost;
+    number_1->name = "main";
+    number_1->ReturnValue = "123.456";
+    NUMBERS.push_back(number_1);
+
+    const std::string metricNamePrefix = "ai_on_the_edge_device";
+    const std::string metricName = metricNamePrefix + "_flow_value";
+
+    std::string expected1 = "# HELP " + metricName + " current value of meter readout\n# TYPE " + metricName + " gauge\n" +
+                             metricName + "{sequence=\"" + number_1->name + "\"} " + number_1->ReturnValue + "\n";
+    TEST_ASSERT_EQUAL_STRING(expected1.c_str(), createSequenceMetrics(metricNamePrefix, NUMBERS).c_str());
+
+    NumberPost *number_2 = new NumberPost;
+    number_2->name = "secondary";
+    number_2->ReturnValue = "1.0";
+    NUMBERS.push_back(number_2);
+
+    std::string expected2 = "# HELP " + metricName + " current value of meter readout\n# TYPE " + metricName + " gauge\n" +
+                             metricName + "{sequence=\"" + number_1->name + "\"} " + number_1->ReturnValue + "\n" +
+                             metricName + "{sequence=\"" + number_2->name + "\"} " + number_2->ReturnValue + "\n";
+    TEST_ASSERT_EQUAL_STRING(expected2.c_str(), createSequenceMetrics(metricNamePrefix, NUMBERS).c_str());
+}
+
+void test_openmetrics()
+{
+    test_createMetric();
+    test_replaceString();
+    test_createSequenceMetrics();
+}
--- a/code/test/test_suite_flowcontroll.cpp
+++ b/code/test/test_suite_flowcontroll.cpp
@@ -20,7 +20,8 @@
 #include "components/jomjol-flowcontroll/test_PointerEvalAnalogToDigitNew.cpp"
 #include "components/jomjol-flowcontroll/test_getReadoutRawString.cpp"
 #include "components/jomjol-flowcontroll/test_cnnflowcontroll.cpp"
-
+#include "components/openmetrics/test_openmetrics.cpp"
+#include "components/jomjol_mqtt/test_server_mqtt.cpp"

 bool Init_NVS_SDCard()
 {
@@ -138,21 +139,6 @@ 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);
@@ -168,7 +154,22 @@ extern "C" void app_main()
  Init_NVS_SDCard();
  esp_log_level_set("*", ESP_LOG_ERROR);        // set all components to ERROR level

-    // 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);
+  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);
+
+    // getReadoutRawString test
+    RUN_TEST(test_getReadoutRawString);
+    RUN_TEST(test_openmetrics);
+    RUN_TEST(test_mqtt);
+  
+  UNITY_END();
 }
--- a/param-docs/expert-params.txt
+++ b/param-docs/expert-params.txt
@@ -19,6 +19,7 @@ CamWpc
 CamRawGma
 CamLenc
 CamDcw
+CamDenoise
 CamZoom
 CamZoomSize
 CamZoomOffsetX
--- a/param-docs/parameter-pages/Alignment/FlipImageSize.md
+++ b/param-docs/parameter-pages/Alignment/FlipImageSize.md
@@ -1,11 +0,0 @@
-# Parameter `FlipImageSize`
-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!
-
-This parameter can be used to rotate the viewport together with the alignment rotation:
-![](img/flipImageSize.png) 
--- a/param-docs/parameter-pages/Alignment/InitialMirror.md
+++ b/param-docs/parameter-pages/Alignment/InitialMirror.md
@@ -1,10 +0,0 @@
-# Parameter `InitialMirror`
-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.
--- a/param-docs/parameter-pages/MQTT/CACert.md
+++ b/param-docs/parameter-pages/MQTT/CACert.md
@@ -16,3 +16,6 @@ Usually there is a common RootCA certificate for the MQTT broker

 !!! Note
    This also means that you might have to change the protocol and port in [uri](https://jomjol.github.io/AI-on-the-edge-device-docs/Parameters/#parameter-uri) to `mqtts://example.com:8883`!
+
+!!! Note
+    Only TLS 1.2 is supported!
--- a/param-docs/parameter-pages/MQTT/ClientCert.md
+++ b/param-docs/parameter-pages/MQTT/ClientCert.md
@@ -17,3 +17,6 @@ Usually there is a one pair of Client Certificate/Key for each client that conne
 !!! Note
    If set, `ClientKey` must be set too
    This also means that you might have to change the protocol and port in [uri](https://jomjol.github.io/AI-on-the-edge-device-docs/Parameters/#parameter-uri) to `mqtts://example.com:8883`!
+
+!!! Note
+    Only TLS 1.2 is supported!
--- a/param-docs/parameter-pages/MQTT/ClientKey.md
+++ b/param-docs/parameter-pages/MQTT/ClientKey.md
@@ -17,3 +17,6 @@ Usually there is a one pair of Client Certificate/Key for each client that conne
 !!! Note
    If set, `ClientCert` must be set too
    This also means that you might have to change the protocol and port in [uri](https://jomjol.github.io/AI-on-the-edge-device-docs/Parameters/#parameter-uri) to `mqtts://example.com:8883`!
+
+!!! Note
+    Only TLS 1.2 is supported!
--- a/param-docs/parameter-pages/MQTT/MainTopic.md
+++ b/param-docs/parameter-pages/MQTT/MainTopic.md
@@ -8,7 +8,7 @@ The single value will be published with the following key: `MAINTOPIC/NUMBER/RES
 With:

 - `NUMBER`: The name of the value (a meter might have more than one value). 
-  The names get defined in the analog and digital ROI configuration (defaults to `main`).
+  The names get defined in the analog and digit ROI configuration (defaults to `main`).
 - `RESULT_TOPIC`: Automatically filled with the right name, eg. `value`, `rate`, `timestamp`, `error`, ....

 The general connection status can be found in `MAINTOPIC/CONNECTION`. 
@@ -16,3 +16,5 @@ See [MQTT Result Topics](../MQTT-API#result) for a full list of topics.

 !!! Note
    The main topic is allowed to contain `/` which can be used to split it into multiple levels, eg. `/basement/meters/watermeter/1/` if you have multiple water meters in your basement.
+
+The nodeId for the Home Assistant MQTT Service Discovery must follow the schema `<discovery_prefix>/<component>/[<node_id>/]<object_id>/config`. The node_id is not configurable but derived from the `MainTopic` by stripping any but the last topic level. A `MainTopic` with the value `home/basement/watermeter` is transformed into the node_id `watermeter`, resulting in the discovery topic `homeassistant/sensor/watermeter/value/config` for the current value.
--- a/param-docs/parameter-pages/PostProcessing/NUMBER.AnalogToDigitTransitionStart.md
+++ b/param-docs/parameter-pages/PostProcessing/NUMBER.AnalogToDigitTransitionStart.md
@@ -1,9 +1,9 @@
-# Parameter `<NUMBER>.AnalogDigitalTransitionStart`
+# Parameter `<NUMBER>.AnalogToDigitTransitionStart`
 Default Value: `9.2`

 This can be used if you have wrong values, but the recognition of the individual ROIs are correct.
 Look for the start of changing of the first digit and note the analog pointer value behind.
 Set it here. Only used on combination of digits and analog pointers.
-See [here](../Watermeter-specific-analog---digital-transition) for details.
+See [here](../Watermeter-specific-analog---digit-transition) for details.

 Range: `6.0` .. `9.9`.
--- a/param-docs/parameter-pages/PostProcessing/NUMBER.ChangeRateThreshold.md
+++ b/param-docs/parameter-pages/PostProcessing/NUMBER.ChangeRateThreshold.md
@@ -0,0 +1,25 @@
+# Parameter `<NUMBER>.ChangeRateThreshold`
+Default Value: `2`
+
+Range: `1` .. `9`.
+
+Threshold parameter for change rate detection.<br>
+This parameter is intended to compensate for small reading fluctuations that occur when the meter does not change its value for a long time (e.g. at night) or slightly turns backwards. This can eg. happen on watermeters.
+
+It is only applied to the last digit of the read value (See example below).
+If the read value is within PreValue +/- Threshold, no further calculation is carried out and the Value/Prevalue remains at the old value.
+
+Example:
+
+    Smallest ROI provides value for 0.000x
+    ChangeRateThreshold = 2
+  
+    Extended Resolution disabled:
+    PreValue: 123.456'7 >>> Threshold = +/- 0.000'2
+	Comparative value >>> max = 123.456'9 and min = 123.456'5
+	
+    Extended Resolution enabled:
+    PreValue: 123.456'78 >>> Threshold = +/- 0.000'02
+	Comparative value >>> max = 123.456'80 and min = 123.456'76
+
+![](img/ChangeRateThreshold.png)
--- a/param-docs/parameter-pages/TakeImage/Aec2.md
+++ b/param-docs/parameter-pages/TakeImage/Aec2.md
@@ -1,13 +0,0 @@
-# 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.
--- a/param-docs/parameter-pages/TakeImage/AutoExposureLevel.md
+++ b/param-docs/parameter-pages/TakeImage/AutoExposureLevel.md
@@ -1,15 +0,0 @@
-# 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`)
--- a/param-docs/parameter-pages/TakeImage/Brightness.md
+++ b/param-docs/parameter-pages/TakeImage/Brightness.md
@@ -1,10 +0,0 @@
-# Parameter `Brightness`
-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`) 
--- a/param-docs/parameter-pages/TakeImage/CamAeLevel.md
+++ b/param-docs/parameter-pages/TakeImage/CamAeLevel.md
@@ -1,15 +1,22 @@
 # Parameter `CamAeLevel`
+
+**Auto-Exposure-Level**
+
+range on OV2640 (`-2` .. `2`)<br>
+range on OV3660 and OV5640 (`-5` .. `5`)
+
 Default Value: `0`

+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! Warning
    This is an **Expert Parameter**! Only change it if you understand what it does!

+	After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    The exposure offset for automatic exposure, lower values produce darker image.
+
 !!! 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`)
--- a/param-docs/parameter-pages/TakeImage/CamAec.md
+++ b/param-docs/parameter-pages/TakeImage/CamAec.md
@@ -1,13 +1,19 @@
 # Parameter `CamAec`
+
+**Auto-Exposure-Control**
+
+- When **true**, the camera attempts to automatically control the exposure.
+- When **false**, the **CamAecValue** setting is used instead.
+
 Default Value: `true`
-    
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! Warning
    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+	After changing this parameter you need to update your reference image and alignment markers!
      
 !!! 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
--- a/param-docs/parameter-pages/TakeImage/CamAec2.md
+++ b/param-docs/parameter-pages/TakeImage/CamAec2.md
@@ -1,13 +1,22 @@
 # Parameter `CamAec2`
-Default Value: `false`
+
+**Auto-Exposure-Control2**
+
+- When **true**, the sensor’s "night mode" is enabled, extending the range of automatic gain control.
+- When **false**, the sensor’s "night mode" is disabled.
+
+Default Value: `true`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.

 !!! Warning
    This is an **Expert Parameter**! Only change it if you understand what it does!
-      
+
+	After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    This may resolve some over-exposure and under-exposure issues.
+	
 !!! 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.
--- a/param-docs/parameter-pages/TakeImage/CamAecValue.md
+++ b/param-docs/parameter-pages/TakeImage/CamAecValue.md
@@ -1,15 +1,21 @@
 # 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
+**Auto-Exposure-Value**

 Range (`0` .. `1200`)
+
+Default Value: `160`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+	After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    Access the exposure value of the camera, higher values produce brighter images.
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
--- a/param-docs/parameter-pages/TakeImage/CamAgc.md
+++ b/param-docs/parameter-pages/TakeImage/CamAgc.md
@@ -1,10 +1,16 @@
 # Parameter `CamAgc`
+
+**Auto-Gain-Control**
+
+- When **true**, the camera attempts to automatically control the sensor gain, up to the value in the **CamGainceiling** property.
+- When **false**, the **CamAgcGain** setting is used instead.
+
 Default Value: `true`

+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! 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.
--- a/param-docs/parameter-pages/TakeImage/CamAgcGain.md
+++ b/param-docs/parameter-pages/TakeImage/CamAgcGain.md
@@ -1,13 +1,21 @@
 # Parameter `CamAgcGain`
-Default Value: ` `
+
+**Auto-Gain-Control-Value**
+
+Range (`0` .. `30`)
+
+Default Value: `15`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.

 !!! 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!
+	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. 
+    This is used when **CamAgc** is off.

-Range (`0` .. `30`)
+!!! Note
+    Access the gain level of the sensor, higher values produce brighter images.
--- a/param-docs/parameter-pages/TakeImage/CamAutoSharpness.md
+++ b/param-docs/parameter-pages/TakeImage/CamAutoSharpness.md
@@ -1,13 +1,22 @@
 # Parameter `CamAutoSharpness`
+
+**Auto-Sharpness**
+
+- When **true**, the camera attempts to automatically adjusts the sharpness.
+- When **false**, the **CamSharpness** setting is used instead.
+
 Default Value: `false`

+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! 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!
+
+	After changing this parameter you need to update your reference image and alignment markers!

 !!! Note
-    After changing this parameter you need to update your reference image and alignment markers!
-	
-AutoSharpness	
+    The OV2640 does not officially support auto sharpness, this is an experimental parameter!
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
--- a/param-docs/parameter-pages/TakeImage/CamAwb.md
+++ b/param-docs/parameter-pages/TakeImage/CamAwb.md
@@ -1,10 +1,16 @@
 # Parameter `CamAwb`
-Default Value: ` `
+
+**Auto-White-Balance**
+ 
+- When **true**, the camera attempts to automatically control white balance.
+- When **false**, the **CamWbMode** setting is used instead.
+
+Default Value: `true`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.

 !!! 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
+	After changing this parameter you need to update your reference image and alignment markers!
--- a/param-docs/parameter-pages/TakeImage/CamAwbGain.md
+++ b/param-docs/parameter-pages/TakeImage/CamAwbGain.md
@@ -1,10 +1,15 @@
 # Parameter `CamAwbGain`
-Default Value: ` `
-    
+
+**Auto-White-Balance-Gain**
+ 
+- Enable/Disable **CamAwbGain** control.
+
+Default Value: `true`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! 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
--- a/param-docs/parameter-pages/TakeImage/CamBpc.md
+++ b/param-docs/parameter-pages/TakeImage/CamBpc.md
@@ -1,10 +1,15 @@
 # Parameter `CamBpc`
+
+**Black-Pixel-Correction**
+
+- Enable/Disable **black point compensation**, this can make black parts of the image darker.
+
 Default Value: `true`
-    
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! 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
--- a/param-docs/parameter-pages/TakeImage/CamBrightness.md
+++ b/param-docs/parameter-pages/TakeImage/CamBrightness.md
@@ -1,10 +1,16 @@
 # Parameter `CamBrightness`
-Default Value: `0`
-      
-!!! Note
-    This parameter can also be set on the Reference Image configuration page!

-!!! Note
+**Image-Brightness**
+
+Range (`-2` .. `2`)
+
+Default Value: `0`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
    After changing this parameter you need to update your reference image and alignment markers!

-Image Brightness (`-2` .. `2`) 
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
--- a/param-docs/parameter-pages/TakeImage/CamColorbar.md
+++ b/param-docs/parameter-pages/TakeImage/CamColorbar.md
@@ -1,5 +1,13 @@
 # Parameter `CamColorbar`
+
+**Colorbar**
+
+currently not implemented.
+
 Default Value: `false`
-    
-!!! Note
-    This parameter can also be set on the Reference Image configuration page!
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
--- a/param-docs/parameter-pages/TakeImage/CamContrast.md
+++ b/param-docs/parameter-pages/TakeImage/CamContrast.md
@@ -1,11 +1,16 @@
 # Parameter `CamContrast`
+
+**Image-Contrast**
+
+Range (`-2` .. `2`)
+
 Default Value: `0`

+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
+    After changing this parameter you need to update your reference image and alignment markers!
+
 !!! 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`)
-
--- a/param-docs/parameter-pages/TakeImage/CamDcw.md
+++ b/param-docs/parameter-pages/TakeImage/CamDcw.md
@@ -1,13 +1,21 @@
 # Parameter `CamDcw`
+
+**Image-Downsize**
+
+- When **CamDcw** is on, the image that you receive will be the size that you requested (VGA, QQVGA, etc).
+- When **CamDcw** is off, the image that you receive will be one of UXGA, SVGA, or CIF.
+
 Default Value: `true`
-    
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! 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!
+	
+	If **CamZoom** is used, this must be activated.

 !!! 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). 
+    If **CamDcw** is off, and you pick a different image size, this implicitly turns **CamDcw** back on again. 
--- a/param-docs/parameter-pages/TakeImage/CamDenoise.md
+++ b/param-docs/parameter-pages/TakeImage/CamDenoise.md
@@ -1,10 +1,15 @@
 # Parameter `CamDenoise`
-Default Value: ` `
    
+**Image-Denoise**
+
+- Denoise Image, is only supported by OV3660 and OV5640
+
+range on OV3660 and OV5640 (0 .. 8)
+
+Default Value: `0`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! 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)
--- a/param-docs/parameter-pages/TakeImage/CamGainceiling.md
+++ b/param-docs/parameter-pages/TakeImage/CamGainceiling.md
@@ -1,14 +1,6 @@
 # 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.
+**Gain-Ceiling**

 Available options:

@@ -19,3 +11,23 @@ Available options:
 - `x32`
 - `x64`
 - `x128`
+
+Default Value for ov2640: `x4`<br>
+Default Value for ov5640: `x8`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+    After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    A higher gain means that the sensor has a greater response to light, but also makes sensor noise more visible.
+	
+    This is used when **CamAgc** is on.
+
+!!! Note
+    The **Gain** is an analog multiplier applied to the raw sensor data.<br>
+    The **Ceiling** is the maximum gain value that the sensor will use.
--- a/param-docs/parameter-pages/TakeImage/CamHmirror.md
+++ b/param-docs/parameter-pages/TakeImage/CamHmirror.md
@@ -1,10 +1,16 @@
 # Parameter `CamHmirror`
-Default Value: `false`
-    
-!!! Note
-    This parameter can also be set on the Reference Image configuration page!

-!!! Note
+**Mirror-Image**
+
+- When **true**, the camera image is mirrored left-to-right.
+
+Default Value: `false`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
    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.
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
--- a/param-docs/parameter-pages/TakeImage/CamLenc.md
+++ b/param-docs/parameter-pages/TakeImage/CamLenc.md
@@ -1,10 +1,18 @@
 # Parameter `CamLenc`
+
+**Lens-Correction**
+
+- Enable/Disable lens correction.
+
 Default Value: `true`

+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! 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
+!!! Note
+    This can help compensate for light fall-off at the edge of the sensor area.
--- a/param-docs/parameter-pages/TakeImage/CamQuality.md
+++ b/param-docs/parameter-pages/TakeImage/CamQuality.md
@@ -1,10 +1,22 @@
 # Parameter `CamQuality`
-Default Value: `12`
+
+**Image-Quality**
+
+Range (`8` .. `63`)
+
+Default Value: `10`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.

 !!! 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)
+    After changing this parameter you need to update your reference image and alignment markers!

-!!! Warning
-    Value below 12 could result in system instabilities!
+    Value below 10 could result in system instabilities!
+
+!!! Note
+    Quality index for pictures: `8` (highest quality) ... `63` (lowest quality)
+
+    This is similar to the quality setting when exporting a jpeg image from photo editing software.
--- a/param-docs/parameter-pages/TakeImage/CamRawGma.md
+++ b/param-docs/parameter-pages/TakeImage/CamRawGma.md
@@ -1,10 +1,21 @@
 # Parameter `CamRawGma`
-Default Value: ` `
+
+**Raw-Gamma**
+
+- Enable/Disable raw gamma mode.
+
+Default Value: `true`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.

 !!! 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
+!!! Note
+    The main purpose of the Gamma (GMA) function is to compensate for the non-linear characteristics of the sensor. 
+	GMA converts the pixel values according to the Gamma curve to compensate the sensor output under different light strengths.
+    The non-linear gamma curve is approximately constructed with different linear functions. Raw gamma compensates the
+    image in the RAW domain.
--- a/param-docs/parameter-pages/TakeImage/CamSaturation.md
+++ b/param-docs/parameter-pages/TakeImage/CamSaturation.md
@@ -1,11 +1,19 @@
 # Parameter `CamSaturation`
+
+**Image-Saturation**
+
+Range (`-2` .. `2`)
+
 Default Value: `0`

+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
+    After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    Positive values increase saturation (more vibrant colors), negative values lower it (more muted colors).
+
 !!! 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`)
-
--- a/param-docs/parameter-pages/TakeImage/CamSharpness.md
+++ b/param-docs/parameter-pages/TakeImage/CamSharpness.md
@@ -1,13 +1,26 @@
 # Parameter `CamSharpness`
+
+**Image-Sharpness**
+
+Range (`-2` .. `2`)
+
 Default Value: `0`

+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! Warning
    This is an **Expert Parameter**! Only change it if you understand what it does!
-      
+
+	After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    The OV2640 does not officially support sharpness, this is an experimental parameter!
+	
+!!! Note
+    Positive values increase sharpness (more defined edges), negative values lower it (softer edges).
+
+    This is used when **CamAutoSharpness** is off.
+
 !!! 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`)
--- a/param-docs/parameter-pages/TakeImage/CamSpecialEffect.md
+++ b/param-docs/parameter-pages/TakeImage/CamSpecialEffect.md
@@ -1,14 +1,6 @@
 # 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!
+**Image-Special-Effect**

 Available options:

@@ -19,3 +11,16 @@ Available options:
 - `green`
 - `blue`
 - `retro`
+
+Default Value: `no_effect`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
+    This is an **Expert Parameter**! Only change it if you understand what it does!
+
+	After changing this parameter you need to update your reference image and alignment markers!
+      
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
--- a/param-docs/parameter-pages/TakeImage/CamVflip.md
+++ b/param-docs/parameter-pages/TakeImage/CamVflip.md
@@ -1,10 +1,19 @@
 # Parameter `CamVflip`
-Default Value: `false`
-    
-!!! Note
-    This parameter can also be set on the Reference Image configuration page!

-!!! Note
+**Flip-Image**
+
+- When **true**, the camera image is flipped top-to-bottom.
+
+Default Value: `false`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
    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. 
+!!! Note
+    On some OV5640 Cameras, the image becomes reddish when Vflip is used in conjunction with the zoom function!
+
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
--- a/param-docs/parameter-pages/TakeImage/CamWbMode.md
+++ b/param-docs/parameter-pages/TakeImage/CamWbMode.md
@@ -1,13 +1,6 @@
 # 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
+**White-Balance-Mode**

 Available options:

@@ -16,3 +9,17 @@ Available options:
 - `cloudy`
 - `office`
 - `home`
+
+Default Value: `auto`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
+    After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    This is used when **CamAwb** is off.
+	
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
--- a/param-docs/parameter-pages/TakeImage/CamWpc.md
+++ b/param-docs/parameter-pages/TakeImage/CamWpc.md
@@ -1,10 +1,16 @@
 # Parameter `CamWpc`
-Default Value: `true`
-    
-!!! Note
-    This parameter can also be set on the Reference Image configuration page!

-!!! Note
+**White-Pixel-Correction**
+
+- Enable/Disable **white point compensation**, his can make white parts of the image whiter.
+
+Default Value: `true`
+
+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
+!!! Warning
    After changing this parameter you need to update your reference image and alignment markers!

-White Pixel Correction
+!!! Note
+    This parameter can also be set on the Reference Image configuration page!
--- a/param-docs/parameter-pages/TakeImage/CamZoom.md
+++ b/param-docs/parameter-pages/TakeImage/CamZoom.md
@@ -1,13 +1,21 @@
 # Parameter `CamZoom`
+
+**Digital-Zoom**
+
+- Enable/Disable digital zoom.
+
 Default Value: `false`

+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! Warning
    This is an **Expert Parameter**! Only change it if you understand what it does!

+	After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    It is always zoomed into the center of the image, if **CamZoomOffsetX** and **CamZoomOffsetY** are zero.
+	
 !!! 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.
--- a/param-docs/parameter-pages/TakeImage/CamZoomOffsetX.md
+++ b/param-docs/parameter-pages/TakeImage/CamZoomOffsetX.md
@@ -1,14 +1,25 @@
 # Parameter `CamZoomOffsetX`
+
+**Digital-Zoom-OffsetX**
+
+range on OV2640 (`-480` .. `480`)<br>
+range on OV3660 (`-704` .. `704`)<br>
+range on OV5640 (`-960` .. `960`)
+
 Default Value: `0`

+See [here](../datasheets/Camera.ov2640_ds_1.8_.pdf) for the ov2640 camera datasheet.<br>
+See [here](../datasheets/OV5640_datasheet.pdf) for the ov5640 camera datasheet.
+
 !!! Warning
    This is an **Expert Parameter**! Only change it if you understand what it does!

+	After changing this parameter you need to update your reference image and alignment markers!
+
+!!! Note
+    X displacement of the image from the center.<br>
+    Positive values shift the image to the right, negative values to the left.<br>
+    The maximum possible offset depends on the value of the **CamZoomSize**.
+	
 !!! 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.
--- a/Show More
+++ b/Show More