Merge branch 'mqtt-logfile' of https://github.com/jomjol/AI-on-the-edge-device into mqtt-logfile

.github/label-commenter-config.yml

@@ -115,9 +115,9 @@
     labeled:
       issue:
           body: |
-            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.
+            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.
             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 [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 [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.
             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/).

.github/workflows/build.yml

@@ -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:
@@ -53,7 +53,6 @@ jobs:
           ./code/.pio/build/esp32cam/partitions.bin
           ./code/.pio/build/esp32cam/bootloader.bin
           ./html/*
-          ./demo/*
         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          
 
@@ -86,22 +85,8 @@ jobs:
         cp -r ./sd-card/html/* ./html/
 
         echo "Replacing variables..."
-        cd html
-        find . -type f -exec sed -i 's/$COMMIT_HASH/${{ steps.vars.outputs.sha_short }}/g' {} \;
-        echo "compressing all html files..."
-        find . -name "*.html" -type f -exec gzip {} \;
-        find . -name "*.css" -type f -exec gzip {} \;
-        find . -name "*.js" -type f -exec gzip {} \;
-        find . -name "*.jpg" -type f -exec gzip {} \;
-        find . -name "*.png" -type f -exec gzip {} \;
-        find . -name "*.svg" -type f -exec gzip {} \;
-        find . -name "*.map" -type f -exec gzip {} \;
-
-    - name: Prepare Demo mode files
-      run: |
-        rm -rf ./demo
-        mkdir demo
-        cp -r ./sd-card/demo/* ./demo/
+        cd html; find . -type f -exec sed -i 's/$COMMIT_HASH/${{ steps.vars.outputs.sha_short }}/g' {} \;
+        
 
 #########################################################################################
 ## Pack for Update
@@ -112,7 +97,6 @@ jobs:
     #  - /firmware.bin
     #  - (optional) /html/* (inkl. subfolders)
     #  - (optional) /config/*.tfl
-    #  - (optional) /demo/*
     runs-on: ubuntu-latest
     needs: build
 
@@ -127,7 +111,6 @@ jobs:
           ./code/.pio/build/esp32cam/partitions.bin
           ./code/.pio/build/esp32cam/bootloader.bin
           ./html/*
-          ./demo/*
         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
 
@@ -137,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: |
@@ -152,9 +135,6 @@ jobs:
 
     - name: Add Web UI to update
       run: cp -r ./html ./update/
-      
-    - name: Add Demo mode files to update
-      run: cp -r ./demo ./update/
 
     - name: Add CNN to update
       run: |
@@ -170,6 +150,7 @@ jobs:
         path: ./update/*
 
 
+
 #########################################################################################
 ## Pack for Remote Setup 
 #########################################################################################
@@ -178,7 +159,6 @@ jobs:
     # remote_setup__version.zip file with following content:
     #  - /firmware.bin
     #  - /html/* (inkl. subfolders)
-    #  - /demo/*
     #  - /config/*
     runs-on: ubuntu-latest
     needs: build
@@ -194,10 +174,9 @@ jobs:
           ./code/.pio/build/esp32cam/partitions.bin
           ./code/.pio/build/esp32cam/bootloader.bin
           ./html/*
-          ./demo/*
         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:
@@ -219,9 +198,6 @@ jobs:
     - name: Add Web UI to remote_setup
       run: cp -r ./html ./remote_setup/
 
-    - name: Add Demo mode files to update
-      run: cp -r ./demo ./update/
-
     - name: Add whole config folder to remote_setup
       run: |
         rm -rf ./remote_setup/config/
@@ -254,7 +230,6 @@ jobs:
           ./code/.pio/build/esp32cam/partitions.bin
           ./code/.pio/build/esp32cam/bootloader.bin
           ./html/*
-          ./demo/*
         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
 
@@ -283,12 +258,10 @@ jobs:
         cp -f "./code/.pio/build/esp32cam/bootloader.bin" "manual_setup/bootloader.bin"
         cp -f "./code/.pio/build/esp32cam/partitions.bin" "manual_setup/partitions.bin"
         rm -rf ./sd-card/html
-        rm -rf ./sd-card/demo
         cp -r ./html ./sd-card/ # Overwrite the Web UI with the preprocessed files
-        cp -r ./demo ./sd-card/
         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:
@@ -299,7 +272,7 @@ jobs:
 #########################################################################################
 ## Prepare and create release
 #########################################################################################
-  prepare-release: 
+  release: 
     runs-on: ubuntu-latest
     needs: [pack-for-update, pack-for-manual_setup, pack-for-remote_setup]
     if: startsWith(github.ref, 'refs/tags/') 
@@ -312,21 +285,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:
@@ -359,18 +332,21 @@ jobs:
 
     # extract the version used in next step
     - id: get_version
-      uses: drewg13/get-version-action@98dda2a47a257e202c2e6c2ed2e6072ec23f448e
+      if: startsWith(github.ref, 'refs/tags/') 
+      uses: Simply007/get-version-action@v2
 
 #    # 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
@@ -378,11 +354,12 @@ 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@v2.0.8
+      uses: softprops/action-gh-release@v1
       # 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 }}
@@ -391,6 +368,7 @@ 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
@@ -403,9 +381,8 @@ jobs:
 ## Update the Web Installer on a release
 #########################################################################################
 # Make sure to also update update-webinstaller.yml!
-  update-web-installer:
-    if: github.event_name == 'release' && github.event.action == 'published' # Only run on release but not on prerelease
-    needs: [prepare-release]
+  update-web-installer:    
+    needs: [release]
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
@@ -420,16 +397,15 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-
+      
     - name: Get version of last release
       id: last_release
-      uses: joutvhu/get-release@v1
+      uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
       with:
-        latest: true
-        prerelease: false
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}   
-
+        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 }}..."

.github/workflows/manual-update-contributors-list.yaml

@@ -1,21 +0,0 @@
-# This updates the Contributors list in the README.md
-# it only gets run on:
-#  - Manually triggered
-
-name: Manually update contributors list
-
-on:
-  workflow_dispatch: # Run on manual trigger
-
-jobs:
-  manually-update-contributors-list: 
-    runs-on: ubuntu-latest
-    name: A job to automatically update the contributors list in the README.md
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-        - name: Contribute List
-          uses: akhilmhdh/contributors-readme-action@v2.3.10
-          env:
-              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/manual-update-webinstaller.yml

@@ -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:
@@ -32,13 +32,12 @@ jobs:
       
     - name: Get version of last release
       id: last_release
-      uses: joutvhu/get-release@v1
+      uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
       with:
-        latest: true
-        prerelease: false
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+        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 }}..."
@@ -51,13 +50,14 @@ jobs:
         sed -i 's/$VERSION/${{ steps.last_release.outputs.tag_name }}/g' docs/manifest.json
 
     - name: Setup Pages
-      uses: actions/configure-pages@v5
+      uses: actions/configure-pages@v2
 
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@v3
+      uses: actions/upload-pages-artifact@v1
       with:
         path: 'docs'
 
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v4 
+      uses: actions/deploy-pages@v1   
+  

.github/workflows/reply-bot.yml

@@ -1,5 +1,5 @@
 # Reply Bot
-# It uses the configuration in .github/label-commenter-config.yaml
+# It uses the configuration in .github/label-commenter-config.yml
 # See https://github.com/peaceiris/actions-label-commenter
 
 name: Reply-Bot
@@ -20,11 +20,12 @@ jobs:
   comment:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
-
+      - uses: actions/checkout@v3
+      
+      
       ####################################################################
       ## Remove labels again (issues only)
-      ## Make sure to also add the reply message to .github/label-commenter-config.yaml!
+      ## Make sure to also add the reply message to .github/label-commenter-config.yml!
       ## This currently seems no longer to work due to changes on the actions-cool/issues-helper!
       ####################################################################
 #      - name: Remove 'Logfile' label again (issues only)
@@ -68,12 +69,11 @@ jobs:
 #        with:
 #          actions: 'remove-labels'
 #          labels: 'bot-reply Show Trained Digits/Pointers'
-
+      
       ####################################################################
       ## Write the response
       ####################################################################
       - name: Write Response
         uses: peaceiris/actions-label-commenter@c2d00660c86f2b9ed0fb35b372c451558eba85b3
         with:
-          github_token: "${{ secrets.GITHUB_TOKEN }}"
-          config_file: .github/label-commenter-config.yaml
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.gitmodules

@@ -10,6 +10,3 @@
 [submodule "code/components/stb"]
 	path = code/components/stb
 	url = https://github.com/nothings/stb.git
-[submodule "code/components/esp-protocols"]
-	path = code/components/esp-protocols
-	url = https://github.com/espressif/esp-protocols.git

Changelog.md

@@ -1,166 +1,3 @@
-## [16.0.0-RC6] - 2024-02-28
-
-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)
-
-#### 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
-Only changes since RC5 are listed:
-- [#3436](https://github.com/jomjol/AI-on-the-edge-device/pull/3436) Added basic authentification of the Web Interface and the REST API, see https://jomjol.github.io/AI-on-the-edge-device-docs/Password-Protection
-
-- [#3520](https://github.com/jomjol/AI-on-the-edge-device/pull/3520) Rewrite InfluxDB Interfache
-
-- [#3500](https://github.com/jomjol/AI-on-the-edge-device/pull/3500)  Update smartled driver
-
-- [#3454](https://github.com/jomjol/AI-on-the-edge-device/pull/3454) Add thermometer
-
-- [#3538](https://github.com/jomjol/AI-on-the-edge-device/pull/3538) add .gz
-
-- [#3565](https://github.com/jomjol/AI-on-the-edge-device/pull/3565) corrected enable/disable texts to make it more intuitive
-
-- [#3568](https://github.com/jomjol/AI-on-the-edge-device/pull/3568) compress all HTML files
-
-  **:warning: Please check your Homeassistant instance to make sure it is handled correctly!**
-
-#### Bug Fixes
-Only changes since RC5 are listed:
- - [#3450](https://github.com/jomjol/AI-on-the-edge-device/pull/3450) fix crash fue to empty CAM parameters in migration
- -  [#3446](https://github.com/jomjol/AI-on-the-edge-device/pull/3446) fix for incorrect decimal shift
-
-## [16.0.0-RC5] - 2024-12-05
-
-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)
-
-#### 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
-Only changes since RC4 are listed:
-- [#3423](https://github.com/jomjol/AI-on-the-edge-device/pull/3423) Removed `Autostart` parameter and make the flow to be always enabled 
-- [#3423](https://github.com/jomjol/AI-on-the-edge-device/pull/3423) Enable `Flow start` menu entry in UI 
-- [#3332](https://github.com/jomjol/AI-on-the-edge-device/pull/3332) Updated the Homeassistant Discovery topics :
-    - `raw` has now set the `State Class` to `measurement`. Before it was always set to `""`. 
-    - `value` has now only set the `State Class` to `total_increasing` if the parameter `Allow Negative Rates` is **not** set. Else it uses `measurement` since the rate could also be negative. Before it was always set to `total_increasing`.
-    - The `rate_per_time_unit` topic of an **Energy** meter needs a `Device Class`=`power`. For `gas` and `water` it should be `volume_flow_rate`. Before it was always set to `""`.
-    - [#3415](https://github.com/jomjol/AI-on-the-edge-device/pull/3415) Added button for `flow start` 
-    - [#3359](https://github.com/jomjol/AI-on-the-edge-device/pull/3359) Added support for Domoticz MQTT integration 
-    - Added Date and time to overview page
-    - Updated submodules and models
-
-  **:warning: Please check your Homeassistant instance to make sure it is handled correctly!**
-
-#### Bug Fixes
-Only changes since RC4 are listed:
- - [#3418](https://github.com/jomjol/AI-on-the-edge-device/pull/3418) Added fix for ledintensity 
- - [#3417](https://github.com/jomjol/AI-on-the-edge-device/pull/3417) Added fix for OV2640 brightness contrast saturation 
- - [#3393](https://github.com/jomjol/AI-on-the-edge-device/pull/3393) Added fix for 'AnalogToDigitTransitionStart' always using 9.2 regardless of the configured value 
- - [#3342](https://github.com/jomjol/AI-on-the-edge-device/pull/3342) Added fix for HA menu entry 
-
-
-## [16.0.0-RC4] - 2024-10-06
-
-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
-Only changes since RC3 are listed:
-- [#3316](https://github.com/jomjol/AI-on-the-edge-device/pull/3316) Update esp32-camera submodule to `v2.0.13` 
-- [#3317](https://github.com/jomjol/AI-on-the-edge-device/pull/3317) Added contributor list 
-- [#3315](https://github.com/jomjol/AI-on-the-edge-device/pull/3315) Added files for demo mode 
-
-#### Bug Fixes
-Only changes since RC2 are listed:
-- [#3313](https://github.com/jomjol/AI-on-the-edge-device/pull/3313) Added delay in InitCam  to fix `Camera not detected` issues
-
-
-## [16.0.0-RC3] - 2024-10-05
-
-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
-Only changes since RC2 are listed:
-- Renamed MQTT topic from `rate_per_digitalization_round` to `rate_per_digitization_round` (change happened already in RC1)
-
-#### Bug Fixes
-Only changes since RC2 are listed:
-- [#3269](https://github.com/jomjol/AI-on-the-edge-device/pull/3269) Re-did revertion of TFlite submodule update as certain modules crash with it  (change was lost)
-
-
-## [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.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
-Only changes since RC1 are listed:
-- Updated parameter documentation pages
-- [#3291](https://github.com/jomjol/AI-on-the-edge-device/pull/3291) Rename/remove unused parameters 
-- [#3288](https://github.com/jomjol/AI-on-the-edge-device/pull/3288) Migrate-cam-parameters 
-
-#### Bug Fixes
-Only changes since RC1 are listed:
-- [#3269](https://github.com/jomjol/AI-on-the-edge-device/pull/3269) Reverted TFlite submodule update as certain modules crash with it 
-- [#3279](https://github.com/jomjol/AI-on-the-edge-device/pull/3279) Changed the webhook UploadImg to false 
-- Changed default value from boolean to numeric value in parameter camDenoise documentation
-- Updated config page
-
-## [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:
-- [#3063](https://github.com/jomjol/AI-on-the-edge-device/pull/3063) Add support for OV5640 camera 
-- New tflite-Models
-- [#3088](https://github.com/jomjol/AI-on-the-edge-device/pull/3088) Homeassistant service discovery: derive node_id when using nested topics 
-- [#3081](https://github.com/jomjol/AI-on-the-edge-device/pull/3081) Added Prometheus/OpenMetrics exporter 
-- [#3148](https://github.com/jomjol/AI-on-the-edge-device/pull/3148), [#3163](https://github.com/jomjol/AI-on-the-edge-device/pull/3163), [#3174](https://github.com/jomjol/AI-on-the-edge-device/pull/3148), [#3163](https://github.com/jomjol/AI-on-the-edge-device/pull/3163), [#3174](https://github.com/jomjol/AI-on-the-edge-device/pull/3174) Added Webhook 
-- [#3195](https://github.com/jomjol/AI-on-the-edge-device/pull/3195) Add rate threshold parameter 
-- [#3068](https://github.com/jomjol/AI-on-the-edge-device/pull/3068) Added a Delay between the WiFi reconnections 
-- 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:
-- [#3220](https://github.com/jomjol/AI-on-the-edge-device/pull/3220) Handle crash on corrupted model 
-- [#3175](https://github.com/jomjol/AI-on-the-edge-device/pull/3175) Bugfix for boot loop 
-- [#3180](https://github.com/jomjol/AI-on-the-edge-device/pull/3180) Bugfix for time stamp 
-- [#3162](https://github.com/jomjol/AI-on-the-edge-device/pull/3162) Handle empty prevalue.ini gracefully 
-- [#3213](https://github.com/jomjol/AI-on-the-edge-device/pull/3213) Added note about only TLS 1.2 is supported 
-
-## [15.7.0] - 2024-02-17
-
-For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.6.0...v15.7.0)
-
-#### Core Changes
-- Added new camera settings (See `Settings > Alignment > Reference Image and Camera Settings`). You might need to re-create the reference image and alignment marks. Note worthy:
-  - You can now crop the image
-  - Support to configure sharpness, grayscale, negatoive and exposure
-- Enhanced various WebUI pages with better explanations and usability
-- Add Firmware Version to MQTT
-
-#### Bug Fixes
-- Reverted "Implemented late analog / 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
 
 For a full list of changes see [Full list of changes](https://github.com/jomjol/AI-on-the-edge-device/compare/v15.5.0...v15.6.0)
@@ -177,7 +14,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 / digit transition
+ - Implemented late analog / digital transition
 
 #### Fixed
 
@@ -205,8 +42,6 @@ For a full list of changes see [Full list of changes](https://github.com/jomjol/
    - dig-class100-0167_s2_q.tflite
    - dig-class11_1700_s2.tflite
    - ana-cont_1208_s2_q.tflite
-  
- - Added config entries for MQTT TLS
 
 
 #### Fixed
@@ -337,7 +172,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`
-    -   Digit CNN network to `dig-class100-1.6.0`
+    -   Digital 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
@@ -473,7 +308,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-digit`, `cnn-analog`
+    -   Content: `time`, `name-of-number`, `raw-value`, `return-value`, `pre-value`, `change-rate`, `change-absolute`, `error-text`, `cnn-digital`, `cnn-analog`
 -   Show graph of values direct in the user interface (thanks to [@rdmueller](https://github.com/rdmueller))
 
     -   Using new data logging (see above)
@@ -491,10 +326,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 `AnalogDigTransitionStart`. 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 `AnalogDigitalTransitionStart`. 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` (Digitization Status), Timezone to MQTT topic `timestamp`.#
+-   NEW v13.0.2: MQTT: Added MQTT topic `status` (Digitalization 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
@@ -619,7 +454,7 @@ Intermediate Digits
 
 -   Updated analog neural network file (`ana-cont_11.3.0_s2.tflite` - default, `ana-class100_0120_s1_q.tflite`)
 
--   Updated digit neural network file (`dig-cont_0570_s3.tflite` - default, `dig-class100_0120_s2_q.tflite`)
+-   Updated digital 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)**)
 
@@ -631,8 +466,8 @@ Intermediate Digits
 
 Intermediate Digits
 
--   New and improved consistency check (especially with analog and digit counters mixed)
--   Bug Fix: digit counter algorithm
+-   New and improved consistency check (especially with analog and digital counters mixed)
+-   Bug Fix: digital counter algorithm
 
 ## [11.0.1](https://github.com/jomjol/AI-on-the-edge-device/releases/tag/v11.0.1), 2022-08-18
 
@@ -643,16 +478,16 @@ Intermediate Digits
 -   Implementation of new CNN types to detect intermediate values of digits with rolling numbers
 
     -   By default the old algo (0, 1, ..., 9, "N") is active (due to the limited types of digits trained so far)
-    -   Activation can be done by selecting a tflite file with the new trained model in the 'config.ini'
+    -   Activation can be done by selection a tflite file with the new trained model in the 'config.ini'
     -   **Details can be found in the [wiki](https://github.com/jomjol/AI-on-the-edge-device/wiki/Neural-Network-Types)** (different types, trained image types, naming convention)
 
--   Updated  neural network files (and adaptation to new naming convention)
+-   Updated  neural network files (and adaption to new naming convention)
 
--   Published a tool to download and combine log files - Thanks to [Contributor]
+-   Published a tool to download and combine log files - **Thanks to **
 
     -   Files see ['/tools/logfile-tool'](tbd), How-to see [wiki](https://github.com/jomjol/AI-on-the-edge-device/wiki/Gasmeter-Log-Downloader)
 
--   Bug Fix: InfluxDB enabling in graphic configuration
+-   Bug Fix: InfluxDB enabling in grahic configuration
 
 ## [10.6.2](https://github.com/jomjol/AI-on-the-edge-device/releases/tag/v10.6.2), 2022-07-24
 
@@ -666,13 +501,13 @@ Stability Increase
 
 -   **NEW 10.6.1**: Bug Fix: tflite-filename with ".", HTML spelling error
 
--   InfluxDB: direct injection into InfluxDB - thanks to **[wetneb](https://github.com/wetneb)**
+-   IndluxDB: direct injection into InfluxDB - thanks to **[wetneb](https://github.com/wetneb)**
 
 -   MQTT: implemented "Retain Flag" and extend with absolute Change (in addition to rate)
 
 -   `config.ini`: removal of modelsize (readout from tflite)
 
--   Updated analog neural network file (`ana1000s2.tflite`) & digit neural network file (`dig1400s2q.tflite`)
+-   Updated analog neural network file (`ana1000s2.tflite`) & digital neural network file (`dig1400s2q.tflite`)
 
 -   TFMicro/Lite: Update (espressif Version 20220716)
 
@@ -708,7 +543,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 digit neural network file (`dig-s1-q-20220102.tflite`)
+-   Updated digital neural network file (`dig-s1-q-20220102.tflite`)
 -   Updated build environment to `Espressif 3.5.0`
 
 ## [10.3.0] - (2022-01-29)
@@ -774,7 +609,7 @@ Stability Increase
 
 -   Update analog neural network (ana-s3-q-20220105.tflite)
 
--   Update digit neural network (dig-s1-q-20220102.tflite)
+-   Update digital neural network (dig-s1-q-20220102.tflite)
 
 -   Increased web-server buffers
 
@@ -811,7 +646,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 digit CNN to v13.3.0 (added new images)
+-   Upgrade digital CNN to v13.3.0 (added new images)
 -   html: support of different ports
 
 ## [9.1.1] - External Illumination (2021-11-16)
@@ -836,7 +671,7 @@ External Illumination
 
 ### Changed
 
--   Upgrade digit CNN to v13.1.0 (added new images)
+-   Upgrade digital 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)
@@ -866,7 +701,7 @@ External Illumination
 
 ### Changed
 
--   Upgrade digit CNN to v12.1.0 (added new images)
+-   Upgrade digital CNN to v12.1.0 (added new images)
 -   Dedicated NaN handling, internal refactoring (CNN-Handling)
 -   HTML: confirmation after config.ini update
 -   Bug fixing
@@ -888,7 +723,7 @@ External Illumination
 -   GPIO: using the general mqtt main topic for GPIO
 
 
--   Upgrade digit CNN to v12.0.0  (added new images)
+-   Upgrade digital 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
 
@@ -924,7 +759,7 @@ External Illumination
 
 -   Update wlan handling to esp-idf 4.1
 
--   Upgrade digit CNN to v8.7.0  (added new images)
+-   Upgrade digital CNN to v8.7.0  (added new images)
 
 -   Bug fix: MQTT, WLAN, LED-Controll, GPIO usage, fixed IP, calculation flow rate
 
@@ -935,7 +770,7 @@ External Illumination
 -   NEW: 7.0.1: bug fix wlan password with "="
 
 
--   Upgrade digit CNN to v8.5.0  (added new images)
+-   Upgrade digital CNN to v8.5.0  (added new images)
 
 -   New MQTT topics: flow rate (units/minute), time stamp (last correct read readout)
 
@@ -952,7 +787,7 @@ External Illumination
 
 -   NEW 6.7.1: Improved stability of camera (back to v6.6.1) - remove black strips and areas
 
--   Upgrade digit CNN to v8.3.0  (added new type of digits)
+-   Upgrade digital CNN to v8.3.0  (added new type of digits)
 
 -   Internal update: TFlite (v2.5), esp32cam, startup sequence
 
@@ -973,7 +808,7 @@ External Illumination
 
 ### Changed
 
--   Upgrade digit CNN to v8.2.0  (added new type of digits)
+-   Upgrade digital CNN to v8.2.0  (added new type of digits)
 
 
 -   Supporting alignment structures in ROI definition
@@ -1009,7 +844,7 @@ External Illumination
 
 -   Determination of fixed illumination settings during startup - speed up of 5s in each run
 
--   Update digit CNN to v8.1.1 (additional digit images trained)
+-   Update digital CNN to v8.1.1 (additional digital images trained)
 
 -   Extended error message in MQTT error message
 
@@ -1021,7 +856,7 @@ External Illumination
 
 ### Changed
 
--   Disabling of analog / digit counters in configuration
+-   Disabling of analog / digital counters in configuration
 
 
 -   Improved Alignment Algorithm (`AlignmentAlgo`  = `Default`,  `Accurate` , `Fast`)
@@ -1041,7 +876,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 digit CNN to v7.2.1 (additional digit images trained)
+-   Update digital CNN to v7.2.1 (additional digital 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)
@@ -1075,7 +910,7 @@ External Illumination
 
 -   standardized access to current logfile via `http://IP-ADRESS/logfileact`
 
--   Update digit CNN to v7.2.0, analog CNN to 6.3.0
+-   Update digital CNN to v7.2.0, analog CNN to 6.3.0
 
 -   Bug fixing: truncation error,  CheckDigitConsistency & PreValue implementation
 
@@ -1094,7 +929,7 @@ External Illumination
 
 ### Changed
 
--   Update digit CNN to v6.5.0 and HTML (Info to hostname, IP, ssid)
+-   Update digital CNN to v6.5.0 and HTML (Info to hostname, IP, ssid)
 
 -   New implementation of "checkDigitConsistency" also for digits
 
@@ -1181,7 +1016,7 @@ External Illumination
 -   Bug in configuration of analog ROIs corrected
 
 
--   minor Bug correction
+-   minor bug correction
 
 ## [1.0.1](2020-09-05)
 
@@ -1190,7 +1025,7 @@ External Illumination
 -   preValue.ini Bug corrected
 
 
--   minor Bug correction
+-   minor bug correction
 
 ## [1.0.0](2020-09-04)
 

FeatureRequest.md

@@ -40,16 +40,16 @@ ____
 Demo mode requires a working camera (if not, one receives a 'Cam bad' error). Would be nice to demo or play around on other ESP32 boards (or on ESP32-CAM boards when you broke the camera cable...).
 
 #### #35 Use the same model, but provide the image from a Smartphone Camera
-as reading the Electricity or Water meter every few minutes only delivers apparent accuracy (DE: "Scheingenauigkeit") you could just as well take a picture with your Smartphone every so often (e.g. once a week when you are in the Basement anyway), then with some "semi clever" tricks pass this image to the model developed here, and the values than on to whoever needs them e.g. via MQTT.
+as reading the Electricity or Water meter every few minutues only delivers apparent accuracy (DE: "Scheingenauigkeit") you could just as well take a picture with your Smartphone evey so often (e.g. once a week when you are in the Basement anyway), then with some "semi clever" tricks pass this image to the model developed here, and the values then on to who ever needs them e.g. via MQTT.
 IMO: It is not needed to have that many readings (datapoints) as our behaviour (Use of electricity or water) doesn't vary that much, say, over a weeks time. The interpolation between weekly readings will give sufficient information on the power and/or water usage. 
 
 
 #### #34 implement state and Roi for water leak detection
-for example see Roi in the next picture..
+for example see Roi on the next picture..
 ![grafik](https://user-images.githubusercontent.com/38385805/207858812-2a6ba41d-1a8c-4fa1-9b6a-53cdd113c106.png)
-in case of position change between the measurements set this state to true, if there is no change set it back to false.
+in case of position change between the measurments set this state to true, if there is no change set it back to false.
 In a defined time window this movement can lead into an alarm state / water leak..
-having this state in the mqtt broker can trigger functions like closing the water pipe valve and so on...
+haveing this state in the mqtt broker can trigger functions like closing the ater pipe walve and so on...
 
 
 
@@ -65,7 +65,7 @@ having this state in the mqtt broker can trigger functions like closing the wate
 
 #### #31 Implement InfluxDB v2.x interface
 
-* Currently only InfluxDB v1.x is supported, extend to v2.x
+* Currently only InfluxDB v1.x is supportet, extend to v2.x
 * Remark: interface has changed
 * see [#1160](https://github.com/jomjol/AI-on-the-edge-device/issues/1160)
 
@@ -82,7 +82,7 @@ having this state in the mqtt broker can trigger functions like closing the wate
 #### #28 Improved error handling for ROIs
 
 * In case a ROI is out of the image, there is no error message, but a non sense image is used
-* Implement a error message for wrong configuration of ROI
+* Implement a error message for wrong configuratioin of ROI
 
 #### #27 Use Homie Spec for Mqtt binding
 

Licence.md

@@ -1,68 +0,0 @@
-# **Dual Use License for AI-on-the-Edge Device**
-
-Version: 1.0
-Date: 2025-01-05 (5th January 2025)
-
-## **Preamble**
-
-This license allows individuals to use, modify, and share AI-on-the-Edge freely for private, non-commercial purposes. Any commercial use requires a separate licensing agreement with the rights holder.
-
-------
-
-## **1. Grant of License**
-
-### 1.1 **Private Use**
-
-The licensor grants the licensee a free, non-exclusive, worldwide license to use, modify, and distribute the software for private, non-commercial purposes.
-
-### 1.2 **Commercial Use**
-
-The use of the software or any derivative works in any commercial context (including, but not limited to, selling, renting, providing as a service, or integrating into commercial products) is prohibited without a separate commercial license.
-
-------
-
-## **2. Obligation to Private Derivatives**
-
-In modified private versions of the software, the unchanged license as well as the reference to the original source and authors must always be stated (https://github.com/jomjol/AI-on-the-edge-device).
-
-Modified versions of the software must be clearly marked as such and must not imply they are provided by the original licensor.
-
-------
-
-## **3. Commercial Licensing**
-
-Companies, organizations, or individuals wishing to use the software for commercial purposes must obtain a separate commercial license. Please contact mueller.josef(@)gmail.com for further details.
-
-------
-
-## **4. Terms of Cooperation**
-
-By contributing to the AI-on-the-Edge software, this license is considered accepted. This applies to, but is not limited to, code, error corrections, extensions, artwork, documentation, and new features. Any contribution, including libraries and sources, must comply with the terms of this license.
-
-The contributor agrees that the added code and functionality may also be used in commercial versions without compensation to the contributor.
-
-------
-
-## **5. Disclaimer of Liability**
-
-### 5.1 **General Disclaimer**
-
-The software is provided "as is", without any express or implied warranties. The licensor is not liable for any damages resulting from the use of the software.
-
-### 5.2 **No Usage in Safety or Security Environments**
-
-The image processing uses neural networks, among other algorithms, whose results can produce incorrect or unexpected outcomes due to their functionality and the underlying training data. Therefore, this system must not be used or offered for safety-relevant systems or systems with high reliability requirements.
-
-------
-
-## **6. General Provisions**
-
-### 6.1 **Severability Clause**
-
-If any provision of this license is deemed invalid, the remaining provisions shall remain in full force and effect.
-
-------
-
-## **Acceptance**
-
-By using this software, the licensee agrees to the terms of this license.

README.md

@@ -1,681 +1,108 @@
-<h1 align="center">AI on the Edge Device: Digitizing Your non-digital meters with an ESP32-CAM</h1>
-<br>
-<br>
+# Welcome to the AI-on-the-edge-device
+<img src="images/icon/watermeter.svg" width="100px">
 
-## Table of Contents
-- [Key Features 🚀](#key-features-)
-- [Workflow 🔧](#workflow-)
-- [Impressions 📷](#impressions-)
-  - [AI-on-the-edge-device on a Water Meter 💧](#ai-on-the-edge-device-on-a-water-meter-)
-  - [Web Interface (Water Meter) 💻](#web-interface-water-meter-)
-  - [AI-on-the-edge-device on an Electrical Power Meter ⚡](#ai-on-the-edge-device-on-an-electrical-power-meter-)
-- [Setup 🛠️](#setup-%EF%B8%8F)
-- [Download 🔽](#download-)
-- [Flashing the ESP32 💾](#flashing-the-esp32-)
-- [Flashing the SD Card 💾](#flashing-the-sd-card-)
-- [Casing 🛠️](#casing-%EF%B8%8F)
-- [Donate ☕](#donate-)
-- [Support 💬](#support-)
-- [Changes and History 📜](#changes-and-history-)
-- [Build It Yourself 🔨](#build-it-yourself-)
-- [Tools 🛠️](#tools-%EF%B8%8F)
-- [Additional Ideas 💡](#additional-ideas-)
-- [Our Contributors ❤️](#our-contributors-%EF%B8%8F)
+Artificial intelligence based systems have become established in our everyday lives. Just think of speech or image recognition. Most of the systems rely on either powerful processors or a direct connection to the cloud for doing the calculations there. With the increasing power of modern processors, the AI systems are coming closer to the end user – which is usually called **edge computing**.
+Here, this edge computing is put into a practically oriented example, where an AI network is implemented on an ESP32 device so: **AI on the edge**.
 
-<p align="center">
-    <a href="#top">
-        <img src="https://img.shields.io/badge/Back%20to%20Top-000000?style=for-the-badge&logo=github&logoColor=white" alt="Back to Top">
-    </a>
-</p>
+This project allows you to digitize your **analog** water, gas, power and other meters using cheap and easily available hardware.
+
+All you need is an [ESP32 board with a supported camera](https://jomjol.github.io/AI-on-the-edge-device-docs/Hardware-Compatibility/) and something of a practical hand.
+
+<img src="images/esp32-cam.png" width="200px">
+
+## Key features
+- Tensorflow Lite (TFlite) integration – including easy-to-use wrapper
+- Inline image processing (feature detection, alignment, ROI extraction)
+- **Small** and **cheap** device (3 x 4.5 x 2 cm³, < 10 EUR)
+- Integrated camera and illumination
+- Web interface for administration and control
+- OTA interface for updating directly via the web interface
+- Full integration into Homeassistant
+- Support for Influx DB 1 and 2
+- MQTT
+- REST API
+
+## Workflow
+The device takes a photo of your meter at a defined interval. It then extracts the Regions of Interest (ROIs) from the image and runs them through artificial intelligence. As a result, you get the digitized value of your meter.
+
+There are several options for what to do with that value. Either send it to an MQTT broker, write it to an InfluxDb or simply provide access to it via a REST API.
+
+<img src="https://raw.githubusercontent.com/jomjol/AI-on-the-edge-device/master/images/idea.jpg" width="600"> 
+
+## Impressions
+### AI-on-the-edge-device on a Water Meter
+<img src="https://raw.githubusercontent.com/jomjol/AI-on-the-edge-device/master/images/watermeter_all.jpg" width="200"><img src="https://raw.githubusercontent.com/jomjol/AI-on-the-edge-device/master/images/main.jpg" width="200"><img src="https://raw.githubusercontent.com/jomjol/AI-on-the-edge-device/master/images/size.png" width="200"> 
+
+### Web Interface (Water Meter)
+<img src="https://raw.githubusercontent.com/jomjol/AI-on-the-edge-device/master/images/watermeter.jpg" width="600"> 
+
+### AI-on-the-edge-device on a Electrical Power Meter
+<img src="https://raw.githubusercontent.com/jomjol/AI-on-the-edge-device/master/images/powermeter.jpg" width="600"> 
 
 
+## Setup
+There is growing [documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/) which provides you with a lot of information. Head there to get a start, set it up and configure it.
 
+There are also articles in the German Heise magazine "make:" about the setup and technical background (behind a paywall): [DIY - Setup](https://www.heise.de/select/make/2021/2/2103513300897420296)
 
-[![made-with-c++](https://img.shields.io/badge/Made%20with-C++-1f425f.svg)](https://github.com/jomjol/AI-on-the-edge-device/tree/main/code)
-[![Doc](https://img.shields.io/badge/Doc-MkDocs-526CFE.svg)](https://jomjol.github.io/AI-on-the-edge-device-docs/)
-[![Total downloads](https://img.shields.io/github/downloads/jomjol/AI-on-the-edge-device/total.svg)](https://GitHub.com/jomjol/AI-on-the-edge-device/releases/)
-[![GitHub release](https://img.shields.io/github/release/jomjol/AI-on-the-edge-device.svg)](https://GitHub.com/jomjol/AI-on-the-edge-device/releases/)
-[![GitHub forks](https://img.shields.io/github/forks/jomjol/AI-on-the-edge-device.svg?style=social&label=Fork&maxAge=2592000)](https://GitHub.com/jomjol/AI-on-the-edge-device/network/)
-[![GitHub stars](https://img.shields.io/github/stars/jomjol/AI-on-the-edge-device.svg?style=social&label=Star&maxAge=2592000)](https://GitHub.com/jomjol/AI-on-the-edge-device/stargazers/)
+A lot of people created useful Youtube videos which might help you getting started.
+Here a small selection:
 
-<p align="center" id="top">
-  <img src="images/icon/watermeter.svg" width="150px">
-</p>
+- [youtube.com/watch?v=HKBofb1cnNc](https://www.youtube.com/watch?v=HKBofb1cnNc)
+- [youtube.com/watch?v=yyf0ORNLCk4](https://www.youtube.com/watch?v=yyf0ORNLCk4)
+- [youtube.com/watch?v=XxmTubGek6M](https://www.youtube.com/watch?v=XxmTubGek6M)
+- [youtube.com/watch?v=mDIJEyElkAU](https://www.youtube.com/watch?v=mDIJEyElkAU)
+- [youtube.com/watch?v=SssiPkyKVVs](https://www.youtube.com/watch?v=SssiPkyKVVs)
+- [youtube.com/watch?v=MAHE_QyHZFQ](https://www.youtube.com/watch?v=MAHE_QyHZFQ)
+- [youtube.com/watch?v=Uap_6bwtILQ](https://www.youtube.com/watch?v=Uap_6bwtILQ)
 
-Artificial intelligence is everywhere, from speech to image recognition. While most AI systems rely on powerful processors or cloud computing, **edge computing** brings AI closer to the end user by utilizing the capabilities of modern processors.  
-This project demonstrates edge computing using the **ESP32**, a low-cost, AI-capable device, to digitize your analog meters—whether water, gas, or electricity. With affordable hardware and simple instructions, you can turn any standard meter into a smart device.
+For further background information, head to [Neural Networks](https://www.heise.de/select/make/2021/6/2126410443385102621), [Training Neural Networks](https://www.heise.de/select/make/2022/1/2134114065999161585) and [Programming on the ESP32](https://www.heise.de/select/make/2022/2/2204010051597422030).
 
-Let's explore how to make **AI on the Edge** a reality! 🌟
-
-All you need is an [ESP32 board with a supported camera](https://jomjol.github.io/AI-on-the-edge-device-docs/Hardware-Compatibility/) and some practical skills. 🛠️
-
----
-
-<br>
-
-## Key Features 🚀
-- 🔗 **Tensorflow Lite (TFLite) integration** – including an easy-to-use wrapper.
-- 📸 **Inline image processing** (feature detection, alignment, ROI extraction).
-- 💡 **Small** and **affordable** device (3 x 4.5 x 2 cm³, less than 10 EUR).
-- 📷 Integrated camera and illumination.
-- 🌐 Web interface for administration and control.
-- 🔄 OTA interface for updating directly via the web interface.
-- 🏠 Full integration with Home Assistant.
-- 📊 Support for **Influx DB 1** and **2**.
-- 📡 **MQTT protocol** support.
-- 📥 **REST API** available for data access.
-
-<br>
-
-## Workflow 🔧
-The device captures a photo of your meter at set intervals. It then extracts the Regions of Interest (ROIs) from the image and runs them through artificial intelligence. As a result, you get the digitized value of your meter.
-
-There are several options for what to do with that value:
-- 📤 Send it to a **MQTT broker**.
-- 📝 Write it to an **InfluxDb**.
-- 🔗 Provide access via a **REST API**.
-
-<p align="center">
-  <img src="images/idea.jpg" width="600"> 
-</p>
-
----
-
-<br>
-
-## Impressions 📷
-
-+ ### AI-on-the-edge-device on a Water Meter 💧
-  <p align="center">
-    <img src="images/watermeter_all.jpg" width="200"><img 
-  src="images/main.jpg" width="200"><img 
-  src="images/size.png" width="200"> 
-  </p>
-
-+ ### Web Interface (Water Meter) 💻
-  <p align="center">
-    <img src="images/watermeter.jpg" width="600"> 
-  </p>
-
-+ ### AI-on-the-edge-device on an Electrical Power Meter ⚡
-  <p align="center">
-    <img src="images/powermeter.jpg" width="600"> 
-  </p>
-
----
-
-<br>
-
-## Setup 🛠️
-There is growing [documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/) which provides you with a lot of information. Head there to get started, set it up, and configure it.
-
-There are also articles in the German Heise magazine "make:" about the setup and technical background (behind a paywall): [DIY - Setup](https://www.heise.de/select/make/2021/2/2103513300897420296) 📰
-
-A lot of people have created useful YouTube videos that might help you get started:
-- 🎥 [youtube.com/watch?v=HKBofb1cnNc](https://www.youtube.com/watch?v=HKBofb1cnNc)
-- 🎥 [youtube.com/watch?v=yyf0ORNLCk4](https://www.youtube.com/watch?v=yyf0ORNLCk4)
-- 🎥 [youtube.com/watch?v=XxmTubGek6M](https://www.youtube.com/watch?v=XxmTubGek6M)
-- 🎥 [youtube.com/watch?v=mDIJEyElkAU](https://www.youtube.com/watch?v=mDIJEyElkAU)
-- 🎥 [youtube.com/watch?v=SssiPkyKVVs](https://www.youtube.com/watch?v=SssiPkyKVVs)
-- 🎥 [youtube.com/watch?v=MAHE_QyHZFQ](https://www.youtube.com/watch?v=MAHE_QyHZFQ)
-- 🎥 [youtube.com/watch?v=Uap_6bwtILQ](https://www.youtube.com/watch?v=Uap_6bwtILQ)
-
-For further background information, head to:
-- [Neural Networks](https://www.heise.de/select/make/2021/6/2126410443385102621)
-- [Training Neural Networks](https://www.heise.de/select/make/2022/1/2134114065999161585)
-- [Programming on the ESP32](https://www.heise.de/select/make/2022/2/2204010051597422030)
-
----
-
-<br>
-
-## Download 🔽
+### Download
 The latest available version can be found on the [Releases page](https://github.com/jomjol/AI-on-the-edge-device/releases).
 
----
-
-<br>
-
-## Flashing the ESP32 💾
-Initially, you will have to flash the ESP32 via a USB connection. Later updates are possible directly over the air (OTA using Wi-Fi).
+### Flashing the ESP32
+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 preferred way is the [Web Installer and Console](https://jomjol.github.io/AI-on-the-edge-device/index.html), a browser-based tool to flash the ESP32 and extract the log over USB:  
-  ![](images/web-installer.png)
+- 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:
+![](images/web-installer.png)
 - Flash Tool from Espressif
 - ESPtool (command-line tool)
 
 See the [documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/Installation/) for more information.
 
----
+### Flashing the SD Card
+The SD card can be setup automatically after the firmware got installed. See the [documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/Installation/#remote-setup-using-the-built-in-access-point) for details. For this to work, the SD card must be FAT formated (which is the default on a new SD card).
+Alternatively the SD card still can be setup manually, see the [documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/Installation/#3-sd-card) for details!
 
-<br>
+## Casing
+Various 3D-printable housing can be found here:
+  - https://www.thingiverse.com/thing:4573481 (Water Meter)
+  - https://www.thingiverse.com/thing:5028229 (Power Meter)
+  - https://www.thingiverse.com/thing:5224101 (Gas Meter)
+  - https://www.thingiverse.com/thing:4571627 (ESP32-cam housing only)
 
-## Flashing the SD Card 💾
-The SD card can be set up automatically after the firmware is installed. See the [documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/Installation/#remote-setup-using-the-built-in-access-point) for details. For this to work, the SD card must be FAT formatted (which is the default on a new SD card).
+## Donate
+If you would like to support the developer with a cup of coffee, you can do that via [PayPal](https://www.paypal.com/donate?hosted_button_id=8TRSVYNYKDSWL).
 
-Alternatively, the SD card can still be set up manually. See the [documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/Installation/#3-sd-card) for details.
+<a href="https://www.paypal.com/donate?hosted_button_id=8TRSVYNYKDSWL"><img border="0" src="images/paypal.png" width="200px" target="_blank"></a>
 
----
+## Support
+If you have any technical problems please search the [discussions](https://github.com/jomjol/AI-on-the-edge-device/discussions). In case you found a ug or have a feature request, please open an [issue](https://github.com/jomjol/AI-on-the-edge-device/issues).
 
-<br>
+In other cases you can contact the developer via email: <img src="https://raw.githubusercontent.com/jomjol/AI-on-the-edge-device/master/images/mail.jpg" height="25">
 
-## Casing 🛠️
-Various 3D-printable housings can be found here:
-- 💧 [Water Meter](https://www.thingiverse.com/thing:4573481)
-- ⚡ [Power Meter](https://www.thingiverse.com/thing:5028229)
-- 🔥 [Gas Meter](https://www.thingiverse.com/thing:5224101)
-- 📷 [ESP32-cam housing only](https://www.thingiverse.com/thing:4571627)
+## Changes and History 
+See [Changelog](Changelog.md).
 
----
+## Build It Yourself
+See [Build Instructions](code/README.md).
 
-<br>
+## Tools
+* Logfile downloader and combiner (Thx to [reserve85](https://github.com/reserve85))
+  * Files see ['/tools/logfile-tool'](tbd), how-to see [documentation](https://jomjol.github.io/AI-on-the-edge-device-docs/outdated--Gasmeter-Log-Downloader/)
 
-## Donate ☕
-If you'd like to support the developer with a cup of coffee, you can do so via [PayPal](https://www.paypal.com/donate?hosted_button_id=8TRSVYNYKDSWL).
-
-<p align="center">
-  <a href="https://www.paypal.com/donate?hosted_button_id=8TRSVYNYKDSWL"><img border="0" src="images/paypal.png" width="200px" target="_blank"></a>
-</p>
-
----
-
-<br>
-
-## Support 💬
-If you have any technical problems, please search the [discussions](https://github.com/jomjol/AI-on-the-edge-device/discussions). In case you find a bug or have a feature request, please open an [issue](https://github.com/jomjol/AI-on-the-edge-device/issues).
-
-For any other issues, you can contact the developer via email:  
-<p align="center">
-  <img src="images/mail.jpg" height="25">
-</p>
-
----
-
-<br>
-
-## Changes and History 📜
-See the [Changelog](Changelog.md) for detailed information.
-
----
-
-<br>
-
-## Build It Yourself 🔨
-See the [Build Instructions](code/README.md) for step-by-step guidance.
-
----
-
-<br>
-
-## Tools 🛠️
-* Logfile downloader and combiner (Thanks to [reserve85](https://github.com/reserve85))  
-  * It can be found at ['/tools/logfile-tool'](https://github.com/jomjol/AI-on-the-edge-device/tree/main/tools/logfile-tool).
-
----
-
-<br>
-
-## Additional Ideas 💡
-There are some ideas and feature requests which are not currently being pursued—mainly due to capacity constraints on the part of the developers. These features are collected in the [issues](https://github.com/jomjol/AI-on-the-edge-device/issues) and in [FeatureRequest.md](FeatureRequest.md).
-
----
-
-<br>
-
-## Our Contributors ❤️
-<!-- Do not manually edit this section! It should get updated using the Github action "Manually update contributors list" -->
-<!-- readme: contributors -start -->
-<table>
-	<tbody>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/jomjol">
-                    <img src="https://avatars.githubusercontent.com/u/30766535?v=4" width="100;" alt="jomjol"/>
-                    <br />
-                    <sub><b>jomjol</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/caco3">
-                    <img src="https://avatars.githubusercontent.com/u/1783586?v=4" width="100;" alt="caco3"/>
-                    <br />
-                    <sub><b>CaCO3</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/haverland">
-                    <img src="https://avatars.githubusercontent.com/u/412645?v=4" width="100;" alt="haverland"/>
-                    <br />
-                    <sub><b>Frank Haverland</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/SybexX">
-                    <img src="https://avatars.githubusercontent.com/u/587201?v=4" width="100;" alt="SybexX"/>
-                    <br />
-                    <sub><b>michael</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/Slider0007">
-                    <img src="https://avatars.githubusercontent.com/u/115730895?v=4" width="100;" alt="Slider0007"/>
-                    <br />
-                    <sub><b>Slider0007</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/nliaudat">
-                    <img src="https://avatars.githubusercontent.com/u/6782613?v=4" width="100;" alt="nliaudat"/>
-                    <br />
-                    <sub><b>Nicolas Liaudat</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/Zwer2k">
-                    <img src="https://avatars.githubusercontent.com/u/10438794?v=4" width="100;" alt="Zwer2k"/>
-                    <br />
-                    <sub><b>Zwer2k</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/phlupp">
-                    <img src="https://avatars.githubusercontent.com/u/6304863?v=4" width="100;" alt="phlupp"/>
-                    <br />
-                    <sub><b>phlupp</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/jasaw">
-                    <img src="https://avatars.githubusercontent.com/u/721280?v=4" width="100;" alt="jasaw"/>
-                    <br />
-                    <sub><b>jasaw</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/dockSquadron">
-                    <img src="https://avatars.githubusercontent.com/u/11964767?v=4" width="100;" alt="dockSquadron"/>
-                    <br />
-                    <sub><b>dockSquadron</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/rdmueller">
-                    <img src="https://avatars.githubusercontent.com/u/1856308?v=4" width="100;" alt="rdmueller"/>
-                    <br />
-                    <sub><b>Ralf D. Müller</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/cristianmitran">
-                    <img src="https://avatars.githubusercontent.com/u/36613624?v=4" width="100;" alt="cristianmitran"/>
-                    <br />
-                    <sub><b>cristianmitran</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/michaeljoos72">
-                    <img src="https://avatars.githubusercontent.com/u/20517474?v=4" width="100;" alt="michaeljoos72"/>
-                    <br />
-                    <sub><b>michaeljoos72</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/henrythasler">
-                    <img src="https://avatars.githubusercontent.com/u/6277203?v=4" width="100;" alt="henrythasler"/>
-                    <br />
-                    <sub><b>Henry Thasler</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/amantyagiprojects">
-                    <img src="https://avatars.githubusercontent.com/u/174239452?v=4" width="100;" alt="amantyagiprojects"/>
-                    <br />
-                    <sub><b>Naman Tyagi</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/pixeldoc2000">
-                    <img src="https://avatars.githubusercontent.com/u/376715?v=4" width="100;" alt="pixeldoc2000"/>
-                    <br />
-                    <sub><b>pixel::doc</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/mad2xlc">
-                    <img src="https://avatars.githubusercontent.com/u/37449746?v=4" width="100;" alt="mad2xlc"/>
-                    <br />
-                    <sub><b>Stefan</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/jochenchrist">
-                    <img src="https://avatars.githubusercontent.com/u/2930448?v=4" width="100;" alt="jochenchrist"/>
-                    <br />
-                    <sub><b>jochenchrist</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/parhedberg">
-                    <img src="https://avatars.githubusercontent.com/u/13777521?v=4" width="100;" alt="parhedberg"/>
-                    <br />
-                    <sub><b>parhedberg</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/fsck-block">
-                    <img src="https://avatars.githubusercontent.com/u/58307481?v=4" width="100;" alt="fsck-block"/>
-                    <br />
-                    <sub><b>fsck-block</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/slovdahl">
-                    <img src="https://avatars.githubusercontent.com/u/1417619?v=4" width="100;" alt="slovdahl"/>
-                    <br />
-                    <sub><b>Sebastian Lövdahl</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/RaHehl">
-                    <img src="https://avatars.githubusercontent.com/u/7577984?v=4" width="100;" alt="RaHehl"/>
-                    <br />
-                    <sub><b>Raphael Hehl</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/LordGuilly">
-                    <img src="https://avatars.githubusercontent.com/u/13271835?v=4" width="100;" alt="LordGuilly"/>
-                    <br />
-                    <sub><b>LordGuilly</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/muggenhor">
-                    <img src="https://avatars.githubusercontent.com/u/484066?v=4" width="100;" alt="muggenhor"/>
-                    <br />
-                    <sub><b>Giel van Schijndel</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/bilalmirza74">
-                    <img src="https://avatars.githubusercontent.com/u/84387676?v=4" width="100;" alt="bilalmirza74"/>
-                    <br />
-                    <sub><b>Bilal Mirza</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/AngryApostrophe">
-                    <img src="https://avatars.githubusercontent.com/u/89547888?v=4" width="100;" alt="AngryApostrophe"/>
-                    <br />
-                    <sub><b>AngryApostrophe</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/ralf1307">
-                    <img src="https://avatars.githubusercontent.com/u/46164027?v=4" width="100;" alt="ralf1307"/>
-                    <br />
-                    <sub><b>Ralf Rachinger</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/Ranjana761">
-                    <img src="https://avatars.githubusercontent.com/u/129291313?v=4" width="100;" alt="Ranjana761"/>
-                    <br />
-                    <sub><b>Ranjana761</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/SURYANSH-RAI">
-                    <img src="https://avatars.githubusercontent.com/u/79277130?v=4" width="100;" alt="SURYANSH-RAI"/>
-                    <br />
-                    <sub><b>SURYANSH RAI</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/SkylightXD">
-                    <img src="https://avatars.githubusercontent.com/u/16561545?v=4" width="100;" alt="SkylightXD"/>
-                    <br />
-                    <sub><b>SkylightXD</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/ottk3">
-                    <img src="https://avatars.githubusercontent.com/u/5236802?v=4" width="100;" alt="ottk3"/>
-                    <br />
-                    <sub><b>Sven Rojek</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/Turbo87">
-                    <img src="https://avatars.githubusercontent.com/u/141300?v=4" width="100;" alt="Turbo87"/>
-                    <br />
-                    <sub><b>Tobias Bieniek</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/tkopczuk">
-                    <img src="https://avatars.githubusercontent.com/u/101632?v=4" width="100;" alt="tkopczuk"/>
-                    <br />
-                    <sub><b>Tomek Kopczuk</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/yonz2">
-                    <img src="https://avatars.githubusercontent.com/u/13886257?v=4" width="100;" alt="yonz2"/>
-                    <br />
-                    <sub><b>Yonz</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/Yveaux">
-                    <img src="https://avatars.githubusercontent.com/u/7716005?v=4" width="100;" alt="Yveaux"/>
-                    <br />
-                    <sub><b>Yveaux</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/flooxo">
-                    <img src="https://avatars.githubusercontent.com/u/93255373?v=4" width="100;" alt="flooxo"/>
-                    <br />
-                    <sub><b>flox_x</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/gneluka">
-                    <img src="https://avatars.githubusercontent.com/u/32097881?v=4" width="100;" alt="gneluka"/>
-                    <br />
-                    <sub><b>gneluka</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/kalwados">
-                    <img src="https://avatars.githubusercontent.com/u/11840444?v=4" width="100;" alt="kalwados"/>
-                    <br />
-                    <sub><b>kalwados</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/kub3let">
-                    <img src="https://avatars.githubusercontent.com/u/95883234?v=4" width="100;" alt="kub3let"/>
-                    <br />
-                    <sub><b>kub3let</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/pfeifferch">
-                    <img src="https://avatars.githubusercontent.com/u/73090220?v=4" width="100;" alt="pfeifferch"/>
-                    <br />
-                    <sub><b>pfeifferch</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/rstephan">
-                    <img src="https://avatars.githubusercontent.com/u/8532364?v=4" width="100;" alt="rstephan"/>
-                    <br />
-                    <sub><b>rstephan</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/smartboart">
-                    <img src="https://avatars.githubusercontent.com/u/38385805?v=4" width="100;" alt="smartboart"/>
-                    <br />
-                    <sub><b>smartboart</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/wetneb">
-                    <img src="https://avatars.githubusercontent.com/u/309908?v=4" width="100;" alt="wetneb"/>
-                    <br />
-                    <sub><b>Antonin Delpeuch</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/adarazs">
-                    <img src="https://avatars.githubusercontent.com/u/6269603?v=4" width="100;" alt="adarazs"/>
-                    <br />
-                    <sub><b>Attila Darazs</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/austindrenski">
-                    <img src="https://avatars.githubusercontent.com/u/21338699?v=4" width="100;" alt="austindrenski"/>
-                    <br />
-                    <sub><b>Austin Drenski</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/PLCHome">
-                    <img src="https://avatars.githubusercontent.com/u/29116097?v=4" width="100;" alt="PLCHome"/>
-                    <br />
-                    <sub><b>PLCHome</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/CFenner">
-                    <img src="https://avatars.githubusercontent.com/u/9592452?v=4" width="100;" alt="CFenner"/>
-                    <br />
-                    <sub><b>Christopher Fenner</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/dkneisz">
-                    <img src="https://avatars.githubusercontent.com/u/43378003?v=4" width="100;" alt="dkneisz"/>
-                    <br />
-                    <sub><b>Dave</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/FarukhS52">
-                    <img src="https://avatars.githubusercontent.com/u/129654632?v=4" width="100;" alt="FarukhS52"/>
-                    <br />
-                    <sub><b>Farookh Zaheer Siddiqui</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/hex7c0">
-                    <img src="https://avatars.githubusercontent.com/u/4419146?v=4" width="100;" alt="hex7c0"/>
-                    <br />
-                    <sub><b>Francesco Carnielli</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/040medien">
-                    <img src="https://avatars.githubusercontent.com/u/115072?v=4" width="100;" alt="040medien"/>
-                    <br />
-                    <sub><b>Frederik Kemner</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/eltociear">
-                    <img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="100;" alt="eltociear"/>
-                    <br />
-                    <sub><b>Ikko Eltociear Ashimine</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/queeek">
-                    <img src="https://avatars.githubusercontent.com/u/9533371?v=4" width="100;" alt="queeek"/>
-                    <br />
-                    <sub><b>Ina</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/joergrosenkranz">
-                    <img src="https://avatars.githubusercontent.com/u/310438?v=4" width="100;" alt="joergrosenkranz"/>
-                    <br />
-                    <sub><b>Joerg Rosenkranz</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/Innovatorcloudy">
-                    <img src="https://avatars.githubusercontent.com/u/183274513?v=4" width="100;" alt="Innovatorcloudy"/>
-                    <br />
-                    <sub><b>KrishCode</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/myxor">
-                    <img src="https://avatars.githubusercontent.com/u/1397377?v=4" width="100;" alt="myxor"/>
-                    <br />
-                    <sub><b>Marco H</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/rainman110">
-                    <img src="https://avatars.githubusercontent.com/u/3213107?v=4" width="100;" alt="rainman110"/>
-                    <br />
-                    <sub><b>Martin Siggel</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/mkelley88">
-                    <img src="https://avatars.githubusercontent.com/u/5567324?v=4" width="100;" alt="mkelley88"/>
-                    <br />
-                    <sub><b>Matthew T. Kelley</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/toolsfactory">
-                    <img src="https://avatars.githubusercontent.com/u/7744975?v=4" width="100;" alt="toolsfactory"/>
-                    <br />
-                    <sub><b>Michael Geissler</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/ppisljar">
-                    <img src="https://avatars.githubusercontent.com/u/13629809?v=4" width="100;" alt="ppisljar"/>
-                    <br />
-                    <sub><b>Peter Pisljar</b></sub>
-                </a>
-            </td>
-		</tr>
-	<tbody>
-</table>
-<!-- readme: contributors -end -->
-
----
-
-<div align="center">
-    <a href="#top">
-        <img src="https://img.shields.io/badge/Back%20to%20Top-000000?style=for-the-badge&logo=github&logoColor=white" alt="Back to Top">
-    </a>
-</div>
+## Additional Ideas
+There are some ideas and feature requests which are not currently being pursued – mainly due to capacity reasons on the part of the developers.
+They features are collected in the [issues](https://github.com/jomjol/AI-on-the-edge-device/issues) and in [FeatureRequest.md](FeatureRequest.md).

code/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16.0)
 
-list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common components/esp-tflite-micro components/esp-protocols/components/mdns)
+list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common components/esp-tflite-micro)
 
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.cpp

code/components/jomjol_controlGPIO/Color.cpp

@@ -1,53 +1,27 @@
-/********************************************************************************
- * https://github.com/RoboticsBrno/SmartLeds
- *
- * MIT License
- * 
- * Copyright (c) 2017 RoboticsBrno (RobotikaBrno)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *******************************************************************************/
-
 #include "Color.h"
 #include <algorithm>
-#include <cassert>
 #include <cmath>
+#include <cassert>
 
 namespace {
 
 // Int -> fixed point
-int up(int x) { return x * 255; }
+int up( int x ) { return x * 255; }
 
 } // namespace
 
-int iRgbSqrt(int num) {
+int iRgbSqrt( int num ) {
     // https://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Binary_numeral_system_.28base_2.29
-    assert("sqrt input should be non-negative" && num >= 0);
-    assert("sqrt input should no exceed 16 bits" && num <= 0xFFFF);
+    assert( "sqrt input should be non-negative" && num >= 0 );
+    assert( "sqrt input should no exceed 16 bits" && num <= 0xFFFF );
     int res = 0;
     int bit = 1 << 16;
-    while (bit > num)
+    while ( bit > num )
         bit >>= 2;
-    while (bit != 0) {
-        if (num >= res + bit) {
+    while ( bit != 0 ) {
+        if ( num >= res + bit ) {
             num -= res + bit;
-            res = (res >> 1) + bit;
+            res = ( res >> 1 ) + bit;
         } else
             res >>= 1;
         bit >>= 2;
@@ -55,133 +29,104 @@ int iRgbSqrt(int num) {
     return res;
 }
 
-Rgb::Rgb(const Hsv& y) {
+Rgb::Rgb( Hsv y ) {
     // https://stackoverflow.com/questions/24152553/hsv-to-rgb-and-back-without-floating-point-math-in-python
     // greyscale
-    if (y.s == 0) {
+    if( y.s == 0 ) {
         r = g = b = y.v;
         return;
     }
 
     const int region = y.h / 43;
-    const int remainder = (y.h - (region * 43)) * 6;
+    const int remainder = ( y.h - ( region * 43 ) ) * 6;
 
-    const int p = (y.v * (255 - y.s)) >> 8;
-    const int q = (y.v * (255 - ((y.s * remainder) >> 8))) >> 8;
-    const int t = (y.v * (255 - ((y.s * (255 - remainder)) >> 8))) >> 8;
+    const int p = ( y.v * ( 255 - y.s ) ) >> 8;
+    const int q = ( y.v * ( 255 - ( ( y.s * remainder ) >> 8 ) ) ) >> 8;
+    const int t = ( y.v * ( 255 - ( ( y.s * (255 -remainder ) ) >> 8 ) ) ) >> 8;
 
-    switch (region) {
-    case 0:
-        r = y.v;
-        g = t;
-        b = p;
-        break;
-    case 1:
-        r = q;
-        g = y.v;
-        b = p;
-        break;
-    case 2:
-        r = p;
-        g = y.v;
-        b = t;
-        break;
-    case 3:
-        r = p;
-        g = q;
-        b = y.v;
-        break;
-    case 4:
-        r = t;
-        g = p;
-        b = y.v;
-        break;
-    case 5:
-        r = y.v;
-        g = p;
-        b = q;
-        break;
-    default:
-        __builtin_trap();
+    switch( region ) {
+        case 0: r = y.v; g = t; b = p; break;
+        case 1: r = q; g = y.v; b = p; break;
+        case 2: r = p; g = y.v; b = t; break;
+        case 3: r = p; g = q; b = y.v; break;
+        case 4: r = t; g = p; b = y.v; break;
+        case 5: r = y.v; g = p; b = q; break;
+        default: __builtin_trap();
     }
 
     a = y.a;
 }
 
-Rgb& Rgb::operator=(const Hsv& hsv) {
-    Rgb r { hsv };
-    swap(r);
+Rgb& Rgb::operator=( Hsv hsv ) {
+    Rgb r{ hsv };
+    swap( r );
     return *this;
 }
 
-Rgb Rgb::operator+(const Rgb& in) const {
+Rgb Rgb::operator+( Rgb in ) const {
     auto copy = *this;
     copy += in;
     return copy;
 }
 
-Rgb& Rgb::operator+=(const Rgb& in) {
+Rgb& Rgb::operator+=( Rgb in ) {
     unsigned int red = r + in.r;
-    r = (red < 255) ? red : 255;
+    r = ( red < 255 ) ? red : 255;
     unsigned int green = g + in.g;
-    g = (green < 255) ? green : 255;
+    g = ( green < 255 ) ? green : 255;
     unsigned int blue = b + in.b;
-    b = (blue < 255) ? blue : 255;
+    b = ( blue < 255 ) ? blue : 255;
     return *this;
 }
 
-Rgb Rgb::operator-(const Rgb& in) const {
-    auto copy = *this;
-    copy -= in;
-    return copy;
-}
-
-Rgb& Rgb::operator-=(const Rgb& in) {
-    r = (in.r > r) ? 0 : r - in.r;
-    g = (in.g > g) ? 0 : g - in.g;
-    b = (in.b > b) ? 0 : b - in.b;
-    return *this;
-}
-
-Rgb& Rgb::blend(const Rgb& in) {
-    unsigned int inAlpha = in.a * (255 - a);
+Rgb& Rgb::blend( Rgb in ) {
+    unsigned int inAlpha = in.a * ( 255 - a );
     unsigned int alpha = a + inAlpha;
-    r = iRgbSqrt(((r * r * a) + (in.r * in.r * inAlpha)) / alpha);
-    g = iRgbSqrt(((g * g * a) + (in.g * in.g * inAlpha)) / alpha);
-    b = iRgbSqrt(((b * b * a) + (in.b * in.b * inAlpha)) / alpha);
+    r = iRgbSqrt( ( ( r * r * a ) + ( in.r * in.r * inAlpha ) ) / alpha );
+    g = iRgbSqrt( ( ( g * g * a ) + ( in.g * in.g * inAlpha ) ) / alpha );
+    b = iRgbSqrt( ( ( b * b * a ) + ( in.b * in.b * inAlpha ) ) / alpha );
     a = alpha;
     return *this;
 }
 
-Hsv::Hsv(const Rgb& r) {
-    int min = std::min(r.r, std::min(r.g, r.b));
-    int max = std::max(r.r, std::max(r.g, r.b));
+uint8_t IRAM_ATTR Rgb::getGrb( int idx ) {
+    switch ( idx ) {
+        case 0: return g;
+        case 1: return r;
+        case 2: return b;
+    }
+    __builtin_unreachable();
+}
+
+Hsv::Hsv( Rgb r ) {
+    int min = std::min( r.r, std::min( r.g, r.b ) );
+    int max = std::max( r.r, std::max( r.g, r.b ) );
     int chroma = max - min;
 
     v = max;
-    if (chroma == 0) {
+    if ( chroma == 0 ) {
         h = s = 0;
         return;
     }
 
-    s = up(chroma) / max;
+    s = up( chroma ) / max;
     int hh;
-    if (max == r.r)
-        hh = (up(int(r.g) - int(r.b))) / chroma / 6;
-    else if (max == r.g)
-        hh = 255 / 3 + (up(int(r.b) - int(r.r))) / chroma / 6;
+    if ( max == r.r )
+        hh = ( up( int( r.g ) - int( r.b ) ) ) / chroma / 6;
+    else if ( max == r.g )
+        hh = 255 / 3 + ( up( int( r.b ) - int( r.r ) ) ) / chroma / 6;
     else
-        hh = 2 * 255 / 3 + (up(int(r.r) - int(r.g))) / chroma / 6;
+        hh = 2 * 255 / 3 + ( up( int( r.r ) - int( r.g ) ) ) / chroma / 6;
 
-    if (hh < 0)
+    if ( hh < 0 )
         hh += 255;
     h = hh;
 
     a = r.a;
 }
 
-Hsv& Hsv::operator=(const Rgb& rgb) {
-    Hsv h { rgb };
-    swap(h);
+Hsv& Hsv::operator=( Rgb rgb ) {
+    Hsv h{ rgb };
+    swap( h );
     return *this;
 }

code/components/jomjol_controlGPIO/Color.h

@@ -1,90 +1,51 @@
-/********************************************************************************
- * https://github.com/RoboticsBrno/SmartLeds
- *
- * MIT License
- * 
- * Copyright (c) 2017 RoboticsBrno (RobotikaBrno)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *******************************************************************************/
-
 #pragma once
 
-#include "esp_attr.h"
+#ifndef COLOR_H
+#define COLOR_H
+
 #include <cstdint>
+#include "esp_attr.h"
 union Hsv;
 
 union Rgb {
-    struct __attribute__((packed)) {
-        uint8_t g, r, b, a;
+    struct __attribute__ ((packed)) {
+        uint8_t r, g, b, a;
     };
     uint32_t value;
 
-    Rgb(uint8_t r = 0, uint8_t g = 0, uint8_t b = 0, uint8_t a = 255)
-        : g(g)
-        , r(r)
-        , b(b)
-        , a(a) {}
-    Rgb(const Hsv& c);
-    Rgb(const Rgb&) = default;
-    Rgb& operator=(const Rgb& rgb) {
-        swap(rgb);
-        return *this;
-    }
-    Rgb& operator=(const Hsv& hsv);
-    Rgb operator+(const Rgb& in) const;
-    Rgb& operator+=(const Rgb& in);
-    Rgb operator-(const Rgb& in) const;
-    Rgb& operator-=(const Rgb& in);
-    bool operator==(const Rgb& in) const { return in.value == value; }
-    Rgb& blend(const Rgb& in);
-    void swap(const Rgb& o) { value = o.value; }
+    Rgb( uint8_t r = 0, uint8_t g = 0, uint8_t b = 0, uint8_t a = 255 ) : r( r ), g( g ), b( b ), a( a ) {}
+    Rgb( Hsv c );
+    Rgb& operator=( Rgb rgb ) { swap( rgb ); return *this; }
+    Rgb& operator=( Hsv hsv );
+    Rgb operator+( Rgb in ) const;
+    Rgb& operator+=( Rgb in );
+    bool operator==( Rgb in ) const { return in.value == value; }
+    Rgb& blend( Rgb in );
+    void swap( Rgb& o ) {  value = o.value; }
     void linearize() {
         r = channelGamma(r);
         g = channelGamma(g);
         b = channelGamma(b);
     }
 
-    inline uint8_t IRAM_ATTR getGrb(int idx) {
-        switch (idx) {
-        case 0:
-            return g;
-        case 1:
-            return r;
-        case 2:
-            return b;
-        }
-        __builtin_unreachable();
+    uint8_t IRAM_ATTR getGrb( int idx );
+
+    void stretchChannels( uint8_t maxR, uint8_t maxG, uint8_t maxB ) {
+        r = stretch( r, maxR );
+        g = stretch( g, maxG );
+        b = stretch( b, maxB );
     }
 
-    void stretchChannels(uint8_t maxR, uint8_t maxG, uint8_t maxB) {
-        r = stretch(r, maxR);
-        g = stretch(g, maxG);
-        b = stretch(b, maxB);
+    void stretchChannelsEvenly( uint8_t max ) {
+        stretchChannels( max, max, max );
     }
 
-    void stretchChannelsEvenly(uint8_t max) { stretchChannels(max, max, max); }
-
 private:
-    uint8_t stretch(int value, uint8_t max) { return (value * max) >> 8; }
+    uint8_t stretch( int value, uint8_t max ) {
+        return ( value * max ) >> 8;
+    }
 
-    uint8_t channelGamma(int channel) {
+    uint8_t channelGamma( int channel ) {
         /* The optimal gamma correction is x^2.8. However, this is expensive to
          * compute. Therefore, we use x^3 for gamma correction. Also, we add a
          * bias as the WS2812 LEDs do not turn on for values less than 4. */
@@ -92,27 +53,22 @@ private:
             return channel;
         channel = channel * channel * channel * 251;
         channel >>= 24;
-        return static_cast<uint8_t>(4 + channel);
+        return static_cast< uint8_t >( 4 + channel );
     }
 };
 
 union Hsv {
-    struct __attribute__((packed)) {
+    struct __attribute__ ((packed)) {
         uint8_t h, s, v, a;
     };
     uint32_t value;
 
-    Hsv(uint8_t h, uint8_t s = 0, uint8_t v = 0, uint8_t a = 255)
-        : h(h)
-        , s(s)
-        , v(v)
-        , a(a) {}
-    Hsv(const Rgb& r);
-    Hsv& operator=(const Hsv& h) {
-        swap(h);
-        return *this;
-    }
-    Hsv& operator=(const Rgb& rgb);
-    bool operator==(const Hsv& in) const { return in.value == value; }
-    void swap(const Hsv& o) { value = o.value; }
+    Hsv( uint8_t h, uint8_t s = 0, uint8_t v = 0, uint8_t a = 255 ) : h( h ), s( s ), v( v ), a( a ) {}
+    Hsv( Rgb r );
+    Hsv& operator=( Hsv h ) { swap( h ); return *this; }
+    Hsv& operator=( Rgb rgb );
+    bool operator==( Hsv in ) const { return in.value == value; }
+    void swap( Hsv& o ) { value = o.value; }
 };
+
+#endif //COLOR_H

code/components/jomjol_controlGPIO/RmtDriver.h

@@ -1,60 +0,0 @@
-/********************************************************************************
- * https://github.com/RoboticsBrno/SmartLeds
- *
- * MIT License
- * 
- * Copyright (c) 2017 RoboticsBrno (RobotikaBrno)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *******************************************************************************/
-
-#pragma once
-
-#include <esp_system.h>
-#include <stdint.h>
-
-#if defined(ESP_IDF_VERSION)
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
-#define SMARTLEDS_NEW_RMT_DRIVER 1
-#else
-#define SMARTLEDS_NEW_RMT_DRIVER 0
-#endif
-#else
-#define SMARTLEDS_NEW_RMT_DRIVER 0
-#endif
-
-namespace detail {
-
-struct TimingParams {
-    uint32_t T0H;
-    uint32_t T1H;
-    uint32_t T0L;
-    uint32_t T1L;
-    uint32_t TRS;
-};
-
-using LedType = TimingParams;
-
-} // namespace detail
-
-#if SMARTLEDS_NEW_RMT_DRIVER
-#include "RmtDriver5.h"
-#else
-#include "RmtDriver4.h"
-#endif

code/components/jomjol_controlGPIO/RmtDriver4.cpp

@@ -1,143 +0,0 @@
-/********************************************************************************
- * https://github.com/RoboticsBrno/SmartLeds
- *
- * MIT License
- * 
- * Copyright (c) 2017 RoboticsBrno (RobotikaBrno)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *******************************************************************************/
-
-#include "RmtDriver4.h"
-
-#if !SMARTLEDS_NEW_RMT_DRIVER
-#include "SmartLeds.h"
-
-namespace detail {
-
-// 8 still seems to work, but timings become marginal
-static const int DIVIDER = 4;
-// minimum time of a single RMT duration based on clock ns
-static const double RMT_DURATION_NS = 12.5;
-
-RmtDriver::RmtDriver(const LedType& timing, int count, int pin, int channel_num, SemaphoreHandle_t finishedFlag)
-    : _timing(timing)
-    , _count(count)
-    , _pin((gpio_num_t)pin)
-    , _finishedFlag(finishedFlag)
-    , _channel((rmt_channel_t)channel_num) {
-    _bitToRmt[0].level0 = 1;
-    _bitToRmt[0].level1 = 0;
-    _bitToRmt[0].duration0 = _timing.T0H / (RMT_DURATION_NS * DIVIDER);
-    _bitToRmt[0].duration1 = _timing.T0L / (RMT_DURATION_NS * DIVIDER);
-
-    _bitToRmt[1].level0 = 1;
-    _bitToRmt[1].level1 = 0;
-    _bitToRmt[1].duration0 = _timing.T1H / (RMT_DURATION_NS * DIVIDER);
-    _bitToRmt[1].duration1 = _timing.T1L / (RMT_DURATION_NS * DIVIDER);
-}
-
-esp_err_t RmtDriver::init() {
-    rmt_config_t config = RMT_DEFAULT_CONFIG_TX(_pin, _channel);
-    config.rmt_mode = RMT_MODE_TX;
-    config.clk_div = DIVIDER;
-    config.mem_block_num = 1;
-
-    return rmt_config(&config);
-}
-
-esp_err_t RmtDriver::registerIsr(bool isFirstRegisteredChannel) {
-    auto err = rmt_driver_install(_channel, 0,
-#if defined(CONFIG_RMT_ISR_IRAM_SAFE)
-        ESP_INTR_FLAG_IRAM
-#else
-        0
-#endif
-    );
-    if (err != ESP_OK) {
-        return err;
-    }
-
-    if (isFirstRegisteredChannel) {
-        rmt_register_tx_end_callback(txEndCallback, NULL);
-    }
-
-    err = rmt_translator_init(_channel, translateSample);
-    if (err != ESP_OK) {
-        return err;
-    }
-    return rmt_translator_set_context(_channel, this);
-}
-
-esp_err_t RmtDriver::unregisterIsr() { return rmt_driver_uninstall(_channel); }
-
-void IRAM_ATTR RmtDriver::txEndCallback(rmt_channel_t channel, void* arg) {
-    xSemaphoreGiveFromISR(SmartLed::ledForChannel(channel)->_finishedFlag, nullptr);
-}
-
-void IRAM_ATTR RmtDriver::translateSample(const void* src, rmt_item32_t* dest, size_t src_size,
-    size_t wanted_rmt_items_num, size_t* out_consumed_src_bytes, size_t* out_used_rmt_items) {
-    RmtDriver* self;
-    ESP_ERROR_CHECK(rmt_translator_get_context(out_used_rmt_items, (void**)&self));
-
-    const auto& _bitToRmt = self->_bitToRmt;
-    const auto src_offset = self->_translatorSourceOffset;
-
-    auto* src_components = (const uint8_t*)src;
-    size_t consumed_src_bytes = 0;
-    size_t used_rmt_items = 0;
-
-    while (consumed_src_bytes < src_size && used_rmt_items + 7 < wanted_rmt_items_num) {
-        uint8_t val = *src_components;
-
-        // each bit, from highest to lowest
-        for (uint8_t j = 0; j != 8; j++, val <<= 1) {
-            dest->val = _bitToRmt[val >> 7].val;
-            ++dest;
-        }
-
-        used_rmt_items += 8;
-        ++src_components;
-        ++consumed_src_bytes;
-
-        // skip alpha byte
-        if (((src_offset + consumed_src_bytes) % 4) == 3) {
-            ++src_components;
-            ++consumed_src_bytes;
-
-            // TRST delay after last pixel in strip
-            if (consumed_src_bytes == src_size) {
-                (dest - 1)->duration1 = self->_timing.TRS / (detail::RMT_DURATION_NS * detail::DIVIDER);
-            }
-        }
-    }
-
-    self->_translatorSourceOffset = src_offset + consumed_src_bytes;
-    *out_consumed_src_bytes = consumed_src_bytes;
-    *out_used_rmt_items = used_rmt_items;
-}
-
-esp_err_t RmtDriver::transmit(const Rgb* buffer) {
-    static_assert(sizeof(Rgb) == 4); // The translator code above assumes RGB is 4 bytes
-
-    _translatorSourceOffset = 0;
-    return rmt_write_sample(_channel, (const uint8_t*)buffer, _count * 4, false);
-}
-};
-#endif // !SMARTLEDS_NEW_RMT_DRIVER

code/components/jomjol_controlGPIO/RmtDriver4.h

@@ -1,68 +0,0 @@
-/********************************************************************************
- * https://github.com/RoboticsBrno/SmartLeds
- *
- * MIT License
- * 
- * Copyright (c) 2017 RoboticsBrno (RobotikaBrno)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *******************************************************************************/
-
-#pragma once
-
-#include "RmtDriver.h"
-
-#if !SMARTLEDS_NEW_RMT_DRIVER
-#include "Color.h"
-#include <driver/rmt.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/semphr.h>
-
-namespace detail {
-
-constexpr const int CHANNEL_COUNT = RMT_CHANNEL_MAX;
-
-class RmtDriver {
-public:
-    RmtDriver(const LedType& timing, int count, int pin, int channel_num, SemaphoreHandle_t finishedFlag);
-    RmtDriver(const RmtDriver&) = delete;
-
-    esp_err_t init();
-    esp_err_t registerIsr(bool isFirstRegisteredChannel);
-    esp_err_t unregisterIsr();
-    esp_err_t transmit(const Rgb* buffer);
-
-private:
-    static void IRAM_ATTR txEndCallback(rmt_channel_t channel, void* arg);
-
-    static void IRAM_ATTR translateSample(const void* src, rmt_item32_t* dest, size_t src_size,
-        size_t wanted_rmt_items_num, size_t* out_consumed_src_bytes, size_t* out_used_rmt_items);
-
-    const LedType& _timing;
-    int _count;
-    gpio_num_t _pin;
-    SemaphoreHandle_t _finishedFlag;
-
-    rmt_channel_t _channel;
-    rmt_item32_t _bitToRmt[2];
-    size_t _translatorSourceOffset;
-};
-
-};
-#endif // !SMARTLEDS_NEW_RMT_DRIVER

code/components/jomjol_controlGPIO/RmtDriver5.cpp

@@ -1,202 +0,0 @@
-/********************************************************************************
- * https://github.com/RoboticsBrno/SmartLeds
- *
- * MIT License
- * 
- * Copyright (c) 2017 RoboticsBrno (RobotikaBrno)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *******************************************************************************/
-
-#include "RmtDriver5.h"
-
-#if SMARTLEDS_NEW_RMT_DRIVER
-#include <cstddef>
-
-#include "SmartLeds.h"
-
-namespace detail {
-
-static constexpr const uint32_t RMT_RESOLUTION_HZ = 20 * 1000 * 1000; // 20 MHz
-static constexpr const uint32_t RMT_NS_PER_TICK = 1000000000LLU / RMT_RESOLUTION_HZ;
-
-static RmtEncoderWrapper* IRAM_ATTR encSelf(rmt_encoder_t* encoder) {
-    return (RmtEncoderWrapper*)(((intptr_t)encoder) - offsetof(RmtEncoderWrapper, base));
-}
-
-static size_t IRAM_ATTR encEncode(rmt_encoder_t* encoder, rmt_channel_handle_t tx_channel, const void* primary_data,
-    size_t data_size, rmt_encode_state_t* ret_state) {
-    auto* self = encSelf(encoder);
-
-    // Delay after last pixel
-    if ((self->last_state & RMT_ENCODING_COMPLETE) && self->frame_idx == data_size) {
-        *ret_state = (rmt_encode_state_t)0;
-        return self->copy_encoder->encode(
-            self->copy_encoder, tx_channel, (const void*)&self->reset_code, sizeof(self->reset_code), ret_state);
-    }
-
-    if (self->last_state & RMT_ENCODING_COMPLETE) {
-        Rgb* pixel = ((Rgb*)primary_data) + self->frame_idx;
-        self->buffer_len = sizeof(self->buffer);
-        for (size_t i = 0; i < sizeof(self->buffer); ++i) {
-            self->buffer[i] = pixel->getGrb(self->component_idx);
-            if (++self->component_idx == 3) {
-                self->component_idx = 0;
-                if (++self->frame_idx == data_size) {
-                    self->buffer_len = i + 1;
-                    break;
-                }
-                ++pixel;
-            }
-        }
-    }
-
-    self->last_state = (rmt_encode_state_t)0;
-    auto encoded_symbols = self->bytes_encoder->encode(
-        self->bytes_encoder, tx_channel, (const void*)&self->buffer, self->buffer_len, &self->last_state);
-    if (self->last_state & RMT_ENCODING_MEM_FULL) {
-        *ret_state = RMT_ENCODING_MEM_FULL;
-    } else {
-        *ret_state = (rmt_encode_state_t)0;
-    }
-
-    return encoded_symbols;
-}
-
-static esp_err_t encReset(rmt_encoder_t* encoder) {
-    auto* self = encSelf(encoder);
-    rmt_encoder_reset(self->bytes_encoder);
-    rmt_encoder_reset(self->copy_encoder);
-    self->last_state = RMT_ENCODING_COMPLETE;
-    self->frame_idx = 0;
-    self->component_idx = 0;
-    return ESP_OK;
-}
-
-static esp_err_t encDelete(rmt_encoder_t* encoder) {
-    auto* self = encSelf(encoder);
-    rmt_del_encoder(self->bytes_encoder);
-    rmt_del_encoder(self->copy_encoder);
-    return ESP_OK;
-}
-
-RmtDriver::RmtDriver(const LedType& timing, int count, int pin, int channel_num, SemaphoreHandle_t finishedFlag)
-    : _timing(timing)
-    , _count(count)
-    , _pin(pin)
-    , _finishedFlag(finishedFlag)
-    , _channel(nullptr)
-    , _encoder {} {}
-
-esp_err_t RmtDriver::init() {
-    _encoder.base.encode = encEncode;
-    _encoder.base.reset = encReset;
-    _encoder.base.del = encDelete;
-
-    _encoder.reset_code.duration0 = _timing.TRS / RMT_NS_PER_TICK;
-
-    rmt_bytes_encoder_config_t bytes_cfg = {
-        .bit0 = {
-            .duration0 = uint16_t(_timing.T0H  / RMT_NS_PER_TICK),
-            .level0 = 1,
-            .duration1 = uint16_t(_timing.T0L  / RMT_NS_PER_TICK),
-            .level1 = 0,
-        },
-        .bit1 = {
-            .duration0 = uint16_t(_timing.T1H / RMT_NS_PER_TICK),
-            .level0 = 1,
-            .duration1 = uint16_t(_timing.T1L  / RMT_NS_PER_TICK),
-            .level1 = 0,
-        },
-        .flags = {
-            .msb_first = 1,
-        },
-    };
-
-    auto err = rmt_new_bytes_encoder(&bytes_cfg, &_encoder.bytes_encoder);
-    if (err != ESP_OK) {
-        return err;
-    }
-
-    rmt_copy_encoder_config_t copy_cfg = {};
-    err = rmt_new_copy_encoder(&copy_cfg, &_encoder.copy_encoder);
-    if (err != ESP_OK) {
-        return err;
-    }
-
-    // The config must be in registerIsr, because rmt_new_tx_channel
-    // registers the ISR
-    return ESP_OK;
-}
-
-esp_err_t RmtDriver::registerIsr(bool isFirstRegisteredChannel) {
-    rmt_tx_channel_config_t conf = {
-        .gpio_num = (gpio_num_t)_pin,
-        .clk_src = RMT_CLK_SRC_DEFAULT, //.clk_src = RMT_CLK_SRC_APB,
-        .resolution_hz = RMT_RESOLUTION_HZ,
-        .mem_block_symbols = SOC_RMT_MEM_WORDS_PER_CHANNEL,
-        .trans_queue_depth = 1,
-        .flags = {},
-    };
-
-    auto err = rmt_new_tx_channel(&conf, &_channel);
-    if (err != ESP_OK) {
-        return err;
-    }
-
-    rmt_tx_event_callbacks_t callbacks_cfg = {};
-    callbacks_cfg.on_trans_done = txDoneCallback;
-
-    err = rmt_tx_register_event_callbacks(_channel, &callbacks_cfg, this);
-    if (err != ESP_OK) {
-        return err;
-    }
-
-    return rmt_enable(_channel);
-}
-
-esp_err_t RmtDriver::unregisterIsr() {
-    auto err = rmt_del_encoder(&_encoder.base);
-    if (err != ESP_OK) {
-        return err;
-    }
-
-    err = rmt_disable(_channel);
-    if (err != ESP_OK) {
-        return err;
-    }
-
-    return rmt_del_channel(_channel);
-}
-
-bool IRAM_ATTR RmtDriver::txDoneCallback(
-    rmt_channel_handle_t tx_chan, const rmt_tx_done_event_data_t* edata, void* user_ctx) {
-    auto* self = (RmtDriver*)user_ctx;
-    auto taskWoken = pdTRUE;
-    xSemaphoreGiveFromISR(self->_finishedFlag, &taskWoken);
-    return taskWoken == pdTRUE;
-}
-
-esp_err_t RmtDriver::transmit(const Rgb* buffer) {
-    rmt_encoder_reset(&_encoder.base);
-    rmt_transmit_config_t cfg = {};
-    return rmt_transmit(_channel, &_encoder.base, buffer, _count, &cfg);
-}
-};
-#endif // !SMARTLEDS_NEW_RMT_DRIVER

code/components/jomjol_controlGPIO/RmtDriver5.h

@@ -1,91 +0,0 @@
-/********************************************************************************
- * https://github.com/RoboticsBrno/SmartLeds
- *
- * MIT License
- * 
- * Copyright (c) 2017 RoboticsBrno (RobotikaBrno)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *******************************************************************************/
-
-#pragma once
-
-#include "RmtDriver.h"
-
-#if SMARTLEDS_NEW_RMT_DRIVER
-#include <driver/rmt_tx.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/semphr.h>
-#include <type_traits>
-
-#include "Color.h"
-
-#if !defined(CONFIG_RMT_ISR_IRAM_SAFE) && !defined(SMARTLEDS_DISABLE_IRAM_WARNING)
-#warning "Please enable CONFIG_RMT_ISR_IRAM_SAFE IDF option." \
-    "without it, the IDF driver is not able to supply data fast enough."
-#endif
-
-namespace detail {
-
-constexpr const int CHANNEL_COUNT = SOC_RMT_GROUPS * SOC_RMT_CHANNELS_PER_GROUP;
-
-class RmtDriver;
-
-// This is ridiculous
-struct RmtEncoderWrapper {
-    struct rmt_encoder_t base;
-    struct rmt_encoder_t* bytes_encoder;
-    struct rmt_encoder_t* copy_encoder;
-    RmtDriver* driver;
-    rmt_symbol_word_t reset_code;
-
-    uint8_t buffer[SOC_RMT_MEM_WORDS_PER_CHANNEL / 8];
-    rmt_encode_state_t last_state;
-    size_t frame_idx;
-    uint8_t component_idx;
-    uint8_t buffer_len;
-};
-
-static_assert(std::is_standard_layout<RmtEncoderWrapper>::value == true);
-
-class RmtDriver {
-public:
-    RmtDriver(const LedType& timing, int count, int pin, int channel_num, SemaphoreHandle_t finishedFlag);
-    RmtDriver(const RmtDriver&) = delete;
-
-    esp_err_t init();
-    esp_err_t registerIsr(bool isFirstRegisteredChannel);
-    esp_err_t unregisterIsr();
-    esp_err_t transmit(const Rgb* buffer);
-
-private:
-    static bool IRAM_ATTR txDoneCallback(
-        rmt_channel_handle_t tx_chan, const rmt_tx_done_event_data_t* edata, void* user_ctx);
-
-    const LedType& _timing;
-    int _count;
-    int _pin;
-    SemaphoreHandle_t _finishedFlag;
-
-    rmt_channel_handle_t _channel;
-    RmtEncoderWrapper _encoder;
-};
-
-};
-#endif // !SMARTLEDS_NEW_RMT_DRIVER

code/components/jomjol_controlGPIO/SmartLeds.cpp

@@ -1,35 +1,90 @@
-/********************************************************************************
- * https://github.com/RoboticsBrno/SmartLeds
- *
- * MIT License
- * 
- * Copyright (c) 2017 RoboticsBrno (RobotikaBrno)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *******************************************************************************/
-
 #include "SmartLeds.h"
 
-IsrCore SmartLed::_interruptCore = CoreCurrent;
 
-SmartLed*& IRAM_ATTR SmartLed::ledForChannel(int channel) {
-    static SmartLed* table[detail::CHANNEL_COUNT] = {};
-    assert(channel < detail::CHANNEL_COUNT);
-    return table[channel];
+/* PlatformIO 6 (ESP IDF 5) does no longer allow access to RMTMEM,
+   see https://docs.espressif.com/projects/esp-idf/en/latest/esp32/migration-guides/release-5.x/5.0/peripherals.html?highlight=rmtmem#id5 
+   As a dirty workaround, we copy the needed structures from rmt_struct.h
+   In the long run, this should be replaced! */
+typedef struct rmt_item32_s {
+    union {
+        struct {
+            uint32_t duration0 :15;
+            uint32_t level0 :1;
+            uint32_t duration1 :15;
+            uint32_t level1 :1;
+        };
+        uint32_t val;
+    };
+} rmt_item32_t;
+
+//Allow access to RMT memory using RMTMEM.chan[0].data32[8]
+typedef volatile struct rmt_mem_s {
+    struct {
+        rmt_item32_t data32[64];
+    } chan[8];
+} rmt_mem_t;
+extern rmt_mem_t RMTMEM;
+
+
+
+IsrCore SmartLed::_interruptCore = CoreCurrent;
+intr_handle_t SmartLed::_interruptHandle = NULL;
+
+SmartLed*& IRAM_ATTR SmartLed::ledForChannel( int channel ) {
+    static SmartLed* table[8] = { nullptr };
+    assert( channel < 8 );
+    return table[ channel ];
+}
+
+void IRAM_ATTR SmartLed::interruptHandler(void*) {
+    for (int channel = 0; channel != 8; channel++) {
+        auto self = ledForChannel( channel );
+
+        if ( RMT.int_st.val & (1 << (24 + channel ) ) ) { // tx_thr_event
+            if ( self )
+                self->copyRmtHalfBlock();
+            RMT.int_clr.val |= 1 << ( 24 + channel );
+        } else if ( RMT.int_st.val & ( 1 << (3 * channel ) ) ) { // tx_end
+            if ( self )
+                xSemaphoreGiveFromISR( self->_finishedFlag, nullptr );
+            RMT.int_clr.val |= 1 << ( 3 * channel );
+        }
+    }
+}
+
+void IRAM_ATTR SmartLed::copyRmtHalfBlock() {
+    int offset = detail::MAX_PULSES * _halfIdx;
+    _halfIdx = !_halfIdx;
+    int len = 3 - _componentPosition + 3 * ( _count - 1 );
+    len = std::min( len, detail::MAX_PULSES / 8 );
+
+    if ( !len ) {
+        for ( int i = 0; i < detail::MAX_PULSES; i++) {
+            RMTMEM.chan[ _channel].data32[i + offset ].val = 0;
+        }
+    }
+
+    int i;
+    for ( i = 0; i != len && _pixelPosition != _count; i++ ) {
+        uint8_t val = _buffer[ _pixelPosition ].getGrb( _componentPosition );
+        for ( int j = 0; j != 8; j++, val <<= 1 ) {
+            int bit = val >> 7;
+            int idx = i * 8 + offset + j;
+            RMTMEM.chan[ _channel ].data32[ idx ].val = _bitToRmt[ bit & 0x01 ].value;
+        }
+        if ( _pixelPosition == _count - 1 && _componentPosition == 2 ) {
+            RMTMEM.chan[ _channel ].data32[ i * 8 + offset + 7 ].duration1 =
+                _timing.TRS / ( detail::RMT_DURATION_NS * detail::DIVIDER );
+        }
+
+        _componentPosition++;
+        if ( _componentPosition == 3 ) {
+            _componentPosition = 0;
+            _pixelPosition++;
+        }
+    }
+
+    for ( i *= 8; i != detail::MAX_PULSES; i++ ) {
+        RMTMEM.chan[ _channel ].data32[ i + offset ].val = 0;
+    }
 }

code/components/jomjol_controlGPIO/SmartLeds.h

@@ -1,31 +1,8 @@
-/********************************************************************************
- * https://github.com/RoboticsBrno/SmartLeds
- *
- * MIT License
- * 
- * Copyright (c) 2017 RoboticsBrno (RobotikaBrno)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *******************************************************************************/
-
 #pragma once
 
+#ifndef SMARTLEDS_H
+#define SMARTLEDS_H
+
 /*
  * A C++ driver for the WS2812 LEDs using the RMT peripheral on the ESP32.
  *
@@ -54,196 +31,305 @@
  * THE SOFTWARE.
  */
 
+#include <memory>
 #include <cassert>
 #include <cstring>
-#include <memory>
 
-#include <driver/gpio.h>
-#include <driver/spi_master.h>
-#include <esp_intr_alloc.h>
-#include <esp_ipc.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/semphr.h>
+#include "esp_idf_version.h"
+#if (ESP_IDF_VERSION_MAJOR >= 5)
+#include "soc/periph_defs.h"
+#include "esp_private/periph_ctrl.h"
+#include "soc/gpio_sig_map.h"
+#include "soc/gpio_periph.h"
+#include "soc/io_mux_reg.h"
+#include "esp_rom_gpio.h"
+#define gpio_pad_select_gpio esp_rom_gpio_pad_select_gpio
+#define gpio_matrix_in(a,b,c) esp_rom_gpio_connect_in_signal(a,b,c)
+#define gpio_matrix_out(a,b,c,d) esp_rom_gpio_connect_out_signal(a,b,c,d)
+#define ets_delay_us(a) esp_rom_delay_us(a)
+#endif
+
+#if defined ( ARDUINO )
+    extern "C" { // ...someone forgot to put in the includes...
+        #include "esp32-hal.h"
+        #include "esp_intr_alloc.h"
+        #include "esp_ipc.h"
+        #include "driver/gpio.h"
+        #include "driver/periph_ctrl.h"
+        #include "freertos/semphr.h"
+        #include "soc/rmt_struct.h"
+        #include <driver/spi_master.h>
+        #include "esp_idf_version.h"
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL( 4, 0, 0 )
+        #include "soc/dport_reg.h"
+#endif
+    }
+#elif defined ( ESP_PLATFORM )
+    extern "C" { // ...someone forgot to put in the includes...
+        #include <esp_intr_alloc.h>
+        #include <esp_ipc.h>
+        #include <driver/gpio.h>
+        #include <freertos/FreeRTOS.h>
+        #include <freertos/semphr.h>
+        #include <soc/dport_reg.h>
+        #include <soc/gpio_sig_map.h>
+        #include <soc/rmt_struct.h>
+        #include <driver/spi_master.h>
+    }
+    #include <stdio.h>
+#endif
+
+#if (ESP_IDF_VERSION_MAJOR >= 4) && (ESP_IDF_VERSION_MINOR > 1)
+#include "hal/gpio_ll.h"
+#else
+#include "soc/gpio_periph.h"
+#define esp_rom_delay_us ets_delay_us
+static inline int gpio_ll_get_level(gpio_dev_t *hw, int gpio_num)
+{
+    if (gpio_num < 32) {
+        return (hw->in >> gpio_num) & 0x1;
+    } else {
+        return (hw->in1.data >> (gpio_num - 32)) & 0x1;
+    }
+}
+#endif
+
+#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0))
+#if !(configENABLE_BACKWARD_COMPATIBILITY == 1)
+#define xSemaphoreHandle SemaphoreHandle_t
+#endif
+#endif
 
 #include "Color.h"
 
-#include "RmtDriver.h"
+namespace detail {
+
+struct TimingParams {
+    uint32_t T0H;
+    uint32_t T1H;
+    uint32_t T0L;
+    uint32_t T1L;
+    uint32_t TRS;
+};
+
+union RmtPulsePair {
+    struct {
+        int duration0:15;
+        int level0:1;
+        int duration1:15;
+        int level1:1;
+    };
+    uint32_t value;
+};
+
+static const int DIVIDER = 4; // 8 still seems to work, but timings become marginal
+static const int MAX_PULSES = 32; // A channel has a 64 "pulse" buffer - we use half per pass
+static const double RMT_DURATION_NS = 12.5; // minimum time of a single RMT duration based on clock ns
+
+} // namespace detail
 
 using LedType = detail::TimingParams;
 
-// Times are in nanoseconds,
-// The RMT driver runs at 20MHz, so minimal representable time is 50 nanoseconds
-static const LedType LED_WS2812 = { 350, 700, 800, 600, 50000 };
-// longer reset time because https://blog.adafruit.com/2017/05/03/psa-the-ws2812b-rgb-led-has-been-revised-will-require-code-tweak/
-static const LedType LED_WS2812B = { 400, 800, 850, 450, 300000 }; // universal
-static const LedType LED_WS2812B_NEWVARIANT = { 200, 750, 750, 200, 300000 };
-static const LedType LED_WS2812B_OLDVARIANT = { 400, 800, 850, 450, 50000 };
-// This is timing from datasheet, but does not seem to actually work - try LED_WS2812B
-static const LedType LED_WS2812C = { 250, 550, 550, 250, 280000 };
-static const LedType LED_SK6812 = { 300, 600, 900, 600, 80000 };
-static const LedType LED_WS2813 = { 350, 800, 350, 350, 300000 };
+static const LedType LED_WS2812  = { 350, 700, 800, 600, 50000 };
+static const LedType LED_WS2812B = { 400, 850, 850, 400, 50100 };
+static const LedType LED_SK6812  = { 300, 600, 900, 600, 80000 };
+static const LedType LED_WS2813  = { 350, 800, 350, 350, 300000 };
 
-// Single buffer == can't touch the Rgbs between show() and wait()
 enum BufferType { SingleBuffer = 0, DoubleBuffer };
 
-enum IsrCore { CoreFirst = 0, CoreSecond = 1, CoreCurrent = 2 };
+enum IsrCore { CoreFirst = 0, CoreSecond = 1, CoreCurrent = 2};
 
 class SmartLed {
 public:
-    friend class detail::RmtDriver;
-
     // The RMT interrupt must not run on the same core as WiFi interrupts, otherwise SmartLeds
     // can't fill the RMT buffer fast enough, resulting in rendering artifacts.
     // Usually, that means you have to set isrCore == CoreSecond.
     //
     // If you use anything other than CoreCurrent, the FreeRTOS scheduler MUST be already running,
     // so you can't use it if you define SmartLed as global variable.
-    //
-    // Does nothing on chips that only have one core.
-    SmartLed(const LedType& type, int count, int pin, int channel = 0, BufferType doubleBuffer = DoubleBuffer,
-        IsrCore isrCore = CoreCurrent)
-        : _finishedFlag(xSemaphoreCreateBinary())
-        , _driver(type, count, pin, channel, _finishedFlag)
-        , _channel(channel)
-        , _count(count)
-        , _firstBuffer(new Rgb[count])
-        , _secondBuffer(doubleBuffer ? new Rgb[count] : nullptr) {
-        assert(channel >= 0 && channel < detail::CHANNEL_COUNT);
-        assert(ledForChannel(channel) == nullptr);
+    SmartLed( const LedType& type, int count, int pin, int channel = 0, BufferType doubleBuffer = SingleBuffer, IsrCore isrCore = CoreCurrent)
+        : _timing( type ),
+          _channel( channel ),
+          _count( count ),
+          _firstBuffer( new Rgb[ count ] ),
+          _secondBuffer( doubleBuffer ? new Rgb[ count ] : nullptr ),
+          _finishedFlag( xSemaphoreCreateBinary() )
+    {
+        assert( channel >= 0 && channel < 8 );
+        assert( ledForChannel( channel ) == nullptr );
 
-        xSemaphoreGive(_finishedFlag);
+        xSemaphoreGive( _finishedFlag );
 
-        _driver.init();
+        DPORT_SET_PERI_REG_MASK( DPORT_PERIP_CLK_EN_REG, DPORT_RMT_CLK_EN );
+        DPORT_CLEAR_PERI_REG_MASK( DPORT_PERIP_RST_EN_REG, DPORT_RMT_RST );
 
-#if !defined(SOC_CPU_CORES_NUM) || SOC_CPU_CORES_NUM > 1
-        if (!anyAlive() && isrCore != CoreCurrent) {
+        PIN_FUNC_SELECT( GPIO_PIN_MUX_REG[ pin ], 2 );
+        gpio_set_direction( static_cast< gpio_num_t >( pin ), GPIO_MODE_OUTPUT );
+        gpio_matrix_out( static_cast< gpio_num_t >( pin ), RMT_SIG_OUT0_IDX + _channel, 0, 0 );
+        initChannel( _channel );
+
+        RMT.tx_lim_ch[ _channel ].limit = detail::MAX_PULSES;
+        RMT.int_ena.val |= 1 << ( 24 + _channel );
+        RMT.int_ena.val |= 1 << ( 3 * _channel );
+
+        _bitToRmt[ 0 ].level0 = 1;
+        _bitToRmt[ 0 ].level1 = 0;
+        _bitToRmt[ 0 ].duration0 = _timing.T0H / ( detail::RMT_DURATION_NS * detail::DIVIDER );
+        _bitToRmt[ 0 ].duration1 = _timing.T0L / ( detail::RMT_DURATION_NS * detail::DIVIDER );
+
+        _bitToRmt[ 1 ].level0 = 1;
+        _bitToRmt[ 1 ].level1 = 0;
+        _bitToRmt[ 1 ].duration0 = _timing.T1H / ( detail::RMT_DURATION_NS * detail::DIVIDER );
+        _bitToRmt[ 1 ].duration1 = _timing.T1L / ( detail::RMT_DURATION_NS * detail::DIVIDER );
+
+        if ( !anyAlive() ) {
             _interruptCore = isrCore;
-            ESP_ERROR_CHECK(esp_ipc_call_blocking(isrCore, registerInterrupt, (void*)this));
-        } else
-#endif
-        {
-            registerInterrupt((void*)this);
+            if(isrCore != CoreCurrent) {
+                ESP_ERROR_CHECK(esp_ipc_call_blocking(isrCore, registerInterrupt, NULL));
+            } else {
+                registerInterrupt(NULL);
+            }
         }
 
-        ledForChannel(channel) = this;
+        ledForChannel( channel ) = this;
     }
 
     ~SmartLed() {
-        ledForChannel(_channel) = nullptr;
-#if !defined(SOC_CPU_CORES_NUM) || SOC_CPU_CORES_NUM > 1
-        if (!anyAlive() && _interruptCore != CoreCurrent) {
-            ESP_ERROR_CHECK(esp_ipc_call_blocking(_interruptCore, unregisterInterrupt, (void*)this));
-        } else
-#endif
-        {
-            unregisterInterrupt((void*)this);
+        ledForChannel( _channel ) = nullptr;
+        if ( !anyAlive() ) {
+            if(_interruptCore != CoreCurrent) {
+                ESP_ERROR_CHECK(esp_ipc_call_blocking(_interruptCore, unregisterInterrupt, NULL));
+            } else {
+                unregisterInterrupt(NULL);
+            }
         }
-        vSemaphoreDelete(_finishedFlag);
+        vSemaphoreDelete( _finishedFlag );
     }
 
-    Rgb& operator[](int idx) { return _firstBuffer[idx]; }
+    Rgb& operator[]( int idx ) {
+        return _firstBuffer[ idx ];
+    }
 
-    const Rgb& operator[](int idx) const { return _firstBuffer[idx]; }
+    const Rgb& operator[]( int idx ) const {
+        return _firstBuffer[ idx ];
+    }
 
-    esp_err_t show() {
-        esp_err_t err = startTransmission();
+    void show() {
+        _buffer = _firstBuffer.get();
+        startTransmission();
         swapBuffers();
-        return err;
     }
 
-    bool wait(TickType_t timeout = portMAX_DELAY) {
-        if (xSemaphoreTake(_finishedFlag, timeout) == pdTRUE) {
-            xSemaphoreGive(_finishedFlag);
+    bool wait( TickType_t timeout = portMAX_DELAY ) {
+        if( xSemaphoreTake( _finishedFlag, timeout ) == pdTRUE ) {
+            xSemaphoreGive( _finishedFlag );
             return true;
         }
         return false;
     }
 
-    int size() const { return _count; }
-    int channel() const { return _channel; }
+    int size() const {
+        return _count;
+    }
 
-    Rgb* begin() { return _firstBuffer.get(); }
-    const Rgb* begin() const { return _firstBuffer.get(); }
-    const Rgb* cbegin() const { return _firstBuffer.get(); }
+    Rgb *begin() { return _firstBuffer.get(); }
+    const Rgb *begin() const { return _firstBuffer.get(); }
+    const Rgb *cbegin() const { return _firstBuffer.get(); }
 
-    Rgb* end() { return _firstBuffer.get() + _count; }
-    const Rgb* end() const { return _firstBuffer.get() + _count; }
-    const Rgb* cend() const { return _firstBuffer.get() + _count; }
+    Rgb *end() { return _firstBuffer.get() + _count; }
+    const Rgb *end() const { return _firstBuffer.get() + _count; }
+    const Rgb *cend() const { return _firstBuffer.get() + _count; }
 
 private:
+    static intr_handle_t _interruptHandle;
     static IsrCore _interruptCore;
 
-    static void registerInterrupt(void* selfVoid) {
-        auto* self = (SmartLed*)selfVoid;
-        ESP_ERROR_CHECK(self->_driver.registerIsr(!anyAlive()));
+    static void initChannel( int channel ) {
+        RMT.apb_conf.fifo_mask = 1;  //enable memory access, instead of FIFO mode.
+        RMT.apb_conf.mem_tx_wrap_en = 1; //wrap around when hitting end of buffer
+        RMT.conf_ch[ channel ].conf0.div_cnt = detail::DIVIDER;
+        RMT.conf_ch[ channel ].conf0.mem_size = 1;
+        RMT.conf_ch[ channel ].conf0.carrier_en = 0;
+        RMT.conf_ch[ channel ].conf0.carrier_out_lv = 1;
+        RMT.conf_ch[ channel ].conf0.mem_pd = 0;
+
+        RMT.conf_ch[ channel ].conf1.rx_en = 0;
+        RMT.conf_ch[ channel ].conf1.mem_owner = 0;
+        RMT.conf_ch[ channel ].conf1.tx_conti_mode = 0;    //loop back mode.
+        RMT.conf_ch[ channel ].conf1.ref_always_on = 1;    // use apb clock: 80M
+        RMT.conf_ch[ channel ].conf1.idle_out_en = 1;
+        RMT.conf_ch[ channel ].conf1.idle_out_lv = 0;
     }
 
-    static void unregisterInterrupt(void* selfVoid) {
-        auto* self = (SmartLed*)selfVoid;
-        ESP_ERROR_CHECK(self->_driver.unregisterIsr());
+    static void registerInterrupt(void *) {
+        ESP_ERROR_CHECK(esp_intr_alloc( ETS_RMT_INTR_SOURCE, 0, interruptHandler, nullptr, &_interruptHandle));
     }
 
-    static SmartLed*& IRAM_ATTR ledForChannel(int channel);
+    static void unregisterInterrupt(void*) {
+        esp_intr_free( _interruptHandle );
+    }
+
+    static SmartLed*& IRAM_ATTR ledForChannel( int channel );
+    static void IRAM_ATTR interruptHandler( void* );
+
+    void IRAM_ATTR copyRmtHalfBlock();
+
+    void swapBuffers() {
+        if ( _secondBuffer )
+            _firstBuffer.swap( _secondBuffer );
+    }
+
+    void startTransmission() {
+        // Invalid use of the library
+        if( xSemaphoreTake( _finishedFlag, 0 ) != pdTRUE )
+            abort();
+
+        _pixelPosition = _componentPosition = _halfIdx = 0;
+        copyRmtHalfBlock();
+        if ( _pixelPosition < _count )
+            copyRmtHalfBlock();
+
+        RMT.conf_ch[ _channel ].conf1.mem_rd_rst = 1;
+        RMT.conf_ch[ _channel ].conf1.tx_start = 1;
+    }
 
     static bool anyAlive() {
-        for (int i = 0; i != detail::CHANNEL_COUNT; i++)
-            if (ledForChannel(i) != nullptr)
-                return true;
+        for ( int i = 0; i != 8; i++ )
+            if ( ledForChannel( i ) != nullptr ) return true;
         return false;
     }
 
-    void swapBuffers() {
-        if (_secondBuffer)
-            _firstBuffer.swap(_secondBuffer);
-    }
-
-    esp_err_t startTransmission() {
-        // Invalid use of the library, you must wait() fir previous frame to get processed first
-        if (xSemaphoreTake(_finishedFlag, 0) != pdTRUE)
-            abort();
-
-        auto err = _driver.transmit(_firstBuffer.get());
-        if (err != ESP_OK) {
-            return err;
-        }
-
-        return ESP_OK;
-    }
-
-    SemaphoreHandle_t _finishedFlag;
-    detail::RmtDriver _driver;
+    const LedType& _timing;
     int _channel;
+    detail::RmtPulsePair _bitToRmt[ 2 ];
     int _count;
-    std::unique_ptr<Rgb[]> _firstBuffer;
-    std::unique_ptr<Rgb[]> _secondBuffer;
-};
+    std::unique_ptr< Rgb[] > _firstBuffer;
+    std::unique_ptr< Rgb[] > _secondBuffer;
+    Rgb *_buffer;
 
-#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C3)
-#define _SMARTLEDS_SPI_HOST SPI2_HOST
-#define _SMARTLEDS_SPI_DMA_CHAN SPI_DMA_CH_AUTO
-#else
-#define _SMARTLEDS_SPI_HOST HSPI_HOST
-#define _SMARTLEDS_SPI_DMA_CHAN 1
-#endif
+    xSemaphoreHandle _finishedFlag;
+
+    int _pixelPosition;
+    int _componentPosition;
+    int _halfIdx;
+};
 
 class Apa102 {
 public:
     struct ApaRgb {
-        ApaRgb(uint8_t r = 0, uint8_t g = 0, uint32_t b = 0, uint32_t v = 0xFF)
-            : v(0xE0 | v)
-            , b(b)
-            , g(g)
-            , r(r) {}
+        ApaRgb( uint8_t r = 0, uint8_t g = 0, uint32_t b = 0, uint32_t v = 0xFF )
+            : v( 0xE0 | v ), b( b ), g( g ), r( r )
+        {}
 
-        ApaRgb& operator=(const Rgb& o) {
+        ApaRgb& operator=( const Rgb& o ) {
             r = o.r;
             g = o.g;
             b = o.b;
             return *this;
         }
 
-        ApaRgb& operator=(const Hsv& o) {
-            *this = Rgb { o };
+        ApaRgb& operator=( const Hsv& o ) {
+            *this = Rgb{ o };
             return *this;
         }
 
@@ -253,14 +339,14 @@ public:
     static const int FINAL_FRAME_SIZE = 4;
     static const int TRANS_COUNT = 2 + 8;
 
-    Apa102(int count, int clkpin, int datapin, BufferType doubleBuffer = SingleBuffer, int clock_speed_hz = 1000000)
-        : _count(count)
-        , _firstBuffer(new ApaRgb[count])
-        , _secondBuffer(doubleBuffer ? new ApaRgb[count] : nullptr)
-        , _transCount(0)
-        , _initFrame(0) {
+    Apa102( int count, int clkpin, int datapin, BufferType doubleBuffer = SingleBuffer )
+        : _count( count ),
+          _firstBuffer( new ApaRgb[ count ] ),
+          _secondBuffer( doubleBuffer ? new ApaRgb[ count ] : nullptr ),
+          _initFrame( 0 )
+    {
         spi_bus_config_t buscfg;
-        memset(&buscfg, 0, sizeof(buscfg));
+        memset( &buscfg, 0, sizeof( buscfg ) );
         buscfg.mosi_io_num = datapin;
         buscfg.miso_io_num = -1;
         buscfg.sclk_io_num = clkpin;
@@ -269,29 +355,33 @@ public:
         buscfg.max_transfer_sz = 65535;
 
         spi_device_interface_config_t devcfg;
-        memset(&devcfg, 0, sizeof(devcfg));
-        devcfg.clock_speed_hz = clock_speed_hz;
+        memset( &devcfg, 0, sizeof( devcfg ) );
+        devcfg.clock_speed_hz = 1000000;
         devcfg.mode = 0;
         devcfg.spics_io_num = -1;
         devcfg.queue_size = TRANS_COUNT;
         devcfg.pre_cb = nullptr;
 
-        auto ret = spi_bus_initialize(_SMARTLEDS_SPI_HOST, &buscfg, _SMARTLEDS_SPI_DMA_CHAN);
-        assert(ret == ESP_OK);
+        auto ret = spi_bus_initialize( HSPI_HOST, &buscfg, 1 );
+        assert( ret == ESP_OK );
 
-        ret = spi_bus_add_device(_SMARTLEDS_SPI_HOST, &devcfg, &_spi);
-        assert(ret == ESP_OK);
+        ret = spi_bus_add_device( HSPI_HOST, &devcfg, &_spi );
+        assert( ret == ESP_OK );
 
-        std::fill_n(_finalFrame, FINAL_FRAME_SIZE, 0xFFFFFFFF);
+        std::fill_n( _finalFrame, FINAL_FRAME_SIZE, 0xFFFFFFFF );
     }
 
     ~Apa102() {
         // ToDo
     }
 
-    ApaRgb& operator[](int idx) { return _firstBuffer[idx]; }
+    ApaRgb& operator[]( int idx ) {
+        return _firstBuffer[ idx ];
+    }
 
-    const ApaRgb& operator[](int idx) const { return _firstBuffer[idx]; }
+    const ApaRgb& operator[]( int idx ) const {
+        return _firstBuffer[ idx ];
+    }
 
     void show() {
         _buffer = _firstBuffer.get();
@@ -300,95 +390,93 @@ public:
     }
 
     void wait() {
-        for (int i = 0; i != _transCount; i++) {
-            spi_transaction_t* t;
-            spi_device_get_trans_result(_spi, &t, portMAX_DELAY);
+        for ( int i = 0; i != _transCount; i++ ) {
+            spi_transaction_t *t;
+            spi_device_get_trans_result( _spi, &t, portMAX_DELAY );
         }
     }
-
 private:
     void swapBuffers() {
-        if (_secondBuffer)
-            _firstBuffer.swap(_secondBuffer);
+        if ( _secondBuffer )
+            _firstBuffer.swap( _secondBuffer );
     }
 
     void startTransmission() {
-        for (int i = 0; i != TRANS_COUNT; i++) {
-            _transactions[i].cmd = 0;
-            _transactions[i].addr = 0;
-            _transactions[i].flags = 0;
-            _transactions[i].rxlength = 0;
-            _transactions[i].rx_buffer = nullptr;
+        for ( int i = 0; i != TRANS_COUNT; i++ ) {
+            _transactions[ i ].cmd = 0;
+            _transactions[ i ].addr = 0;
+            _transactions[ i ].flags = 0;
+            _transactions[ i ].rxlength = 0;
+            _transactions[ i ].rx_buffer = nullptr;
         }
         // Init frame
-        _transactions[0].length = 32;
-        _transactions[0].tx_buffer = &_initFrame;
-        spi_device_queue_trans(_spi, _transactions + 0, portMAX_DELAY);
+        _transactions[ 0 ].length = 32;
+        _transactions[ 0 ].tx_buffer = &_initFrame;
+        spi_device_queue_trans( _spi, _transactions + 0, portMAX_DELAY );
         // Data
-        _transactions[1].length = 32 * _count;
-        _transactions[1].tx_buffer = _buffer;
-        spi_device_queue_trans(_spi, _transactions + 1, portMAX_DELAY);
+        _transactions[ 1 ].length = 32 * _count;
+        _transactions[ 1 ].tx_buffer = _buffer;
+        spi_device_queue_trans( _spi, _transactions + 1, portMAX_DELAY );
         _transCount = 2;
         // End frame
-        for (int i = 0; i != 1 + _count / 32 / FINAL_FRAME_SIZE; i++) {
-            _transactions[2 + i].length = 32 * FINAL_FRAME_SIZE;
-            _transactions[2 + i].tx_buffer = _finalFrame;
-            spi_device_queue_trans(_spi, _transactions + 2 + i, portMAX_DELAY);
+        for ( int i = 0; i != 1 + _count / 32 / FINAL_FRAME_SIZE; i++ ) {
+            _transactions[ 2 + i ].length = 32 * FINAL_FRAME_SIZE;
+            _transactions[ 2 + i ].tx_buffer = _finalFrame;
+            spi_device_queue_trans( _spi, _transactions + 2 + i, portMAX_DELAY );
             _transCount++;
         }
     }
 
     spi_device_handle_t _spi;
     int _count;
-    std::unique_ptr<ApaRgb[]> _firstBuffer, _secondBuffer;
-    ApaRgb* _buffer;
+    std::unique_ptr< ApaRgb[] > _firstBuffer, _secondBuffer;
+    ApaRgb *_buffer;
 
-    spi_transaction_t _transactions[TRANS_COUNT];
+    spi_transaction_t _transactions[ TRANS_COUNT ];
     int _transCount;
 
     uint32_t _initFrame;
-    uint32_t _finalFrame[FINAL_FRAME_SIZE];
+    uint32_t _finalFrame[ FINAL_FRAME_SIZE ];
 };
 
 class LDP8806 {
 public:
     struct LDP8806_GRB {
 
-        LDP8806_GRB(uint8_t g_7bit = 0, uint8_t r_7bit = 0, uint32_t b_7bit = 0)
-            : g(g_7bit)
-            , r(r_7bit)
-            , b(b_7bit) {}
+        LDP8806_GRB( uint8_t g_7bit = 0, uint8_t r_7bit = 0, uint32_t b_7bit = 0 )
+            : g( g_7bit ), r( r_7bit ), b( b_7bit )
+        {
+        }
 
-        LDP8806_GRB& operator=(const Rgb& o) {
+        LDP8806_GRB& operator=( const Rgb& o ) {
             //Convert 8->7bit colour
-            r = (o.r * 127 / 256) | 0x80;
-            g = (o.g * 127 / 256) | 0x80;
-            b = (o.b * 127 / 256) | 0x80;
+            r = ( o.r * 127 / 256 ) | 0x80;
+            g = ( o.g * 127 / 256 ) | 0x80;
+            b = ( o.b * 127 / 256 ) | 0x80;
             return *this;
         }
 
-        LDP8806_GRB& operator=(const Hsv& o) {
-            *this = Rgb { o };
+        LDP8806_GRB& operator=( const Hsv& o ) {
+            *this = Rgb{ o };
             return *this;
         }
 
         uint8_t g, r, b;
     };
 
-    static const int LED_FRAME_SIZE_BYTES = sizeof(LDP8806_GRB);
+    static const int LED_FRAME_SIZE_BYTES = sizeof( LDP8806_GRB );
     static const int LATCH_FRAME_SIZE_BYTES = 3;
-    static const int TRANS_COUNT_MAX = 20; //Arbitrary, supports up to 600 LED
+    static const int TRANS_COUNT_MAX = 20;//Arbitrary, supports up to 600 LED
 
-    LDP8806(
-        int count, int clkpin, int datapin, BufferType doubleBuffer = SingleBuffer, uint32_t clock_speed_hz = 2000000)
-        : _count(count)
-        , _firstBuffer(new LDP8806_GRB[count])
-        , _secondBuffer(doubleBuffer ? new LDP8806_GRB[count] : nullptr)
-        ,
-        // one 'latch'/start-of-data mark frame for every 32 leds
-        _latchFrames((count + 31) / 32) {
+    LDP8806( int count, int clkpin, int datapin, BufferType doubleBuffer = SingleBuffer, uint32_t clock_speed_hz = 2000000 )
+        : _count( count ),
+          _firstBuffer( new LDP8806_GRB[ count ] ),
+          _secondBuffer( doubleBuffer ? new LDP8806_GRB[ count ] : nullptr ),
+          // one 'latch'/start-of-data mark frame for every 32 leds
+          _latchFrames( ( count + 31 ) / 32 )
+    {
         spi_bus_config_t buscfg;
-        memset(&buscfg, 0, sizeof(buscfg));
+        memset( &buscfg, 0, sizeof( buscfg ) );
         buscfg.mosi_io_num = datapin;
         buscfg.miso_io_num = -1;
         buscfg.sclk_io_num = clkpin;
@@ -397,29 +485,33 @@ public:
         buscfg.max_transfer_sz = 65535;
 
         spi_device_interface_config_t devcfg;
-        memset(&devcfg, 0, sizeof(devcfg));
+        memset( &devcfg, 0, sizeof( devcfg ) );
         devcfg.clock_speed_hz = clock_speed_hz;
         devcfg.mode = 0;
         devcfg.spics_io_num = -1;
         devcfg.queue_size = TRANS_COUNT_MAX;
         devcfg.pre_cb = nullptr;
 
-        auto ret = spi_bus_initialize(_SMARTLEDS_SPI_HOST, &buscfg, _SMARTLEDS_SPI_DMA_CHAN);
-        assert(ret == ESP_OK);
+        auto ret = spi_bus_initialize( HSPI_HOST, &buscfg, 1 );
+        assert( ret == ESP_OK );
 
-        ret = spi_bus_add_device(_SMARTLEDS_SPI_HOST, &devcfg, &_spi);
-        assert(ret == ESP_OK);
+        ret = spi_bus_add_device( HSPI_HOST, &devcfg, &_spi );
+        assert( ret == ESP_OK );
 
-        std::fill_n(_latchBuffer, LATCH_FRAME_SIZE_BYTES, 0x0);
+        std::fill_n( _latchBuffer, LATCH_FRAME_SIZE_BYTES, 0x0 );
     }
 
     ~LDP8806() {
         // noop
     }
 
-    LDP8806_GRB& operator[](int idx) { return _firstBuffer[idx]; }
+    LDP8806_GRB& operator[]( int idx ) {
+        return _firstBuffer[ idx ];
+    }
 
-    const LDP8806_GRB& operator[](int idx) const { return _firstBuffer[idx]; }
+    const LDP8806_GRB& operator[]( int idx ) const {
+        return _firstBuffer[ idx ];
+    }
 
     void show() {
         _buffer = _firstBuffer.get();
@@ -428,50 +520,51 @@ public:
     }
 
     void wait() {
-        while (_transCount--) {
-            spi_transaction_t* t;
-            spi_device_get_trans_result(_spi, &t, portMAX_DELAY);
+        while ( _transCount-- ) {
+            spi_transaction_t *t;
+            spi_device_get_trans_result( _spi, &t, portMAX_DELAY );
         }
     }
-
 private:
     void swapBuffers() {
-        if (_secondBuffer)
-            _firstBuffer.swap(_secondBuffer);
+        if ( _secondBuffer )
+            _firstBuffer.swap( _secondBuffer );
     }
 
     void startTransmission() {
         _transCount = 0;
-        for (int i = 0; i != TRANS_COUNT_MAX; i++) {
-            _transactions[i].cmd = 0;
-            _transactions[i].addr = 0;
-            _transactions[i].flags = 0;
-            _transactions[i].rxlength = 0;
-            _transactions[i].rx_buffer = nullptr;
+        for ( int i = 0; i != TRANS_COUNT_MAX; i++ ) {
+            _transactions[ i ].cmd = 0;
+            _transactions[ i ].addr = 0;
+            _transactions[ i ].flags = 0;
+            _transactions[ i ].rxlength = 0;
+            _transactions[ i ].rx_buffer = nullptr;
         }
         // LED Data
-        _transactions[0].length = (LED_FRAME_SIZE_BYTES * 8) * _count;
-        _transactions[0].tx_buffer = _buffer;
-        spi_device_queue_trans(_spi, _transactions + _transCount, portMAX_DELAY);
+        _transactions[ 0 ].length = ( LED_FRAME_SIZE_BYTES * 8 ) * _count;
+        _transactions[ 0 ].tx_buffer = _buffer;
+        spi_device_queue_trans( _spi, _transactions + _transCount, portMAX_DELAY );
         _transCount++;
 
         // 'latch'/start-of-data marker frames
-        for (int i = 0; i < _latchFrames; i++) {
-            _transactions[_transCount].length = (LATCH_FRAME_SIZE_BYTES * 8);
-            _transactions[_transCount].tx_buffer = _latchBuffer;
-            spi_device_queue_trans(_spi, _transactions + _transCount, portMAX_DELAY);
+        for ( int i = 0; i < _latchFrames; i++ ) {
+            _transactions[ _transCount ].length = ( LATCH_FRAME_SIZE_BYTES * 8 );
+            _transactions[ _transCount ].tx_buffer = _latchBuffer;
+            spi_device_queue_trans( _spi, _transactions + _transCount, portMAX_DELAY );
             _transCount++;
         }
     }
 
     spi_device_handle_t _spi;
     int _count;
-    std::unique_ptr<LDP8806_GRB[]> _firstBuffer, _secondBuffer;
-    LDP8806_GRB* _buffer;
+    std::unique_ptr< LDP8806_GRB[] > _firstBuffer, _secondBuffer;
+    LDP8806_GRB *_buffer;
 
-    spi_transaction_t _transactions[TRANS_COUNT_MAX];
+    spi_transaction_t _transactions[ TRANS_COUNT_MAX ];
     int _transCount;
 
     int _latchFrames;
-    uint8_t _latchBuffer[LATCH_FRAME_SIZE_BYTES];
+    uint8_t _latchBuffer[ LATCH_FRAME_SIZE_BYTES ];
 };
+
+#endif //SMARTLEDS_H

code/components/jomjol_controlGPIO/server_GPIO.cpp

@@ -25,7 +25,6 @@
 #include "server_mqtt.h"
 #endif //ENABLE_MQTT
 
-#include "basic_auth.h"
 
 static const char *TAG = "GPIO";
 QueueHandle_t gpio_queue_handle = NULL;
@@ -459,7 +458,7 @@ void GpioHandler::registerGpioUri()
     httpd_uri_t camuri = { };
     camuri.method    = HTTP_GET;
     camuri.uri       = "/GPIO";
-    camuri.handler   = APPLY_BASIC_AUTH_FILTER(callHandleHttpRequest);
+    camuri.handler   = callHandleHttpRequest;
     camuri.user_ctx  = (void*)this;    
     httpd_register_uri_handler(_httpServer, &camuri);
 }

code/components/jomjol_controlcamera/ClassControllCamera.h

@@ -15,103 +15,49 @@
 #include "CImageBasis.h"
 #include "../../include/defines.h"
 
-typedef struct
-{
-    uint16_t CamSensor_id;
+class CCamera {
+    protected:
+        int ActualQuality;
+        framesize_t ActualResolution;
+        int brightness, contrast, saturation;
+        bool isFixedExposure;
+        int waitbeforepicture_org;
+        int led_intensity = 4095;
 
-    framesize_t ImageFrameSize = FRAMESIZE_VGA; // 0 - 10
-    gainceiling_t ImageGainceiling;             // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)
+        void ledc_init(void);
+        bool CameraInitSuccessful = false;
+        bool demoMode = false;
 
-    int ImageQuality;    // 0 - 63
-    int ImageBrightness; // (-2 to 2) - set brightness
-    int ImageContrast;   //-2 - 2
-    int ImageSaturation; //-2 - 2
-    int ImageSharpness;  //-2 - 2
-    bool ImageAutoSharpness;
-    int ImageSpecialEffect; // 0 - 6
-    int ImageWbMode;        // 0 to 4 - if awb_gain enabled (0 - Auto, 1 - Sunny, 2 - Cloudy, 3 - Office, 4 - Home)
-    int ImageAwb;           // white balance enable (0 or 1)
-    int ImageAwbGain;       // Auto White Balance enable (0 or 1)
-    int ImageAec;           // auto exposure off (1 or 0)
-    int ImageAec2;          // automatic exposure sensor  (0 or 1)
-    int ImageAeLevel;       // auto exposure levels (-2 to 2)
-    int ImageAecValue;      // set exposure manually  (0-1200)
-    int ImageAgc;           // auto gain off (1 or 0)
-    int ImageAgcGain;       // set gain manually (0 - 30)
-    int ImageBpc;           // black pixel correction
-    int ImageWpc;           // white pixel correction
-    int ImageRawGma;        // (1 or 0)
-    int ImageLenc;          // lens correction (1 or 0)
-    int ImageHmirror;       // (0 or 1) flip horizontally
-    int ImageVflip;         // Invert image (0 or 1)
-    int ImageDcw;           // downsize enable (1 or 0)
+        bool loadNextDemoImage(camera_fb_t *fb);
+        long GetFileSize(std::string filename);
 
-    int ImageDenoiseLevel; // The OV2640 does not support it, OV3660 and OV5640 (0 to 8)
+    public:
+        int image_height, image_width;
+        
+        CCamera();
+        esp_err_t InitCam();
 
-    int ImageWidth;
-    int ImageHeight;
+        void LightOnOff(bool status);
+        void LEDOnOff(bool status);
+        esp_err_t CaptureToHTTP(httpd_req_t *req, int delay = 0);
+        esp_err_t CaptureToStream(httpd_req_t *req, bool FlashlightOn);
+        void SetQualitySize(int qual, framesize_t resol);
+        bool SetBrightnessContrastSaturation(int _brightness, int _contrast, int _saturation);
+        void GetCameraParameter(httpd_req_t *req, int &qual, framesize_t &resol);
+        void SetLEDIntensity(float _intrel);
+        bool testCamera(void);
+        void EnableAutoExposure(int flash_duration);
+        bool getCameraInitSuccessful();
+        void useDemoMode(void);
+       
 
-    int ImageLedIntensity;
+        framesize_t TextToFramesize(const char * text);
 
-    bool ImageZoomEnabled;
-    int ImageZoomOffsetX;
-    int ImageZoomOffsetY;
-    int ImageZoomSize;
-
-    int WaitBeforePicture;
-    bool isImageSize;
-
-    bool CameraInitSuccessful;
-    bool changedCameraSettings;
-    bool DemoMode;
-    bool SaveAllFiles;
-} camera_controll_config_temp_t;
-
-extern camera_controll_config_temp_t CCstatus;
-
-class CCamera
-{
-protected:
-    void ledc_init(void);
-    bool loadNextDemoImage(camera_fb_t *fb);
-    long GetFileSize(std::string filename);
-    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:
-    int LedIntensity = 4096;
-
-    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 SetCamGainceiling(sensor_t *s, gainceiling_t gainceilingLevel);
-    void SetCamSharpness(bool autoSharpnessEnabled, int sharpnessLevel);
-    void SetCamSpecialEffect(sensor_t *s, int specialEffect);
-    void SetCamContrastBrightness(sensor_t *s, int _contrast, int _brightness);
-
-    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, int imageVflip);
-    void SetZoomSize(bool zoomEnabled, int zoomOffsetX, int zoomOffsetY, int imageSize, int imageVflip);
-
-    int SetLEDIntensity(int _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);
+        esp_err_t CaptureToFile(std::string nm, int delay = 0);
+        esp_err_t CaptureToBasisImage(CImageBasis *_Image, int delay = 0);
 };
 
+
 extern CCamera Camera;
+
 #endif

code/components/jomjol_controlcamera/ov2640_contrast_brightness.cpp

@@ -1,88 +0,0 @@
-// Workaround - bug in cam library - enable bits are set without using bitwise OR logic -> only latest enable setting is used
-// Reference: https://esp32.com/viewtopic.php?f=19&t=14376#p93178
-/* The memory structure is as follows for
-   byte_0 = enable_bits
-      byte_0->bit0 = enable saturation and hue --> OK
-      byte_0->bit1 = enable saturation --> OK
-      byte_0->bit2 = enable brightness and contrast --> OK
-      byte_0->bit3 = enable green -> blue spitial effect (Antique and blunish and greenish and reddish and b&w) enable
-      byte_0->bit4 = anable gray -> red spitial effect (Antique and blunish and greenish and reddish and b&w) enable
-      byte_0->bit5 = remove (UV) in YUV color system
-      byte_0->bit6 = enable negative
-      byte_0->bit7 = remove (Y) in YUV color system
-   byte_1  = saturation1 0-255 --> ?
-   byte_2  = hue 0-255 --> OK
-   byte_3  = saturation2 0-255 --> OK
-   byte_4  = reenter saturation2 in documents --> ?
-   byte_5  = spital effect green -> blue 0-255 --> ?
-   byte_6  = spital effect gray -> red 0-255 --> ?
-   byte_7  = contrast lower byte 0-255 --> OK
-   byte_8  = contrast higher byte 0-255 --> OK
-   byte_9  = brightness 0-255 --> OK
-   byte_10 = if byte_10==4 contrast effective --> ?
-*/
-
-#include <stdint.h>
-#include "esp_camera.h"
-#include "ov2640_contrast_brightness.h"
-
-static const uint8_t brightness_regs[6][5] = {
-    {0x7C, 0x7D, 0x7C, 0x7D, 0x7D },
-    {0x00, 0x04, 0x09, 0x00, 0x00 }, /* -2 */
-    {0x00, 0x04, 0x09, 0x10, 0x00 }, /* -1 */
-    {0x00, 0x04, 0x09, 0x20, 0x00 }, /*  0 */
-    {0x00, 0x04, 0x09, 0x30, 0x00 }, /* +1 */
-    {0x00, 0x04, 0x09, 0x40, 0x00 }, /* +2 */
-};
-
-static const uint8_t contrast_regs[6][7] = {
-    {0x7C, 0x7D, 0x7C, 0x7D, 0x7D, 0x7D, 0x7D },
-    {0x00, 0x04, 0x07, 0x20, 0x18, 0x34, 0x06 }, /* -2 */
-    {0x00, 0x04, 0x07, 0x20, 0x1c, 0x2a, 0x06 }, /* -1 */
-    {0x00, 0x04, 0x07, 0x20, 0x20, 0x20, 0x06 }, /*  0 */
-    {0x00, 0x04, 0x07, 0x20, 0x24, 0x16, 0x06 }, /* +1 */
-    {0x00, 0x04, 0x07, 0x20, 0x28, 0x0c, 0x06 }, /* +2 */
-};
-
-int ov2640_set_contrast_brightness(sensor_t *sensor, int _contrast, int _brightness)
-{
-    int ret=0;
-
-    _contrast += 3;
-    if (_contrast <= 0) {
-        _contrast = 3;
-    }
-	else if (_contrast > 5)
-	{
-		_contrast = 5;
-	}
-    sensor->status.contrast = _contrast-3;
-
-    _brightness += 3;
-    if (_brightness <= 0) {
-        _brightness = 3;
-    }
-	else if (_brightness > 5)
-	{
-		_brightness = 5;
-	}
-	int brightness = brightness_regs[_brightness][3];
-    sensor->status.brightness = _brightness-3;
-
-    // sensor->set_reg(sensor, int reg, int mask, int value)
-    sensor->set_reg(sensor, 0xFF, 0x01, 0x00); // Select DSP bank
-
-    for (int i=0; i<7; i++) 
-	{
-		if (i == 5)
-		{
-			sensor->set_reg(sensor, contrast_regs[0][i], 0xFF, (brightness | contrast_regs[_contrast][i]));
-		}
-		else
-		{
-			sensor->set_reg(sensor, contrast_regs[0][i], 0xFF, contrast_regs[_contrast][i]);
-		}
-    }
-
-    return ret;
-}

code/components/jomjol_controlcamera/ov2640_contrast_brightness.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#ifndef OV2640_CONTRAST_BRIGHTNESS_H
-#define OV2640_CONTRAST_BRIGHTNESS_H
-
-#include "esp_camera.h"
-
-int ov2640_set_contrast_brightness(sensor_t *sensor, int _contrast, int _brightness);
-
-#endif

code/components/jomjol_controlcamera/ov2640_sharpness.cpp

@@ -1,151 +0,0 @@
-#include <stdint.h>
-#include "esp_camera.h"
-#include "ov2640_sharpness.h"
-
-const static uint8_t OV2640_SHARPNESS_AUTO[]=
-{
-    //reg, val, mask
-    0xFF, 0x00, 0xFF,
-    0x92, 0x01, 0xFF,
-    0x93, 0x20, 0x20,
-    0x00, 0x00, 0x00
-};
-
-const static uint8_t OV2640_SHARPNESS_MANUAL[]=
-{
-    //reg, val, mask
-    0xFF, 0x00, 0xFF,
-    0x92, 0x01, 0xFF,
-    0x93, 0x00, 0x20,
-    0x00, 0x00, 0x00
-};
-
-const static uint8_t OV2640_SHARPNESS_LEVEL0[]=
-{
-    //reg, val, mask
-    0xFF, 0x00, 0xFF,
-    0x92, 0x01, 0xFF,
-    0x93, 0xC0, 0x1F,
-    0x00, 0x00, 0x00
-};
-const static uint8_t OV2640_SHARPNESS_LEVEL1[]=
-{
-    //reg, val, mask
-    0xFF, 0x00, 0xFF,
-    0x92, 0x01, 0xFF,
-    0x93, 0xC1, 0x1F,
-    0x00, 0x00, 0x00
-};
-const static uint8_t OV2640_SHARPNESS_LEVEL2[]=
-{
-    //reg, val, mask
-    0xFF, 0x00, 0xFF,
-    0x92, 0x01, 0xFF,
-    0x93, 0xC2, 0x1F,
-    0x00, 0x00, 0x00
-};
-const static uint8_t OV2640_SHARPNESS_LEVEL3[]=
-{
-    //reg, val, mask
-    0xFF, 0x00, 0xFF,
-    0x92, 0x01, 0xFF,
-    0x93, 0xC4, 0x1F,
-    0x00, 0x00, 0x00
-};
-const static uint8_t OV2640_SHARPNESS_LEVEL4[]=
-{
-    //reg, val, mask
-    0xFF, 0x00, 0xFF,
-    0x92, 0x01, 0xFF,
-    0x93, 0xC8, 0x1F,
-    0x00, 0x00, 0x00
-};
-const static uint8_t OV2640_SHARPNESS_LEVEL5[]=
-{
-    //reg, val, mask
-    0xFF, 0x00, 0xFF,
-    0x92, 0x01, 0xFF,
-    0x93, 0xD0, 0x1F,
-    0x00, 0x00, 0x00
-};
-const static uint8_t OV2640_SHARPNESS_LEVEL6[]=
-{
-    //reg, val, mask
-    0xFF, 0x00, 0xFF,
-    0x92, 0x01, 0xFF,
-    0x93, 0xDF, 0x1F,
-    0x00, 0x00, 0x00
-};
-
-const static uint8_t *OV2640_SETTING_SHARPNESS[]=
-{
-    OV2640_SHARPNESS_LEVEL0, // -3 sharpness
-    OV2640_SHARPNESS_LEVEL1,
-    OV2640_SHARPNESS_LEVEL2,
-    OV2640_SHARPNESS_LEVEL3,
-    OV2640_SHARPNESS_LEVEL4,
-    OV2640_SHARPNESS_LEVEL5,
-    OV2640_SHARPNESS_LEVEL6  // +3 sharpness
-};
-
-#define OV2640_MAXLEVEL_SHARPNESS 6
-
-static int table_mask_write(sensor_t *sensor, const uint8_t* ptab)
-{
-    uint8_t address;
-    uint8_t value;
-    uint8_t orgval;
-    uint8_t mask;
-    const uint8_t *pdata = ptab;
-
-    if (pdata == NULL)
-    {
-        return -1;
-    }
-
-    while (1)
-    {   
-        address = *pdata++;
-        value = *pdata++;
-        mask = *pdata++;
-		
-        if ((address == 0) && (value == 0) && (mask == 0))
-        {
-            break;
-        }
-		
-        sensor->set_reg(sensor, address, mask, value);
-    }   
-
-    return 0;
-}
-
-int ov2640_enable_auto_sharpness(sensor_t *sensor)
-{
-    table_mask_write(sensor, OV2640_SHARPNESS_AUTO);
-    sensor->status.sharpness = 0;
-	
-    return 0;
-}
-
-int ov2640_set_sharpness(sensor_t *sensor, int sharpness)
-{
-    int sharpness_temp = 0;
-	
-    if (sharpness < -3)
-    {
-        sharpness_temp = -3;
-    }
-	
-    if (sharpness > OV2640_MAXLEVEL_SHARPNESS - 3)
-    {
-        sharpness_temp = OV2640_MAXLEVEL_SHARPNESS - 3;
-    }	
-
-    table_mask_write(sensor, OV2640_SHARPNESS_MANUAL);
-    table_mask_write(sensor, OV2640_SETTING_SHARPNESS[sharpness_temp + 3]);
-	
-    sensor->status.sharpness = sharpness;
-	
-    return 0;
-}

code/components/jomjol_controlcamera/ov2640_sharpness.h

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

code/components/jomjol_controlcamera/ov2640_specialEffect.cpp

@@ -1,66 +0,0 @@
-// Workaround - bug in cam library - enable bits are set without using bitwise OR logic -> only latest enable setting is used
-// Reference: https://esp32.com/viewtopic.php?f=19&t=14376#p93178
-/* The memory structure is as follows for
-   byte_0 = enable_bits
-      byte_0->bit0 = enable saturation and hue --> OK
-      byte_0->bit1 = enable saturation --> OK
-      byte_0->bit2 = enable brightness and contrast --> OK
-      byte_0->bit3 = enable green -> blue spitial effect (Antique and blunish and greenish and reddish and b&w) enable
-      byte_0->bit4 = anable gray -> red spitial effect (Antique and blunish and greenish and reddish and b&w) enable
-      byte_0->bit5 = remove (UV) in YUV color system
-      byte_0->bit6 = enable negative
-      byte_0->bit7 = remove (Y) in YUV color system
-   byte_1  = saturation1 0-255 --> ?
-   byte_2  = hue 0-255 --> OK
-   byte_3  = saturation2 0-255 --> OK
-   byte_4  = reenter saturation2 in documents --> ?
-   byte_5  = spital effect green -> blue 0-255 --> ?
-   byte_6  = spital effect gray -> red 0-255 --> ?
-   byte_7  = contrast lower byte 0-255 --> OK
-   byte_8  = contrast higher byte 0-255 --> OK
-   byte_9  = brightness 0-255 --> OK
-   byte_10 = if byte_10==4 contrast effective --> ?
-*/
-
-#include <stdint.h>
-#include "esp_camera.h"
-#include "ov2640_specialEffect.h"
-
-static const uint8_t special_effects_regs[8][5] = {
-    {0x7C, 0x7D, 0x7C, 0x7D, 0x7D},
-    {0x00, 0X00, 0x05, 0X80, 0X80}, /* no effect */
-    {0x00, 0X40, 0x05, 0X80, 0X80}, /* negative */
-    {0x00, 0X18, 0x05, 0X80, 0X80}, /* black and white */
-    {0x00, 0X18, 0x05, 0X40, 0XC0}, /* reddish */
-    {0x00, 0X18, 0x05, 0X40, 0X40}, /* greenish */
-    {0x00, 0X18, 0x05, 0XA0, 0X40}, /* blue */
-    {0x00, 0X18, 0x05, 0X40, 0XA6}, /* retro */
-};
-
-int ov2640_set_special_effect(sensor_t *sensor, int effect)
-{
-    int ret = 0;
-    effect++;
-
-    if (effect <= 0 || effect > 7)
-    {
-        effect = 1;
-    }
-
-    sensor->status.special_effect = effect - 1;
-
-    int registerValue = 0x06; // enable saturation, contrast, brightness
-    registerValue |= special_effects_regs[effect][1];
-
-    // sensor->set_reg(sensor, int reg, int mask, int value)
-    sensor->set_reg(sensor, 0xFF, 0x01, 0x00); // Select DSP bank
-    sensor->set_reg(sensor, special_effects_regs[0][0], 0xFF, 0x00);
-    sensor->set_reg(sensor, special_effects_regs[0][1], 0x5E, registerValue);
-
-    for (int i = 2; i < 5; i++)
-    {
-        sensor->set_reg(sensor, special_effects_regs[0][i], 0xFF, special_effects_regs[effect][i]);
-    }
-
-    return ret;
-}

code/components/jomjol_controlcamera/ov2640_specialEffect.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#ifndef OV2640_SPECIALEFFECT_H
-#define OV2640_SPECIALEFFECT_H
-
-#include "esp_camera.h"
-
-int ov2640_set_special_effect(sensor_t *sensor, int effect);
-
-#endif

code/components/jomjol_controlcamera/server_camera.cpp

@@ -5,200 +5,191 @@
 
 #include "esp_camera.h"
 #include "ClassControllCamera.h"
-#include "MainFlowControl.h"
 
 #include "ClassLogFile.h"
 #include "esp_log.h"
 
-#include "basic_auth.h"
-
 #include "../../include/defines.h"
 
 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 << 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(CAM_PIN_PWDN, 1);
-    vTaskDelay(1000 / portTICK_PERIOD_MS);
-    gpio_set_level(CAM_PIN_PWDN, 0);
-    vTaskDelay(1000 / portTICK_PERIOD_MS);
-#endif
+void PowerResetCamera(){
+
+        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.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);
+        vTaskDelay(1000 / portTICK_PERIOD_MS);
+        gpio_set_level(GPIO_NUM_32, 0);
+        vTaskDelay(1000 / portTICK_PERIOD_MS);
 }
 
+
 esp_err_t handler_lightOn(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("handler_lightOn - Start");
-    ESP_LOGD(TAG, "handler_lightOn uri: %s", req->uri);
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_lightOn - Start");
+        ESP_LOGD(TAG, "handler_lightOn uri: %s", req->uri);
+    #endif
 
-    if (Camera.getCameraInitSuccessful())
+    if (Camera.getCameraInitSuccessful()) 
     {
         Camera.LightOnOff(true);
-        const char *resp_str = (const char *)req->user_ctx;
+        const char* resp_str = (const char*) req->user_ctx;
         httpd_resp_send(req, resp_str, strlen(resp_str));
     }
-    else
+    else 
     {
         httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera not initialized: REST API /lighton not available!");
         return ESP_ERR_NOT_FOUND;
     }
 
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("handler_lightOn - Done");
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_lightOn - Done");
+    #endif
 
     return ESP_OK;
 }
 
+
 esp_err_t handler_lightOff(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("handler_lightOff - Start");
-    ESP_LOGD(TAG, "handler_lightOff uri: %s", req->uri);
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_lightOff - Start");
+        ESP_LOGD(TAG, "handler_lightOff uri: %s", req->uri);
+    #endif
 
-    if (Camera.getCameraInitSuccessful())
+    if (Camera.getCameraInitSuccessful()) 
     {
         Camera.LightOnOff(false);
-        const char *resp_str = (const char *)req->user_ctx;
-        httpd_resp_send(req, resp_str, strlen(resp_str));
+        const char* resp_str = (const char*) req->user_ctx;
+        httpd_resp_send(req, resp_str, strlen(resp_str));       
     }
-    else
+    else 
     {
         httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera not initialized: REST API /lightoff not available!");
         return ESP_ERR_NOT_FOUND;
     }
 
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("handler_lightOff - Done");
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_lightOff - Done");
+    #endif
 
     return ESP_OK;
 }
 
+
 esp_err_t handler_capture(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("handler_capture - Start");
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_capture - Start");
+    #endif
 
-    if (Camera.getCameraInitSuccessful())
+    if (Camera.getCameraInitSuccessful()) 
     {
-        // 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, CCstatus.ImageVflip);
-            Camera.LedIntensity = CCstatus.ImageLedIntensity;
-            CFstatus.changedCameraSettings = false;
-        }
+        int quality;
+        framesize_t res;
 
-#ifdef DEBUG_DETAIL_ON
-        ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
-#endif        
+        Camera.GetCameraParameter(req, quality, res);
+
+        #ifdef DEBUG_DETAIL_ON   
+            ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
+        #endif
+
+        Camera.SetQualitySize(quality, res);
 
         esp_err_t result;
         result = Camera.CaptureToHTTP(req);
 
-#ifdef DEBUG_DETAIL_ON
-        LogFile.WriteHeapInfo("handler_capture - Done");
-#endif
+        #ifdef DEBUG_DETAIL_ON   
+            LogFile.WriteHeapInfo("handler_capture - Done");
+        #endif
 
         return result;
     }
-    else
+        else 
     {
         httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera not initialized: REST API /capture not available!");
         return ESP_ERR_NOT_FOUND;
     }
 }
 
+
 esp_err_t handler_capture_with_light(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("handler_capture_with_light - Start");
-#endif
-
-    if (Camera.getCameraInitSuccessful())
+    #ifdef DEBUG_DETAIL_ON  
+        LogFile.WriteHeapInfo("handler_capture_with_light - Start");
+    #endif
+    
+    if (Camera.getCameraInitSuccessful()) 
     {
         char _query[100];
         char _delay[10];
+
+        int quality;
+        framesize_t res;    
         int delay = 2500;
 
         if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK)
         {
             ESP_LOGD(TAG, "Query: %s", _query);
-
             if (httpd_query_key_value(_query, "delay", _delay, 10) == ESP_OK)
             {
-#ifdef DEBUG_DETAIL_ON
-                ESP_LOGD(TAG, "Delay: %s", _delay);
-#endif
+                #ifdef DEBUG_DETAIL_ON   
+                    ESP_LOGD(TAG, "Delay: %s", _delay);
+                #endif        
                 delay = atoi(_delay);
 
                 if (delay < 0)
-                {
                     delay = 0;
-                }
             }
         }
 
-        // 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, CCstatus.ImageVflip);
-            Camera.LedIntensity = CCstatus.ImageLedIntensity;
-            CFstatus.changedCameraSettings = false;
-        }
+        Camera.GetCameraParameter(req, quality, res);
 
-#ifdef DEBUG_DETAIL_ON
-        ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
-#endif        
+        #ifdef DEBUG_DETAIL_ON   
+            ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
+        #endif
 
+        Camera.SetQualitySize(quality, res);
         Camera.LightOnOff(true);
         const TickType_t xDelay = delay / portTICK_PERIOD_MS;
-        vTaskDelay(xDelay);
+        vTaskDelay( xDelay );
 
         esp_err_t result;
-        result = Camera.CaptureToHTTP(req);
+        result = Camera.CaptureToHTTP(req);  
 
         Camera.LightOnOff(false);
 
-#ifdef DEBUG_DETAIL_ON
-        LogFile.WriteHeapInfo("handler_capture_with_light - Done");
-#endif
+        #ifdef DEBUG_DETAIL_ON   
+            LogFile.WriteHeapInfo("handler_capture_with_light - Done");
+        #endif
 
         return result;
     }
-    else
+        else 
     {
         httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera not initialized: REST API /capture_with_flashlight not available!");
         return ESP_ERR_NOT_FOUND;
     }
 }
 
+
 esp_err_t handler_capture_save_to_file(httpd_req_t *req)
 {
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("handler_capture_save_to_file - Start");
-#endif
+    #ifdef DEBUG_DETAIL_ON   
+        LogFile.WriteHeapInfo("handler_capture_save_to_file - Start");
+    #endif
 
-    if (Camera.getCameraInitSuccessful())
+    if (Camera.getCameraInitSuccessful()) 
     {
         char _query[100];
         char _delay[10];
@@ -206,103 +197,94 @@ esp_err_t handler_capture_save_to_file(httpd_req_t *req)
         char filename[100];
         std::string fn = "/sdcard/";
 
+
+        int quality;
+        framesize_t res;    
+
         if (httpd_req_get_url_query_str(req, _query, 100) == ESP_OK)
         {
             ESP_LOGD(TAG, "Query: %s", _query);
-
             if (httpd_query_key_value(_query, "filename", filename, 100) == ESP_OK)
             {
                 fn.append(filename);
-#ifdef DEBUG_DETAIL_ON
-                ESP_LOGD(TAG, "Filename: %s", fn.c_str());
-#endif
+                #ifdef DEBUG_DETAIL_ON   
+                    ESP_LOGD(TAG, "Filename: %s", fn.c_str());
+                #endif
             }
             else
-            {
                 fn.append("noname.jpg");
-            }
 
             if (httpd_query_key_value(_query, "delay", _delay, 10) == ESP_OK)
             {
-#ifdef DEBUG_DETAIL_ON
-                ESP_LOGD(TAG, "Delay: %s", _delay);
-#endif
+                #ifdef DEBUG_DETAIL_ON   
+                    ESP_LOGD(TAG, "Delay: %s", _delay);
+                #endif
                 delay = atoi(_delay);
 
                 if (delay < 0)
-                {
                     delay = 0;
-                }
             }
         }
         else
-        {
             fn.append("noname.jpg");
-        }
 
-        // 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, CCstatus.ImageVflip);
-            Camera.LedIntensity = CCstatus.ImageLedIntensity;
-            CFstatus.changedCameraSettings = false;
-        }
-
-#ifdef DEBUG_DETAIL_ON
-        ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
-#endif        
+        Camera.GetCameraParameter(req, quality, res);
+        #ifdef DEBUG_DETAIL_ON   
+            ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
+        #endif
+        Camera.SetQualitySize(quality, res);
 
         esp_err_t result;
-        result = Camera.CaptureToFile(fn, delay);
+        result = Camera.CaptureToFile(fn, delay);  
 
-        const char *resp_str = (const char *)fn.c_str();
+        const char* resp_str = (const char*) fn.c_str();
         httpd_resp_send(req, resp_str, strlen(resp_str));
 
-#ifdef DEBUG_DETAIL_ON
-        LogFile.WriteHeapInfo("handler_capture_save_to_file - Done");
-#endif
+        #ifdef DEBUG_DETAIL_ON   
+            LogFile.WriteHeapInfo("handler_capture_save_to_file - Done");
+        #endif
 
         return result;
     }
-    else
+    else 
     {
         httpd_resp_send_err(req, HTTPD_403_FORBIDDEN, "Camera not initialized: REST API /save not available!");
         return ESP_ERR_NOT_FOUND;
     }
 }
 
+
 void register_server_camera_uri(httpd_handle_t server)
 {
-#ifdef DEBUG_DETAIL_ON
+#ifdef DEBUG_DETAIL_ON   
     ESP_LOGI(TAG, "server_part_camera - Registering URI handlers");
 #endif
 
-    httpd_uri_t camuri = {};
-    camuri.method = HTTP_GET;
+    httpd_uri_t camuri = { };
+    camuri.method    = HTTP_GET;
 
-    camuri.uri = "/lighton";
-    camuri.handler = APPLY_BASIC_AUTH_FILTER(handler_lightOn);
-    camuri.user_ctx = (void *)"Light On";
+    camuri.uri       = "/lighton";
+    camuri.handler   = handler_lightOn;
+    camuri.user_ctx  = (void*) "Light On";    
     httpd_register_uri_handler(server, &camuri);
 
-    camuri.uri = "/lightoff";
-    camuri.handler = APPLY_BASIC_AUTH_FILTER(handler_lightOff);
-    camuri.user_ctx = (void *)"Light Off";
-    httpd_register_uri_handler(server, &camuri);
+    camuri.uri       = "/lightoff";
+    camuri.handler   = handler_lightOff;
+    camuri.user_ctx  = (void*) "Light Off"; 
+    httpd_register_uri_handler(server, &camuri);    
 
-    camuri.uri = "/capture";
-    camuri.handler = APPLY_BASIC_AUTH_FILTER(handler_capture);
-    camuri.user_ctx = NULL;
-    httpd_register_uri_handler(server, &camuri);
+    camuri.uri       = "/capture";
+    camuri.handler   = handler_capture;
+    camuri.user_ctx  = NULL; 
+    httpd_register_uri_handler(server, &camuri);      
 
-    camuri.uri = "/capture_with_flashlight";
-    camuri.handler = APPLY_BASIC_AUTH_FILTER(handler_capture_with_light);
-    camuri.user_ctx = NULL;
-    httpd_register_uri_handler(server, &camuri);
+    camuri.uri       = "/capture_with_flashlight";
+    camuri.handler   = handler_capture_with_light;
+    camuri.user_ctx  = NULL; 
+    httpd_register_uri_handler(server, &camuri);  
 
-    camuri.uri = "/save";
-    camuri.handler = APPLY_BASIC_AUTH_FILTER(handler_capture_save_to_file);
-    camuri.user_ctx = NULL;
-    httpd_register_uri_handler(server, &camuri);
+    camuri.uri       = "/save";
+    camuri.handler   = handler_capture_save_to_file;
+    camuri.user_ctx  = NULL; 
+    httpd_register_uri_handler(server, &camuri);    
 }

code/components/jomjol_controlcamera/server_camera.h

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

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 simplicity we therefore use the release files as suggested in the readme.
- Additionally we added the CMakeLists.txt and this readme.
+ For sumplicity we therefore use the release files as suggested in the readme.
+ Additionally we added the CMakeLists.txt and this readme.

code/components/jomjol_fileserver_ota/server_file.cpp

@@ -6,8 +6,11 @@
    software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
    CONDITIONS OF ANY KIND, either express or implied.
 */
+
+
 #include "server_file.h"
 
+
 #include <stdio.h>
 #include <string.h>
 #include <string>
@@ -43,7 +46,6 @@ extern "C" {
 
 #include "Helper.h"
 #include "miniz.h"
-#include "basic_auth.h"
 
 static const char *TAG = "OTA FILE";
 
@@ -55,17 +57,20 @@ struct file_server_data {
     char scratch[SERVER_FILER_SCRATCH_BUFSIZE];
 };
 
+
 #include <iostream>
 #include <sys/types.h>
 #include <dirent.h>
 
 using namespace std;
 
-string SUFFIX_ZW = "_tmp";
+string SUFFIX_ZW = "_0xge";
+
 
 static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file);
 static esp_err_t send_datafile(httpd_req_t *req, bool send_full_file);
 
+
 esp_err_t get_numbers_file_handler(httpd_req_t *req)
 {
     std::string ret = flowctrl.getNumbersName();
@@ -81,6 +86,7 @@ esp_err_t get_numbers_file_handler(httpd_req_t *req)
     return ESP_OK;
 }
 
+
 esp_err_t get_data_file_handler(httpd_req_t *req)
 {
     struct dirent *entry;
@@ -124,6 +130,7 @@ esp_err_t get_data_file_handler(httpd_req_t *req)
     return ESP_OK;
 }
 
+
 esp_err_t get_tflite_file_handler(httpd_req_t *req)
 {
     struct dirent *entry;
@@ -167,11 +174,12 @@ esp_err_t get_tflite_file_handler(httpd_req_t *req)
     return ESP_OK;
 }
 
+
 /* Send HTTP response with a run-time generated html consisting of
  * a list of all files and folders under the requested path.
  * In case of SPIFFS this returns empty list when path is any
  * string other than '/', since SPIFFS doesn't support directories */
-static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const char *uripath, bool readonly)
+static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const char* uripath, bool readonly)
 {
     char entrypath[FILE_PATH_MAX];
     char entrysize[16];
@@ -183,85 +191,82 @@ static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const
     char dirpath_corrected[FILE_PATH_MAX];
     strcpy(dirpath_corrected, dirpath);
 
-    file_server_data *server_data = (file_server_data *)req->user_ctx;
+    file_server_data * server_data = (file_server_data *) req->user_ctx;
+    if ((strlen(dirpath_corrected)-1) > strlen(server_data->base_path))      // if dirpath is not mountpoint, the last "\" needs to be removed
+        dirpath_corrected[strlen(dirpath_corrected)-1] = '\0';
 
-    if ((strlen(dirpath_corrected) - 1) > strlen(server_data->base_path)) {
-        // if dirpath is not mountpoint, the last "\" needs to be removed
-        dirpath_corrected[strlen(dirpath_corrected) - 1] = '\0';
-    }
-
-    DIR *pdir = opendir(dirpath_corrected);
+    DIR *dir = opendir(dirpath_corrected);
 
     const size_t dirpath_len = strlen(dirpath);
     ESP_LOGD(TAG, "Dirpath: <%s>, Pathlength: %d", dirpath, dirpath_len);
 
-    // Retrieve the base path of file storage to construct the full path
+    /* Retrieve the base path of file storage to construct the full path */
     strlcpy(entrypath, dirpath, sizeof(entrypath));
     ESP_LOGD(TAG, "entrypath: <%s>", entrypath);
 
-    if (!pdir) {
+    if (!dir) {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to stat dir: " + std::string(dirpath) + "!");
-        // Respond with 404 Not Found
+        /* Respond with 404 Not Found */
         httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404());
         return ESP_FAIL;
     }
 
     httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
 
-    // Send HTML file header
-    httpd_resp_sendstr_chunk(req, "<!DOCTYPE html><html lang=\"en\" xml:lang=\"en\"><head>");
-    httpd_resp_sendstr_chunk(req, "<link href=\"/file_server.css\" rel=\"stylesheet\">");
-    httpd_resp_sendstr_chunk(req, "<link href=\"/firework.css\" rel=\"stylesheet\">");
-    httpd_resp_sendstr_chunk(req, "<script type=\"text/javascript\" src=\"/jquery-3.6.0.min.js\"></script>");
-    httpd_resp_sendstr_chunk(req, "<script type=\"text/javascript\" src=\"/firework.js\"></script></head>");
+    /* Send HTML file header */
+    httpd_resp_sendstr_chunk(req, "<!DOCTYPE html><html><body>");
 
-    httpd_resp_sendstr_chunk(req, "<body>");
-
-    httpd_resp_sendstr_chunk(req, "<table class=\"fixed\" border=\"0\" width=100% style=\"font-family: arial\">");
-    httpd_resp_sendstr_chunk(req, "<tr><td style=\"vertical-align: top;width: 300px;\"><h2>Fileserver</h2></td>"
-                                  "<td rowspan=\"2\"><table border=\"0\" style=\"width:100%\"><tr><td style=\"width:80px\">"
-                                  "<label for=\"newfile\">Source</label></td><td colspan=\"2\">"
-                                  "<input id=\"newfile\" type=\"file\" onchange=\"setpath()\" style=\"width:100%;\"></td></tr>"
-                                  "<tr><td><label for=\"filepath\">Destination</label></td><td>"
-                                  "<input id=\"filepath\" type=\"text\" style=\"width:94%;\"></td><td>"
-                                  "<button id=\"upload\" type=\"button\" class=\"button\" onclick=\"upload()\">Upload</button></td></tr>"
-                                  "</table></td></tr><tr></tr><tr><td colspan=\"2\">"
-                                  "<button style=\"font-size:16px; padding: 5px 10px\" id=\"dirup\" type=\"button\" onclick=\"dirup()\""
-                                  "disabled>&#129145; Directory up</button><span style=\"padding-left:15px\" id=\"currentpath\">"
-                                  "</span></td></tr>");
-    httpd_resp_sendstr_chunk(req, "</table>");
-
-    httpd_resp_sendstr_chunk(req, "<script type=\"text/javascript\" src=\"/file_server.js\"></script>");
-    httpd_resp_sendstr_chunk(req, "<script type=\"text/javascript\">initFileServer();</script>");
+/////////////////////////////////////////////////
+    if (!readonly) {
+        FILE *fd = fopen("/sdcard/html/file_server.html", "r");
+        char *chunk = ((struct file_server_data *)req->user_ctx)->scratch;
+        size_t chunksize;
+        do {
+            chunksize = fread(chunk, 1, SERVER_FILER_SCRATCH_BUFSIZE, fd);
+            //        ESP_LOGD(TAG, "Chunksize %d", chunksize);
+            if (chunksize > 0){
+                if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK) {
+                fclose(fd);
+                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "File sending failed!");
+                return ESP_FAIL;
+                }
+            }
+        } while (chunksize != 0);
+        fclose(fd);
+        //    ESP_LOGI(TAG, "File sending complete");
+    }
+///////////////////////////////
 
     std::string _zw = std::string(dirpath);
     _zw = _zw.substr(8, _zw.length() - 8);
-    _zw = "/delete/" + _zw + "?task=deldircontent";
+    _zw = "/delete/" + _zw + "?task=deldircontent"; 
 
-    // Send file-list table definition and column labels
-    httpd_resp_sendstr_chunk(req, "<table id=\"files_table\">"
-                                  "<col width=\"800px\"><col width=\"300px\"><col width=\"300px\"><col width=\"100px\">"
-                                  "<thead><tr><th>Name</th><th>Type</th><th>Size</th>");
 
+    /* Send file-list table definition and column labels */
+    httpd_resp_sendstr_chunk(req,
+        "<table id=\"files_table\">"
+        "<col width=\"800px\" /><col width=\"300px\" /><col width=\"300px\" /><col width=\"100px\" />"
+        "<thead><tr><th>Name</th><th>Type</th><th>Size</th>");
     if (!readonly) {
-        httpd_resp_sendstr_chunk(req, "<th><form method=\"post\" action=\"");
+        httpd_resp_sendstr_chunk(req, "<th>"
+            "<form method=\"post\" action=\"");
         httpd_resp_sendstr_chunk(req, _zw.c_str());
-        httpd_resp_sendstr_chunk(req, "\"><button type=\"submit\">DELETE ALL!</button></form></th></tr>");
+        httpd_resp_sendstr_chunk(req,
+            "\"><button type=\"submit\">DELETE ALL!</button></form>"
+            "</th></tr>");
     }
-
     httpd_resp_sendstr_chunk(req, "</thead><tbody>\n");
 
-    // Iterate over all files / folders and fetch their names and sizes
-    while ((entry = readdir(pdir)) != NULL) {
-        // wlan.ini soll nicht angezeigt werden!
-        if (strcmp("wlan.ini", entry->d_name) != 0) {
+    /* Iterate over all files / folders and fetch their names and sizes */
+    while ((entry = readdir(dir)) != NULL) {
+        if (strcmp("wlan.ini", entry->d_name) != 0 )        // wlan.ini soll nicht angezeigt werden!
+        {
             entrytype = (entry->d_type == DT_DIR ? "directory" : "file");
 
             strlcpy(entrypath + dirpath_len, entry->d_name, sizeof(entrypath) - dirpath_len);
             ESP_LOGD(TAG, "Entrypath: %s", entrypath);
-
             if (stat(entrypath, &entry_stat) == -1) {
-                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to stat " + std::string(entrytype) + ": " + std::string(entry->d_name));
+                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to stat " + string(entrytype) + ": " + string(entry->d_name));
                 continue;
             }
 
@@ -277,25 +282,22 @@ static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const
                 }
             }
 
-            ESP_LOGD(TAG, "Found %s: %s (%s bytes)", entrytype, entry->d_name, entrysize);
+            ESP_LOGI(TAG, "Found %s: %s (%s bytes)", entrytype, entry->d_name, entrysize);
 
-            // Send chunk of HTML file containing table entries with file name and size
+            /* Send chunk of HTML file containing table entries with file name and size */
             httpd_resp_sendstr_chunk(req, "<tr><td><a href=\"");
             httpd_resp_sendstr_chunk(req, "/fileserver");
             httpd_resp_sendstr_chunk(req, uripath);
             httpd_resp_sendstr_chunk(req, entry->d_name);
-
             if (entry->d_type == DT_DIR) {
                 httpd_resp_sendstr_chunk(req, "/");
             }
-
             httpd_resp_sendstr_chunk(req, "\">");
             httpd_resp_sendstr_chunk(req, entry->d_name);
             httpd_resp_sendstr_chunk(req, "</a></td><td>");
             httpd_resp_sendstr_chunk(req, entrytype);
             httpd_resp_sendstr_chunk(req, "</td><td>");
             httpd_resp_sendstr_chunk(req, entrysize);
-
             if (!readonly) {
                 httpd_resp_sendstr_chunk(req, "</td><td>");
                 httpd_resp_sendstr_chunk(req, "<form method=\"post\" action=\"/delete");
@@ -303,28 +305,31 @@ static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const
                 httpd_resp_sendstr_chunk(req, entry->d_name);
                 httpd_resp_sendstr_chunk(req, "\"><button type=\"submit\">Delete</button></form>");
             }
-
             httpd_resp_sendstr_chunk(req, "</td></tr>\n");
         }
     }
+    closedir(dir);
 
-    closedir(pdir);
-
-    // Finish the file list table
+    /* Finish the file list table */
     httpd_resp_sendstr_chunk(req, "</tbody></table>");
 
-    // Send remaining chunk of HTML file to complete it
+    /* Send remaining chunk of HTML file to complete it */
     httpd_resp_sendstr_chunk(req, "</body></html>");
 
-    // Send empty chunk to signal HTTP response completion
+    /* Send empty chunk to signal HTTP response completion */
     httpd_resp_sendstr_chunk(req, NULL);
     return ESP_OK;
 }
+/*
+#define IS_FILE_EXT(filename, ext) \
+    (strcasecmp(&filename[strlen(filename) - sizeof(ext) + 1], ext) == 0)
+*/
 
 static esp_err_t logfileact_get_full_handler(httpd_req_t *req) {
     return send_logfile(req, true);
 }
 
+
 static esp_err_t logfileact_get_last_part_handler(httpd_req_t *req) {
     return send_logfile(req, false);
 }
@@ -333,6 +338,7 @@ static esp_err_t datafileact_get_full_handler(httpd_req_t *req) {
     return send_datafile(req, true);
 }
 
+
 static esp_err_t datafileact_get_last_part_handler(httpd_req_t *req) {
     return send_datafile(req, false);
 }
@@ -417,6 +423,7 @@ static esp_err_t send_datafile(httpd_req_t *req, bool send_full_file)
     return ESP_OK;
 }
 
+
 static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file)
 {
     LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "log_get_last_part_handler");
@@ -502,6 +509,7 @@ static esp_err_t send_logfile(httpd_req_t *req, bool send_full_file)
     return ESP_OK;
 }
 
+
 /* Handler to download a file kept on the server */
 static esp_err_t download_get_handler(httpd_req_t *req)
 {
@@ -519,6 +527,7 @@ static esp_err_t download_get_handler(httpd_req_t *req)
 //    filename = get_path_from_uri(filepath, ((struct file_server_data *)req->user_ctx)->base_path,
 //                                             req->uri, sizeof(filepath));
 
+
     if (!filename) {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Filename is too long");
         /* Respond with 414 Error */
@@ -749,6 +758,7 @@ static esp_err_t upload_post_handler(httpd_req_t *req)
     httpd_resp_set_hdr(req, "Location", directory.c_str());
     httpd_resp_sendstr(req, "File uploaded successfully");
 
+
     return ESP_OK;
 }
 
@@ -759,6 +769,7 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
     char filepath[FILE_PATH_MAX];
     struct stat file_stat;
 
+
 //////////////////////////////////////////////////////////////
     char _query[200];
     char _valuechar[30];    
@@ -881,11 +892,13 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
         }
     }
 
+
     httpd_resp_set_hdr(req, "Location", directory.c_str());
     httpd_resp_sendstr(req, "File successfully deleted");
     return ESP_OK;
 }
 
+
 void delete_all_in_directory(std::string _directory)
 {
     struct dirent *entry;
@@ -911,7 +924,7 @@ void delete_all_in_directory(std::string _directory)
     closedir(dir);
 }
 
-std::string unzip_new(std::string _in_zip_file, std::string _html_tmp, std::string _html_final, std::string _target_bin, std::string _main, bool _initial_setup)
+std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::string _target_bin, std::string _main, bool _initial_setup)
 {
     int i, sort_iter;
     mz_bool status;
@@ -993,15 +1006,10 @@ std::string unzip_new(std::string _in_zip_file, std::string _html_tmp, std::stri
                     }
                     else
                     {
-                        zw = _html_tmp + zw;
+                        zw = _target_zip + zw;
                     }
 
                 }
-
-                // files in the html folder shall be redirected to the temporary html folder
-                if (zw.find(_html_final) == 0) {
-                    FindReplace(zw, _html_final, _html_tmp);
-                }
             
                 string filename_zw = zw + SUFFIX_ZW;
 
@@ -1128,6 +1136,8 @@ void unzip(std::string _in_zip_file, std::string _target_directory){
     ESP_LOGD(TAG, "Success.");
 }
 
+
+
 void register_server_file_uri(httpd_handle_t server, const char *base_path)
 {
     static struct file_server_data *server_data = NULL;
@@ -1153,6 +1163,8 @@ void register_server_file_uri(httpd_handle_t server, const char *base_path)
     strlcpy(server_data->base_path, base_path,
             sizeof(server_data->base_path));
 
+
+
     /* URI handler for getting uploaded files */
 //    char zw[sizeof(serverprefix)+1];
 //    strcpy(zw, serverprefix);
@@ -1162,23 +1174,25 @@ void register_server_file_uri(httpd_handle_t server, const char *base_path)
     httpd_uri_t file_download = {
         .uri       = "/fileserver*",  // Match all URIs of type /path/to/file
         .method    = HTTP_GET,
-        .handler = APPLY_BASIC_AUTH_FILTER(download_get_handler),
+        .handler   = download_get_handler,
         .user_ctx  = server_data    // Pass server data as context
     };
     httpd_register_uri_handler(server, &file_download);
 
+
     httpd_uri_t file_datafileact = {
         .uri       = "/datafileact",  // Match all URIs of type /path/to/file
         .method    = HTTP_GET,
-        .handler = APPLY_BASIC_AUTH_FILTER(datafileact_get_full_handler),
+        .handler   = datafileact_get_full_handler,
         .user_ctx  = server_data    // Pass server data as context
     };
     httpd_register_uri_handler(server, &file_datafileact);
 
+
     httpd_uri_t file_datafile_last_part_handle = {
         .uri       = "/data",  // Match all URIs of type /path/to/file
         .method    = HTTP_GET,
-        .handler = APPLY_BASIC_AUTH_FILTER(datafileact_get_last_part_handler),
+        .handler   = datafileact_get_last_part_handler,
         .user_ctx  = server_data    // Pass server data as context
     };
     httpd_register_uri_handler(server, &file_datafile_last_part_handle);
@@ -1186,24 +1200,26 @@ void register_server_file_uri(httpd_handle_t server, const char *base_path)
     httpd_uri_t file_logfileact = {
         .uri       = "/logfileact",  // Match all URIs of type /path/to/file
         .method    = HTTP_GET,
-        .handler = APPLY_BASIC_AUTH_FILTER(logfileact_get_full_handler),
+        .handler   = logfileact_get_full_handler,
         .user_ctx  = server_data    // Pass server data as context
     };
     httpd_register_uri_handler(server, &file_logfileact);
 
+
     httpd_uri_t file_logfile_last_part_handle = {
         .uri       = "/log",  // Match all URIs of type /path/to/file
         .method    = HTTP_GET,
-        .handler = APPLY_BASIC_AUTH_FILTER(logfileact_get_last_part_handler),
+        .handler   = logfileact_get_last_part_handler,
         .user_ctx  = server_data    // Pass server data as context
     };
     httpd_register_uri_handler(server, &file_logfile_last_part_handle);
 
+
     /* URI handler for uploading files to server */
     httpd_uri_t file_upload = {
         .uri       = "/upload/*",   // Match all URIs of type /upload/path/to/file
         .method    = HTTP_POST,
-        .handler = APPLY_BASIC_AUTH_FILTER(upload_post_handler),
+        .handler   = upload_post_handler,
         .user_ctx  = server_data    // Pass server data as context
     };
     httpd_register_uri_handler(server, &file_upload);
@@ -1212,8 +1228,9 @@ void register_server_file_uri(httpd_handle_t server, const char *base_path)
     httpd_uri_t file_delete = {
         .uri       = "/delete/*",   // Match all URIs of type /delete/path/to/file
         .method    = HTTP_POST,
-        .handler = APPLY_BASIC_AUTH_FILTER(delete_post_handler),
+        .handler   = delete_post_handler,
         .user_ctx  = server_data    // Pass server data as context
     };
     httpd_register_uri_handler(server, &file_delete);
+
 }

code/components/jomjol_fileserver_ota/server_file.h

@@ -9,7 +9,7 @@
 void register_server_file_uri(httpd_handle_t server, const char *base_path);
 
 void unzip(std::string _in_zip_file, std::string _target_directory);
-std::string unzip_new(std::string _in_zip_file, std::string _html_tmp, std::string _html_final, std::string _target_bin, std::string _main = "/sdcard/", bool _initial_setup = false);
+std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::string _target_bin, std::string _main = "/sdcard/", bool _initial_setup = false);
 
 
 void delete_all_in_directory(std::string _directory);

code/components/jomjol_fileserver_ota/server_help.cpp

@@ -16,101 +16,77 @@ extern "C" {
 
 #include "esp_err.h"
 #include "esp_log.h"
+
 #include "Helper.h"
+
 #include "esp_http_server.h"
+
 #include "../../include/defines.h"
 
+
 static const char *TAG = "SERVER HELP";
 
 char scratch[SERVER_HELPER_SCRATCH_BUFSIZE];
 
-bool endsWith(std::string const &str, std::string const &suffix) 
-{
+
+bool endsWith(std::string const &str, std::string const &suffix) {
     if (str.length() < suffix.length()) {
         return false;
     }
     return str.compare(str.length() - suffix.length(), suffix.length(), suffix) == 0;
 }
 
+
 esp_err_t send_file(httpd_req_t *req, std::string filename)
 {
-    std::string _filename_old = filename;
-    struct stat file_stat;
-    bool _gz_file_exists = false;
-
-    ESP_LOGD(TAG, "old filename: %s", filename.c_str());
-    std::string _filename_temp = std::string(filename) + ".gz";
-
-    // Checks whether the file is available as .gz
-    if (stat(_filename_temp.c_str(), &file_stat) == 0) {
-        filename = _filename_temp;
-
-        ESP_LOGD(TAG, "new filename: %s", filename.c_str());
-        _gz_file_exists = true;
-    }
-
     FILE *fd = fopen(filename.c_str(), "r");
-    if (!fd)  {
+    if (!fd) {
         ESP_LOGE(TAG, "Failed to read file: %s", filename.c_str());
-		
         /* Respond with 404 Error */
         httpd_resp_send_err(req, HTTPD_404_NOT_FOUND, get404());
         return ESP_FAIL;
     }
 
     ESP_LOGD(TAG, "Sending file: %s ...", filename.c_str());
+//    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
 
-    /* For all files with the following file extention tell the webbrowser to cache them for 12h */
+    /* For all files with the following file extention tell
+       the webbrowser to cache them for 24h */
     if (endsWith(filename, ".html") ||
         endsWith(filename, ".htm") ||
-        endsWith(filename, ".xml") ||
         endsWith(filename, ".css") ||
         endsWith(filename, ".js") ||
         endsWith(filename, ".map") ||
         endsWith(filename, ".jpg") ||
         endsWith(filename, ".jpeg") ||
         endsWith(filename, ".ico") ||
-        endsWith(filename, ".png") ||
-        endsWith(filename, ".gif") ||
-        // endsWith(filename, ".zip") ||
-        endsWith(filename, ".gz"))	{
-        if (filename == "/sdcard/html/setup.html") {
+        endsWith(filename, ".png")) {
+
+    	if (filename == "/sdcard/html/setup.html") {    
             httpd_resp_set_hdr(req, "Clear-Site-Data", "\"*\"");
-            set_content_type_from_file(req, filename.c_str());
-        }
-        else if (_gz_file_exists) {
-            httpd_resp_set_hdr(req, "Cache-Control", "max-age=43200");
-            httpd_resp_set_hdr(req, "Content-Encoding", "gzip");
-            set_content_type_from_file(req, _filename_old.c_str());
         }
         else {
-            httpd_resp_set_hdr(req, "Cache-Control", "max-age=43200");
-            set_content_type_from_file(req, filename.c_str());
+            httpd_resp_set_hdr(req, "Cache-Control", "max-age=86400");
         }
     }
-    else {
-        set_content_type_from_file(req, filename.c_str());
-    }
+
+    set_content_type_from_file(req, filename.c_str());
 
     /* Retrieve the pointer to scratch buffer for temporary storage */
     char *chunk = scratch;
     size_t chunksize;
-	
-    do  {
+    do {
         /* Read file in chunks into the scratch buffer */
         chunksize = fread(chunk, 1, SERVER_HELPER_SCRATCH_BUFSIZE, fd);
 
         /* Send the buffer contents as HTTP response chunk */
-        if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK)  {
+        if (httpd_resp_send_chunk(req, chunk, chunksize) != ESP_OK) {
             fclose(fd);
             ESP_LOGE(TAG, "File sending failed!");
-			
             /* Abort sending file */
             httpd_resp_sendstr_chunk(req, NULL);
-			
             /* Respond with 500 Internal Server Error */
             httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to send file");
-			
             return ESP_FAIL;
         }
 
@@ -119,11 +95,13 @@ esp_err_t send_file(httpd_req_t *req, std::string filename)
 
     /* Close file after sending complete */
     fclose(fd);
-    ESP_LOGD(TAG, "File sending complete");
-	
+    ESP_LOGD(TAG, "File sending complete");    
     return ESP_OK;    
 }
 
+
+
+
 /* Copies the full path into destination buffer and returns
  * pointer to path (skipping the preceding base path) */
 const char* get_path_from_uri(char *dest, const char *base_path, const char *uri, size_t destsize)
@@ -153,49 +131,25 @@ const char* get_path_from_uri(char *dest, const char *base_path, const char *uri
     return dest + base_pathlen;
 }
 
+
 /* Set HTTP response content type according to file extension */
 esp_err_t set_content_type_from_file(httpd_req_t *req, const char *filename)
 {
     if (IS_FILE_EXT(filename, ".pdf")) {
-        return httpd_resp_set_type(req, "application/x-pdf");
-    }
-    else if (IS_FILE_EXT(filename, ".htm")) {
+        return httpd_resp_set_type(req, "application/pdf");
+    } else if (IS_FILE_EXT(filename, ".html")) {
         return httpd_resp_set_type(req, "text/html");
-    }
-    else if (IS_FILE_EXT(filename, ".html")) {
-        return httpd_resp_set_type(req, "text/html");
-    }
-    else if (IS_FILE_EXT(filename, ".jpeg")) {
+    } else if (IS_FILE_EXT(filename, ".jpeg")) {
         return httpd_resp_set_type(req, "image/jpeg");
-    }
-    else if (IS_FILE_EXT(filename, ".jpg")) {
+    } else if (IS_FILE_EXT(filename, ".jpg")) {
         return httpd_resp_set_type(req, "image/jpeg");
-    }
-    else if (IS_FILE_EXT(filename, ".gif")) {
-        return httpd_resp_set_type(req, "image/gif");
-    }
-    else if (IS_FILE_EXT(filename, ".png")) {
-        return httpd_resp_set_type(req, "image/png");
-    }
-    else if (IS_FILE_EXT(filename, ".ico")) {
+    } else if (IS_FILE_EXT(filename, ".ico")) {
         return httpd_resp_set_type(req, "image/x-icon");
-    }
-    else if (IS_FILE_EXT(filename, ".js")) {
-        return httpd_resp_set_type(req, "application/javascript");
-    }
-    else if (IS_FILE_EXT(filename, ".css")) {
+    } else if (IS_FILE_EXT(filename, ".js")) {
+        return httpd_resp_set_type(req, "text/javascript");
+    } else if (IS_FILE_EXT(filename, ".css")) {
         return httpd_resp_set_type(req, "text/css");
     }
-    else if (IS_FILE_EXT(filename, ".xml")) {
-        return httpd_resp_set_type(req, "text/xml");
-    }
-    else if (IS_FILE_EXT(filename, ".zip")) {
-        return httpd_resp_set_type(req, "application/x-zip");
-    }
-    else if (IS_FILE_EXT(filename, ".gz")) {
-        return httpd_resp_set_type(req, "application/x-gzip");
-    }
-
     /* This is a limited set only */
     /* For any other type always set as plain text */
     return httpd_resp_set_type(req, "text/plain");

code/components/jomjol_fileserver_ota/server_ota.cpp

@@ -42,7 +42,6 @@ https://docs.espressif.com/projects/esp-idf/en/latest/esp32/migration-guides/rel
 
 #include "Helper.h"
 #include "statusled.h"
-#include "basic_auth.h"
 #include "../../include/defines.h"
 
 /*an ota data write buffer ready to write to the flash*/
@@ -76,35 +75,20 @@ void task_do_Update_ZIP(void *pvParameter)
 
   	LogFile.WriteToFile(ESP_LOG_INFO, TAG, "File: " + _file_name_update + " Filetype: " + filetype);
 
+
     if (filetype == "ZIP")
     {
-        std::string in, outHtml, outHtmlTmp, outHtmlOld, outbin, zw, retfirmware;
+        std::string in, out, outbin, zw, retfirmware;
 
-        outHtml = "/sdcard/html";
-        outHtmlTmp = "/sdcard/html_tmp";
-        outHtmlOld = "/sdcard/html_old";
+        out = "/sdcard/html";
         outbin = "/sdcard/firmware";
 
-        /* Remove the old and tmp html folder in case they still exist */
-        removeFolder(outHtmlTmp.c_str(), TAG);
-        removeFolder(outHtmlOld.c_str(), TAG);
-
-        /* Extract the ZIP file. The content of the html folder gets extracted to the temporar folder html-temp. */
-        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Extracting ZIP file " + _file_name_update + "...");
-        retfirmware = unzip_new(_file_name_update, outHtmlTmp+"/", outHtml+"/", outbin+"/", "/sdcard/", initial_setup);
+        retfirmware = unzip_new(_file_name_update, out+"/", outbin+"/", "/sdcard/", initial_setup);
     	LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Files unzipped.");
 
-        /* ZIP file got extracted, replace the old html folder with the new one */
-        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Renaming folder " + outHtml + " to " + outHtmlOld + "...");
-        RenameFolder(outHtml, outHtmlOld);
-        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Renaming folder " + outHtmlTmp + " to " + outHtml + "...");
-        RenameFolder(outHtmlTmp, outHtml);
-        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Deleting folder " + outHtmlOld + "...");
-        removeFolder(outHtmlOld.c_str(), TAG);
-
         if (retfirmware.length() > 0)
         {
-            LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Found firmware.bin");
+        	LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Found firmware.bin");
             ota_update_task(retfirmware);
         }
 
@@ -449,6 +433,7 @@ esp_err_t handler_ota_update(httpd_req_t *req)
             return ESP_OK;        
         }
 
+
         if ((filetype == "TFLITE") || (filetype == "TFL"))
         {
             std::string out = "/sdcard/config/" + getFileFullFileName(fn);
@@ -705,13 +690,13 @@ void register_server_ota_sdcard_uri(httpd_handle_t server)
     httpd_uri_t camuri = { };
     camuri.method    = HTTP_GET;
     camuri.uri       = "/ota";
-    camuri.handler = APPLY_BASIC_AUTH_FILTER(handler_ota_update);
+    camuri.handler   = handler_ota_update;
     camuri.user_ctx  = (void*) "Do OTA";    
     httpd_register_uri_handler(server, &camuri);
 
     camuri.method    = HTTP_GET;
     camuri.uri       = "/reboot";
-    camuri.handler = APPLY_BASIC_AUTH_FILTER(handler_reboot);
+    camuri.handler   = handler_reboot;
     camuri.user_ctx  = (void*) "Reboot";    
     httpd_register_uri_handler(server, &camuri);
 

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_webhook jomjol_fileserver_ota jomjol_image_proc jomjol_wlan openmetrics)
+                    REQUIRES esp_timer esp_wifi jomjol_tfliteclass jomjol_helper jomjol_controlcamera jomjol_mqtt jomjol_influxdb jomjol_fileserver_ota jomjol_image_proc jomjol_wlan)
 
 

code/components/jomjol_flowcontroll/ClassFlow.cpp

@@ -67,6 +67,11 @@ string ClassFlow::getHTMLSingleStep(string host){
 	return "";
 }
 
+string ClassFlow::getReadout()
+{
+	return string();
+}
+
 std::string ClassFlow::GetParameterName(std::string _input)
 {
     string _param;

code/components/jomjol_flowcontroll/ClassFlow.h

@@ -46,6 +46,7 @@ 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";};
 
 };

code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp

@@ -1,374 +1,393 @@
-#include "ClassFlowAlignment.h"
-#include "ClassFlowTakeImage.h"
-#include "ClassFlow.h"
-#include "MainFlowControl.h"
-
-#include "CRotateImage.h"
-#include "esp_log.h"
-
-#include "ClassLogFile.h"
-#include "psram.h"
-#include "../../include/defines.h"
-
-static const char *TAG = "ALIGN";
-
-// #define DEBUG_DETAIL_ON
-
-void ClassFlowAlignment::SetInitialParameter(void)
-{
-    initialrotate = 0;
-    anz_ref = 0;
-    use_antialiasing = false;
-    initialflip = false;
-    SaveAllFiles = false;
-    namerawimage = "/sdcard/img_tmp/raw.jpg";
-    FileStoreRefAlignment = "/sdcard/config/align.txt";
-    ListFlowControll = NULL;
-    AlignAndCutImage = NULL;
-    ImageBasis = NULL;
-    ImageTMP = NULL;
-#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-    AlgROI = (ImageData *)malloc_psram_heap(std::string(TAG) + "->AlgROI", sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
-#endif
-    previousElement = NULL;
-    disabled = false;
-    SAD_criteria = 0.05;
-}
-
-ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow *> *lfc)
-{
-    SetInitialParameter();
-    ListFlowControll = lfc;
-
-    for (int i = 0; i < ListFlowControll->size(); ++i) {
-        if (((*ListFlowControll)[i])->name().compare("ClassFlowTakeImage") == 0) {
-            ImageBasis = ((ClassFlowTakeImage *)(*ListFlowControll)[i])->rawImage;
-        }
-    }
-
-    // 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);
-    }
-}
-
-bool ClassFlowAlignment::ReadParameter(FILE *pfile, string &aktparamgraph)
-{
-    std::vector<string> splitted;
-    int suchex = 40;
-    int suchey = 40;
-    int alg_algo = 0; // default=0; 1 =HIGHACCURACY; 2= FAST; 3= OFF //add disable aligment algo |01.2023
-
-    aktparamgraph = trim(aktparamgraph);
-
-    if (aktparamgraph.size() == 0)
-    {
-        if (!this->GetNextParagraph(pfile, aktparamgraph)) {
-            return false;
-        }
-    }
-
-    if (aktparamgraph.compare("[Alignment]") != 0)
-    {
-        // Paragraph does not fit Alignment
-        return false;
-    }
-
-    while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
-    {
-        splitted = ZerlegeZeile(aktparamgraph);
-
-        if ((toUpper(splitted[0]) == "FLIPIMAGESIZE") && (splitted.size() > 1)) {
-            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]) == "SEARCHFIELDX") && (splitted.size() > 1)) {
-            if (isStringNumeric(splitted[1])) {
-                suchex = std::stod(splitted[1]);
-            }
-        }
-        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)) {
-            SaveAllFiles = alphanumericToBoolean(splitted[1]);
-        }
-        else if ((toUpper(splitted[0]) == "ALIGNMENTALGO") && (splitted.size() > 1)) {
-#ifdef DEBUG_DETAIL_ON
-            std::string zw2 = "Alignment mode selected: " + splitted[1];
-            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw2);
-#endif
-            if (toUpper(splitted[1]) == "HIGHACCURACY") {
-                alg_algo = 1;
-            }
-            if (toUpper(splitted[1]) == "FAST") {
-                alg_algo = 2;
-            }
-            if (toUpper(splitted[1]) == "OFF") {
-                // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
-                alg_algo = 3;
-            }
-        }
-    }
-
-    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;
-        References[i].alignment_algo = alg_algo;
-#ifdef DEBUG_DETAIL_ON
-        std::string zw2 = "Alignment mode written: " + std::to_string(alg_algo);
-        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw2);
-#endif
-    }
-
-    // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
-    if (References[0].alignment_algo != 3) {
-        return LoadReferenceAlignmentValues();
-    }
-
-    return true;
-}
-
-string ClassFlowAlignment::getHTMLSingleStep(string host)
-{
-    string result;
-
-    result = "<p>Rotated Image: </p> <p><img src=\"" + host + "/img_tmp/rot.jpg\"></p>\n";
-    result = result + "<p>Found Alignment: </p> <p><img src=\"" + host + "/img_tmp/rot_roi.jpg\"></p>\n";
-    result = result + "<p>Aligned Image: </p> <p><img src=\"" + host + "/img_tmp/alg.jpg\"></p>\n";
-    return result;
-}
-
-bool ClassFlowAlignment::doFlow(string time)
-{
-#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-    // 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) {
-            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlgROI");
-            LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
-        }
-    }
-
-    if (AlgROI) {
-        ImageBasis->writeToMemoryAsJPG((ImageData *)AlgROI, 90);
-    }
-#endif
-
-    if (!ImageTMP) {
-        ImageTMP = new CImageBasis("tmpImage", ImageBasis); // Make sure the name does not get change, it is relevant for the PSRAM allocation!
-
-        if (!ImageTMP) {
-            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate tmpImage -> Exec this round aborted!");
-            LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
-            return false;
-        }
-    }
-
-    delete AlignAndCutImage;
-    AlignAndCutImage = new CAlignAndCutImage("AlignAndCutImage", ImageBasis, ImageTMP);
-
-    if (!AlignAndCutImage) {
-        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlignAndCutImage -> Exec this round aborted!");
-        LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
-        return false;
-    }
-
-    CRotateImage rt("rawImage", AlignAndCutImage, ImageTMP, initialflip);
-
-    if (initialflip) {
-        int _zw = ImageBasis->height;
-        ImageBasis->height = ImageBasis->width;
-        ImageBasis->width = _zw;
-
-        _zw = ImageTMP->width;
-        ImageTMP->width = ImageTMP->height;
-        ImageTMP->height = _zw;
-    }
-
-    if ((initialrotate != 0) || initialflip) {
-        if (use_antialiasing) {
-            rt.RotateAntiAliasing(initialrotate);
-        }
-        else {
-            rt.Rotate(initialrotate);
-        }
-
-        if (SaveAllFiles) {
-            AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/rot.jpg"));
-        }
-    }
-
-    // no align algo if set to 3 = off //add disable aligment algo |01.2023
-    if (References[0].alignment_algo != 3) {
-        if (!AlignAndCutImage->Align(&References[0], &References[1])) {
-            SaveReferenceAlignmentValues();
-        }
-    } // no align
-
-#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-    if (AlgROI) {
-        // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
-        if (References[0].alignment_algo != 3) {
-            DrawRef(ImageTMP);
-        }
-
-        flowctrl.DigitDrawROI(ImageTMP);
-        flowctrl.AnalogDrawROI(ImageTMP);
-        ImageTMP->writeToMemoryAsJPG((ImageData *)AlgROI, 90);
-    }
-#endif
-
-    if (SaveAllFiles) {
-        AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/alg.jpg"));
-        ImageTMP->SaveToFile(FormatFileName("/sdcard/img_tmp/alg_roi.jpg"));
-    }
-
-    // must be deleted to have memory space for loading tflite
-    delete ImageTMP;
-    ImageTMP = NULL;
-
-    // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
-    if (References[0].alignment_algo != 3) {
-        return LoadReferenceAlignmentValues();
-    }
-
-    return true;
-}
-
-void ClassFlowAlignment::SaveReferenceAlignmentValues()
-{
-    FILE *pFile;
-    std::string zwtime, zwvalue;
-
-    pFile = fopen(FileStoreRefAlignment.c_str(), "w");
-
-    if (strlen(zwtime.c_str()) == 0) {
-        time_t rawtime;
-        struct tm *timeinfo;
-        char buffer[80];
-
-        time(&rawtime);
-        timeinfo = localtime(&rawtime);
-
-        strftime(buffer, 80, "%Y-%m-%dT%H:%M:%S", timeinfo);
-        zwtime = std::string(buffer);
-    }
-
-    fputs(zwtime.c_str(), pFile);
-    fputs("\n", pFile);
-
-    zwvalue = std::to_string(References[0].fastalg_x) + "\t" + std::to_string(References[0].fastalg_y);
-    zwvalue = zwvalue + "\t" + std::to_string(References[0].fastalg_SAD) + "\t" + std::to_string(References[0].fastalg_min);
-    zwvalue = zwvalue + "\t" + std::to_string(References[0].fastalg_max) + "\t" + std::to_string(References[0].fastalg_avg);
-    fputs(zwvalue.c_str(), pFile);
-    fputs("\n", pFile);
-
-    zwvalue = std::to_string(References[1].fastalg_x) + "\t" + std::to_string(References[1].fastalg_y);
-    zwvalue = zwvalue + "\t" + std::to_string(References[1].fastalg_SAD) + "\t" + std::to_string(References[1].fastalg_min);
-    zwvalue = zwvalue + "\t" + std::to_string(References[1].fastalg_max) + "\t" + std::to_string(References[1].fastalg_avg);
-    fputs(zwvalue.c_str(), pFile);
-    fputs("\n", pFile);
-
-    fclose(pFile);
-}
-
-bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
-{
-    FILE *pFile;
-    char zw[1024];
-    string zwvalue;
-    std::vector<string> splitted;
-
-    pFile = fopen(FileStoreRefAlignment.c_str(), "r");
-
-    if (pFile == NULL) {
-        return false;
-    }
-
-    fgets(zw, 1024, pFile);
-    ESP_LOGD(TAG, "%s", zw);
-
-    fgets(zw, 1024, pFile);
-    splitted = ZerlegeZeile(std::string(zw), " \t");
-
-    if (splitted.size() < 6) {
-        fclose(pFile);
-        return false;
-    }
-
-    References[0].fastalg_x = stoi(splitted[0]);
-    References[0].fastalg_y = stoi(splitted[1]);
-    References[0].fastalg_SAD = stof(splitted[2]);
-    References[0].fastalg_min = stoi(splitted[3]);
-    References[0].fastalg_max = stoi(splitted[4]);
-    References[0].fastalg_avg = stof(splitted[5]);
-
-    fgets(zw, 1024, pFile);
-    splitted = ZerlegeZeile(std::string(zw));
-
-    if (splitted.size() < 6) {
-        fclose(pFile);
-        return false;
-    }
-
-    References[1].fastalg_x = stoi(splitted[0]);
-    References[1].fastalg_y = stoi(splitted[1]);
-    References[1].fastalg_SAD = stof(splitted[2]);
-    References[1].fastalg_min = stoi(splitted[3]);
-    References[1].fastalg_max = stoi(splitted[4]);
-    References[1].fastalg_avg = stof(splitted[5]);
-
-    fclose(pFile);
-
-    /*#ifdef DEBUG_DETAIL_ON
-        std::string _zw = "\tLoadReferences[0]\tx,y:\t" + std::to_string(References[0].fastalg_x) + "\t" + std::to_string(References[0].fastalg_x);
-        _zw = _zw + "\tSAD, min, max, avg:\t" + std::to_string(References[0].fastalg_SAD) + "\t" + std::to_string(References[0].fastalg_min);
-        _zw = _zw + "\t" + std::to_string(References[0].fastalg_max) + "\t" + std::to_string(References[0].fastalg_avg);
-        LogFile.WriteToDedicatedFile("/sdcard/alignment.txt", _zw);
-        _zw = "\tLoadReferences[1]\tx,y:\t" + std::to_string(References[1].fastalg_x) + "\t" + std::to_string(References[1].fastalg_x);
-        _zw = _zw + "\tSAD, min, max, avg:\t" + std::to_string(References[1].fastalg_SAD) + "\t" + std::to_string(References[1].fastalg_min);
-        _zw = _zw + "\t" + std::to_string(References[1].fastalg_max) + "\t" + std::to_string(References[1].fastalg_avg);
-        LogFile.WriteToDedicatedFile("/sdcard/alignment.txt", _zw);
-    #endif*/
-
-    return true;
-}
-
-void ClassFlowAlignment::DrawRef(CImageBasis *_zw)
-{
-    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);
-    }
-}
+#include "ClassFlowAlignment.h"
+#include "ClassFlowTakeImage.h"
+#include "ClassFlow.h"
+#include "MainFlowControl.h"
+
+#include "CRotateImage.h"
+#include "esp_log.h"
+
+
+#include "ClassLogFile.h"
+#include "psram.h"
+#include "../../include/defines.h"
+
+
+static const char *TAG = "ALIGN";
+
+// #define DEBUG_DETAIL_ON  
+
+
+void ClassFlowAlignment::SetInitialParameter(void)
+{
+    initalrotate = 0;
+    anz_ref = 0;
+    initialmirror = false;
+    use_antialiasing = false;
+    initialflip = false;
+    SaveAllFiles = false;
+    namerawimage =  "/sdcard/img_tmp/raw.jpg";
+    FileStoreRefAlignment = "/sdcard/config/align.txt";
+    ListFlowControll = NULL;
+    AlignAndCutImage = NULL;
+    ImageBasis = NULL;
+    ImageTMP = NULL;
+    #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG 
+    AlgROI = (ImageData*)malloc_psram_heap(std::string(TAG) + "->AlgROI", sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
+    #endif
+    previousElement = NULL;
+    disabled = false;
+    SAD_criteria = 0.05;
+}
+
+
+ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow*>* lfc)
+{
+    SetInitialParameter();
+    ListFlowControll = lfc;
+
+    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
+    {
+        ESP_LOGD(TAG, "CImageBasis had to be created");
+        ImageBasis = new CImageBasis("ImageBasis", namerawimage);
+    }
+}
+
+
+bool ClassFlowAlignment::ReadParameter(FILE* pfile, string& aktparamgraph)
+{
+    std::vector<string> splitted;
+    int suchex = 40;
+    int suchey = 40;
+    int alg_algo = 0; //default=0; 1 =HIGHACCURACY; 2= FAST; 3= OFF //add disable aligment algo |01.2023
+
+
+    aktparamgraph = trim(aktparamgraph);
+
+    if (aktparamgraph.size() == 0)
+        if (!this->GetNextParagraph(pfile, aktparamgraph))
+            return false;
+
+    if (aktparamgraph.compare("[Alignment]") != 0)       //Paragraph does not fit Alignment
+        return false;
+
+    while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
+    {
+        splitted = ZerlegeZeile(aktparamgraph);
+        if ((toUpper(splitted[0]) == "FLIPIMAGESIZE") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+                initialflip = true;
+        }
+        if ((toUpper(splitted[0]) == "INITIALMIRROR") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+                initialmirror = true;
+        }
+        if (((toUpper(splitted[0]) == "INITALROTATE") || (toUpper(splitted[0]) == "INITIALROTATE")) && (splitted.size() > 1))
+        {
+            this->initalrotate = std::stod(splitted[1]);
+        }
+        if ((toUpper(splitted[0]) == "SEARCHFIELDX") && (splitted.size() > 1))
+        {
+            suchex = std::stod(splitted[1]);
+        }   
+        if ((toUpper(splitted[0]) == "SEARCHFIELDY") && (splitted.size() > 1))
+        {
+            suchey = std::stod(splitted[1]);
+        }   
+        if ((toUpper(splitted[0]) == "ANTIALIASING") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+                use_antialiasing = true;
+        }   
+        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++;
+        }
+
+        if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+                SaveAllFiles = true;
+        }
+        if ((toUpper(splitted[0]) == "ALIGNMENTALGO") && (splitted.size() > 1))
+        {
+            #ifdef DEBUG_DETAIL_ON
+                std::string zw2 = "Alignment mode selected: " + splitted[1];
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw2);
+            #endif
+            if (toUpper(splitted[1]) == "HIGHACCURACY")
+                alg_algo = 1;
+            if (toUpper(splitted[1]) == "FAST")
+                alg_algo = 2;
+            if (toUpper(splitted[1]) == "OFF") //no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
+                alg_algo = 3;
+        }
+    }
+
+    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;
+        References[i].alignment_algo = alg_algo;
+        #ifdef DEBUG_DETAIL_ON
+            std::string zw2 = "Alignment mode written: " + std::to_string(alg_algo);
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw2);
+        #endif
+    }
+
+    //no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
+    if(References[0].alignment_algo != 3){
+        LoadReferenceAlignmentValues();
+    }
+    
+    return true;
+
+}
+
+
+string ClassFlowAlignment::getHTMLSingleStep(string host)
+{
+    string result;
+
+    result =          "<p>Rotated Image: </p> <p><img src=\"" + host + "/img_tmp/rot.jpg\"></p>\n";
+    result = result + "<p>Found Alignment: </p> <p><img src=\"" + host + "/img_tmp/rot_roi.jpg\"></p>\n";
+    result = result + "<p>Aligned Image: </p> <p><img src=\"" + host + "/img_tmp/alg.jpg\"></p>\n";
+    return result;
+}
+
+
+bool ClassFlowAlignment::doFlow(string time) 
+{
+    #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
+        if (!AlgROI)  // AlgROI needs to be allocated before ImageTMP to avoid heap fragmentation
+        {
+            AlgROI = (ImageData*)heap_caps_realloc(AlgROI, sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);     
+            if (!AlgROI) 
+            {
+                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlgROI");
+                LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
+            }
+        }
+
+        if (AlgROI)
+        {
+            ImageBasis->writeToMemoryAsJPG((ImageData*)AlgROI, 90);
+        }
+    #endif
+
+    if (!ImageTMP) 
+    {
+        ImageTMP = new CImageBasis("tmpImage", ImageBasis); // Make sure the name does not get change, it is relevant for the PSRAM allocation!
+        if (!ImageTMP) 
+        {
+            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate tmpImage -> Exec this round aborted!");
+            LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
+            return false;
+        }
+    }
+
+    delete AlignAndCutImage;
+    AlignAndCutImage = new CAlignAndCutImage("AlignAndCutImage", ImageBasis, ImageTMP);
+    if (!AlignAndCutImage) 
+    {
+        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlignAndCutImage -> Exec this round aborted!");
+        LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
+        return false;
+    }
+
+    CRotateImage rt("rawImage", AlignAndCutImage, ImageTMP, initialflip);
+    if (initialflip)
+    {
+        int _zw = ImageBasis->height;
+        ImageBasis->height = ImageBasis->width;
+        ImageBasis->width = _zw;
+
+        _zw = ImageTMP->width;
+        ImageTMP->width = ImageTMP->height;
+        ImageTMP->height = _zw;
+    }
+
+    if (initialmirror)
+    {
+        ESP_LOGD(TAG, "do mirror");
+        rt.Mirror();
+        
+        if (SaveAllFiles)
+            AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/mirror.jpg"));
+    }
+ 
+    if ((initalrotate != 0) || initialflip)
+    {
+        if (use_antialiasing)
+            rt.RotateAntiAliasing(initalrotate);
+        else
+            rt.Rotate(initalrotate);
+        
+        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])) 
+            {
+                SaveReferenceAlignmentValues();
+            }
+        }// no align
+
+
+    #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
+        if (AlgROI) {
+            //no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
+            if(References[0].alignment_algo != 3){
+                DrawRef(ImageTMP);
+            }
+            flowctrl.DigitalDrawROI(ImageTMP);
+            flowctrl.AnalogDrawROI(ImageTMP);
+            ImageTMP->writeToMemoryAsJPG((ImageData*)AlgROI, 90);
+        }
+    #endif
+    
+    if (SaveAllFiles)
+    {
+        AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/alg.jpg"));
+        ImageTMP->SaveToFile(FormatFileName("/sdcard/img_tmp/alg_roi.jpg"));
+    }
+
+    // must be deleted to have memory space for loading tflite
+    delete ImageTMP;
+    ImageTMP = NULL;
+
+    //no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
+    if(References[0].alignment_algo != 3){
+        LoadReferenceAlignmentValues();
+    }
+
+    return true;
+}
+
+
+void ClassFlowAlignment::SaveReferenceAlignmentValues()
+{
+    FILE* pFile;
+    std::string zwtime, zwvalue;
+
+    pFile = fopen(FileStoreRefAlignment.c_str(), "w");
+
+    if (strlen(zwtime.c_str()) == 0)
+    {
+        time_t rawtime;
+        struct tm* timeinfo;
+        char buffer[80];
+
+        time(&rawtime);
+        timeinfo = localtime(&rawtime);
+
+        strftime(buffer, 80, "%Y-%m-%dT%H:%M:%S", timeinfo);
+        zwtime = std::string(buffer);
+    }
+
+    fputs(zwtime.c_str(), pFile);
+    fputs("\n", pFile);
+
+    zwvalue = std::to_string(References[0].fastalg_x) + "\t" + std::to_string(References[0].fastalg_y);
+    zwvalue = zwvalue + "\t" +std::to_string(References[0].fastalg_SAD)+ "\t" +std::to_string(References[0].fastalg_min); 
+    zwvalue = zwvalue + "\t" +std::to_string(References[0].fastalg_max)+ "\t" +std::to_string(References[0].fastalg_avg); 
+    fputs(zwvalue.c_str(), pFile);
+    fputs("\n", pFile);
+
+    zwvalue = std::to_string(References[1].fastalg_x) + "\t" + std::to_string(References[1].fastalg_y);
+    zwvalue = zwvalue + "\t" +std::to_string(References[1].fastalg_SAD)+ "\t" +std::to_string(References[1].fastalg_min); 
+    zwvalue = zwvalue + "\t" +std::to_string(References[1].fastalg_max)+ "\t" +std::to_string(References[1].fastalg_avg); 
+    fputs(zwvalue.c_str(), pFile);
+    fputs("\n", pFile);
+
+    fclose(pFile);
+}
+
+
+bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
+{
+    FILE* pFile;
+    char zw[1024];
+    string zwvalue;
+    std::vector<string> splitted;  
+
+
+    pFile = fopen(FileStoreRefAlignment.c_str(), "r");
+    if (pFile == NULL)
+        return false;
+
+    fgets(zw, 1024, pFile);
+    ESP_LOGD(TAG, "%s", zw);
+
+    fgets(zw, 1024, pFile);
+    splitted = ZerlegeZeile(std::string(zw), " \t");
+    if (splitted.size() < 6)
+    {
+        fclose(pFile);
+        return false;
+    }
+
+    References[0].fastalg_x = stoi(splitted[0]);
+    References[0].fastalg_y = stoi(splitted[1]);
+    References[0].fastalg_SAD = stof(splitted[2]);
+    References[0].fastalg_min = stoi(splitted[3]);
+    References[0].fastalg_max = stoi(splitted[4]);
+    References[0].fastalg_avg = stof(splitted[5]);
+
+    fgets(zw, 1024, pFile);
+    splitted = ZerlegeZeile(std::string(zw));
+    if (splitted.size() < 6)
+    {
+        fclose(pFile);
+        return false;
+    }
+
+    References[1].fastalg_x = stoi(splitted[0]);
+    References[1].fastalg_y = stoi(splitted[1]);
+    References[1].fastalg_SAD = stof(splitted[2]);
+    References[1].fastalg_min = stoi(splitted[3]);
+    References[1].fastalg_max = stoi(splitted[4]);
+    References[1].fastalg_avg = stof(splitted[5]);
+
+    fclose(pFile);
+
+
+    /*#ifdef DEBUG_DETAIL_ON
+        std::string _zw = "\tLoadReferences[0]\tx,y:\t" + std::to_string(References[0].fastalg_x) + "\t" + std::to_string(References[0].fastalg_x);
+        _zw = _zw + "\tSAD, min, max, avg:\t" + std::to_string(References[0].fastalg_SAD) + "\t" + std::to_string(References[0].fastalg_min);
+        _zw = _zw + "\t" + std::to_string(References[0].fastalg_max) + "\t" + std::to_string(References[0].fastalg_avg);
+        LogFile.WriteToDedicatedFile("/sdcard/alignment.txt", _zw);
+        _zw = "\tLoadReferences[1]\tx,y:\t" + std::to_string(References[1].fastalg_x) + "\t" + std::to_string(References[1].fastalg_x);
+        _zw = _zw + "\tSAD, min, max, avg:\t" + std::to_string(References[1].fastalg_SAD) + "\t" + std::to_string(References[1].fastalg_min);
+        _zw = _zw + "\t" + std::to_string(References[1].fastalg_max) + "\t" + std::to_string(References[1].fastalg_avg);
+        LogFile.WriteToDedicatedFile("/sdcard/alignment.txt", _zw);
+    #endif*/
+
+    return true;
+}
+
+
+void ClassFlowAlignment::DrawRef(CImageBasis *_zw)
+{
+    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);
+    }
+}

code/components/jomjol_flowcontroll/ClassFlowAlignment.h

@@ -1,51 +1,54 @@
-#pragma once
-
-#ifndef CLASSFLOWALIGNMENT_H
-#define CLASSFLOWALIGNMENT_H
-
-#include "ClassFlow.h"
-#include "Helper.h"
-#include "CAlignAndCutImage.h"
-#include "CFindTemplate.h"
-
-#include <string>
-
-using namespace std;
-
-class ClassFlowAlignment : public ClassFlow
-{
-protected:
-    float initialrotate;
-    bool initialflip;
-    bool use_antialiasing;
-    RefInfo References[2];
-    int anz_ref;
-    string namerawimage;
-    bool SaveAllFiles;
-    CAlignAndCutImage *AlignAndCutImage;
-    std::string FileStoreRefAlignment;
-    float SAD_criteria;
-
-    void SetInitialParameter(void);
-    bool LoadReferenceAlignmentValues(void);
-    void SaveReferenceAlignmentValues();
-
-public:
-    CImageBasis *ImageBasis, *ImageTMP;
-#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-    ImageData *AlgROI;
-#endif
-
-    ClassFlowAlignment(std::vector<ClassFlow *> *lfc);
-
-    CAlignAndCutImage *GetAlignAndCutImage() { return AlignAndCutImage; };
-
-    void DrawRef(CImageBasis *_zw);
-
-    bool ReadParameter(FILE *pfile, string &aktparamgraph);
-    bool doFlow(string time);
-    string getHTMLSingleStep(string host);
-    string name() { return "ClassFlowAlignment"; };
-};
-
-#endif // CLASSFLOWALIGNMENT_H
+#pragma once
+
+#ifndef CLASSFLOWALIGNMENT_H
+#define CLASSFLOWALIGNMENT_H
+
+#include "ClassFlow.h"
+#include "Helper.h"
+#include "CAlignAndCutImage.h"
+#include "CFindTemplate.h"
+
+#include <string>
+
+using namespace std;
+
+class ClassFlowAlignment :
+    public ClassFlow
+{
+protected:
+    float initalrotate;
+    bool initialmirror;
+    bool initialflip;
+    bool use_antialiasing;
+    RefInfo References[2];
+    int anz_ref;
+    string namerawimage;
+    bool SaveAllFiles;
+    CAlignAndCutImage *AlignAndCutImage;
+    std::string FileStoreRefAlignment;
+    float SAD_criteria;
+
+    void SetInitialParameter(void);
+    bool LoadReferenceAlignmentValues(void);
+    void SaveReferenceAlignmentValues();
+
+public:
+    CImageBasis *ImageBasis, *ImageTMP;
+    #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG 
+    ImageData *AlgROI;
+    #endif
+    
+    ClassFlowAlignment(std::vector<ClassFlow*>* lfc);
+
+    CAlignAndCutImage* GetAlignAndCutImage(){return AlignAndCutImage;};
+
+    void DrawRef(CImageBasis *_zw);
+
+    bool ReadParameter(FILE* pfile, string& aktparamgraph);
+    bool doFlow(string time);
+    string getHTMLSingleStep(string host);
+    string name(){return "ClassFlowAlignment";};
+};
+
+
+#endif //CLASSFLOWALIGNMENT_H

code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h

@@ -11,10 +11,10 @@ enum t_CNNType {
     AutoDetect,
     Analogue,
     Analogue100,
-    Digit,
-    DigitHyprid10,
+    Digital,
+    DigitalHyprid10,
     DoubleHyprid10,
-    Digit100,
+    Digital100,
     None
  };
 
@@ -26,6 +26,15 @@ 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;
@@ -35,8 +44,8 @@ protected:
     bool SaveAllFiles;   
 
     int PointerEvalAnalogNew(float zahl, int numeral_preceder);
-    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);
+    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);
 
 
 
@@ -52,7 +61,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 AnalogToDigitTransitionStart=9.2); 
+    string getReadout(int _analog, bool _extendedResolution = false, int prev = -1, float _before_narrow_Analog = -1, float analogDigitalTransitionStart=9.2); 
 
     string getReadoutRawString(int _analog);  
 

code/components/jomjol_flowcontroll/ClassFlowControll.h

@@ -17,9 +17,6 @@
 	#include "ClassFlowInfluxDB.h"
 	#include "ClassFlowInfluxDBv2.h"
 #endif //ENABLE_INFLUXDB
-#ifdef ENABLE_WEBHOOK
-	#include "ClassFlowWebhook.h"
-#endif //ENABLE_WEBHOOK
 #include "ClassFlowCNNGeneral.h"
 
 class ClassFlowControll :
@@ -55,13 +52,12 @@ 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 DigitDrawROI(CImageBasis *_zw);
+	void DigitalDrawROI(CImageBasis *_zw);
 	void AnalogDrawROI(CImageBasis *_zw);
 	#endif
 
@@ -77,10 +73,10 @@ public:
 	std::string* getActStatus();
 	void setActStatus(std::string _aktstatus);
 
-	std::vector<HTMLInfo*> GetAllDigit();
+	std::vector<HTMLInfo*> GetAllDigital();
 	std::vector<HTMLInfo*> GetAllAnalog();	
 
-	t_CNNType GetTypeDigit();
+	t_CNNType GetTypeDigital();
 	t_CNNType GetTypeAnalog();
 	
 	#ifdef ENABLE_MQTT

code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h

@@ -5,10 +5,6 @@
 
 #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;
@@ -18,68 +14,56 @@ 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, // 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
+    AbsoluteChange,
+    RateChange
  };
 
 
-/**
- * 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;         // 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
+    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;
 
-    string DomoticzIdx;             // Domoticz counter Idx
-    
-    string FieldV1;             // influxdbFieldName_v1; Name of the Field in InfluxDBv1
-    string MeasurementV1;       // influxdbMeasurementName_v1; Name of the Measurement in InfluxDBv1
+    string FieldV1; // Fieldname in InfluxDBv1  
+    string MeasurementV1;   // Measurement in InfluxDBv1
 
-    string FieldV2;             // influxdbFieldName_v2; Name of the Field in InfluxDBv2
-    string MeasurementV2;       // influxdbMeasurementName_v2; Name of the Measurement in InfluxDBv2
+    string FieldV2;         // Fieldname in InfluxDBv2  
+    string MeasurementV2;   // Measurement in InfluxDBv2
 
-    bool isExtendedResolution;  // extendResolution; Adds the decimal place of the least significant analog ROI to the value
+    bool isExtendedResolution;
 
-    general *digit_roi;         // digitRoi; set of digit ROIs for the sequence
-    general *analog_roi;        // analogRoi; set of analog ROIs for the sequence
+    general *digit_roi;
+    general *analog_roi;
 
-    string name;                // name; Designation for the sequence 
+    string name;
 };
 
 #endif

code/components/jomjol_flowcontroll/ClassFlowInfluxDB.cpp

@@ -117,12 +117,7 @@ bool ClassFlowInfluxDB::ReadParameter(FILE* pfile, string& aktparamgraph)
     { 
 //        ESP_LOGD(TAG, "Init InfluxDB with uri: %s, measurement: %s, user: %s, password: %s", uri.c_str(), measurement.c_str(), user.c_str(), password.c_str());
         LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Init InfluxDB with uri: " + uri + ", user: " + user + ", password: " + password);
-
-/////////////////////// NEW //////////////////////////
-//        InfluxDBInit(uri, database, user, password);
-        influxDB.InfluxDBInitV1(uri, database, user, password);
-/////////////////////// NEW //////////////////////////
-
+        InfluxDBInit(uri, database, user, password); 
         InfluxDBenable = true;
     } else {
         LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "InfluxDB init skipped as we are missing some parameters");
@@ -174,12 +169,7 @@ bool ClassFlowInfluxDB::doFlow(string zwtime)
             }
 
             if (result.length() > 0)   
-//////////////////////// NEW //////////////////////////            
-//                InfluxDBPublish(measurement, namenumber, result, timeutc);
-                influxDB.InfluxDBPublish(measurement, namenumber, result, timeutc);
-//////////////////////// NEW //////////////////////////
-
-
+                InfluxDBPublish(measurement, namenumber, result, timeutc);
         }
     }
    

code/components/jomjol_flowcontroll/ClassFlowInfluxDB.h

@@ -8,7 +8,6 @@
 #include "ClassFlow.h"
 
 #include "ClassFlowPostProcessing.h"
-#include "interface_influxdb.h"
 
 #include <string>
 
@@ -22,8 +21,6 @@ protected:
     std::string user, password; 
     bool InfluxDBenable;
 
-    InfluxDB influxDB;
-
     void SetInitialParameter(void);    
     
     void handleFieldname(string _decsep, string _value);   

code/components/jomjol_flowcontroll/ClassFlowInfluxDBv2.cpp

@@ -123,14 +123,7 @@ bool ClassFlowInfluxDBv2::ReadParameter(FILE* pfile, string& aktparamgraph)
     { 
         LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Init InfluxDB with uri: " + uri + ", org: " + dborg + ", token: *****");
 //        printf("vor V2 Init\n");
-
-
-////////////////////////////////////////// NEW ////////////////////////////////////////////
-//        InfluxDB_V2_Init(uri, bucket, dborg, dbtoken);
-//        InfluxDB_V2_Init(uri, bucket, dborg, dbtoken); 
-        influxdb.InfluxDBInitV2(uri, bucket, dborg, dbtoken);
-////////////////////////////////////////// NEW ////////////////////////////////////////////
-
+        InfluxDB_V2_Init(uri, bucket, dborg, dbtoken); 
 //        printf("nach V2 Init\n");
         InfluxDBenable = true;
     } else {
@@ -239,8 +232,7 @@ bool ClassFlowInfluxDBv2::doFlow(string zwtime)
             printf("vor sende Influx_DB_V2 - namenumber. %s, result: %s, timestampt: %s", namenumber.c_str(), result.c_str(), resulttimestamp.c_str());
 
             if (result.length() > 0)   
-                influxdb.InfluxDBPublish(measurement, namenumber, result, resulttimeutc);
-//                InfluxDB_V2_Publish(measurement, namenumber, result, resulttimeutc);
+                InfluxDB_V2_Publish(measurement, namenumber, result, resulttimeutc);
         }
     }
    

code/components/jomjol_flowcontroll/ClassFlowInfluxDBv2.h

@@ -9,8 +9,6 @@
 
 #include "ClassFlowPostProcessing.h"
 
-#include "interface_influxdb.h"
-
 #include <string>
 
 class ClassFlowInfluxDBv2 :
@@ -23,8 +21,6 @@ protected:
 	ClassFlowPostProcessing* flowpostprocessing;  
     bool InfluxDBenable;
 
-    InfluxDB influxdb;
-
     void SetInitialParameter(void);     
 
     void handleFieldname(string _decsep, string _value);   

code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp

@@ -40,7 +40,6 @@ void ClassFlowMQTT::SetInitialParameter(void)
     caCertFilename = "";
     clientCertFilename = "";
     clientKeyFilename = "";
-    validateServerCert = true;
     clientname = wlan_config.hostname;
 
     OldValue = "";
@@ -52,7 +51,6 @@ void ClassFlowMQTT::SetInitialParameter(void)
     ListFlowControll = NULL; 
     disabled = false;
     keepAlive = 25*60;
-    domoticzintopic = "";
 }       
 
 ClassFlowMQTT::ClassFlowMQTT()
@@ -107,46 +105,43 @@ bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
     while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
     {
         splitted = ZerlegeZeile(aktparamgraph);
-        std::string _param = GetParameterName(splitted[0]);
-        if ((toUpper(_param) == "CACERT") && (splitted.size() > 1))
+        if ((toUpper(splitted[0]) == "CACERT") && (splitted.size() > 1))
         {
-            this->caCertFilename = "/sdcard" + splitted[1];
-        }
-        if ((toUpper(_param) == "VALIDATESERVERCERT") && (splitted.size() > 1))
-        {
-            validateServerCert = alphanumericToBoolean(splitted[1]);
+            this->caCertFilename = splitted[1];
         }  
-        if ((toUpper(_param) == "CLIENTCERT") && (splitted.size() > 1))
+        if ((toUpper(splitted[0]) == "CLIENTCERT") && (splitted.size() > 1))
         {
-            this->clientCertFilename = "/sdcard" + splitted[1];
+            this->clientCertFilename = splitted[1];
         }  
-        if ((toUpper(_param) == "CLIENTKEY") && (splitted.size() > 1))
+        if ((toUpper(splitted[0]) == "CLIENTKEY") && (splitted.size() > 1))
         {
-            this->clientKeyFilename = "/sdcard" + splitted[1];
+            this->clientKeyFilename = splitted[1];
         }  
-        if ((toUpper(_param) == "USER") && (splitted.size() > 1))
+        if ((toUpper(splitted[0]) == "USER") && (splitted.size() > 1))
         {
             this->user = splitted[1];
         }  
-        if ((toUpper(_param) == "PASSWORD") && (splitted.size() > 1))
+        if ((toUpper(splitted[0]) == "PASSWORD") && (splitted.size() > 1))
         {
             this->password = splitted[1];
         }               
-        if ((toUpper(_param) == "URI") && (splitted.size() > 1))
+        if ((toUpper(splitted[0]) == "URI") && (splitted.size() > 1))
         {
             this->uri = splitted[1];
         }
-        if ((toUpper(_param) == "RETAINMESSAGES") && (splitted.size() > 1))
+        if ((toUpper(splitted[0]) == "RETAINMESSAGES") && (splitted.size() > 1))
         {
-            SetRetainFlag = alphanumericToBoolean(splitted[1]);
-            setMqtt_Server_Retain(SetRetainFlag);
+            if (toUpper(splitted[1]) == "TRUE") {
+                SetRetainFlag = true;  
+                setMqtt_Server_Retain(SetRetainFlag);
+            }
         }
-        if ((toUpper(_param) == "HOMEASSISTANTDISCOVERY") && (splitted.size() > 1))
+        if ((toUpper(splitted[0]) == "HOMEASSISTANTDISCOVERY") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
                 SetHomeassistantDiscoveryEnabled(true);  
         }
-        if ((toUpper(_param) == "METERTYPE") && (splitted.size() > 1)) {
+        if ((toUpper(splitted[0]) == "METERTYPE") && (splitted.size() > 1)) {
         /* Use meter type for the device class 
            Make sure it is a listed one on https://developers.home-assistant.io/docs/core/entity/sensor/#available-device-classes */
             if (toUpper(splitted[1]) == "WATER_M3") {
@@ -156,7 +151,7 @@ bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
                 mqttServer_setMeterType("water", "L", "h", "L/h");
             }
             else if (toUpper(splitted[1]) == "WATER_FT3") {
-                mqttServer_setMeterType("water", "ft³", "m", "ft³/m"); // m = Minutes
+                mqttServer_setMeterType("water", "ft³", "m", "ft³/m"); // Minutes
             }
             else if (toUpper(splitted[1]) == "WATER_GAL") {
                 mqttServer_setMeterType("water", "gal", "h", "gal/h");
@@ -165,7 +160,7 @@ bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
                 mqttServer_setMeterType("gas", "m³", "h", "m³/h");
             }
             else if (toUpper(splitted[1]) == "GAS_FT3") {
-                mqttServer_setMeterType("gas", "ft³", "m", "ft³/m"); // m = Minutes
+                mqttServer_setMeterType("gas", "ft³", "m", "ft³/m"); // Minutes
             }
             else if (toUpper(splitted[1]) == "ENERGY_WH") {
                 mqttServer_setMeterType("energy", "Wh", "h", "W");
@@ -179,37 +174,17 @@ bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
             else if (toUpper(splitted[1]) == "ENERGY_GJ") {
                 mqttServer_setMeterType("energy", "GJ", "h", "GJ/h");
             }
-            else if (toUpper(splitted[1]) == "TEMPERATURE_C") {
-                mqttServer_setMeterType("temperature", "°C", "m", "°C/m"); // m = Minutes
-            }
-            else if (toUpper(splitted[1]) == "TEMPERATURE_F") {
-                mqttServer_setMeterType("temperature", "°F", "m", "°F/m"); // m = Minutes
-            }
-            else if (toUpper(splitted[1]) == "TEMPERATURE_K") {
-                mqttServer_setMeterType("temperature", "K", "m", "K/m"); // m = Minutes
-            }
         }
 
-        if ((toUpper(_param) == "CLIENTID") && (splitted.size() > 1))
+        if ((toUpper(splitted[0]) == "CLIENTID") && (splitted.size() > 1))
         {
             this->clientname = splitted[1];
         }
 
-        if (((toUpper(_param) == "TOPIC") || (toUpper(splitted[0]) == "MAINTOPIC")) && (splitted.size() > 1))
+        if (((toUpper(splitted[0]) == "TOPIC") || (toUpper(splitted[0]) == "MAINTOPIC")) && (splitted.size() > 1))
         {
             maintopic = splitted[1];
         }
-
-        if (((toUpper(_param) == "DOMOTICZTOPICIN")) && (splitted.size() > 1))
-        {
-            this->domoticzintopic = splitted[1];
-        }
-
-        if (((toUpper(_param) == "DOMOTICZIDX")) && (splitted.size() > 1))
-        {
-            handleIdx(splitted[0], splitted[1]);
-        }
-        
     }
 
     /* Note:
@@ -218,7 +193,6 @@ bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
      * To work around this, we delay the start and trigger it from ClassFlowControll::ReadParameter() */
 
     mqttServer_setMainTopic(maintopic);
-    mqttServer_setDmoticzInTopic(domoticzintopic);
 
     return true;
 }
@@ -236,8 +210,8 @@ bool ClassFlowMQTT::Start(float AutoInterval)
 
     mqttServer_setParameter(flowpostprocessing->GetNumbers(), keepAlive, roundInterval);
 
-    bool MQTTConfigCheck = MQTT_Configure(uri, clientname, user, password, maintopic, domoticzintopic, LWT_TOPIC, LWT_CONNECTED,
-                                     LWT_DISCONNECTED, caCertFilename, validateServerCert, clientCertFilename, clientKeyFilename,
+    bool MQTTConfigCheck = MQTT_Configure(uri, clientname, user, password, maintopic, LWT_TOPIC, LWT_CONNECTED,
+                                     LWT_DISCONNECTED, caCertFilename, clientCertFilename, clientKeyFilename,
                                      keepAlive, SetRetainFlag, (void *)&GotConnected);
 
     if (!MQTTConfigCheck) {
@@ -261,8 +235,6 @@ bool ClassFlowMQTT::doFlow(string zwtime)
     std::string resultchangabs = "";
     string zw = "";
     string namenumber = "";
-    string domoticzpayload = "";
-    string DomoticzIdx = "";
     int qos = 1;
 
     /* Send the the Homeassistant Discovery and the Static Topics in case they where scheduled */
@@ -286,20 +258,16 @@ bool ClassFlowMQTT::doFlow(string zwtime)
             resultchangabs = (*NUMBERS)[i]->ReturnChangeAbsolute; // Units per round
             resulttimestamp = (*NUMBERS)[i]->timeStamp;
 
-            DomoticzIdx = (*NUMBERS)[i]->DomoticzIdx;
-            domoticzpayload = "{\"command\":\"udevice\",\"idx\":" + DomoticzIdx + ",\"svalue\":\""+ result + "\"}";
-
             namenumber = (*NUMBERS)[i]->name;
             if (namenumber == "default")
                 namenumber = maintopic + "/";
             else
                 namenumber = maintopic + "/" + namenumber + "/";
 
-            if ((domoticzintopic.length() > 0) && (result.length() > 0)) 
-                success |= MQTTPublish(domoticzintopic, domoticzpayload, qos, SetRetainFlag);
 
-            if (result.length() > 0)
+            if (result.length() > 0)   
                 success |= MQTTPublish(namenumber + "value", result, qos, SetRetainFlag);
+
             if (resulterror.length() > 0)  
                 success |= MQTTPublish(namenumber + "error", resulterror, qos, SetRetainFlag);
 
@@ -318,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_digitization_round", resultchangabs, qos, SetRetainFlag);
+                success |= MQTTPublish(namenumber + "rate_per_digitalization_round", resultchangabs, qos, SetRetainFlag);
             }
 
             if (resultraw.length() > 0)   
@@ -357,26 +325,6 @@ bool ClassFlowMQTT::doFlow(string zwtime)
     
     return true;
 }
-void ClassFlowMQTT::handleIdx(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]->DomoticzIdx = _value;
-        }
-        if (flowpostprocessing->NUMBERS[j]->name == _digit)
-        {
-            flowpostprocessing->NUMBERS[j]->DomoticzIdx = _value;
-        }
-    }
-}
 
-#endif //ENABLE_MQTT
+
+#endif //ENABLE_MQTT

code/components/jomjol_flowcontroll/ClassFlowMQTT.h

@@ -19,14 +19,13 @@ protected:
     std::string OldValue;
 	ClassFlowPostProcessing* flowpostprocessing;  
     std::string user, password; 
-    std::string caCertFilename, clientCertFilename, clientKeyFilename;
-    bool validateServerCert;
+    std::string caCertFilename, clientCertFilename, clientKeyFilename; 
     bool SetRetainFlag;
     int keepAlive; // Seconds
     float roundInterval; // Minutes
-    std::string maintopic, domoticzintopic; 
+
+    std::string maintopic; 
 	void SetInitialParameter(void);        
-    void handleIdx(string _decsep, string _value);   
 
 public:
     ClassFlowMQTT();

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h

@@ -21,9 +21,11 @@ protected:
     bool ErrorMessage;
     bool IgnoreLeadingNaN;          // SPECIAL CASE for User Gustl ???
 
+
     ClassFlowCNNGeneral* flowAnalog;
     ClassFlowCNNGeneral* flowDigit;    
 
+
     string FilePreValue;
 
     ClassFlowTakeImage *flowTakeImage;
@@ -39,18 +41,21 @@ protected:
     void handleMaxRateValue(string _decsep, string _value);
     void handleDecimalExtendedResolution(string _decsep, string _value); 
     void handleMaxRateType(string _decsep, string _value);
-    void handleAnalogToDigitTransitionStart(string _decsep, string _value);
+    void handleAnalogDigitalTransitionStart(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);

code/components/jomjol_flowcontroll/ClassFlowTakeImage.cpp

@@ -1,15 +1,9 @@
-#include <iostream>
-#include <string>
-#include <vector>
-#include <regex>
-
 #include "ClassFlowTakeImage.h"
 #include "Helper.h"
 #include "ClassLogFile.h"
 
 #include "CImageBasis.h"
 #include "ClassControllCamera.h"
-#include "MainFlowControl.h"
 
 #include "esp_wifi.h"
 #include "esp_log.h"
@@ -18,14 +12,14 @@
 
 #include <time.h>
 
-// #define DEBUG_DETAIL_ON
+// #define DEBUG_DETAIL_ON 
+
 // #define WIFITURNOFF
 
-static const char *TAG = "TAKEIMAGE";
+static const char* TAG = "TAKEIMAGE";
 
-esp_err_t ClassFlowTakeImage::camera_capture(void)
-{
-    string nm = namerawimage;
+esp_err_t ClassFlowTakeImage::camera_capture(){
+    string nm =  namerawimage;
     Camera.CaptureToFile(nm);
     time(&TimeImageTaken);
     localtime(&TimeImageTaken);
@@ -36,500 +30,150 @@ esp_err_t ClassFlowTakeImage::camera_capture(void)
 void ClassFlowTakeImage::takePictureWithFlash(int flash_duration)
 {
     // in case the image is flipped, it must be reset here //
-    rawImage->width = CCstatus.ImageWidth;
-    rawImage->height = CCstatus.ImageHeight;
-
+    rawImage->width = image_width;          
+    rawImage->height = image_height;
+    /////////////////////////////////////////////////////////////////////////////////////
     ESP_LOGD(TAG, "flash_duration: %d", flash_duration);
-
     Camera.CaptureToBasisImage(rawImage, flash_duration);
-
     time(&TimeImageTaken);
     localtime(&TimeImageTaken);
 
-    if (CCstatus.SaveAllFiles)
-    {
-        rawImage->SaveToFile(namerawimage);
-    }
+    if (SaveAllFiles) rawImage->SaveToFile(namerawimage);
 }
 
 void ClassFlowTakeImage::SetInitialParameter(void)
 {
+    waitbeforepicture = 5;
+    isImageSize = false;
+    ImageQuality = -1;    
     TimeImageTaken = 0;
+    ImageQuality = 5;
     rawImage = NULL;
+    ImageSize = FRAMESIZE_VGA;
+    SaveAllFiles = false;
     disabled = false;
+    FixedExposure = false;
     namerawimage = "/sdcard/img_tmp/raw.jpg";
-}
+}     
 
-// auslesen der Kameraeinstellungen aus der config.ini
-// wird beim Start aufgerufen
-bool ClassFlowTakeImage::ReadParameter(FILE *pfile, string &aktparamgraph)
-{
-    Camera.getSensorDatenToCCstatus(); // Kamera >>> CCstatus
 
-    std::vector<string> splitted;
-
-    aktparamgraph = trim(aktparamgraph);
-
-    if (aktparamgraph.size() == 0)
-    {
-        if (!this->GetNextParagraph(pfile, aktparamgraph))
-        {
-            return false;
-        }
-    }
-
-    if (aktparamgraph.compare("[TakeImage]") != 0)
-    {
-        // Paragraph does not fit TakeImage
-        return false;
-    }
-
-    while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
-    {
-        splitted = ZerlegeZeile(aktparamgraph);
-
-        if ((toUpper(splitted[0]) == "RAWIMAGESLOCATION") && (splitted.size() > 1))
-        {
-            imagesLocation = "/sdcard" + splitted[1];
-            isLogImage = true;
-        }
-
-        else if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                this->imagesRetention = std::stod(splitted[1]);
-            }          
-        }
-
-        else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
-        {
-            CCstatus.SaveAllFiles = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                int _WaitBeforePicture = std::stoi(splitted[1]);
-                if (_WaitBeforePicture != 0)
-                {
-                    CCstatus.WaitBeforePicture = _WaitBeforePicture;
-                }
-                else
-                {
-                    CCstatus.WaitBeforePicture = 2;
-                }
-            }
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMGAINCEILING") && (splitted.size() > 1))
-        {
-            std::string _ImageGainceiling = toUpper(splitted[1]);
-
-            if (isStringNumeric(_ImageGainceiling))
-            {
-                int _ImageGainceiling_ = std::stoi(_ImageGainceiling);
-                switch (_ImageGainceiling_)
-                {
-                case 1:
-                    CCstatus.ImageGainceiling = GAINCEILING_4X;
-                    break;
-                case 2:
-                    CCstatus.ImageGainceiling = GAINCEILING_8X;
-                    break;
-                case 3:
-                    CCstatus.ImageGainceiling = GAINCEILING_16X;
-                    break;
-                case 4:
-                    CCstatus.ImageGainceiling = GAINCEILING_32X;
-                    break;
-                case 5:
-                    CCstatus.ImageGainceiling = GAINCEILING_64X;
-                    break;
-                case 6:
-                    CCstatus.ImageGainceiling = GAINCEILING_128X;
-                    break;
-                default:
-                    CCstatus.ImageGainceiling = GAINCEILING_2X;
-                }
-            }
-            else
-            {
-                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))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                int _ImageQuality = std::stoi(splitted[1]);
-                CCstatus.ImageQuality = clipInt(_ImageQuality, 63, 6);
-            }
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMBRIGHTNESS") && (splitted.size() > 1))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                int _ImageBrightness = std::stoi(splitted[1]);
-                CCstatus.ImageBrightness = clipInt(_ImageBrightness, 2, -2);
-            }
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMCONTRAST") && (splitted.size() > 1))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                int _ImageContrast = std::stoi(splitted[1]);
-                CCstatus.ImageContrast = clipInt(_ImageContrast, 2, -2);
-            }
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMSATURATION") && (splitted.size() > 1))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                int _ImageSaturation = std::stoi(splitted[1]);
-                CCstatus.ImageSaturation = clipInt(_ImageSaturation, 2, -2);
-            }
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMSHARPNESS") && (splitted.size() > 1))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                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))
-        {
-            CCstatus.ImageAutoSharpness = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMSPECIALEFFECT") && (splitted.size() > 1))
-        {
-            std::string _ImageSpecialEffect = toUpper(splitted[1]);
-
-            if (isStringNumeric(_ImageSpecialEffect))
-            {
-                int _ImageSpecialEffect_ = std::stoi(_ImageSpecialEffect);
-                CCstatus.ImageSpecialEffect = clipInt(_ImageSpecialEffect_, 6, 0);
-            }
-            else
-            {
-                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 (isStringNumeric(_ImageWbMode))
-            {
-                int _ImageWbMode_ = std::stoi(_ImageWbMode);
-                CCstatus.ImageWbMode = clipInt(_ImageWbMode_, 4, 0);
-            }
-            else
-            {
-                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))
-        {
-            CCstatus.ImageAwb = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMAWBGAIN") && (splitted.size() > 1))
-        {
-            CCstatus.ImageAwbGain = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMAEC") && (splitted.size() > 1))
-        {
-            CCstatus.ImageAec = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMAEC2") && (splitted.size() > 1))
-        {
-            CCstatus.ImageAec2 = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMAELEVEL") && (splitted.size() > 1))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                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))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                int _ImageAecValue = std::stoi(splitted[1]);
-                CCstatus.ImageAecValue = clipInt(_ImageAecValue, 1200, 0);
-            }
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMAGC") && (splitted.size() > 1))
-        {
-            CCstatus.ImageAgc = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMAGCGAIN") && (splitted.size() > 1))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                int _ImageAgcGain = std::stoi(splitted[1]);
-                CCstatus.ImageAgcGain = clipInt(_ImageAgcGain, 30, 0);
-            }
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMBPC") && (splitted.size() > 1))
-        {
-            CCstatus.ImageBpc = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMWPC") && (splitted.size() > 1))
-        {
-            CCstatus.ImageWpc = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMRAWGMA") && (splitted.size() > 1))
-        {
-            CCstatus.ImageRawGma = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMLENC") && (splitted.size() > 1))
-        {
-            CCstatus.ImageLenc = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMHMIRROR") && (splitted.size() > 1))
-        {
-            CCstatus.ImageHmirror = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMVFLIP") && (splitted.size() > 1))
-        {
-            CCstatus.ImageVflip = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMDCW") && (splitted.size() > 1))
-        {
-            CCstatus.ImageDcw = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMDENOISE") && (splitted.size() > 1))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                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))
-        {
-            CCstatus.ImageZoomEnabled = alphanumericToBoolean(splitted[1]);
-        }
-
-        else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETX") && (splitted.size() > 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))
-        {
-            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))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                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))
-        {
-            if (isStringNumeric(splitted[1]))
-            {
-                int ledintensity = std::stoi(splitted[1]);
-                CCstatus.ImageLedIntensity = Camera.SetLEDIntensity(ledintensity);
-            }
-        }
-
-        else if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
-        {
-            CCstatus.DemoMode = alphanumericToBoolean(splitted[1]);
-            if (CCstatus.DemoMode == true)
-            {
-                Camera.useDemoMode();
-            }
-        }
-    }
-
-    Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
-    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);
-
-    return true;
-}
-
-ClassFlowTakeImage::ClassFlowTakeImage(std::vector<ClassFlow *> *lfc) : ClassFlowImage(lfc, TAG)
+ClassFlowTakeImage::ClassFlowTakeImage(std::vector<ClassFlow*>* lfc) : ClassFlowImage(lfc, TAG)
 {
     imagesLocation = "/log/source";
     imagesRetention = 5;
     SetInitialParameter();
 }
 
+
+bool ClassFlowTakeImage::ReadParameter(FILE* pfile, string& aktparamgraph)
+{
+    std::vector<string> splitted;
+
+    aktparamgraph = trim(aktparamgraph);
+    int _brightness = -100;
+    int _contrast = -100;
+    int _saturation = -100;
+
+    if (aktparamgraph.size() == 0)
+        if (!this->GetNextParagraph(pfile, aktparamgraph))
+            return false;
+
+    if (aktparamgraph.compare("[TakeImage]") != 0)       // Paragraph does not fit TakeImage
+        return false;
+
+    while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
+    {
+        splitted = ZerlegeZeile(aktparamgraph);
+        if ((toUpper(splitted[0]) ==  "RAWIMAGESLOCATION") && (splitted.size() > 1))
+        {
+            imagesLocation = "/sdcard" + splitted[1];
+            isLogImage = true;
+        }
+        if ((toUpper(splitted[0]) == "IMAGEQUALITY") && (splitted.size() > 1))
+            ImageQuality = std::stod(splitted[1]);
+
+        if ((toUpper(splitted[0]) == "IMAGESIZE") && (splitted.size() > 1))
+        {
+            ImageSize = Camera.TextToFramesize(splitted[1].c_str());
+            isImageSize = true;
+        }
+
+        if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+                SaveAllFiles = true;
+        }
+        
+        if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1))
+        {
+            waitbeforepicture = stoi(splitted[1]);
+        }
+
+        if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
+        {
+            this->imagesRetention = std::stoi(splitted[1]);
+        }
+
+        if ((toUpper(splitted[0]) == "BRIGHTNESS") && (splitted.size() > 1))
+        {
+            _brightness = stoi(splitted[1]);
+        }
+
+        if ((toUpper(splitted[0]) == "CONTRAST") && (splitted.size() > 1))
+        {
+            _contrast = stoi(splitted[1]);
+        }
+
+        if ((toUpper(splitted[0]) == "SATURATION") && (splitted.size() > 1))
+        {
+            _saturation = stoi(splitted[1]);
+        }
+
+        if ((toUpper(splitted[0]) == "FIXEDEXPOSURE") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+                FixedExposure = true;  
+        }
+
+        if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1))
+        {
+            float ledintensity = stof(splitted[1]);
+            ledintensity = min((float) 100, ledintensity);
+            ledintensity = max((float) 0, ledintensity);
+            Camera.SetLEDIntensity(ledintensity);
+        }
+
+        if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "TRUE")
+                Camera.useDemoMode();
+        }
+    }
+
+    Camera.SetBrightnessContrastSaturation(_brightness, _contrast, _saturation);
+    Camera.SetQualitySize(ImageQuality, ImageSize);
+
+    image_width = Camera.image_width;
+    image_height = Camera.image_height;
+    rawImage = new CImageBasis("rawImage");
+    rawImage->CreateEmptyImage(image_width, image_height, 3);
+
+    waitbeforepicture_store = waitbeforepicture;
+    if (FixedExposure && (waitbeforepicture > 0))
+    {
+//        ESP_LOGD(TAG, "Fixed Exposure enabled!");
+        int flash_duration = (int) (waitbeforepicture * 1000);
+        Camera.EnableAutoExposure(flash_duration);
+        waitbeforepicture = 0.2;
+//        flash_duration = (int) (waitbeforepicture * 1000);
+//        takePictureWithFlash(flash_duration);
+//        rawImage->SaveToFile("/sdcard/init2.jpg");
+    }
+
+    return true;
+}
+
+
 string ClassFlowTakeImage::getHTMLSingleStep(string host)
 {
     string result;
@@ -537,79 +181,74 @@ string ClassFlowTakeImage::getHTMLSingleStep(string host)
     return result;
 }
 
-// wird bei jeder Auswertrunde aufgerufen
+
 bool ClassFlowTakeImage::doFlow(string zwtime)
 {
     psram_init_shared_memory_for_take_image_step();
 
     string logPath = CreateLogFolder(zwtime);
 
-    int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
+    int flash_duration = (int) (waitbeforepicture * 1000);
+ 
+    #ifdef DEBUG_DETAIL_ON  
+        LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - Before takePictureWithFlash");
+    #endif
 
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - Before takePictureWithFlash");
-#endif
 
-#ifdef WIFITURNOFF
-    esp_wifi_stop(); // to save power usage and
-#endif
-
-    // wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
-    if (CFstatus.changedCameraSettings)
-    {
-        Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
-        Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);
-        Camera.LedIntensity = CCstatus.ImageLedIntensity;
-        CFstatus.changedCameraSettings = false;
-    }
+    #ifdef WIFITURNOFF
+        esp_wifi_stop();        // to save power usage and 
+    #endif
 
     takePictureWithFlash(flash_duration);
 
-#ifdef WIFITURNOFF
-    esp_wifi_start();
-#endif
+    #ifdef WIFITURNOFF
+        esp_wifi_start();
+    #endif
 
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After takePictureWithFlash");
-#endif
+
+    #ifdef DEBUG_DETAIL_ON  
+        LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After takePictureWithFlash");
+    #endif
 
     LogImage(logPath, "raw", NULL, NULL, zwtime, rawImage);
 
     RemoveOldLogs();
 
-#ifdef DEBUG_DETAIL_ON
-    LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After RemoveOldLogs");
-#endif
+    #ifdef DEBUG_DETAIL_ON  
+        LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After RemoveOldLogs");
+    #endif
 
     psram_deinit_shared_memory_for_take_image_step();
 
     return true;
 }
 
+
 esp_err_t ClassFlowTakeImage::SendRawJPG(httpd_req_t *req)
 {
-    int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
+    int flash_duration = (int) (waitbeforepicture * 1000);
     time(&TimeImageTaken);
     localtime(&TimeImageTaken);
 
     return Camera.CaptureToHTTP(req, flash_duration);
 }
 
-ImageData *ClassFlowTakeImage::SendRawImage(void)
+
+ImageData* ClassFlowTakeImage::SendRawImage()
 {
     CImageBasis *zw = new CImageBasis("SendRawImage", rawImage);
     ImageData *id;
-    int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
+    int flash_duration = (int) (waitbeforepicture * 1000);
     Camera.CaptureToBasisImage(zw, flash_duration);
     time(&TimeImageTaken);
     localtime(&TimeImageTaken);
 
-    id = zw->writeToMemoryAsJPG();
+    id = zw->writeToMemoryAsJPG();    
     delete zw;
-    return id;
+    return id;  
 }
 
-time_t ClassFlowTakeImage::getTimeImageTaken(void)
+time_t ClassFlowTakeImage::getTimeImageTaken()
 {
     return TimeImageTaken;
 }
@@ -618,3 +257,4 @@ ClassFlowTakeImage::~ClassFlowTakeImage(void)
 {
     delete rawImage;
 }
+

code/components/jomjol_flowcontroll/ClassFlowTakeImage.h

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

code/components/jomjol_flowcontroll/ClassFlowWebhook.cpp

@@ -1,171 +0,0 @@
-#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

code/components/jomjol_flowcontroll/ClassFlowWebhook.h

@@ -1,43 +0,0 @@
-#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

code/components/jomjol_flowcontroll/MainFlowControl.h

@@ -9,83 +9,26 @@
 #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)
-
-    int ImageQuality;    // 0 - 63
-    int ImageBrightness; // (-2 to 2) - set brightness
-    int ImageContrast;   //-2 - 2
-    int ImageSaturation; //-2 - 2
-    int ImageSharpness;  //-2 - 2
-    bool ImageAutoSharpness;
-    int ImageSpecialEffect; // 0 - 6
-    int ImageWbMode;        // 0 to 4 - if awb_gain enabled (0 - Auto, 1 - Sunny, 2 - Cloudy, 3 - Office, 4 - Home)
-    int ImageAwb;           // white balance enable (0 or 1)
-    int ImageAwbGain;       // Auto White Balance enable (0 or 1)
-    int ImageAec;           // auto exposure off (1 or 0)
-    int ImageAec2;          // automatic exposure sensor  (0 or 1)
-    int ImageAeLevel;       // auto exposure levels (-2 to 2)
-    int ImageAecValue;      // set exposure manually  (0-1200)
-    int ImageAgc;           // auto gain off (1 or 0)
-    int ImageAgcGain;       // set gain manually (0 - 30)
-    int ImageBpc;           // black pixel correction
-    int ImageWpc;           // white pixel correction
-    int ImageRawGma;        // (1 or 0)
-    int ImageLenc;          // lens correction (1 or 0)
-    int ImageHmirror;       // (0 or 1) flip horizontally
-    int ImageVflip;         // Invert image (0 or 1)
-    int ImageDcw;           // downsize enable (1 or 0)
-
-    int ImageDenoiseLevel; // The OV2640 does not support it, OV3660 and OV5640 (0 to 8)
-
-    int ImageWidth;
-    int ImageHeight;
-
-    int ImageLedIntensity;
-
-    bool ImageZoomEnabled;
-    int ImageZoomOffsetX;
-    int ImageZoomOffsetY;
-    int ImageZoomSize;
-
-    int WaitBeforePicture;
-    bool isImageSize;
-
-    bool CameraInitSuccessful;
-    bool changedCameraSettings;
-    bool DemoMode;
-    bool SaveAllFiles;
-} camera_flow_config_temp_t;
-
-extern camera_flow_config_temp_t CFstatus;
 extern ClassFlowControll flowctrl;
 
-esp_err_t setCCstatusToCFstatus(void); // CCstatus >>> CFstatus
-esp_err_t setCFstatusToCCstatus(void); // CFstatus >>> CCstatus
-esp_err_t setCFstatusToCam(void);      // CFstatus >>> Kamera
 
 void register_server_main_flow_task_uri(httpd_handle_t server);
 
-void CheckIsPlannedReboot(void);
-bool getIsPlannedReboot(void);
+void CheckIsPlannedReboot();
+bool getIsPlannedReboot();
 
-void InitializeFlowTask(void);
-void DeleteMainFlowTask(void);
-bool isSetupModusActive(void);
+void InitializeFlowTask();
+void DeleteMainFlowTask();
+bool isSetupModusActive();
 
-int getCountFlowRounds(void);
+int getCountFlowRounds();
 
 #ifdef ENABLE_MQTT
 esp_err_t MQTTCtrlFlowStart(std::string _topic);
-#endif // ENABLE_MQTT
+#endif //ENABLE_MQTT
 
 esp_err_t GetRawJPG(httpd_req_t *req);
 esp_err_t GetJPG(std::string _filename, httpd_req_t *req);
 
-#endif // MAINFLOWCONTROL_H
+#endif //MAINFLOWCONTROL_H

code/components/jomjol_helper/Helper.h

@@ -16,12 +16,11 @@ std::size_t file_size(const std::string& file_name);
 void FindReplace(std::string& line, std::string& oldString, std::string& newString);
 
 bool CopyFile(string input, string output);
-bool DeleteFile(string filename);
+bool DeleteFile(string fn);
 bool RenameFile(string from, string to);
-bool RenameFolder(string from, string to);
 bool MakeDir(std::string _what);
 bool FileExists(string filename);
-bool FolderExists(string foldername);
+
 
 string RundeOutput(double _in, int _anzNachkomma);
 
@@ -34,6 +33,7 @@ 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);
 
@@ -42,7 +42,6 @@ string toUpper(string in);
 
 float temperatureRead();
 
-std::string intToHexString(int _valueInt);
 time_t addDays(time_t startTime, int days);
 
 void memCopyGen(uint8_t* _source, uint8_t* _target, int _size);
@@ -69,6 +68,7 @@ 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,18 +98,8 @@ 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

code/components/jomjol_helper/psram.cpp

@@ -120,15 +120,15 @@ void psram_free_shared_temp_image_memory(void) {
 
 
 /*******************************************************************
- * Memory used in Digitization Steps
+ * Memory used in Digitalization 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 == "Digitization_Model")) {
-        sharedMemoryInUseFor = "Digitization_Tensor";
+    if ((sharedMemoryInUseFor == "") || (sharedMemoryInUseFor == "Digitalization_Model")) {
+        sharedMemoryInUseFor = "Digitalization_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 == "Digitization_Tensor")) {
-        sharedMemoryInUseFor = "Digitization_Model";
+    if ((sharedMemoryInUseFor == "") || (sharedMemoryInUseFor == "Digitalization_Tensor")) {
+        sharedMemoryInUseFor = "Digitalization_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
     }

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 Digitization Steps */
+/* Memory used in Digitalization 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);

code/components/jomjol_helper/sdcard_check.cpp

@@ -69,6 +69,7 @@ int SDCardCheckRW(void)
     return 0;
 }
 
+
 bool SDCardCheckFolderFilePresence()
 {
     struct stat sb;
@@ -124,25 +125,25 @@ bool SDCardCheckFolderFilePresence()
     }
 
     /* check if file exists: index.html */
-    if ((stat("/sdcard/html/index.html", &sb) != 0) && (stat("/sdcard/html/index.html.gz", &sb) != 0)) {
+    if (stat("/sdcard/html/index.html", &sb) != 0) {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Folder/file check: File /html/index.html not found");
         bRetval = false;
     }
 
     /* check if file exists: ota.html */
-    if ((stat("/sdcard/html/ota_page.html", &sb) != 0) && (stat("/sdcard/html/ota_page.html.gz", &sb) != 0)) {
+    if (stat("/sdcard/html/ota_page.html", &sb) != 0) {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Folder/file check: File /html/ota.html not found");
         bRetval = false;
     }
 
     /* check if file exists: log.html */
-    if ((stat("/sdcard/html/log.html", &sb) != 0) && (stat("/sdcard/html/log.html.gz", &sb) != 0)) {
+    if (stat("/sdcard/html/log.html", &sb) != 0) {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Folder/file check: File /html/log.html not found");
         bRetval = false;
     }
 
     /* check if file exists: common.js */
-    if ((stat("/sdcard/html/common.js", &sb) != 0) && (stat("/sdcard/html/common.js.gz", &sb) != 0)) {
+    if (stat("/sdcard/html/common.js", &sb) != 0) {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Folder/file check: File /html/common.js not found");
         bRetval = false;
     }
@@ -153,9 +154,8 @@ bool SDCardCheckFolderFilePresence()
         bRetval = false;
     }
 
-    if (bRetval) {
+    if (bRetval)
         LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Folder/file presence check successful");
-    }
     
     return bRetval;
 }

code/components/jomjol_helper/sdcard_init.c

@@ -35,15 +35,15 @@ static const char* TAG = "sdcard_init";
     } \
     } while(0)
 
-typedef struct mh_vfs_fat_sd_ctx_t {
+typedef struct 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
-} mh_vfs_fat_sd_ctx_t;
+} vfs_fat_sd_ctx_t;
 
-static mh_vfs_fat_sd_ctx_t *s_ctx[FF_VOLUMES] = {};
+static 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,9 +185,14 @@ 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)
 {
-    mh_vfs_fat_sd_ctx_t *p_ctx = NULL;
+    vfs_fat_sd_ctx_t *p_ctx = NULL;
     for (int i = 0; i < FF_VOLUMES; i++) {
         p_ctx = s_ctx[i];
         if (p_ctx) {
@@ -373,7 +378,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;
-    mh_vfs_fat_sd_ctx_t *ctx = NULL;
+    vfs_fat_sd_ctx_t *ctx = NULL;
     uint32_t ctx_id = FF_VOLUMES;
     FATFS *fs = NULL;
     int card_handle = -1;   //uninitialized
@@ -414,7 +419,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(mh_vfs_fat_sd_ctx_t), 1);
+    ctx = calloc(sizeof(vfs_fat_sd_ctx_t), 1);
 
     if (!ctx) {
         CHECK_EXECUTE_RESULT(ESP_ERR_NO_MEM, "no mem");
@@ -457,7 +462,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;
-    mh_vfs_fat_sd_ctx_t *ctx = NULL;
+    vfs_fat_sd_ctx_t *ctx = NULL;
     uint32_t ctx_id = FF_VOLUMES;
     FATFS *fs = NULL;
     int card_handle = -1;   //uninitialized
@@ -509,7 +514,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(mh_vfs_fat_sd_ctx_t), 1);
+    ctx = calloc(sizeof(vfs_fat_sd_ctx_t), 1);
 
     if (!ctx) {
         CHECK_EXECUTE_RESULT(ESP_ERR_NO_MEM, "no mem");

code/components/jomjol_image_proc/CImageBasis.cpp

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

code/components/jomjol_image_proc/CImageBasis.h

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

code/components/jomjol_image_proc/CRotateImage.cpp

@@ -1,309 +1,353 @@
-#include <string>
-#include "CRotateImage.h"
-#include "psram.h"
-
-static const char *TAG = "C ROTATE IMG";
-
-CRotateImage::CRotateImage(std::string _name, CImageBasis *_org, CImageBasis *_temp, bool _flip) : CImageBasis(_name)
-{
-    rgb_image = _org->rgb_image;
-    channels = _org->channels;
-    width = _org->width;
-    height = _org->height;
-    bpp = _org->bpp;
-    externalImage = true;   
-    ImageTMP = _temp;   
-    ImageOrg = _org; 
-    islocked = false;
-    doflip = _flip;
-}
-
-void CRotateImage::Rotate(float _angle, int _centerx, int _centery)
-{
-    int org_width, org_height;
-    float m[2][3];
-
-    float x_center = _centerx;
-    float y_center = _centery;
-    _angle = _angle / 180 * M_PI;
-
-    if (doflip)
-    {
-        org_width = width;
-        org_height = height;
-        height = org_width;
-        width = org_height;
-        x_center =  x_center - (org_width/2) + (org_height/2);
-        y_center =  y_center + (org_width/2) - (org_height/2);
-        if (ImageOrg)
-        {
-            ImageOrg->height = height;
-            ImageOrg->width = width;
-        }
-    }
-    else
-    {
-        org_width = width;
-        org_height = height;
-    }
-
-    m[0][0] = cos(_angle);
-    m[0][1] = sin(_angle);
-    m[0][2] = (1 - m[0][0]) * x_center - m[0][1] * y_center;
-
-    m[1][0] = -m[0][1];
-    m[1][1] = m[0][0];
-    m[1][2] = m[0][1] * x_center + (1 - m[0][0]) * y_center;
-
-    if (doflip)
-    {
-        m[0][2] = m[0][2] + (org_width/2) - (org_height/2);
-        m[1][2] = m[1][2] - (org_width/2) + (org_height/2);
-    }
-
-    int memsize = width * height * channels;
-    uint8_t* odata;
-    if (ImageTMP)
-    {
-        odata = ImageTMP->RGBImageLock();
-    }
-    else
-    {
-        odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
-    }
-    
-
-    int x_source, y_source;
-    stbi_uc* p_target;
-    stbi_uc* p_source;
-
-    RGBImageLock();
-
-    for (int x = 0; x < width; ++x)
-        for (int y = 0; y < height; ++y)
-        {
-            p_target = odata + (channels * (y * width + x));
-
-            x_source = int(m[0][0] * x + m[0][1] * y);
-            y_source = int(m[1][0] * x + m[1][1] * y);
-
-            x_source += int(m[0][2]);
-            y_source += int(m[1][2]);
-
-            if ((x_source >= 0) && (x_source < org_width) && (y_source >= 0) && (y_source < org_height))
-            {
-                p_source = rgb_image + (channels * (y_source * org_width + x_source));
-                for (int _channels = 0; _channels < channels; ++_channels)
-                    p_target[_channels] = p_source[_channels];
-            }
-            else
-            {
-                for (int _channels = 0; _channels < channels; ++_channels)
-                    p_target[_channels] = 255;
-            }
-        }
-
-    //    memcpy(rgb_image, odata, memsize);
-    memCopy(odata, rgb_image, memsize);
-
-    if (!ImageTMP)
-    {
-        free_psram_heap(std::string(TAG) + "->odata", odata);
-    }
-    if (ImageTMP)
-        ImageTMP->RGBImageRelease();
-
-    RGBImageRelease();
-}
-
-
-
-void CRotateImage::RotateAntiAliasing(float _angle, int _centerx, int _centery)
-{
-    int org_width, org_height;
-    float m[2][3];
-
-    float x_center = _centerx;
-    float y_center = _centery;
-    _angle = _angle / 180 * M_PI;
-
-    if (doflip)
-    {
-        org_width = width;
-        org_height = height;
-        height = org_width;
-        width = org_height;
-        x_center =  x_center - (org_width/2) + (org_height/2);
-        y_center =  y_center + (org_width/2) - (org_height/2);
-        if (ImageOrg)
-        {
-            ImageOrg->height = height;
-            ImageOrg->width = width;
-        }
-    }
-    else
-    {
-        org_width = width;
-        org_height = height;
-    }
-
-    m[0][0] = cos(_angle);
-    m[0][1] = sin(_angle);
-    m[0][2] = (1 - m[0][0]) * x_center - m[0][1] * y_center;
-
-    m[1][0] = -m[0][1];
-    m[1][1] = m[0][0];
-    m[1][2] = m[0][1] * x_center + (1 - m[0][0]) * y_center;
-
-    if (doflip)
-    {
-        m[0][2] = m[0][2] + (org_width/2) - (org_height/2);
-        m[1][2] = m[1][2] - (org_width/2) + (org_height/2);
-    }
-
-    int memsize = width * height * channels;
-    uint8_t* odata;
-    if (ImageTMP)
-    {
-        odata = ImageTMP->RGBImageLock();
-    }
-    else
-    {
-        odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
-    }
-    
-
-    int x_source_1, y_source_1, x_source_2, y_source_2;
-    float x_source, y_source;
-    float quad_ul, quad_ur, quad_ol, quad_or;
-    stbi_uc* p_target;
-    stbi_uc *p_source_ul, *p_source_ur, *p_source_ol, *p_source_or;
-
-    RGBImageLock();
-
-    for (int x = 0; x < width; ++x)
-        for (int y = 0; y < height; ++y)
-        {
-            p_target = odata + (channels * (y * width + x));
-
-            x_source = (m[0][0] * x + m[0][1] * y);
-            y_source = (m[1][0] * x + m[1][1] * y);
-
-            x_source += (m[0][2]);
-            y_source += (m[1][2]);
-
-            x_source_1 = (int)x_source;
-            x_source_2 = x_source_1 + 1;
-            y_source_1 = (int)y_source;
-            y_source_2 = y_source_1 + 1;
-
-            quad_ul = (x_source_2 - x_source) * (y_source_2 - y_source);
-            quad_ur = (1- (x_source_2 - x_source)) * (y_source_2 - y_source);
-            quad_or = (x_source_2 - x_source) * (1-(y_source_2 - y_source));
-            quad_ol = (1- (x_source_2 - x_source)) * (1-(y_source_2 - y_source));
-
-
-            if ((x_source_1 >= 0) && (x_source_2 < org_width) && (y_source_1 >= 0) && (y_source_2 < org_height))
-            {
-                p_source_ul = rgb_image + (channels * (y_source_1 * org_width + x_source_1));
-                p_source_ur = rgb_image + (channels * (y_source_1 * org_width + x_source_2));
-                p_source_or = rgb_image + (channels * (y_source_2 * org_width + x_source_1));
-                p_source_ol = rgb_image + (channels * (y_source_2 * org_width + x_source_2));
-                for (int _channels = 0; _channels < channels; ++_channels)
-                {
-                    p_target[_channels] = (int)((float)p_source_ul[_channels] * quad_ul
-                                                + (float)p_source_ur[_channels] * quad_ur
-                                                + (float)p_source_or[_channels] * quad_or
-                                                + (float)p_source_ol[_channels] * quad_ol);
-                }
-            }
-            else
-            {
-                for (int _channels = 0; _channels < channels; ++_channels)
-                    p_target[_channels] = 255;
-            }
-        }
-
-    //    memcpy(rgb_image, odata, memsize);
-    memCopy(odata, rgb_image, memsize);
-
-    if (!ImageTMP)
-    {
-        free_psram_heap(std::string(TAG) + "->odata", odata);
-    }
-    if (ImageTMP)
-        ImageTMP->RGBImageRelease();
-
-    RGBImageRelease();
-}
-
-
-void CRotateImage::Rotate(float _angle)
-{
-//    ESP_LOGD(TAG, "width %d, height %d", width, height);
-    Rotate(_angle, width / 2, height / 2);
-}
-
-void CRotateImage::RotateAntiAliasing(float _angle)
-{
-//    ESP_LOGD(TAG, "width %d, height %d", width, height);
-    RotateAntiAliasing(_angle, width / 2, height / 2);
-}
-
-void CRotateImage::Translate(int _dx, int _dy)
-{
-    int memsize = width * height * channels;
-    uint8_t* odata;
-    if (ImageTMP)
-    {
-        odata = ImageTMP->RGBImageLock();
-    }
-    else
-    {
-        odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
-    }
-
-
-
-    int x_source, y_source;
-    stbi_uc* p_target;
-    stbi_uc* p_source;
-
-    RGBImageLock();
-
-    for (int x = 0; x < width; ++x)
-        for (int y = 0; y < height; ++y)
-        {
-            p_target = odata + (channels * (y * width + x));
-
-            x_source = x - _dx;
-            y_source = y - _dy;
-
-            if ((x_source >= 0) && (x_source < width) && (y_source >= 0) && (y_source < height))
-            {
-                p_source = rgb_image + (channels * (y_source * width + x_source));
-                for (int _channels = 0; _channels < channels; ++_channels)
-                    p_target[_channels] = p_source[_channels];
-            }
-            else
-            {
-                for (int _channels = 0; _channels < channels; ++_channels)
-                    p_target[_channels] = 255;
-            }
-        }
-
-    //    memcpy(rgb_image, odata, memsize);
-    memCopy(odata, rgb_image, memsize);
-    if (!ImageTMP)
-    {
-        free_psram_heap(std::string(TAG) + "->odata", odata);
-    }
-
-    if (ImageTMP)
-    {
-        ImageTMP->RGBImageRelease();
-    }
-    RGBImageRelease();
-
-}
-
+#include <string>
+#include "CRotateImage.h"
+#include "psram.h"
+
+static const char *TAG = "C ROTATE IMG";
+
+CRotateImage::CRotateImage(std::string _name, CImageBasis *_org, CImageBasis *_temp, bool _flip) : CImageBasis(_name)
+{
+    rgb_image = _org->rgb_image;
+    channels = _org->channels;
+    width = _org->width;
+    height = _org->height;
+    bpp = _org->bpp;
+    externalImage = true;   
+    ImageTMP = _temp;   
+    ImageOrg = _org; 
+    islocked = false;
+    doflip = _flip;
+}
+
+
+void CRotateImage::Mirror(){
+    int memsize = width * height * channels;
+    uint8_t* odata;
+    if (ImageTMP)
+    {
+        odata = ImageTMP->RGBImageLock();
+    }
+    else
+    {
+        odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
+    }
+
+
+    int x_source, y_source;
+    stbi_uc* p_target;
+    stbi_uc* p_source;
+
+    RGBImageLock();
+
+    for (int x = 0; x < width; ++x)
+        for (int y = 0; y < height; ++y)
+        {
+            p_target = odata + (channels * (y * width + x));
+
+            x_source = width - x;
+            y_source = y;
+
+            p_source = rgb_image + (channels * (y_source * width + x_source));
+            for (int _channels = 0; _channels < channels; ++_channels)
+                p_target[_channels] = p_source[_channels];
+        }
+
+    //    memcpy(rgb_image, odata, memsize);
+    memCopy(odata, rgb_image, memsize);
+    if (!ImageTMP)
+        free_psram_heap(std::string(TAG) + "->odata", odata);
+
+    if (ImageTMP)
+        ImageTMP->RGBImageRelease();
+
+    RGBImageRelease();
+}
+
+void CRotateImage::Rotate(float _angle, int _centerx, int _centery)
+{
+    int org_width, org_height;
+    float m[2][3];
+
+    float x_center = _centerx;
+    float y_center = _centery;
+    _angle = _angle / 180 * M_PI;
+
+    if (doflip)
+    {
+        org_width = width;
+        org_height = height;
+        height = org_width;
+        width = org_height;
+        x_center =  x_center - (org_width/2) + (org_height/2);
+        y_center =  y_center + (org_width/2) - (org_height/2);
+        if (ImageOrg)
+        {
+            ImageOrg->height = height;
+            ImageOrg->width = width;
+        }
+    }
+    else
+    {
+        org_width = width;
+        org_height = height;
+    }
+
+    m[0][0] = cos(_angle);
+    m[0][1] = sin(_angle);
+    m[0][2] = (1 - m[0][0]) * x_center - m[0][1] * y_center;
+
+    m[1][0] = -m[0][1];
+    m[1][1] = m[0][0];
+    m[1][2] = m[0][1] * x_center + (1 - m[0][0]) * y_center;
+
+    if (doflip)
+    {
+        m[0][2] = m[0][2] + (org_width/2) - (org_height/2);
+        m[1][2] = m[1][2] - (org_width/2) + (org_height/2);
+    }
+
+    int memsize = width * height * channels;
+    uint8_t* odata;
+    if (ImageTMP)
+    {
+        odata = ImageTMP->RGBImageLock();
+    }
+    else
+    {
+        odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
+    }
+    
+
+    int x_source, y_source;
+    stbi_uc* p_target;
+    stbi_uc* p_source;
+
+    RGBImageLock();
+
+    for (int x = 0; x < width; ++x)
+        for (int y = 0; y < height; ++y)
+        {
+            p_target = odata + (channels * (y * width + x));
+
+            x_source = int(m[0][0] * x + m[0][1] * y);
+            y_source = int(m[1][0] * x + m[1][1] * y);
+
+            x_source += int(m[0][2]);
+            y_source += int(m[1][2]);
+
+            if ((x_source >= 0) && (x_source < org_width) && (y_source >= 0) && (y_source < org_height))
+            {
+                p_source = rgb_image + (channels * (y_source * org_width + x_source));
+                for (int _channels = 0; _channels < channels; ++_channels)
+                    p_target[_channels] = p_source[_channels];
+            }
+            else
+            {
+                for (int _channels = 0; _channels < channels; ++_channels)
+                    p_target[_channels] = 255;
+            }
+        }
+
+    //    memcpy(rgb_image, odata, memsize);
+    memCopy(odata, rgb_image, memsize);
+
+    if (!ImageTMP)
+    {
+        free_psram_heap(std::string(TAG) + "->odata", odata);
+    }
+    if (ImageTMP)
+        ImageTMP->RGBImageRelease();
+
+    RGBImageRelease();
+}
+
+
+
+void CRotateImage::RotateAntiAliasing(float _angle, int _centerx, int _centery)
+{
+    int org_width, org_height;
+    float m[2][3];
+
+    float x_center = _centerx;
+    float y_center = _centery;
+    _angle = _angle / 180 * M_PI;
+
+    if (doflip)
+    {
+        org_width = width;
+        org_height = height;
+        height = org_width;
+        width = org_height;
+        x_center =  x_center - (org_width/2) + (org_height/2);
+        y_center =  y_center + (org_width/2) - (org_height/2);
+        if (ImageOrg)
+        {
+            ImageOrg->height = height;
+            ImageOrg->width = width;
+        }
+    }
+    else
+    {
+        org_width = width;
+        org_height = height;
+    }
+
+    m[0][0] = cos(_angle);
+    m[0][1] = sin(_angle);
+    m[0][2] = (1 - m[0][0]) * x_center - m[0][1] * y_center;
+
+    m[1][0] = -m[0][1];
+    m[1][1] = m[0][0];
+    m[1][2] = m[0][1] * x_center + (1 - m[0][0]) * y_center;
+
+    if (doflip)
+    {
+        m[0][2] = m[0][2] + (org_width/2) - (org_height/2);
+        m[1][2] = m[1][2] - (org_width/2) + (org_height/2);
+    }
+
+    int memsize = width * height * channels;
+    uint8_t* odata;
+    if (ImageTMP)
+    {
+        odata = ImageTMP->RGBImageLock();
+    }
+    else
+    {
+        odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
+    }
+    
+
+    int x_source_1, y_source_1, x_source_2, y_source_2;
+    float x_source, y_source;
+    float quad_ul, quad_ur, quad_ol, quad_or;
+    stbi_uc* p_target;
+    stbi_uc *p_source_ul, *p_source_ur, *p_source_ol, *p_source_or;
+
+    RGBImageLock();
+
+    for (int x = 0; x < width; ++x)
+        for (int y = 0; y < height; ++y)
+        {
+            p_target = odata + (channels * (y * width + x));
+
+            x_source = (m[0][0] * x + m[0][1] * y);
+            y_source = (m[1][0] * x + m[1][1] * y);
+
+            x_source += (m[0][2]);
+            y_source += (m[1][2]);
+
+            x_source_1 = (int)x_source;
+            x_source_2 = x_source_1 + 1;
+            y_source_1 = (int)y_source;
+            y_source_2 = y_source_1 + 1;
+
+            quad_ul = (x_source_2 - x_source) * (y_source_2 - y_source);
+            quad_ur = (1- (x_source_2 - x_source)) * (y_source_2 - y_source);
+            quad_or = (x_source_2 - x_source) * (1-(y_source_2 - y_source));
+            quad_ol = (1- (x_source_2 - x_source)) * (1-(y_source_2 - y_source));
+
+
+            if ((x_source_1 >= 0) && (x_source_2 < org_width) && (y_source_1 >= 0) && (y_source_2 < org_height))
+            {
+                p_source_ul = rgb_image + (channels * (y_source_1 * org_width + x_source_1));
+                p_source_ur = rgb_image + (channels * (y_source_1 * org_width + x_source_2));
+                p_source_or = rgb_image + (channels * (y_source_2 * org_width + x_source_1));
+                p_source_ol = rgb_image + (channels * (y_source_2 * org_width + x_source_2));
+                for (int _channels = 0; _channels < channels; ++_channels)
+                {
+                    p_target[_channels] = (int)((float)p_source_ul[_channels] * quad_ul
+                                                + (float)p_source_ur[_channels] * quad_ur
+                                                + (float)p_source_or[_channels] * quad_or
+                                                + (float)p_source_ol[_channels] * quad_ol);
+                }
+            }
+            else
+            {
+                for (int _channels = 0; _channels < channels; ++_channels)
+                    p_target[_channels] = 255;
+            }
+        }
+
+    //    memcpy(rgb_image, odata, memsize);
+    memCopy(odata, rgb_image, memsize);
+
+    if (!ImageTMP)
+    {
+        free_psram_heap(std::string(TAG) + "->odata", odata);
+    }
+    if (ImageTMP)
+        ImageTMP->RGBImageRelease();
+
+    RGBImageRelease();
+}
+
+
+void CRotateImage::Rotate(float _angle)
+{
+//    ESP_LOGD(TAG, "width %d, height %d", width, height);
+    Rotate(_angle, width / 2, height / 2);
+}
+
+void CRotateImage::RotateAntiAliasing(float _angle)
+{
+//    ESP_LOGD(TAG, "width %d, height %d", width, height);
+    RotateAntiAliasing(_angle, width / 2, height / 2);
+}
+
+void CRotateImage::Translate(int _dx, int _dy)
+{
+    int memsize = width * height * channels;
+    uint8_t* odata;
+    if (ImageTMP)
+    {
+        odata = ImageTMP->RGBImageLock();
+    }
+    else
+    {
+        odata = (unsigned char*)malloc_psram_heap(std::string(TAG) + "->odata", memsize, MALLOC_CAP_SPIRAM);
+    }
+
+
+
+    int x_source, y_source;
+    stbi_uc* p_target;
+    stbi_uc* p_source;
+
+    RGBImageLock();
+
+    for (int x = 0; x < width; ++x)
+        for (int y = 0; y < height; ++y)
+        {
+            p_target = odata + (channels * (y * width + x));
+
+            x_source = x - _dx;
+            y_source = y - _dy;
+
+            if ((x_source >= 0) && (x_source < width) && (y_source >= 0) && (y_source < height))
+            {
+                p_source = rgb_image + (channels * (y_source * width + x_source));
+                for (int _channels = 0; _channels < channels; ++_channels)
+                    p_target[_channels] = p_source[_channels];
+            }
+            else
+            {
+                for (int _channels = 0; _channels < channels; ++_channels)
+                    p_target[_channels] = 255;
+            }
+        }
+
+    //    memcpy(rgb_image, odata, memsize);
+    memCopy(odata, rgb_image, memsize);
+    if (!ImageTMP)
+    {
+        free_psram_heap(std::string(TAG) + "->odata", odata);
+    }
+
+    if (ImageTMP)
+    {
+        ImageTMP->RGBImageRelease();
+    }
+    RGBImageRelease();
+
+}
+

code/components/jomjol_image_proc/CRotateImage.h

@@ -1,28 +1,29 @@
-#pragma once
-
-#ifndef CROTATEIMAGE_H
-#define CROTATEIMAGE_H
-
-#include "CImageBasis.h"
-
-
-class CRotateImage: public CImageBasis
-{
-
-    public:
-        CImageBasis *ImageTMP, *ImageOrg;
-        bool doflip;
-        CRotateImage(std::string name, std::string _image, bool _flip = false) : CImageBasis(name, _image) {ImageTMP = NULL; ImageOrg = NULL; doflip = _flip;};
-        CRotateImage(std::string name, uint8_t* _rgb_image, int _channels, int _width, int _height, int _bpp, bool _flip = false) : CImageBasis(name, _rgb_image, _channels, _width, _height, _bpp) {ImageTMP = NULL;  ImageOrg = NULL; doflip = _flip;};
-        CRotateImage(std::string name, CImageBasis *_org, CImageBasis *_temp, bool _flip = false);
-
-        void Rotate(float _angle);
-        void RotateAntiAliasing(float _angle);
-       
-        void Rotate(float _angle, int _centerx, int _centery);
-        void RotateAntiAliasing(float _angle, int _centerx, int _centery);
-
-        void Translate(int _dx, int _dy);
-};
-
+#pragma once
+
+#ifndef CROTATEIMAGE_H
+#define CROTATEIMAGE_H
+
+#include "CImageBasis.h"
+
+
+class CRotateImage: public CImageBasis
+{
+
+    public:
+        CImageBasis *ImageTMP, *ImageOrg;
+        bool doflip;
+        CRotateImage(std::string name, std::string _image, bool _flip = false) : CImageBasis(name, _image) {ImageTMP = NULL; ImageOrg = NULL; doflip = _flip;};
+        CRotateImage(std::string name, uint8_t* _rgb_image, int _channels, int _width, int _height, int _bpp, bool _flip = false) : CImageBasis(name, _rgb_image, _channels, _width, _height, _bpp) {ImageTMP = NULL;  ImageOrg = NULL; doflip = _flip;};
+        CRotateImage(std::string name, CImageBasis *_org, CImageBasis *_temp, bool _flip = false);
+
+        void Rotate(float _angle);
+        void RotateAntiAliasing(float _angle);
+       
+        void Rotate(float _angle, int _centerx, int _centery);
+        void RotateAntiAliasing(float _angle, int _centerx, int _centery);
+
+        void Translate(int _dx, int _dy);
+        void Mirror();
+};
+
 #endif //CROTATEIMAGE_H

code/components/jomjol_influxdb/interface_influxdb.cpp

@@ -8,35 +8,95 @@
 #include "time_sntp.h"
 #include "../../include/defines.h"
 
+
 static const char *TAG = "INFLUXDB";
 
-/**
- * @brief Buffer to store the HTTP response.
- * 
- * This character array is used to store the output of an HTTP response.
- * The size of the buffer is defined by the constant MAX_HTTP_OUTPUT_BUFFER.
- */
-char response_buffer[MAX_HTTP_OUTPUT_BUFFER] = {0};
+std::string _influxDBURI;
+std::string _influxDBDatabase;
+std::string _influxDBUser;
+std::string _influxDBPassword;
+
+std::string _influxDB_V2_URI;
+std::string _influxDB_V2_Bucket;
+std::string _influxDB_V2_Token;
+std::string _influxDB_V2_Org;
+
+static esp_err_t http_event_handler(esp_http_client_event_t *evt);
+
+void InfluxDB_V2_Init(std::string _uri, std::string _bucket, std::string _org, std::string _token)
+{
+    _influxDB_V2_URI = _uri;
+    _influxDB_V2_Bucket = _bucket;
+    _influxDB_V2_Org = _org;
+    _influxDB_V2_Token = _token;
+}
+
+void InfluxDB_V2_Publish(std::string _measurement, std::string _key, std::string _content, long int _timeUTC) 
+{
+    char response_buffer[MAX_HTTP_OUTPUT_BUFFER] = {0};
+    esp_http_client_config_t http_config = {
+       .user_agent = "ESP32 Meter reader",
+       .method = HTTP_METHOD_POST,
+       .event_handler = http_event_handler,
+       .buffer_size = MAX_HTTP_OUTPUT_BUFFER,
+       .user_data = response_buffer
+    };
+
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "InfluxDB_V2_Publish - Key: " + _key + ", Content: " + _content + ", timeUTC: " + std::to_string(_timeUTC));
+
+    std::string payload;
+    char nowTimestamp[21];
+
+    if (_timeUTC > 0)
+    {
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Timestamp (UTC): " + std::to_string(_timeUTC));
+        sprintf(nowTimestamp,"%ld000000000", _timeUTC);           // UTC
+        payload = _measurement + " " + _key + "=" + _content + " " + nowTimestamp;
+    }
+    else
+    {
+        LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "no timestamp given");
+        payload = _measurement + " " + _key + "=" + _content;
+    }
+
+    payload.shrink_to_fit();
+
+    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "sending line to influxdb:" + payload);
+
+    std::string apiURI = _influxDB_V2_URI + "/api/v2/write?org=" + _influxDB_V2_Org + "&bucket=" + _influxDB_V2_Bucket;
+    apiURI.shrink_to_fit();
+    http_config.url = apiURI.c_str();
+    ESP_LOGI(TAG, "http_config: %s", http_config.url); // Add mark on log to see when it restarted
+
+    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "API URI: " + apiURI);
+
+    esp_http_client_handle_t http_client = esp_http_client_init(&http_config);
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "client is initialized");
+
+    esp_http_client_set_header(http_client, "Content-Type", "text/plain");
+    std::string _zw = "Token " + _influxDB_V2_Token;
+    //    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Tokenheader: %s\n", _zw.c_str());
+    esp_http_client_set_header(http_client, "Authorization", _zw.c_str());
+
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "header is set");
+
+    ESP_ERROR_CHECK(esp_http_client_set_post_field(http_client, payload.c_str(), payload.length()));
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "post payload is set");
+
+    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_DEBUG, TAG, "HTTP request failed");
+    }
+    esp_http_client_cleanup(http_client);
+}
+
 
 
-/**
- * @brief HTTP event handler callback function.
- *
- * This function handles various HTTP client events and logs appropriate messages.
- *
- * @param evt Pointer to the HTTP client event structure.
- * @return esp_err_t ESP_OK on success.
- *
- * Event types handled:
- * - HTTP_EVENT_ERROR: Logs an error message when an HTTP error is encountered.
- * - HTTP_EVENT_ON_CONNECTED: Logs a message when the HTTP client successfully connects.
- * - HTTP_EVENT_HEADERS_SENT: Logs a message when all request headers are sent.
- * - HTTP_EVENT_ON_HEADER: Logs the received header key and value.
- * - HTTP_EVENT_ON_DATA: Logs the length of the received data.
- * - HTTP_EVENT_ON_FINISH: Logs a message when the HTTP client finishes the request.
- * - HTTP_EVENT_DISCONNECTED: Logs a message when the HTTP client disconnects.
- * - HTTP_EVENT_REDIRECT: Logs a message when an HTTP redirect occurs.
- */
 static esp_err_t http_event_handler(esp_http_client_event_t *evt)
 {
     switch(evt->event_id)
@@ -70,123 +130,25 @@ static esp_err_t http_event_handler(esp_http_client_event_t *evt)
     return ESP_OK;
 }
 
+void InfluxDBPublish(std::string _measurement, std::string _key, std::string _content, long int _timeUTC) {
+    char response_buffer[MAX_HTTP_OUTPUT_BUFFER] = {0};
+    esp_http_client_config_t http_config = {
+       .user_agent = "ESP32 Meter reader",
+       .method = HTTP_METHOD_POST,
+       .event_handler = http_event_handler,
+       .buffer_size = MAX_HTTP_OUTPUT_BUFFER,
+       .user_data = response_buffer
+    };
 
-
-/**
- * @brief Initializes the InfluxDB connection with version 1 settings.
- * 
- * This function sets up the connection parameters for InfluxDB version 1.
- * 
- * @param _influxDBURI The URI of the InfluxDB server.
- * @param _database The name of the database to connect to.
- * @param _user The username for authentication.
- * @param _password The password for authentication.
- */
-void InfluxDB::InfluxDBInitV1(std::string _influxDBURI, std::string _database, std::string _user, std::string _password) {
-    version = INFLUXDB_V1;
-    influxDBURI = _influxDBURI;
-    database = _database;
-    user = _user;
-    password = _password;
-}
-
-/**
- * @brief Initializes the InfluxDB client with version 2 settings.
- * 
- * This function sets up the InfluxDB client to use InfluxDB version 2 by
- * configuring the URI, bucket, organization, and token.
- * 
- * @param _influxDBURI The URI of the InfluxDB server.
- * @param _bucket The bucket name to store data in.
- * @param _org The organization name associated with the bucket.
- * @param _token The authentication token for accessing the InfluxDB server.
- */
-void InfluxDB::InfluxDBInitV2(std::string _influxDBURI, std::string _bucket, std::string _org, std::string _token) {
-    version = INFLUXDB_V2;
-    influxDBURI = _influxDBURI;
-    bucket = _bucket;
-    org = _org;
-    token = _token;
-}
-
-/**
- * @brief Establishes an HTTP connection to the InfluxDB server.
- *
- * This function configures and initializes an HTTP client to connect to the InfluxDB server.
- * It sets up the necessary parameters such as the URL, event handler, buffer size, and user data.
- * Depending on the InfluxDB version, it also configures the authentication type and credentials.
- *
- * @note This function destroys any existing HTTP client before initializing a new one.
- *
- * @param None
- * @return None
- */
-void InfluxDB::connectHTTP() {
-    esp_http_client_config_t config = {};
-
-    config.url = influxDBURI.c_str();
-    config.event_handler = http_event_handler;
-    config.buffer_size = MAX_HTTP_OUTPUT_BUFFER;
-    config.user_data = response_buffer;
-
-
-    switch (version) {
-        case INFLUXDB_V1:
-            config.auth_type = HTTP_AUTH_TYPE_BASIC;
-            config.username = user.c_str();
-            config.password = password.c_str();
-            break;
-        case INFLUXDB_V2:
-            break;
+    if (_influxDBUser.length() && _influxDBPassword.length()){
+       http_config.username = _influxDBUser.c_str();
+       http_config.password = _influxDBPassword.c_str();
+       http_config.auth_type = HTTP_AUTH_TYPE_BASIC;
     }
 
-    InfluxDBdestroy();
-    httpClient = esp_http_client_init(&config);
-    if (!httpClient) {
-        LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to initialize HTTP client");
-    } else {
-        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "HTTP client initialized successfully");
-    }
-}
-
-
-/**
- * @brief Destroys the InfluxDB instance by cleaning up the HTTP client.
- *
- * This function checks if the HTTP client is initialized. If it is, it cleans up the HTTP client
- * and logs the cleanup action. The HTTP client pointer is then set to NULL.
- */
-void InfluxDB::InfluxDBdestroy() {
-    if (httpClient) {
-        esp_http_client_cleanup(httpClient);
-        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "HTTP client cleaned up");
-        httpClient = NULL;
-    }
-}
-
-/**
- * @brief Publishes data to an InfluxDB instance.
- *
- * This function sends a measurement, key, and content to an InfluxDB server.
- * It supports both InfluxDB v1 and v2 APIs.
- *
- * @param _measurement The measurement name to publish.
- * @param _key The key associated with the measurement.
- * @param _content The content or value to publish.
- * @param _timeUTC The timestamp in UTC. If greater than 0, it will be included in the payload.
- *
- * The function logs the process and handles HTTP communication with the InfluxDB server.
- * It constructs the appropriate API URI based on the InfluxDB version and sends the data
- * using an HTTP POST request.
- */
-void InfluxDB::InfluxDBPublish(std::string _measurement, std::string _key, std::string _content, long int _timeUTC) {
-    std::string apiURI;        
     std::string payload;
     char nowTimestamp[21];
 
-    connectHTTP();
-
-
     LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "InfluxDBPublish - Key: " + _key + ", Content: " + _content + ", timeUTC: " + std::to_string(_timeUTC));
 
     if (_timeUTC > 0)
@@ -202,47 +164,50 @@ void InfluxDB::InfluxDBPublish(std::string _measurement, std::string _key, std::
     }
 
     payload.shrink_to_fit();
+
     LogFile.WriteToFile(ESP_LOG_INFO, TAG, "sending line to influxdb:" + payload);
 
-    esp_err_t err;
 
-    switch (version) {
-        case INFLUXDB_V1: 
-            apiURI = influxDBURI + "/write?db=" + database;
-            apiURI.shrink_to_fit();
+    // use the default retention policy of the bucket
+    std::string apiURI = _influxDBURI + "/write?db=" + _influxDBDatabase;
+//    std::string apiURI = _influxDBURI + "/api/v2/write?bucket=" + _influxDBDatabase + "/";
 
-            esp_http_client_set_url(httpClient, apiURI.c_str());
-            esp_http_client_set_method(httpClient, HTTP_METHOD_POST);
-            esp_http_client_set_header(httpClient, "Content-Type", "text/plain");
-            esp_http_client_set_post_field(httpClient, payload.c_str(), payload.length());
+    apiURI.shrink_to_fit();
+    http_config.url = apiURI.c_str();
 
-            err = esp_http_client_perform(httpClient);
-            if (err == ESP_OK) {
-                LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Data published successfully: " + payload);
-            } else {
-                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to publish data: " + std::string(esp_err_to_name(err)));
-            }
-            break;
+    LogFile.WriteToFile(ESP_LOG_INFO, TAG, "API URI: " + apiURI);
 
-        case INFLUXDB_V2:        
-            apiURI = influxDBURI + "/api/v2/write?org=" + org + "&bucket=" + bucket;
-            apiURI.shrink_to_fit();
-            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "apiURI: " + apiURI);
+    esp_http_client_handle_t http_client = esp_http_client_init(&http_config);
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "client is initialized");
 
-            esp_http_client_set_url(httpClient, apiURI.c_str());
-            esp_http_client_set_method(httpClient, HTTP_METHOD_POST);
-            esp_http_client_set_header(httpClient, "Content-Type", "text/plain");
-            std::string _zw = "Token " + token;
-            esp_http_client_set_header(httpClient, "Authorization", _zw.c_str());
-            esp_http_client_set_post_field(httpClient, payload.c_str(), payload.length());
-            err = ESP_ERROR_CHECK_WITHOUT_ABORT(esp_http_client_perform(httpClient));
-            if (err == ESP_OK) {
-                LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Data published successfully: " + payload);
-            } else {
-                LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Failed to publish data: " + std::string(esp_err_to_name(err)));
-            }
-        break;
+    esp_http_client_set_header(http_client, "Content-Type", "text/plain");
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "header is set");
+
+    ESP_ERROR_CHECK(esp_http_client_set_post_field(http_client, payload.c_str(), payload.length()));
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "post payload is set");
+
+    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_DEBUG, TAG, "HTTP request failed");
     }
+    esp_http_client_cleanup(http_client);
+}
+
+
+void InfluxDBInit(std::string _uri, std::string _database, std::string _user, std::string _password){
+    _influxDBURI = _uri;
+    _influxDBDatabase = _database;
+    _influxDBUser = _user;
+    _influxDBPassword = _password;
+ 
+}
+
+void InfluxDBdestroy() {
 }
 
 #endif //ENABLE_INFLUXDB

code/components/jomjol_influxdb/interface_influxdb.h

@@ -8,106 +8,17 @@
 #include <map>
 #include <functional>
 
+// Interface to InfluxDB v1.x
+void InfluxDBInit(std::string _influxDBURI, std::string _database, std::string _user, std::string _password);
+void InfluxDBPublish(std::string _measurement, std::string _key, std::string _content, long int _timeUTC);
 
-#include <string>
-#include "esp_http_client.h"
-#include "esp_log.h"
+// Interface to InfluxDB v2.x
+void InfluxDB_V2_Init(std::string _uri, std::string _bucket, std::string _org, std::string _token);
+void InfluxDB_V2_Publish(std::string _measurement, std::string _key, std::string _content, long int _timeUTC);
 
 
-enum InfluxDBVersion {
-    INFLUXDB_V1,
-    INFLUXDB_V2
-};
-
-/**
- * @class InfluxDB
- * @brief A class to handle connections and data publishing to InfluxDB servers.
- * 
- * This class supports both InfluxDB v1.x and v2.x versions. It provides methods to initialize
- * the connection parameters, publish data, and destroy the connection.
- * 
- * @private
- * @var std::string influxDBURI
- * URI for the InfluxDB server.
- * 
- * @var std::string database
- * Database name for InfluxDB v1.x.
- * 
- * @var std::string user
- * Username for InfluxDB v1.x.
- * 
- * @var std::string password
- * Password for InfluxDB v1.x.
- * 
- * @var std::string bucket
- * Bucket name for InfluxDB v2.x.
- * 
- * @var std::string org
- * Organization name for InfluxDB v2.x.
- * 
- * @var std::string token
- * Token for InfluxDB v2.x.
- * 
- * @var InfluxDBVersion version
- * Version of the InfluxDB server (v1.x or v2.x).
- * 
- * @var esp_http_client_handle_t httpClient
- * HTTP client handle for making requests to the InfluxDB server.
- * 
- * @var void connectHTTP()
- * Establishes an HTTP connection to the InfluxDB server.
- * 
- * @public
- * @fn void InfluxDBInitV1(std::string _influxDBURI, std::string _database, std::string _user, std::string _password)
- * Initializes the connection parameters for InfluxDB v1.x.
- * 
- * @fn void InfluxDBInitV2(std::string _influxDBURI, std::string _bucket, std::string _org, std::string _token)
- * Initializes the connection parameters for InfluxDB v2.x.
- * 
- * @fn void InfluxDBdestroy()
- * Destroys the InfluxDB connection.
- * 
- * @fn void InfluxDBPublish(std::string _measurement, std::string _key, std::string _content, long int _timeUTC)
- * Publishes data to the InfluxDB server.
- * 
- * @param _measurement The measurement name.
- * @param _key The key for the data point.
- * @param _content The content or value of the data point.
- * @param _timeUTC The timestamp in UTC for the data point.
- */
-
-class InfluxDB {
-private:
-    // Information for InfluxDB v1.x
-    std::string influxDBURI = "";
-    // Information for InfluxDB v1.x
-    std::string database = "";
-    std::string user = "";
-    std::string password = "";
-
-    // Information for InfluxDB v2.x
-    std::string bucket = "";
-    std::string org = "";
-    std::string token = "";
-
-    InfluxDBVersion version;
-
-    esp_http_client_handle_t httpClient = NULL;
-
-    void connectHTTP();
-
-public:
-    // Initialize the InfluxDB connection parameters
-    void InfluxDBInitV1(std::string _influxDBURI, std::string _database, std::string _user, std::string _password);
-    void InfluxDBInitV2(std::string _influxDBURI, std::string _bucket, std::string _org, std::string _token);
-
-    // Destroy the InfluxDB connection
-    void InfluxDBdestroy();
-    // Publish data to the InfluxDB server
-    void InfluxDBPublish(std::string _measurement, std::string _key, std::string _content, long int _timeUTC);
-};
-
 
+void InfluxDBdestroy();
 
 #endif //INTERFACE_INFLUXDB_H
 #endif //ENABLE_INFLUXDB

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  _digit, 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  _digital, 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(_digit.c_str(), pFile);
+        fputs(_digital.c_str(), pFile);
         fputs(_analog.c_str(), pFile);
         fputs("\n", pFile);
 

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 _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);
+//    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);
 
 
     std::string GetCurrentFileName();

code/components/jomjol_mqtt/interface_mqtt.cpp

@@ -16,6 +16,7 @@
 #include "esp_timer.h"
 #endif
 
+
 static const char *TAG = "MQTT IF";
 
 std::map<std::string, std::function<void()>>* connectFunktionMap = NULL;  
@@ -33,13 +34,13 @@ bool mqtt_initialized = false;
 bool mqtt_connected = false;
 
 esp_mqtt_client_handle_t client = NULL;
-std::string uri, client_id, lwt_topic, lwt_connected, lwt_disconnected, user, password, maintopic, domoticz_in_topic;
+std::string uri, client_id, lwt_topic, lwt_connected, lwt_disconnected, user, password, maintopic;
 std::string caCert, clientCert, clientKey;
-bool validateServerCert = true;
 int keepalive;
 bool SetRetainFlag;
 void (*callbackOnConnected)(std::string, bool) = NULL;
 
+
 bool MQTTPublish(std::string _key, std::string _content, int qos, bool retained_flag) 
 {
     if (!mqtt_enabled) {                            // MQTT sevice not started / configured (MQTT_Init not called before)      
@@ -62,7 +63,7 @@ bool MQTTPublish(std::string _key, std::string _content, int qos, bool retained_
         #endif
         int msg_id = esp_mqtt_client_publish(client, _key.c_str(), _content.c_str(), 0, qos, retained_flag);
         #ifdef DEBUG_DETAIL_ON 
-            ESP_LOGD(TAG, "Publish msg_id %d in %lld ms", msg_id, (esp_timer_get_time() - starttime)/1000);
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Publish msg_id " + std::to_string(msg_id) + " in " + std::to_string((esp_timer_get_time() - starttime)/1000) + " ms");
         #endif
         if (msg_id == -1) {
             LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Failed to publish topic '" + _key + "', re-trying...");   
@@ -71,7 +72,7 @@ bool MQTTPublish(std::string _key, std::string _content, int qos, bool retained_
             #endif
             msg_id = esp_mqtt_client_publish(client, _key.c_str(), _content.c_str(), 0, qos, retained_flag);
             #ifdef DEBUG_DETAIL_ON 
-                ESP_LOGD(TAG, "Publish msg_id %d in %lld ms", msg_id, (esp_timer_get_time() - starttime)/1000);
+               LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Publish msg_id " + std::to_string(msg_id) + " in " + std::to_string((esp_timer_get_time() - starttime)/1000) + " ms");
             #endif
             if (msg_id == -1) {
                 LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to publish topic '" + _key + "', skipping all MQTT publishings in this round!");
@@ -94,6 +95,7 @@ bool MQTTPublish(std::string _key, std::string _content, int qos, bool retained_
     }
 }
 
+
 static esp_err_t mqtt_event_handler_cb(esp_mqtt_event_handle_t event) {
     std::string topic = "";
     switch (event->event_id) {
@@ -120,29 +122,32 @@ static esp_err_t mqtt_event_handler_cb(esp_mqtt_event_handle_t event) {
             break;
         
         case MQTT_EVENT_SUBSCRIBED:
-            ESP_LOGD(TAG, "MQTT_EVENT_SUBSCRIBED, msg_id=%d", event->msg_id);
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "MQTT_EVENT_SUBSCRIBED, msg_id=" + std::to_string(event->msg_id));
             break;
         
         case MQTT_EVENT_UNSUBSCRIBED:
-            ESP_LOGD(TAG, "MQTT_EVENT_UNSUBSCRIBED, msg_id=%d", event->msg_id);
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "MQTT_EVENT_UNSUBSCRIBED, msg_id=" + std::to_string(event->msg_id));
             break;
         
         case MQTT_EVENT_PUBLISHED:
-            ESP_LOGD(TAG, "MQTT_EVENT_PUBLISHED, msg_id=%d", event->msg_id);
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "MQTT_EVENT_PUBLISHED, msg_id=" + std::to_string(event->msg_id));
             break;
         
         case MQTT_EVENT_DATA:
-            ESP_LOGD(TAG, "MQTT_EVENT_DATA");
-            ESP_LOGD(TAG, "TOPIC=%.*s", event->topic_len, event->topic);
-            ESP_LOGD(TAG, "DATA=%.*s", event->data_len, event->data);
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "MQTT_EVENT_DATA");
+            char buf[100];
+            snprintf(buf, sizeof(buf), "%.*s", event->topic_len, event->topic);
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "TOPIC=" + std::string(buf));
+            snprintf(buf, sizeof(buf), "%.*s", event->data_len, event->data);
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "DATA=" + std::string(buf));
             topic.assign(event->topic, event->topic_len);
             if (subscribeFunktionMap != NULL) {
                 if (subscribeFunktionMap->find(topic) != subscribeFunktionMap->end()) {
-                    ESP_LOGD(TAG, "call subcribe function for topic %s", topic.c_str());
+                    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "call subcribe function for topic " + topic);
                     (*subscribeFunktionMap)[topic](topic, event->data, event->data_len);
                 }
             } else {
-                ESP_LOGW(TAG, "no handler available\r\n");
+                LogFile.WriteToFile(ESP_LOG_WARN, TAG, "no handler available!");
             }
             break;
         
@@ -172,37 +177,38 @@ static esp_err_t mqtt_event_handler_cb(esp_mqtt_event_handle_t event) {
                 LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Connection refused, not authorized. Check username/password (0x05)");
             }
             else {
-                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Other event id:" + event->error_handle->connect_return_code);
-                ESP_LOGE(TAG, "Other event id:%d", event->error_handle->connect_return_code);
+                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Other event id: " + std::to_string(event->error_handle->connect_return_code));
             }
 
             #ifdef DEBUG_DETAIL_ON 
-                ESP_LOGD(TAG, "MQTT_EVENT_ERROR - esp_mqtt_error_codes:");
-                ESP_LOGD(TAG, "error_type:%d", event->error_handle->error_type);
-                ESP_LOGD(TAG, "connect_return_code:%d", event->error_handle->connect_return_code);
-                ESP_LOGD(TAG, "esp_transport_sock_errno:%d", event->error_handle->esp_transport_sock_errno);
-                ESP_LOGD(TAG, "esp_tls_last_esp_err:%d", event->error_handle->esp_tls_last_esp_err);
-                ESP_LOGD(TAG, "esp_tls_stack_err:%d", event->error_handle->esp_tls_stack_err);
-                ESP_LOGD(TAG, "esp_tls_cert_verify_flags:%d", event->error_handle->esp_tls_cert_verify_flags);
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "MQTT_EVENT_ERROR - esp_mqtt_error_codes:");
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "error_type: " + std::to_string(event->error_handle->error_type));
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "connect_return_code: " + std::to_string(event->error_handle->connect_return_code));
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "esp_transport_sock_errno: " + std::to_string(event->error_handle->esp_transport_sock_errno));
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "esp_tls_last_esp_err: " + std::to_string(event->error_handle->esp_tls_last_esp_err));
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "esp_tls_stack_err: " + std::to_string(event->error_handle->esp_tls_stack_err));
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "esp_tls_cert_verify_flags: " + std::to_string(event->error_handle->esp_tls_cert_verify_flags));
             #endif
 
             break;
         
         default:
-            ESP_LOGD(TAG, "Other event id:%d", event->event_id);
+            LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Other event id: " + std::to_string(event->event_id));
             break;
     }
     return ESP_OK;
 }
 
+
 static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data) {
-    ESP_LOGD(TAG, "Event dispatched from event loop base=%s, event_id=%d", base, (int)event_id);
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Event dispatched from event loop base=" + std::string(base) + ", event_id=" + std::to_string(event_id));
     mqtt_event_handler_cb((esp_mqtt_event_handle_t) event_data);
 }
 
+
 bool MQTT_Configure(std::string _mqttURI, std::string _clientid, std::string _user, std::string _password,
-        std::string _maintopic, std::string _domoticz_in_topic, std::string _lwt, std::string _lwt_connected, std::string _lwt_disconnected,
-        std::string _cacertfilename, bool _validateServerCert, std::string _clientcertfilename, std::string _clientkeyfilename, 
+        std::string _maintopic, std::string _lwt, std::string _lwt_connected, std::string _lwt_disconnected,
+        std::string _cacertfilename, std::string _clientcertfilename, std::string _clientkeyfilename, 
                     int _keepalive, bool _SetRetainFlag, void *_callbackOnConnected) {
     if ((_mqttURI.length() == 0) || (_maintopic.length() == 0) || (_clientid.length() == 0)) 
     {
@@ -218,48 +224,27 @@ bool MQTT_Configure(std::string _mqttURI, std::string _clientid, std::string _us
     keepalive = _keepalive;
     SetRetainFlag = _SetRetainFlag;
     maintopic = _maintopic;
-    domoticz_in_topic = _domoticz_in_topic;
     callbackOnConnected = ( void (*)(std::string, bool) )(_callbackOnConnected);
 
-    if (_clientcertfilename.length() && _clientkeyfilename.length()) {
+    if (_clientcertfilename.length() && _clientkeyfilename.length()){
         std::ifstream cert_ifs(_clientcertfilename);
-        if (cert_ifs.is_open()) {
-            std::string cert_content((std::istreambuf_iterator<char>(cert_ifs)), (std::istreambuf_iterator<char>()));
-            clientCert = cert_content;
-            cert_ifs.close();
-            LogFile.WriteToFile(ESP_LOG_INFO, TAG, "using clientCert: " + _clientcertfilename);
-        }
-        else {
-            LogFile.WriteToFile(ESP_LOG_INFO, TAG, "could not open clientCert: " + _clientcertfilename);
-        }
+        std::string cert_content((std::istreambuf_iterator<char>(cert_ifs)), (std::istreambuf_iterator<char>()));
+        clientCert = cert_content;
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "using clientCert: " + _clientcertfilename);
 
         std::ifstream key_ifs(_clientkeyfilename);
-        if (key_ifs.is_open()) {
-            std::string key_content((std::istreambuf_iterator<char>(key_ifs)), (std::istreambuf_iterator<char>()));
-            clientKey = key_content;
-            key_ifs.close();
-            LogFile.WriteToFile(ESP_LOG_INFO, TAG, "using clientKey: " + _clientkeyfilename);
-        }
-        else {
-            LogFile.WriteToFile(ESP_LOG_INFO, TAG, "could not open clientKey: " + _clientkeyfilename);
-        }
+        std::string key_content((std::istreambuf_iterator<char>(key_ifs)), (std::istreambuf_iterator<char>()));
+        clientKey = key_content;
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "using clientKey: " + _clientkeyfilename);
     }
 
-    if (_cacertfilename.length()) {
-        std::ifstream ca_ifs(_cacertfilename);
-        if (ca_ifs.is_open()) {
-            std::string content((std::istreambuf_iterator<char>(ca_ifs)), (std::istreambuf_iterator<char>()));
-            caCert = content;
-            ca_ifs.close();
-            LogFile.WriteToFile(ESP_LOG_INFO, TAG, "using caCert: " + _cacertfilename);
-        }
-        else {
-            LogFile.WriteToFile(ESP_LOG_INFO, TAG, "could not open caCert: " + _cacertfilename);
-        }
+    if (_cacertfilename.length() ){
+        std::ifstream ifs(_cacertfilename);
+        std::string content((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
+        caCert = content;
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "using caCert: " + _cacertfilename);
     }
 
-    validateServerCert = _validateServerCert;
-
     if (_user.length() && _password.length()){
         user = _user;
         password = _password;
@@ -277,6 +262,7 @@ bool MQTT_Configure(std::string _mqttURI, std::string _clientid, std::string _us
     return true;
 }
 
+
 int MQTT_Init() { 
     if (mqtt_initialized) {
         return 0;
@@ -310,21 +296,18 @@ int MQTT_Init() {
     mqtt_cfg.session.last_will.msg = lwt_disconnected.c_str();
     mqtt_cfg.session.last_will.msg_len = (int)(lwt_disconnected.length());
     mqtt_cfg.session.keepalive = keepalive;
-    mqtt_cfg.buffer.size = 2048;                         // size of MQTT send/receive buffer
+    mqtt_cfg.buffer.size = 1536;                         // size of MQTT send/receive buffer (Default: 1024)
 
-    if (caCert.length()) {
+    if (caCert.length()){
         mqtt_cfg.broker.verification.certificate = caCert.c_str();
         mqtt_cfg.broker.verification.certificate_len = caCert.length() + 1;
-
-        // Skip any validation of server certificate CN field, this reduces the
-        // security of TLS and makes the *MQTT* client susceptible to MITM attacks
-        mqtt_cfg.broker.verification.skip_cert_common_name_check = !validateServerCert;
+        mqtt_cfg.broker.verification.skip_cert_common_name_check = true;
     }
 
-    if (clientCert.length() && clientKey.length()) {
+    if (clientCert.length() && clientKey.length()){
         mqtt_cfg.credentials.authentication.certificate = clientCert.c_str();
         mqtt_cfg.credentials.authentication.certificate_len = clientCert.length() + 1;
-
+        
         mqtt_cfg.credentials.authentication.key = clientKey.c_str();
         mqtt_cfg.credentials.authentication.key_len = clientKey.length() + 1;
     }
@@ -374,6 +357,7 @@ int MQTT_Init() {
 
 }
 
+
 void MQTTdestroy_client(bool _disable = false) {
     if (client) {
         if (mqtt_connected) {
@@ -391,25 +375,35 @@ void MQTTdestroy_client(bool _disable = false) {
         mqtt_configOK = false;
 }
 
+
 bool getMQTTisEnabled() {
     return mqtt_enabled;
 }
 
+
 bool getMQTTisConnected() {
     return mqtt_connected;
 }
 
+
 bool mqtt_handler_flow_start(std::string _topic, char* _data, int _data_len) 
 {
-    ESP_LOGD(TAG, "Handler called: topic %s, data %.*s", _topic.c_str(), _data_len, _data);
+   LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Handler called: topic='" + _topic + "', data='" + _data +"'");
+
+    if (_data_len > 0) {
+        MQTTCtrlFlowStart(_topic);
+    }
+    else {
+        LogFile.WriteToFile(ESP_LOG_WARN, TAG, "handler_flow_start: handler called, but no data");
+    }
 
-    MQTTCtrlFlowStart(_topic);
     return ESP_OK;
 }
 
+
 bool mqtt_handler_set_prevalue(std::string _topic, char* _data, int _data_len) 
 {
-    //ESP_LOGD(TAG, "Handler called: topic %s, data %.*s", _topic.c_str(), _data_len, _data);
+    //LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Handler called: topic='" + _topic + "', data='" + _data +"'");
     //example: {"numbersname": "main", "value": 12345.1234567}
 
     if (_data_len > 0) {    // Check if data length > 0
@@ -442,6 +436,7 @@ bool mqtt_handler_set_prevalue(std::string _topic, char* _data, int _data_len)
     return ESP_FAIL;
 }
 
+
 void MQTTconnected(){
     if (mqtt_connected) {
         LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Connected to broker");
@@ -449,7 +444,7 @@ void MQTTconnected(){
         if (connectFunktionMap != NULL) {
             for(std::map<std::string, std::function<void()>>::iterator it = connectFunktionMap->begin(); it != connectFunktionMap->end(); ++it) {
                 it->second();
-                ESP_LOGD(TAG, "call connect function %s", it->first.c_str());
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "call connect function '" + it->first + "'");
             }
         }
 
@@ -476,14 +471,15 @@ void MQTTconnected(){
     }
 }
 
+
 void MQTTregisterConnectFunction(std::string name, std::function<void()> func){
-    ESP_LOGD(TAG, "MQTTregisteronnectFunction %s\r\n", name.c_str());
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "MQTTregisteronnectFunction " + name);
     if (connectFunktionMap == NULL) {
         connectFunktionMap = new std::map<std::string, std::function<void()>>();
     }
 
     if ((*connectFunktionMap)[name] != NULL) {
-        ESP_LOGW(TAG, "connect function %s already registred", name.c_str());
+        LogFile.WriteToFile(ESP_LOG_WARN, TAG, "connect function '" + name + "' already registred!");
         return;
     }
 
@@ -494,33 +490,36 @@ void MQTTregisterConnectFunction(std::string name, std::function<void()> func){
     }
 }
 
+
 void MQTTunregisterConnectFunction(std::string name){
-    ESP_LOGD(TAG, "unregisterConnnectFunction %s\r\n", name.c_str());
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "unregisterConnnectFunction '" + name + "'");
     if ((connectFunktionMap != NULL) && (connectFunktionMap->find(name) != connectFunktionMap->end())) {
         connectFunktionMap->erase(name);
     }
 }
 
+
 void MQTTregisterSubscribeFunction(std::string topic, std::function<bool(std::string, char*, int)> func){
-    ESP_LOGD(TAG, "registerSubscribeFunction %s", topic.c_str());
+    LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "registerSubscribeFunction '" + topic + "'");
     if (subscribeFunktionMap == NULL) {
         subscribeFunktionMap = new std::map<std::string, std::function<bool(std::string, char*, int)>>();
     }
 
     if ((*subscribeFunktionMap)[topic] != NULL) {
-        ESP_LOGW(TAG, "topic %s already registered for subscription", topic.c_str());
+        LogFile.WriteToFile(ESP_LOG_WARN, TAG, "topic '" + topic + "' already registered for subscription!");
         return;
     }
 
     (*subscribeFunktionMap)[topic] = func;
 }
 
+
 void MQTTdestroySubscribeFunction(){
     if (subscribeFunktionMap != NULL) {
         if (mqtt_connected) {
             for(std::map<std::string, std::function<bool(std::string, char*, int)>>::iterator it = subscribeFunktionMap->begin(); it != subscribeFunktionMap->end(); ++it) {
                 int msg_id = esp_mqtt_client_unsubscribe(client, it->first.c_str());
-                ESP_LOGD(TAG, "topic %s unsubscribe successful, msg_id=%d", it->first.c_str(), msg_id);
+                LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "topic '" + it->first + "' unsubscribe successful, msg_id=" + std::to_string(msg_id));
             }
         }
 

code/components/jomjol_mqtt/interface_mqtt.h

@@ -10,8 +10,8 @@
 #include <functional>
 
 bool MQTT_Configure(std::string _mqttURI, std::string _clientid, std::string _user, std::string _password,
-                    std::string _maintopic, std::string _domoticz_in_topic, std::string _lwt, std::string _lwt_connected, std::string _lwt_disconnected,
-                    std::string _cacertfilename, bool _validateServerCert, std::string _clientcertfilename, std::string _clientkeyfilename, 
+                    std::string _maintopic, std::string _lwt, std::string _lwt_connected, std::string _lwt_disconnected,
+                    std::string _cacertfilename, std::string _clientcertfilename, std::string _clientkeyfilename, 
                     int _keepalive, bool SetRetainFlag, void *callbackOnConnected);
 int MQTT_Init();
 void MQTTdestroy_client(bool _disable);

code/components/jomjol_mqtt/server_mqtt.cpp

@@ -12,7 +12,6 @@
 #include "interface_mqtt.h"
 #include "time_sntp.h"
 #include "../../include/defines.h"
-#include "basic_auth.h"
 
 
 
@@ -33,11 +32,10 @@ std::string rateUnit = "Unit/Minute";
 float roundInterval; // Minutes
 int keepAlive = 0; // Seconds
 bool retainFlag;
-static std::string maintopic, domoticzintopic;
+static std::string maintopic;
 bool sendingOf_DiscoveryAndStaticTopics_scheduled = true; // Set it to true to make sure it gets sent at least once after startup
 
 
-
 void mqttServer_setParameter(std::vector<NumberPost*>* _NUMBERS, int _keepAlive, float _roundInterval) {
     NUMBERS = _NUMBERS;
     keepAlive = _keepAlive;
@@ -51,15 +49,6 @@ 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) {
@@ -80,21 +69,11 @@ 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 case: Binary sensor which is based on error topic
-        topicFull = "homeassistant/binary_sensor/" + node_id + "/" + configTopic + "/config";
-    }
-    else if (field == "flowstart") { // Special case: Button
-        topicFull = "homeassistant/button/" + node_id + "/" + configTopic + "/config";
+    if (field == "problem") { // Special binary sensor which is based on error topic
+        topicFull = "homeassistant/binary_sensor/" + maintopic + "/" + configTopic + "/config";
     }
     else {
-        topicFull = "homeassistant/sensor/" + node_id + "/" + configTopic + "/config";
+        topicFull = "homeassistant/sensor/" + maintopic + "/" + configTopic + "/config";
     }
 
     /* See https://www.home-assistant.io/docs/mqtt/discovery/ */
@@ -106,7 +85,7 @@ bool sendHomeAssistantDiscoveryTopic(std::string group, std::string field,
         "\"icon\": \"mdi:" + icon + "\",";        
 
     if (group != "") {
-        if (field == "problem") { // Special case: Binary sensor which is based on error topic
+        if (field == "problem") { // Special binary sensor which is based on error topic
             payload += "\"state_topic\": \"~/" + group + "/error\",";
             payload += "\"value_template\": \"{{ 'OFF' if 'no error' in value else 'ON'}}\",";
         }
@@ -115,13 +94,10 @@ bool sendHomeAssistantDiscoveryTopic(std::string group, std::string field,
         }
     }
     else {
-        if (field == "problem") { // Special case: Binary sensor which is based on error topic
+        if (field == "problem") { // Special binary sensor which is based on error topic
             payload += "\"state_topic\": \"~/error\",";
             payload += "\"value_template\": \"{{ 'OFF' if 'no error' in value else 'ON'}}\",";
         }
-        else if (field == "flowstart") { // Special case: Button
-            payload += "\"cmd_t\":\"~/ctrl/flow_start\","; // Add command topic
-        }
         else {
             payload += "\"state_topic\": \"~/" + field + "\",";
         }
@@ -184,7 +160,6 @@ bool MQTThomeassistantDiscovery(int qos) {
     allSendsSuccessed |= sendHomeAssistantDiscoveryTopic("",     "interval",        "Interval",          "clock-time-eight-outline", "min",  ""           ,    "measurement", "diagnostic", qos);
     allSendsSuccessed |= sendHomeAssistantDiscoveryTopic("",     "IP",              "IP",                "network-outline",           "",    "",               "",            "diagnostic", qos);
     allSendsSuccessed |= sendHomeAssistantDiscoveryTopic("",     "status",          "Status",            "list-status",               "",    "",               "",            "diagnostic", qos);
-    allSendsSuccessed |= sendHomeAssistantDiscoveryTopic("",     "flowstart",       "Manual Flow Start", "timer-play-outline",        "",    "",               "",            "",           qos);
 
 
     for (int i = 0; i < (*NUMBERS).size(); ++i) {
@@ -193,26 +168,14 @@ bool MQTThomeassistantDiscovery(int qos) {
             group = "";
         }
 
-        /* If "Allow neg. rate" is true, use "measurement" instead of "total_increasing" for the State Class, see https://github.com/jomjol/AI-on-the-edge-device/issues/3331 */
-        std::string value_state_class = "total_increasing";
-        if ((*NUMBERS)[i]->AllowNegativeRates) {
-            value_state_class = "measurement";
-        }
-
-        /* Energy meters need a different Device Class, see https://github.com/jomjol/AI-on-the-edge-device/issues/3333 */
-        std::string rate_device_class = "volume_flow_rate";
-        if (meterType == "energy") {
-            rate_device_class = "power";
-        }
-
     //                                                       Group | Field                          | User Friendly Name                | Icon                   | Unit                 | Device Class | State Class       | Entity Category
-        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "value",                      "Value",                            "gauge",                 valueUnit,             meterType,      value_state_class, "", qos); // State Class = "total_increasing" if <NUMBERS>.AllowNegativeRates = false, else use "measurement"
-        allSendsSuccessed |= sendHomeAssistantDiscoveryTopic(group,   "raw",                        "Raw Value",                        "raw",                   valueUnit,             meterType,      "measurement",      "diagnostic", 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_digitization_round */
+        /* Not announcing "rate" as it is better to use rate_per_time_unit resp. rate_per_digitalization_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,              rate_device_class, "measurement",      "", qos);
-        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,   "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,   "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
@@ -348,7 +311,7 @@ void register_server_mqtt_uri(httpd_handle_t server) {
     uri.method    = HTTP_GET;
 
     uri.uri       = "/mqtt_publish_discovery";
-    uri.handler = APPLY_BASIC_AUTH_FILTER(scheduleSendingDiscovery_and_static_Topics);
+    uri.handler   = scheduleSendingDiscovery_and_static_Topics;
     uri.user_ctx  = (void*) "";    
     httpd_register_uri_handler(server, &uri); 
 }
@@ -376,9 +339,4 @@ std::string mqttServer_getMainTopic() {
     return maintopic;
 }
 
-void mqttServer_setDmoticzInTopic( std::string _domoticzintopic) {
-    domoticzintopic = _domoticzintopic;
-}
-
-
 #endif //ENABLE_MQTT

code/components/jomjol_mqtt/server_mqtt.h

@@ -12,9 +12,6 @@ void mqttServer_setParameter(std::vector<NumberPost*>* _NUMBERS, int interval, f
 void mqttServer_setMeterType(std::string meterType, std::string valueUnit, std::string timeUnit,std::string rateUnit);
 void setMqtt_Server_Retain(bool SetRetainFlag);
 void mqttServer_setMainTopic( std::string maintopic);
-void mqttServer_setDmoticzInTopic( std::string domoticzintopic);
-
-
 std::string mqttServer_getMainTopic();
 
 void register_server_mqtt_uri(httpd_handle_t server);
@@ -25,7 +22,6 @@ 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

code/components/jomjol_tfliteclass/CTfLiteClass.cpp

@@ -206,7 +206,6 @@ 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) 
     {
@@ -246,18 +245,9 @@ void CTfLiteClass::GetInputTensorSize()
 
 long CTfLiteClass::GetFileSize(std::string filename)
 {
-  struct stat stat_buf;
-  long rc = -1;
-
-  FILE *pFile = fopen(filename.c_str(), "rb"); // previously only "rb
-
-  if (pFile != NULL)
-  {
-    rc = stat(filename.c_str(), &stat_buf);
-    fclose(pFile);
-  }
-  
-  return rc == 0 ? stat_buf.st_size : -1;
+    struct stat stat_buf;
+    long rc = stat(filename.c_str(), &stat_buf);
+    return rc == 0 ? stat_buf.st_size : -1;
 }
 
 
@@ -279,33 +269,25 @@ bool CTfLiteClass::ReadFileToModel(std::string _fn)
 
     LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Loading Model " + _fn + " /size: " + std::to_string(size) + " bytes...");
 
+
 #ifdef DEBUG_DETAIL_ON      
         LogFile.WriteHeapInfo("CTLiteClass::Alloc modelfile start");
 #endif
 
     modelfile = (unsigned char*)psram_get_shared_model_memory();
   
-    if (modelfile != NULL)
+	  if(modelfile != NULL) 
     {
-        FILE *pFile = fopen(_fn.c_str(), "rb"); // previously only "rb
-    
-        if (pFile != NULL)
-        {
-          fread(modelfile, 1, size, pFile);
-          fclose(pFile);
+        FILE* f = fopen(_fn.c_str(), "rb");     // previously only "r
+        fread(modelfile, 1, size, f);
+        fclose(f);        
 
-#ifdef DEBUG_DETAIL_ON
-          LogFile.WriteHeapInfo("CTLiteClass::Alloc modelfile successful");
-#endif
+        #ifdef DEBUG_DETAIL_ON 
+            LogFile.WriteHeapInfo("CTLiteClass::Alloc modelfile successful");
+        #endif
 
-          return true;
-        }
-        else
-        {
-          LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "CTfLiteClass::ReadFileToModel: Model does not exist");
-          return false;
-        }
-    }   
+        return true;    
+	}    
     else 
     {
         LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "CTfLiteClass::ReadFileToModel: Can't allocate enough memory: " + std::to_string(size));

code/components/jomjol_webhook/CMakeLists.txt

@@ -1,7 +0,0 @@
-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)
-
-

code/components/jomjol_webhook/interface_webhook.cpp

@@ -1,170 +0,0 @@
-#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

code/components/jomjol_webhook/interface_webhook.h

@@ -1,17 +0,0 @@
-#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

code/components/jomjol_wlan/basic_auth.cpp

@@ -1,107 +0,0 @@
-#include "basic_auth.h"
-#include "read_wlanini.h"
-#include <esp_tls_crypto.h>
-#include <esp_log.h>
-
-
-#define HTTPD_401 "401 UNAUTHORIZED"
-
-static const char *TAG = "HTTPAUTH";
-
-typedef struct {
-    const char *username;
-    const char *password;
-} basic_auth_info_t;
-
-basic_auth_info_t basic_auth_info = { NULL, NULL };
-
-void init_basic_auth() {
-    if (!wlan_config.http_username.empty() && !wlan_config.http_password.empty()) {
-        basic_auth_info.username = wlan_config.http_username.c_str();
-        basic_auth_info.password = wlan_config.http_password.c_str();
-    }
-}
-
-static char *http_auth_basic(const char *username, const char *password)
-{
-    int out;
-    char *user_info = NULL;
-    char *digest = NULL;
-    size_t n = 0;
-    asprintf(&user_info, "%s:%s", username, password);
-    if (!user_info) {
-        ESP_LOGE(TAG, "No enough memory for user information");
-        return NULL;
-    }
-    esp_crypto_base64_encode(NULL, 0, &n, (const unsigned char *)user_info, strlen(user_info));
-
-    /* 6: The length of the "Basic " string
-     * n: Number of bytes for a base64 encode format
-     * 1: Number of bytes for a reserved which be used to fill zero
-    */
-    digest = static_cast<char*>(calloc(1, 6 + n + 1));
-    if (digest) {
-        strcpy(digest, "Basic ");
-        esp_crypto_base64_encode((unsigned char *)digest + 6, n, (size_t *)&out, (const unsigned char *)user_info, strlen(user_info));
-    }
-    free(user_info);
-    return digest;
-}
-
-esp_err_t basic_auth_request_filter(httpd_req_t *req, esp_err_t original_handler(httpd_req_t *))
-{
-    char *buf = NULL;
-    size_t buf_len = 0;
-    esp_err_t ret = ESP_OK;
-
-    char unauthorized[] = "You are not authorized to use this website!";
-
-    if (basic_auth_info.username == NULL || basic_auth_info.password == NULL) {
-        ret = original_handler(req);
-    } else {
-        buf_len = httpd_req_get_hdr_value_len(req, "Authorization") + 1;
-        if (buf_len > 1) {
-            buf = static_cast<char*>(calloc(1, buf_len));
-            if (!buf) {
-                ESP_LOGE(TAG, "No enough memory for basic authorization");
-                return ESP_ERR_NO_MEM;
-            }
-
-            if (httpd_req_get_hdr_value_str(req, "Authorization", buf, buf_len) == ESP_OK) {
-                ESP_LOGI(TAG, "Found header => Authorization: %s", buf);
-            } else {
-                ESP_LOGE(TAG, "No auth value received");
-            }
-
-            char *auth_credentials = http_auth_basic(basic_auth_info.username, basic_auth_info.password);
-            if (!auth_credentials) {
-                ESP_LOGE(TAG, "No enough memory for basic authorization credentials");
-                free(buf);
-                return ESP_ERR_NO_MEM;
-            }
-
-            if (strncmp(auth_credentials, buf, buf_len)) {
-                ESP_LOGE(TAG, "Not authenticated");
-                httpd_resp_set_status(req, HTTPD_401);
-                httpd_resp_set_type(req, HTTPD_TYPE_TEXT);
-                httpd_resp_set_hdr(req, "Connection", "keep-alive");
-                httpd_resp_set_hdr(req, "WWW-Authenticate", "Basic realm=\"AIOTED\"");
-                httpd_resp_send(req, unauthorized, strlen(unauthorized));
-            } else {
-                ESP_LOGI(TAG, "Authenticated calling http handler now!");
-                ret=original_handler(req);
-            }
-            free(auth_credentials);
-            free(buf);
-        } else {
-            ESP_LOGE(TAG, "No auth header received");
-            httpd_resp_set_status(req, HTTPD_401);
-            httpd_resp_set_type(req, HTTPD_TYPE_TEXT);
-            httpd_resp_set_hdr(req, "Connection", "keep-alive");
-            httpd_resp_set_hdr(req, "WWW-Authenticate", "Basic realm=\"AIOTED\"");
-            httpd_resp_send(req, unauthorized, strlen(unauthorized));
-        }
-    }
-
-    return ret;
-}

code/components/jomjol_wlan/basic_auth.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <esp_http_server.h>
-
-void init_basic_auth();
-esp_err_t basic_auth_request_filter(httpd_req_t *req, esp_err_t original_handler(httpd_req_t *));
-
-#define APPLY_BASIC_AUTH_FILTER(method) [](httpd_req_t *req){ return basic_auth_request_filter(req, method); }

code/components/jomjol_wlan/connect_wlan.cpp

@@ -49,9 +49,6 @@
 #define ets_delay_us(a) esp_rom_delay_us(a)
 #endif
 
-#include "../esp-protocols/components/mdns/include/mdns.h" 
-
-
 static const char *TAG = "WIFI";
 
 static bool APWithBetterRSSI = false;
@@ -483,8 +480,7 @@ 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) + "), retrying after 5s");
-			vTaskDelay(5000 / portTICK_PERIOD_MS); // Delay between the reconnections
+													 std::to_string(disconn->reason) + "), still retrying...");
 		}
 	}	
 	else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_CONNECTED) 
@@ -660,14 +656,6 @@ esp_err_t wifi_init_sta(void)
         else {
 			LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Set hostname to: " + wlan_config.hostname);
         }
-		//initialize mDNS service
-        retval = mdns_init();
-        if (retval != ESP_OK) {
-            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "mdns_init failed! Error: "  + std::to_string(retval));
-        } else {
-			//set mdns hostname
-			mdns_hostname_set(wlan_config.hostname.c_str());
-	    }
     }
 
     LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Init successful");

code/components/jomjol_wlan/read_wlanini.cpp

@@ -145,29 +145,6 @@ int LoadWlanFromFile(std::string fn)
                 wlan_config.dns = tmp;
                 LogFile.WriteToFile(ESP_LOG_INFO, TAG, "DNS: " + wlan_config.dns);
             }
-
-            else if ((splitted.size() > 1) && (toUpper(splitted[0]) == "HTTP_USERNAME")){
-                tmp = splitted[1];
-                if ((tmp[0] == '"') && (tmp[tmp.length()-1] == '"')){
-                    tmp = tmp.substr(1, tmp.length()-2);
-                }
-                wlan_config.http_username = tmp;
-                LogFile.WriteToFile(ESP_LOG_INFO, TAG, "HTTP_USERNAME: " + wlan_config.http_username);
-            }
-
-            else if ((splitted.size() > 1) && (toUpper(splitted[0]) == "HTTP_PASSWORD")){
-                tmp = splitted[1];
-                if ((tmp[0] == '"') && (tmp[tmp.length()-1] == '"')){
-                    tmp = tmp.substr(1, tmp.length()-2);
-                }
-                wlan_config.http_password = tmp;
-                #ifndef __HIDE_PASSWORD
-                LogFile.WriteToFile(ESP_LOG_INFO, TAG, "HTTP_PASSWORD: " + wlan_config.http_password);
-                #else
-                LogFile.WriteToFile(ESP_LOG_INFO, TAG, "HTTP_PASSWORD: XXXXXXXX");
-                #endif
-            }
-
             #if (defined WLAN_USE_ROAMING_BY_SCANNING || (defined WLAN_USE_MESH_ROAMING && defined WLAN_USE_MESH_ROAMING_ACTIVATE_CLIENT_TRIGGERED_QUERIES))
             else if ((splitted.size() > 1) && (toUpper(splitted[0]) == "RSSITHRESHOLD")){
                 tmp = trim(splitted[1]);

code/components/jomjol_wlan/read_wlanini.h

@@ -13,8 +13,6 @@ struct wlan_config {
     std::string gateway = "";
     std::string netmask = "";
     std::string dns = "";
-    std::string http_username = "";
-    std::string http_password = "";
     int rssi_threshold = 0;                 // Default: 0 -> ROAMING disabled
 };
 extern struct wlan_config wlan_config;

code/components/openmetrics/CMakeLists.txt

@@ -1,7 +0,0 @@
-FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*)
-
-idf_component_register(SRCS ${app_sources}
-                    INCLUDE_DIRS "."
-                    REQUIRES jomjol_image_proc)
-
-

code/components/openmetrics/openmetrics.cpp

@@ -1,102 +0,0 @@
-#include "openmetrics.h"
-#include "functional"
-#include "esp_log.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";
-}
-
-typedef struct sequence_metric {
-    const char *name;
-    const char *help;
-    const char *type;
-    std::function<std::string(NumberPost *number)> valueFunc;
-} sequence_metric_t;
-
-
-sequence_metric_t sequenceMetrics[4] = {
-    { "flow_value",     "current value of meter readout",     "gauge", [](NumberPost *number)-> std::string {return number->ReturnValue;} },
-    { "flow_raw_value", "current raw value of meter readout", "gauge", [](NumberPost *number)-> std::string {return number->ReturnRawValue;} },
-    { "flow_pre_value", "previous value of meter readout",    "gauge", [](NumberPost *number)-> std::string {return number->ReturnPreValue;} },
-    { "flow_error",     "Error message text != 'no error'",   "gauge", [](NumberPost *number)-> std::string {return number->ErrorMessageText.compare("no error") == 0 ? "0" : "1";} },
-};
-
-std::string createSequenceMetrics(std::string prefix, const std::vector<NumberPost *> &numbers)
-{
-    std::string result;
-    for (int i = 0; i<sizeof(sequenceMetrics)/sizeof(sequence_metric_t);i++) 
-    {
-        std::string res;
-        for (const auto &number : numbers)
-        {
-            std::string value = sequenceMetrics[i].valueFunc(number); 
-            if (value.find("N") != std::string::npos) {
-                value = "NaN";
-            }
-            ESP_LOGD("METRICS", "metric=%s, name=%s, value = %s ",sequenceMetrics[i].name,number->name.c_str(), value.c_str());
-
-            // only valid data is reported (https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#missing-data)
-            if (value.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 + "_" + sequenceMetrics[i].name + "{sequence=\"" + label + "\"} " + value + "\n";
-            }
-        }
-        // prepend metadata if a valid metric was created
-        if (res.length() > 0)
-        {
-            res = "# HELP " + prefix + "_" + sequenceMetrics[i].name + " " + sequenceMetrics[i].help + "\n"
-                + "# TYPE " + prefix + "_" + sequenceMetrics[i].name + " " + sequenceMetrics[i].type + "\n"
-                + res;
-        }
-        result += res;
-    }
-
-    return result;
-}
-
-/**
- * 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;
-}
-*/

code/components/openmetrics/openmetrics.h

@@ -1,15 +0,0 @@
-#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

code/dependencies.lock

@@ -1,15 +1,3 @@
-dependencies:
-  espressif/esp-nn:
-    component_hash: f6f2851ce82137a66e4265071c9b852bbe0130b882a18dea9f03faea7bf1295a
-    source:
-      service_url: https://api.components.espressif.com/
-      type: service
-    version: 1.1.0
-  idf:
-    component_hash: null
-    source:
-      type: idf
-    version: 5.3.1
-manifest_hash: f88c9e5c2d75a9d5d6968fc67a90ef0cd7146dd6a3905a79c4dfcfc3b4fe6731
+manifest_hash: 63f5c6c9f0bcebc7b9ca12d2aa8b26b2c5f5218d377dc4b2375d9b9ca1df7815
 target: esp32
-version: 1.0.0
+version: 1.0.0