Update changelog (consolidate all RC changes into one) (#3614)

* Update changelog (consolidate all RC changes into one)

* Update Changelog.md

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>
Co-authored-by: jomjol <mueller.josef@gmail.com>

.github/label-commenter-config.yaml

@@ -115,9 +115,9 @@
     labeled:
       issue:
           body: |
-            See [Digital Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
+            See [Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
             If your type is not contained it can be added to our training material, see [here](https://jomjol.github.io/AI-on-the-edge-device-docs/collect-new-images/).
       discussion:
           body: |
-            See [Digital Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
+            See [Digits](https://jomjol.github.io/neural-network-digital-counter-readout) resp. [Analogue Pointers](https://jomjol.github.io/neural-network-analog-needle-readout) for an overview of all trained data.
             If your type is not contained it can be added to our training material, see [here](https://jomjol.github.io/AI-on-the-edge-device-docs/collect-new-images/).

.github/workflows/build.yaml

@@ -14,7 +14,7 @@ jobs:
       uses: fkirc/skip-duplicate-actions@v5
       with:
         concurrent_skipping: same_content_newer
-    
+
     - uses: actions/checkout@v4
       with:
         submodules: recursive
@@ -37,14 +37,14 @@ jobs:
         path: ~/.platformio
         key: platformio-${{ github.run_id }}
         restore-keys: platformio # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-          
+
     - name: Update Build cache on every commit
       uses: actions/cache@v4
       with:
         path: ./code/.pio/
         key: build-${{ github.run_id }}
         restore-keys: build # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-          
+
     - name: Update generated-files cache on every commit
       uses: actions/cache@v4
       with:
@@ -53,6 +53,7 @@ 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          
 
@@ -83,10 +84,25 @@ jobs:
         cd ../..
 
         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' {} \;
+        rm -f ./html/edit_config_template.html # Remove the config page template, it is no longer needed
         
+        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/
 
 #########################################################################################
 ## Pack for Update
@@ -97,6 +113,7 @@ jobs:
     #  - /firmware.bin
     #  - (optional) /html/* (inkl. subfolders)
     #  - (optional) /config/*.tfl
+    #  - (optional) /demo/*
     runs-on: ubuntu-latest
     needs: build
 
@@ -111,6 +128,7 @@ 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
 
@@ -120,7 +138,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: |
@@ -135,6 +153,9 @@ 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: |
@@ -150,7 +171,6 @@ jobs:
         path: ./update/*
 
 
-
 #########################################################################################
 ## Pack for Remote Setup 
 #########################################################################################
@@ -159,6 +179,7 @@ jobs:
     # remote_setup__version.zip file with following content:
     #  - /firmware.bin
     #  - /html/* (inkl. subfolders)
+    #  - /demo/*
     #  - /config/*
     runs-on: ubuntu-latest
     needs: build
@@ -174,9 +195,10 @@ 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:
@@ -198,6 +220,9 @@ 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/
@@ -230,6 +255,7 @@ 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
 
@@ -258,10 +284,12 @@ 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
-        cd sd-card; zip -r ../manual_setup/sd-card.zip *; cd ..
+        cp -r ./demo ./sd-card/
+        cd sd-card; rm -rf html/param-tooltips; 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:
@@ -272,7 +300,7 @@ jobs:
 #########################################################################################
 ## Prepare and create release
 #########################################################################################
-  release: 
+  prepare-release: 
     runs-on: ubuntu-latest
     needs: [pack-for-update, pack-for-manual_setup, pack-for-remote_setup]
     if: startsWith(github.ref, 'refs/tags/') 
@@ -285,21 +313,21 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    
+
     - name: Update update cache on every commit
       uses: actions/cache@v4
       with:
         path: update
         key: update-${{ github.run_id }}
         restore-keys: update # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-    
+
     - name: Update remote_setup cache on every commit
       uses: actions/cache@v4
       with:
         path: remote_setup
         key: remote_setup-${{ github.run_id }}
         restore-keys: remote_setup # This matches above key as it is only used as a prefix. it the restores the nearest cache, see https://github.com/restore-keys:/blob/main/tips-and-workarounds.md#update-a-cache
-    
+
     - name: Update manual_setup cache on every commit
       uses: actions/cache@v4
       with:
@@ -332,21 +360,18 @@ jobs:
 
     # extract the version used in next step
     - id: get_version
-      if: startsWith(github.ref, 'refs/tags/') 
-      uses: Simply007/get-version-action@v2
+      uses: drewg13/get-version-action@98dda2a47a257e202c2e6c2ed2e6072ec23f448e
 
 #    # the changelog [unreleased] will now be changed to the release version
 #    - name: Update changelog
 #      uses: thomaseizinger/keep-a-changelog-new-release@v1
-#      if: startsWith(github.ref, 'refs/tags/') 
 #      with:
 #        changelogPath: Changelog.md
 #        version: ${{ steps.get_version.outputs.version-without-v }}
-            
+
 #    # the release notes will be extracted from changelog 
 #    - name: Extract release notes
 #      id: extract-release-notes
-#      if: startsWith(github.ref, 'refs/tags/') 
 #      uses: ffurrer2/extract-release-notes@v1
 #      with:
 #          changelog_file: Changelog.md
@@ -354,12 +379,11 @@ jobs:
     # Releases should only be created on master by tagging the last commit.
     # all artifacts in firmware folder pushed to the release
     - name: Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2.0.8
       # Note:
       # If you get the error "Resource not accessible by integration",
       # The access rights are not sufficient, see
       # https://github.com/softprops/action-gh-release/issues/232#issuecomment-1131379440
-      if: startsWith(github.ref, 'refs/tags/')
       with:
         name:  ${{ steps.get_version.outputs.version-without-v }}
         body: ${{ steps.extract-release-notes.outputs.release_notes }}
@@ -368,7 +392,6 @@ jobs:
 
 #    # Commit&Push Changelog to master branch. Must be manually merged back to rolling
 #    - name: Commit changes and push changes
-#      if: startsWith(github.ref, 'refs/tags/') 
 #      run: |
 #        git config user.name github-actions
 #        git config user.email github-actions@github.com
@@ -381,8 +404,9 @@ jobs:
 ## Update the Web Installer on a release
 #########################################################################################
 # Make sure to also update update-webinstaller.yml!
-  update-web-installer:    
-    needs: [release]
+  update-web-installer:
+    if: github.event_name == 'release' && github.event.action == 'published' # Only run on release but not on prerelease
+    needs: [prepare-release]
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
@@ -397,25 +421,27 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-      
+
     - name: Get version of last release
       id: last_release
-      uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
+      uses: joutvhu/get-release@v1
       with:
-        myToken: ${{ github.token }}
-        exclude_types: "draft|prerelease"
-        view_top: 1     
-      
+        latest: true
+        prerelease: false
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}   
+
     - name: Add binary to Web Installer and update manifest
       run: |
         echo "Updating Web installer to use firmware from ${{ steps.last_release.outputs.tag_name }}..."
         rm -f docs/binary/firmware.bin
-        wget https://github.com/jomjol/AI-on-the-edge-device/releases/download/${{ steps.last_release.outputs.tag_name }}/AI-on-the-edge-device__update__${{ steps.last_release.outputs.tag_name }}.zip
+        wget ${{ github.server_url }}/${{ github.repository }}/releases/download/${{ steps.last_release.outputs.tag_name }}/AI-on-the-edge-device__update__${{ steps.last_release.outputs.tag_name }}.zip
         unzip AI-on-the-edge-device__update__${{ steps.last_release.outputs.tag_name }}.zip
         cp -f firmware.bin docs/binary/firmware.bin
         echo "Updating index and manifest file..."
         sed -i 's/$VERSION/${{ steps.last_release.outputs.tag_name }}/g' docs/index.html
         sed -i 's/$VERSION/${{ steps.last_release.outputs.tag_name }}/g' docs/manifest.json
+
     - name: Setup Pages
       uses: actions/configure-pages@v4
 
@@ -426,4 +452,4 @@ jobs:
 
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v4
+      uses: actions/deploy-pages@v3  # Note: v4 does not work!

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

@@ -0,0 +1,21 @@
+# 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.yaml

@@ -12,7 +12,7 @@ on:
 #    - rolling
 #    paths:
 #    - docs # The path filter somehow does not work, so lets run it on every change to rolling
-      
+
 jobs:
   manually-update-web-installer:    
     environment:
@@ -32,12 +32,13 @@ jobs:
       
     - name: Get version of last release
       id: last_release
-      uses: mindojo/get-latest-release@0b8ef1434d7468d6bffcc8263baff5c777f72321
+      uses: joutvhu/get-release@v1
       with:
-        myToken: ${{ github.token }}
-        exclude_types: "draft|prerelease"
-        view_top: 1     
-      
+        latest: true
+        prerelease: false
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Add binary to Web Installer and update manifest
       run: |
         echo "Updating Web installer to use firmware from ${{ steps.last_release.outputs.tag_name }}..."
@@ -50,14 +51,13 @@ jobs:
         sed -i 's/$VERSION/${{ steps.last_release.outputs.tag_name }}/g' docs/manifest.json
 
     - name: Setup Pages
-      uses: actions/configure-pages@v2
+      uses: actions/configure-pages@v5
 
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@v1
+      uses: actions/upload-pages-artifact@v3
       with:
         path: 'docs'
 
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v1   
-  
+      uses: actions/deploy-pages@v4 

.github/workflows/reply-bot.yaml

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

.gitmodules

@@ -10,3 +10,6 @@
 [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

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 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.
+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.
 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 on the next picture..
+for example see Roi in the next picture..
 ![grafik](https://user-images.githubusercontent.com/38385805/207858812-2a6ba41d-1a8c-4fa1-9b6a-53cdd113c106.png)
-in case of position change between the measurments set this state to true, if there is no change set it back to false.
+in case of position change between the measurements 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..
-haveing this state in the mqtt broker can trigger functions like closing the ater pipe walve and so on...
+having this state in the mqtt broker can trigger functions like closing the water pipe valve and so on...
 
 
 
@@ -65,7 +65,7 @@ haveing this state in the mqtt broker can trigger functions like closing the ate
 
 #### #31 Implement InfluxDB v2.x interface
 
-* Currently only InfluxDB v1.x is supportet, extend to v2.x
+* Currently only InfluxDB v1.x is supported, 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 @@ haveing this state in the mqtt broker can trigger functions like closing the ate
 #### #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 configuratioin of ROI
+* Implement a error message for wrong configuration of ROI
 
 #### #27 Use Homie Spec for Mqtt binding
 

Licence.md

@@ -0,0 +1,68 @@
+# **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,108 +1,681 @@
-# Welcome to the AI-on-the-edge-device
-<img src="images/icon/watermeter.svg" width="100px">
+<h1 align="center">AI on the Edge Device: Digitizing Your non-digital meters with an ESP32-CAM</h1>
+<br>
+<br>
 
-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**.
+## 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)
 
-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"> 
+<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>
 
 
-## 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)
 
-A lot of people created useful Youtube videos which might help you getting started.
-Here a small selection:
+[![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/)
 
-- [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)
+<p align="center" id="top">
+  <img src="images/icon/watermeter.svg" width="150px">
+</p>
 
-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).
+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.
 
-### Download
+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 🔽
 The latest available version can be found on the [Releases page](https://github.com/jomjol/AI-on-the-edge-device/releases).
 
-### 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).
+---
+
+<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).
 
 There are different ways to flash your ESP32:
-- The prefered way is the [Web Installer and Console](https://jomjol.github.io/AI-on-the-edge-device/index.html) which is a browser-based tool to flash the ESP32 and extract the log over USB:
-![](images/web-installer.png)
+- 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)
 - 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!
+---
 
-## 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)
+<br>
 
-## 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).
+## 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).
 
-<a href="https://www.paypal.com/donate?hosted_button_id=8TRSVYNYKDSWL"><img border="0" src="images/paypal.png" width="200px" target="_blank"></a>
+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.
 
-## 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).
+---
 
-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">
+<br>
 
-## Changes and History 
-See [Changelog](Changelog.md).
+## 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)
 
-## Build It Yourself
-See [Build Instructions](code/README.md).
+---
 
-## 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/)
+<br>
 
-## 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).
+## 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>

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)
+list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common components/esp-tflite-micro components/esp-protocols/components/mdns)
 
 ADD_CUSTOM_COMMAND(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.cpp

code/components/esp-fatfs/CMakeLists.txt

@@ -1,18 +0,0 @@
-set(srcs "diskio/diskio_mh.c"
-         "diskio/diskio_rawflash_mh.c"
-         "diskio/diskio_sdmmc_mh.c"
-         "diskio/diskio_wl_mh.c"
-         "src/ff_mh.c"
-         "port/freertos/ffsystem_mh.c"
-         "src/ffunicode_mh.c"
-         "vfs/vfs_fat_mh.c"
-         "vfs/vfs_fat_sdmmc_mh.c"
-         "vfs/vfs_fat_spiflash_mh.c")
-
-idf_component_register(SRCS ${srcs}
-                       INCLUDE_DIRS "." diskio vfs src
-                       REQUIRES wear_levelling esp-sdmmc
-                       PRIV_REQUIRES vfs spi_flash
-                      )
-
-target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

code/components/esp-fatfs/README.md

@@ -1,278 +0,0 @@
-# AIOTED related changes, see https://github.com/jomjol/AI-on-the-edge-device/pull/2781
-These files/folders were copied from `framework-espidf@3.50002.230601/components/` and adapted to our own needs.
-Since not every SD/MMC was recognized and this was due to the implementation of ATA trim support, this was revised.
-Furthermore, files that we don't need were deleted from it.
-
-## The most relevant changes are:
-### fatfs/diskio/diskio_sdmmc.c
-DRESULT ff_sdmmc_ioctl (BYTE pdrv, BYTE cmd, void* buff), at lines 106 to 110 changed from:
-```c
-#if FF_USE_TRIM
-        case CTRL_TRIM:
-            return ff_sdmmc_trim (pdrv, *((DWORD*)buff), //start_sector
-                    (*((DWORD*)buff + 1) - *((DWORD*)buff) + 1)); //sector_count
-#endif //FF_USE_TRIM
-```
-to:
-```c
-#if (FF_USE_TRIM)
-        case CTRL_TRIM:
-            if(FF_CAN_TRIM){
-                return ff_sdmmc_trim (pdrv, *((DWORD*)buff), //start_sector
-                    (*((DWORD*)buff + 1) - *((DWORD*)buff) + 1)); //sector_count
-            }
-            else{
-                return RES_ERROR;
-            }
-#endif //FF_USE_TRIM
-```
-
-### fatfs/src/ff.c
-added:
-```c
-#include "sdmmc_cmd.h"
-```
-
-static FRESULT remove_chain(FFOBJID* obj, DWORD clst, DWORD pclst), at lines 1437 to 1454 changed from:
-```c
-#if FF_FS_EXFAT || FF_USE_TRIM
-		if (ecl + 1 == nxt) {	/* Is next cluster contiguous? */
-			ecl = nxt;
-		} else {				/* End of contiguous cluster block */
-#if FF_FS_EXFAT
-			if (fs->fs_type == FS_EXFAT) {
-				res = change_bitmap(fs, scl, ecl - scl + 1, 0);	/* Mark the cluster block 'free' on the bitmap */
-				if (res != FR_OK) return res;
-			}
-#endif
-#if FF_USE_TRIM
-			rt[0] = clst2sect(fs, scl);					/* Start of data area to be freed */
-			rt[1] = clst2sect(fs, ecl) + fs->csize - 1;	/* End of data area to be freed */
-			disk_ioctl(fs->pdrv, CTRL_TRIM, rt);		/* Inform storage device that the data in the block may be erased */
-#endif
-			scl = ecl = nxt;
-		}
-#endif
-```
-
-to:
-```c
-#if FF_FS_EXFAT || FF_USE_TRIM
-		if(FF_FS_EXFAT || FF_CAN_TRIM){
-			if (ecl + 1 == nxt) {	/* Is next cluster contiguous? */
-				ecl = nxt;
-			} 
-			else {				/* End of contiguous cluster block */
-#if FF_FS_EXFAT
-				if (fs->fs_type == FS_EXFAT) {
-					res = change_bitmap(fs, scl, ecl - scl + 1, 0);	/* Mark the cluster block 'free' on the bitmap */
-					if (res != FR_OK) return res;
-				}
-#endif
-#if FF_USE_TRIM
-				if(FF_CAN_TRIM){
-					rt[0] = clst2sect(fs, scl);					/* Start of data area to be freed */
-					rt[1] = clst2sect(fs, ecl) + fs->csize - 1;	/* End of data area to be freed */
-					disk_ioctl(fs->pdrv, CTRL_TRIM, rt);		/* Inform storage device that the data in the block may be erased */
-				}
-#endif
-				scl = ecl = nxt;
-			}
-		}
-#endif
-```
-
-FRESULT f_mkfs(const TCHAR* path, const MKFS_PARM* opt, void* work, UINT len), at lines 5946 to 5949 changed from:
-```c
-#if FF_USE_TRIM
-		lba[0] = b_vol; lba[1] = b_vol + sz_vol - 1;	/* Inform storage device that the volume area may be erased */
-		disk_ioctl(pdrv, CTRL_TRIM, lba);
-#endif
-```
-to:
-```c
-#if FF_USE_TRIM
-		if(FF_CAN_TRIM){
-			lba[0] = b_vol; lba[1] = b_vol + sz_vol - 1;	/* Inform storage device that the volume area may be erased */
-			disk_ioctl(pdrv, CTRL_TRIM, lba);
-		}
-#endif
-```
-
-FRESULT f_mkfs(const TCHAR* path, const MKFS_PARM* opt, void* work, UINT len), at lines 6175 to 6178 changed from:
-```c
-#if FF_USE_TRIM
-		lba[0] = b_vol; lba[1] = b_vol + sz_vol - 1;	/* Inform storage device that the volume area may be erased */
-		disk_ioctl(pdrv, CTRL_TRIM, lba);
-#endif
-```
-to:
-```c
-#if FF_USE_TRIM
-		if(FF_CAN_TRIM){
-			lba[0] = b_vol; lba[1] = b_vol + sz_vol - 1;	/* Inform storage device that the volume area may be erased */
-			disk_ioctl(pdrv, CTRL_TRIM, lba);
-		}
-#endif
-```
-
-### sdmmc/sdmmc_cmd.c
-added:
-```c
-int FF_CAN_TRIM = 0;
-```
-
-esp_err_t sdmmc_can_trim(sdmmc_card_t* card), at lines 630 to 636 changed from:
-```c
-esp_err_t sdmmc_can_trim(sdmmc_card_t* card)
-{
-    if ((card->is_mmc) && (card->ext_csd.sec_feature & EXT_CSD_SEC_GB_CL_EN)) {
-        return ESP_OK;
-    }
-    return ESP_FAIL;
-}
-```
-to:
-```c
-esp_err_t sdmmc_can_trim(sdmmc_card_t* card)
-{
-    if ((card->is_mmc) && (card->ext_csd.sec_feature & EXT_CSD_SEC_GB_CL_EN)) {
-        FF_CAN_TRIM = 1;
-        return ESP_OK;
-    }
-    FF_CAN_TRIM = 0;
-    return ESP_FAIL;
-}
-```
-
-### sdmmc/include/sdmmc_cmd.h
-
-added:
-```c
-extern int FF_CAN_TRIM;
-```
-
-# Espressif IoT Development Framework
-
-* [中文版](./README_CN.md)
-
-ESP-IDF is the development framework for Espressif SoCs supported on Windows, Linux and macOS.
-
-# ESP-IDF Release Support Schedule
-
-![Support Schedule](https://dl.espressif.com/dl/esp-idf/support-periods.svg)
-
-- Please read [the support policy](SUPPORT_POLICY.md) and [the documentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html) for more information about ESP-IDF versions.
-- Please see the [End-of-Life Advisories](https://www.espressif.com/en/support/documents/advisories?keys=&field_type_of_advisory_tid%5B%5D=817) for information about ESP-IDF releases with discontinued support.
-
-# ESP-IDF Release and SoC Compatibility
-
-The following table shows ESP-IDF support of Espressif SoCs where ![alt text][preview] and ![alt text][supported] denote preview status and support, respectively. The preview support is usually limited in time and intended for beta versions of chips. Please use an ESP-IDF release where the desired SoC is already supported.
-
-|Chip         |          v4.1         |          v4.2          |         v4.3           |          v4.4          |          v5.0          |                                                                                      |
-|:----------- |:---------------------:| :---------------------:| :---------------------:| :---------------------:| :---------------------:|:------------------------------------------------------------------------------------ |
-|ESP32        |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                                                      |
-|ESP32-S2     |                       | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                                                      |
-|ESP32-C3     |                       |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                                                      |
-|ESP32-S3     |                       |                        |                        | ![alt text][supported] | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32_S3)                           |
-|ESP32-C2     |                       |                        |                        |                        | ![alt text][supported] | [Announcement](https://blog.espressif.com/esp32-c2-and-why-it-matter-s-bcf4d7d0b2c6) |
-|ESP32-H2     |                       |                        |                        | ![alt text][preview]   | ![alt text][preview]   | [Announcement](https://www.espressif.com/en/news/ESP32_H2)                           |
-
-[supported]: https://img.shields.io/badge/-supported-green "supported"
-[preview]: https://img.shields.io/badge/-preview-orange "preview"
-
-Espressif SoCs released before 2016 (ESP8266 and ESP8285) are supported by [RTOS SDK](https://github.com/espressif/ESP8266_RTOS_SDK) instead.
-
-# Developing With ESP-IDF
-
-## Setting Up ESP-IDF
-
-See https://idf.espressif.com/ for links to detailed instructions on how to set up the ESP-IDF depending on chip you use.
-
-**Note:** Each SoC series and each ESP-IDF release has its own documentation. Please see Section [Versions](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html) on how to find documentation and how to checkout specific release of ESP-IDF.
-
-### Non-GitHub forks
-
-ESP-IDF uses relative locations as its submodules URLs ([.gitmodules](.gitmodules)). So they link to GitHub. If ESP-IDF is forked to a Git repository which is not on GitHub, you will need to run the script [tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh) after git clone.
-
-The script sets absolute URLs for all submodules, allowing `git submodule update --init --recursive` to complete. If cloning ESP-IDF from GitHub, this step is not needed.
-
-## Finding a Project
-
-As well as the [esp-idf-template](https://github.com/espressif/esp-idf-template) project mentioned in Getting Started, ESP-IDF comes with some example projects in the [examples](examples) directory.
-
-Once you've found the project you want to work with, change to its directory and you can configure and build it.
-
-To start your own project based on an example, copy the example project directory outside of the ESP-IDF directory.
-
-# Quick Reference
-
-See the Getting Started guide links above for a detailed setup guide. This is a quick reference for common commands when working with ESP-IDF projects:
-
-## Setup Build Environment
-
-(See the Getting Started guide listed above for a full list of required steps with more details.)
-
-* Install host build dependencies mentioned in the Getting Started guide.
-* Run the install script to set up the build environment. The options include `install.bat` or `install.ps1` for Windows, and `install.sh` or `install.fish` for Unix shells.
-* Run the export script on Windows (`export.bat`) or source it on Unix (`source export.sh`) in every shell environment before using ESP-IDF.
-
-## Configuring the Project
-
-* `idf.py set-target <chip_name>` sets the target of the project to `<chip_name>`. Run `idf.py set-target` without any arguments to see a list of supported targets.
-* `idf.py menuconfig` opens a text-based configuration menu where you can configure the project.
-
-## Compiling the Project
-
-`idf.py build`
-
-... will compile app, bootloader and generate a partition table based on the config.
-
-## Flashing the Project
-
-When the build finishes, it will print a command line to use esptool.py to flash the chip. However you can also do this automatically by running:
-
-`idf.py -p PORT flash`
-
-Replace PORT with the name of your serial port (like `COM3` on Windows, `/dev/ttyUSB0` on Linux, or `/dev/cu.usbserial-X` on MacOS. If the `-p` option is left out, `idf.py flash` will try to flash the first available serial port.
-
-This will flash the entire project (app, bootloader and partition table) to a new chip. The settings for serial port flashing can be configured with `idf.py menuconfig`.
-
-You don't need to run `idf.py build` before running `idf.py flash`, `idf.py flash` will automatically rebuild anything which needs it.
-
-## Viewing Serial Output
-
-The `idf.py monitor` target uses the [idf_monitor tool](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html) to display serial output from Espressif SoCs. idf_monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
-
-Exit the monitor by typing Ctrl-].
-
-To build, flash and monitor output in one pass, you can run:
-
-`idf.py flash monitor`
-
-## Compiling & Flashing Only the App
-
-After the initial flash, you may just want to build and flash just your app, not the bootloader and partition table:
-
-* `idf.py app` - build just the app.
-* `idf.py app-flash` - flash just the app.
-
-`idf.py app-flash` will automatically rebuild the app if any source files have changed.
-
-(In normal development there's no downside to reflashing the bootloader and partition table each time, if they haven't changed.)
-
-## Erasing Flash
-
-The `idf.py flash` target does not erase the entire flash contents. However it is sometimes useful to set the device back to a totally erased state, particularly when making partition table changes or OTA app updates. To erase the entire flash, run `idf.py erase-flash`.
-
-This can be combined with other targets, ie `idf.py -p PORT erase-flash flash` will erase everything and then re-flash the new app, bootloader and partition table.
-
-# Resources
-
-* Documentation for the latest version: https://docs.espressif.com/projects/esp-idf/. This documentation is built from the [docs directory](docs) of this repository.
-
-* The [esp32.com forum](https://esp32.com/) is a place to ask questions and find community resources.
-
-* [Check the Issues section on github](https://github.com/espressif/esp-idf/issues) if you find a bug or have a feature request. Please check existing Issues before opening a new one.
-
-* If you're interested in contributing to ESP-IDF, please check the [Contributions Guide](https://docs.espressif.com/projects/esp-idf/en/latest/contribute/index.html).

code/components/esp-fatfs/diskio/diskio_impl_mh.h

@@ -1,72 +0,0 @@
-// Copyright 2017-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-typedef unsigned int UINT;
-typedef unsigned char BYTE;
-typedef uint32_t DWORD;
-
-#define FF_DRV_NOT_USED 0xFF
-
-#include "diskio_mh.h"
-#include "esp_err.h"
-
-/**
- * Structure of pointers to disk IO driver functions.
- *
- * See FatFs documentation for details about these functions
- */
-typedef struct {
-    DSTATUS (*init) (unsigned char pdrv);    /*!< disk initialization function */
-    DSTATUS (*status) (unsigned char pdrv);  /*!< disk status check function */
-    DRESULT (*read) (unsigned char pdrv, unsigned char* buff, uint32_t sector, unsigned count);  /*!< sector read function */
-    DRESULT (*write) (unsigned char pdrv, const unsigned char* buff, uint32_t sector, unsigned count);   /*!< sector write function */
-    DRESULT (*ioctl) (unsigned char pdrv, unsigned char cmd, void* buff); /*!< function to get info about disk and do some misc operations */
-} ff_diskio_impl_t;
-
-/**
- * Register or unregister diskio driver for given drive number.
- *
- * When FATFS library calls one of disk_xxx functions for driver number pdrv,
- * corresponding function in discio_impl for given pdrv will be called.
- *
- * @param pdrv drive number
- * @param discio_impl   pointer to ff_diskio_impl_t structure with diskio functions
- *                      or NULL to unregister and free previously registered drive
- */
-void ff_diskio_register(BYTE pdrv, const ff_diskio_impl_t* discio_impl);
-
-#define ff_diskio_unregister(pdrv_) ff_diskio_register(pdrv_, NULL)
-
-
-/**
- * Get next available drive number
- *
- * @param   out_pdrv            pointer to the byte to set if successful
- *
- * @return  ESP_OK              on success
- *          ESP_ERR_NOT_FOUND   if all drives are attached
- */
-esp_err_t ff_diskio_get_drive(BYTE* out_pdrv);
-
-
-#ifdef __cplusplus
-}
-#endif

code/components/esp-fatfs/diskio/diskio_mh.c

@@ -1,117 +0,0 @@
-/*-----------------------------------------------------------------------*/
-/* Low level disk I/O module skeleton for FatFs     (C)ChaN, 2016        */
-/* ESP-IDF port Copyright 2016 Espressif Systems (Shanghai) PTE LTD      */
-/*-----------------------------------------------------------------------*/
-/* If a working storage control module is available, it should be        */
-/* attached to the FatFs via a glue function rather than modifying it.   */
-/* This is an example of glue functions to attach various exsisting      */
-/* storage control modules to the FatFs module with a defined API.       */
-/*-----------------------------------------------------------------------*/
-
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include "diskio_impl_mh.h"
-#include "ffconf_mh.h"
-#include "ff_mh.h"
-
-static ff_diskio_impl_t * s_impls[FF_VOLUMES] = { NULL };
-
-#if FF_MULTI_PARTITION		/* Multiple partition configuration */
-const PARTITION VolToPart[FF_VOLUMES] = {
-    {0, 0},    /* Logical drive 0 ==> Physical drive 0, auto detection */
-    {1, 0},    /* Logical drive 1 ==> Physical drive 1, auto detection */
-#if FF_VOLUMES > 2
-    {2, 0},     /* Logical drive 2 ==> Physical drive 2, auto detection */
-#endif
-#if FF_VOLUMES > 3
-    {3, 0},     /* Logical drive 3 ==> Physical drive 3, auto detection */
-#endif
-#if FF_VOLUMES > 4
-    {4, 0},     /* Logical drive 4 ==> Physical drive 4, auto detection */
-#endif
-#if FF_VOLUMES > 5
-    {5, 0},     /* Logical drive 5 ==> Physical drive 5, auto detection */
-#endif
-#if FF_VOLUMES > 6
-    {6, 0},     /* Logical drive 6 ==> Physical drive 6, auto detection */
-#endif
-#if FF_VOLUMES > 7
-    {7, 0},     /* Logical drive 7 ==> Physical drive 7, auto detection */
-#endif
-#if FF_VOLUMES > 8
-    {8, 0},     /* Logical drive 8 ==> Physical drive 8, auto detection */
-#endif
-#if FF_VOLUMES > 9
-    {9, 0},     /* Logical drive 9 ==> Physical drive 9, auto detection */
-#endif
-};
-#endif
-
-esp_err_t ff_diskio_get_drive(BYTE* out_pdrv)
-{
-    BYTE i;
-    for(i=0; i<FF_VOLUMES; i++) {
-        if (!s_impls[i]) {
-            *out_pdrv = i;
-            return ESP_OK;
-        }
-    }
-    return ESP_ERR_NOT_FOUND;
-}
-
-void ff_diskio_register(BYTE pdrv, const ff_diskio_impl_t* discio_impl)
-{
-    assert(pdrv < FF_VOLUMES);
-
-    if (s_impls[pdrv]) {
-        ff_diskio_impl_t* im = s_impls[pdrv];
-        s_impls[pdrv] = NULL;
-        free(im);
-    }
-
-    if (!discio_impl) {
-        return;
-    }
-
-    ff_diskio_impl_t * impl = (ff_diskio_impl_t *)malloc(sizeof(ff_diskio_impl_t));
-    assert(impl != NULL);
-    memcpy(impl, discio_impl, sizeof(ff_diskio_impl_t));
-    s_impls[pdrv] = impl;
-}
-
-DSTATUS ff_disk_initialize (BYTE pdrv)
-{
-    return s_impls[pdrv]->init(pdrv);
-}
-DSTATUS ff_disk_status (BYTE pdrv)
-{
-    return s_impls[pdrv]->status(pdrv);
-}
-DRESULT ff_disk_read (BYTE pdrv, BYTE* buff, LBA_t sector, UINT count)
-{
-    return s_impls[pdrv]->read(pdrv, buff, sector, count);
-}
-DRESULT ff_disk_write (BYTE pdrv, const BYTE* buff, LBA_t sector, UINT count)
-{
-    return s_impls[pdrv]->write(pdrv, buff, sector, count);
-}
-DRESULT ff_disk_ioctl (BYTE pdrv, BYTE cmd, void* buff)
-{
-    return s_impls[pdrv]->ioctl(pdrv, cmd, buff);
-}
-
-DWORD get_fattime(void)
-{
-    time_t t = time(NULL);
-    struct tm tmr;
-    localtime_r(&t, &tmr);
-    int year = tmr.tm_year < 80 ? 0 : tmr.tm_year - 80;
-    return    ((DWORD)(year) << 25)
-            | ((DWORD)(tmr.tm_mon + 1) << 21)
-            | ((DWORD)tmr.tm_mday << 16)
-            | (WORD)(tmr.tm_hour << 11)
-            | (WORD)(tmr.tm_min << 5)
-            | (WORD)(tmr.tm_sec >> 1);
-}

code/components/esp-fatfs/diskio/diskio_rawflash_mh.c

@@ -1,99 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <string.h>
-#include "diskio_impl_mh.h"
-#include "ffconf_mh.h"
-#include "ff_mh.h"
-#include "esp_log.h"
-#include "diskio_rawflash_mh.h"
-#include "esp_compiler.h"
-#include "spi_flash_mmap.h"
-
-
-static const char* TAG = "diskio_rawflash";
-
-const esp_partition_t* ff_raw_handles[FF_VOLUMES];
-
-
-DSTATUS ff_raw_initialize (BYTE pdrv)
-{
-    return 0;
-}
-
-DSTATUS ff_raw_status (BYTE pdrv)
-{
-    return 0;
-}
-
-DRESULT ff_raw_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)
-{
-    ESP_LOGV(TAG, "ff_raw_read - pdrv=%i, sector=%i, count=%in", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);
-    const esp_partition_t* part = ff_raw_handles[pdrv];
-    assert(part);
-    esp_err_t err = esp_partition_read(part, sector * SPI_FLASH_SEC_SIZE, buff, count * SPI_FLASH_SEC_SIZE);
-    if (unlikely(err != ESP_OK)) {
-        ESP_LOGE(TAG, "esp_partition_read failed (0x%x)", err);
-        return RES_ERROR;
-    }
-    return RES_OK;
-}
-
-
-DRESULT ff_raw_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)
-{
-    return RES_ERROR;
-}
-
-DRESULT ff_raw_ioctl (BYTE pdrv, BYTE cmd, void *buff)
-{
-    const esp_partition_t* part = ff_raw_handles[pdrv];
-    ESP_LOGV(TAG, "ff_raw_ioctl: cmd=%in", cmd);
-    assert(part);
-    switch (cmd) {
-        case CTRL_SYNC:
-            return RES_OK;
-        case GET_SECTOR_COUNT:
-            *((DWORD *) buff) = part->size / SPI_FLASH_SEC_SIZE;
-            return RES_OK;
-        case GET_SECTOR_SIZE:
-            *((WORD *) buff) = SPI_FLASH_SEC_SIZE;
-            return RES_OK;
-        case GET_BLOCK_SIZE:
-            return RES_ERROR;
-    }
-    return RES_ERROR;
-}
-
-
-esp_err_t ff_diskio_register_raw_partition(BYTE pdrv, const esp_partition_t* part_handle)
-{
-    if (pdrv >= FF_VOLUMES) {
-        return ESP_ERR_INVALID_ARG;
-    }
-    static const ff_diskio_impl_t raw_impl = {
-        .init = &ff_raw_initialize,
-        .status = &ff_raw_status,
-        .read = &ff_raw_read,
-        .write = &ff_raw_write,
-        .ioctl = &ff_raw_ioctl
-    };
-    ff_diskio_register(pdrv, &raw_impl);
-    ff_raw_handles[pdrv] = part_handle;
-    return ESP_OK;
-
-}
-
-
-BYTE ff_diskio_get_pdrv_raw(const esp_partition_t* part_handle)
-{
-    for (int i = 0; i < FF_VOLUMES; i++) {
-        if (part_handle == ff_raw_handles[i]) {
-            return i;
-        }
-    }
-    return 0xff;
-}

code/components/esp-fatfs/diskio/diskio_rawflash_mh.h

@@ -1,37 +0,0 @@
-// Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef _DISKIO_RAWFLASH_DEFINED
-#define _DISKIO_RAWFLASH_DEFINED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "esp_partition.h"
-
-/**
- * Register spi flash partition
- *
- * @param pdrv  drive number
- * @param part_handle  pointer to raw flash partition.
- */
-esp_err_t ff_diskio_register_raw_partition(unsigned char pdrv, const esp_partition_t* part_handle);
-unsigned char ff_diskio_get_pdrv_raw(const esp_partition_t* part_handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _DISKIO_RAWFLASH_DEFINED

code/components/esp-fatfs/diskio/diskio_sdmmc_mh.c

@@ -1,147 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "diskio_impl_mh.h"
-#include "ffconf_mh.h"
-#include "ff_mh.h"
-#include "sdmmc_cmd_mh.h"
-#include "esp_log.h"
-#include "esp_compiler.h"
-
-static sdmmc_card_t* s_cards[FF_VOLUMES] = { NULL };
-static bool s_disk_status_check_en[FF_VOLUMES] = { };
-
-static const char* TAG = "diskio_sdmmc";
-
-//Check if SD/MMC card is present
-static DSTATUS ff_sdmmc_card_available(BYTE pdrv)
-{
-    sdmmc_card_t* card = s_cards[pdrv];
-    assert(card);
-    esp_err_t err = sdmmc_get_status(card);
-    if (unlikely(err != ESP_OK)) {
-        ESP_LOGE(TAG, "Check status failed (0x%x)", err);
-        return STA_NOINIT;
-    }
-    return 0;
-}
-
-/**
-*   ff_sdmmc_status() and ff_sdmmc_initialize() return STA_NOINIT when sdmmc_get_status()
-*   fails. This error value is checked throughout the FATFS code.
-*   Both functions return 0 on success.
-*/
-DSTATUS ff_sdmmc_initialize (BYTE pdrv)
-{
-    return ff_sdmmc_card_available(pdrv);
-}
-
-DSTATUS ff_sdmmc_status(BYTE pdrv)
-{
-    if (s_disk_status_check_en[pdrv]) {
-        return ff_sdmmc_card_available(pdrv);
-    }
-    return 0;
-}
-
-DRESULT ff_sdmmc_read (BYTE pdrv, BYTE* buff, DWORD sector, UINT count)
-{
-    sdmmc_card_t* card = s_cards[pdrv];
-    assert(card);
-    esp_err_t err = sdmmc_read_sectors(card, buff, sector, count);
-    if (unlikely(err != ESP_OK)) {
-        ESP_LOGE(TAG, "sdmmc_read_blocks failed (%d)", err);
-        return RES_ERROR;
-    }
-    return RES_OK;
-}
-
-DRESULT ff_sdmmc_write (BYTE pdrv, const BYTE* buff, DWORD sector, UINT count)
-{
-    sdmmc_card_t* card = s_cards[pdrv];
-    assert(card);
-    esp_err_t err = sdmmc_write_sectors(card, buff, sector, count);
-    if (unlikely(err != ESP_OK)) {
-        ESP_LOGE(TAG, "sdmmc_write_blocks failed (%d)", err);
-        return RES_ERROR;
-    }
-    return RES_OK;
-}
-
-#if (FF_USE_TRIM)
-DRESULT ff_sdmmc_trim (BYTE pdrv, DWORD start_sector, DWORD sector_count)
-{
-    sdmmc_card_t* card = s_cards[pdrv];
-    assert(card);
-    sdmmc_erase_arg_t arg;
-
-    arg = sdmmc_can_discard(card) == ESP_OK ? SDMMC_DISCARD_ARG : SDMMC_ERASE_ARG;
-    esp_err_t err = sdmmc_erase_sectors(card, start_sector, sector_count, arg);
-    if (unlikely(err != ESP_OK)) {
-        ESP_LOGE(TAG, "sdmmc_erase_sectors failed (%d)", err);
-        return RES_ERROR;
-    }
-    return RES_OK;
-}
-#endif //FF_USE_TRIM
-
-DRESULT ff_sdmmc_ioctl (BYTE pdrv, BYTE cmd, void* buff)
-{
-    sdmmc_card_t* card = s_cards[pdrv];
-    assert(card);
-    switch(cmd) {
-        case CTRL_SYNC:
-            return RES_OK;
-        case GET_SECTOR_COUNT:
-            *((DWORD*) buff) = card->csd.capacity;
-            return RES_OK;
-        case GET_SECTOR_SIZE:
-            *((WORD*) buff) = card->csd.sector_size;
-            return RES_OK;
-        case GET_BLOCK_SIZE:
-            return RES_ERROR;
-#if (FF_USE_TRIM)
-        case CTRL_TRIM:
-            if(FF_CAN_TRIM){
-                return ff_sdmmc_trim (pdrv, *((DWORD*)buff), //start_sector
-                    (*((DWORD*)buff + 1) - *((DWORD*)buff) + 1)); //sector_count
-            }
-            else{
-                return RES_ERROR;
-            }
-#endif //FF_USE_TRIM
-    }
-    return RES_ERROR;
-}
-
-void ff_sdmmc_set_disk_status_check(BYTE pdrv, bool enable)
-{
-    s_disk_status_check_en[pdrv] = enable;
-}
-
-void ff_diskio_register_sdmmc(BYTE pdrv, sdmmc_card_t* card)
-{
-    static const ff_diskio_impl_t sdmmc_impl = {
-        .init = &ff_sdmmc_initialize,
-        .status = &ff_sdmmc_status,
-        .read = &ff_sdmmc_read,
-        .write = &ff_sdmmc_write,
-        .ioctl = &ff_sdmmc_ioctl
-    };
-    s_cards[pdrv] = card;
-    s_disk_status_check_en[pdrv] = false;
-    ff_diskio_register(pdrv, &sdmmc_impl);
-}
-
-BYTE ff_diskio_get_pdrv_card(const sdmmc_card_t* card)
-{
-    for (int i = 0; i < FF_VOLUMES; i++) {
-        if (card == s_cards[i]) {
-            return i;
-        }
-    }
-    return 0xff;
-}

code/components/esp-fatfs/diskio/diskio_sdmmc_mh.h

@@ -1,43 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include "sdmmc_cmd_mh.h"
-
-#include "driver/sdmmc_defs.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief Enable/disable SD card status checking
- *
- * @param pdrv   drive number
- * @param enable mock ff_sdmmc_status function (return 0)
- */
-void ff_sdmmc_set_disk_status_check(BYTE pdrv, bool enable);
-
-/**
- * Register SD/MMC diskio driver
- *
- * @param pdrv  drive number
- * @param card  pointer to sdmmc_card_t structure describing a card; card should be initialized before calling f_mount.
- */
-void ff_diskio_register_sdmmc(unsigned char pdrv, sdmmc_card_t* card);
-
-/**
- * @brief Get the driver number corresponding to a card
- *
- * @param card The card to get its driver
- * @return Driver number to the card
- */
-BYTE ff_diskio_get_pdrv_card(const sdmmc_card_t* card);
-
-#ifdef __cplusplus
-}
-#endif

code/components/esp-fatfs/diskio/diskio_wl_mh.c

@@ -1,118 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <string.h>
-#include "diskio_impl_mh.h"
-#include "ffconf_mh.h"
-#include "ff_mh.h"
-#include "esp_log.h"
-#include "diskio_wl_mh.h"
-#include "wear_levelling.h"
-#include "esp_compiler.h"
-
-static const char* TAG = "ff_diskio_spiflash";
-
-wl_handle_t ff_wl_handles[FF_VOLUMES] = {
-        [0 ... FF_VOLUMES - 1] = WL_INVALID_HANDLE
-};
-
-DSTATUS ff_wl_initialize (BYTE pdrv)
-{
-    return 0;
-}
-
-DSTATUS ff_wl_status (BYTE pdrv)
-{
-    return 0;
-}
-
-DRESULT ff_wl_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count)
-{
-    ESP_LOGV(TAG, "ff_wl_read - pdrv=%i, sector=%i, count=%i\n", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);
-    wl_handle_t wl_handle = ff_wl_handles[pdrv];
-    assert(wl_handle + 1);
-    esp_err_t err = wl_read(wl_handle, sector * wl_sector_size(wl_handle), buff, count * wl_sector_size(wl_handle));
-    if (unlikely(err != ESP_OK)) {
-        ESP_LOGE(TAG, "wl_read failed (%d)", err);
-        return RES_ERROR;
-    }
-    return RES_OK;
-}
-
-DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count)
-{
-    ESP_LOGV(TAG, "ff_wl_write - pdrv=%i, sector=%i, count=%i\n", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count);
-    wl_handle_t wl_handle = ff_wl_handles[pdrv];
-    assert(wl_handle + 1);
-    esp_err_t err = wl_erase_range(wl_handle, sector * wl_sector_size(wl_handle), count * wl_sector_size(wl_handle));
-    if (unlikely(err != ESP_OK)) {
-        ESP_LOGE(TAG, "wl_erase_range failed (%d)", err);
-        return RES_ERROR;
-    }
-    err = wl_write(wl_handle, sector * wl_sector_size(wl_handle), buff, count * wl_sector_size(wl_handle));
-    if (unlikely(err != ESP_OK)) {
-        ESP_LOGE(TAG, "wl_write failed (%d)", err);
-        return RES_ERROR;
-    }
-    return RES_OK;
-}
-
-DRESULT ff_wl_ioctl (BYTE pdrv, BYTE cmd, void *buff)
-{
-    wl_handle_t wl_handle = ff_wl_handles[pdrv];
-    ESP_LOGV(TAG, "ff_wl_ioctl: cmd=%i\n", cmd);
-    assert(wl_handle + 1);
-    switch (cmd) {
-    case CTRL_SYNC:
-        return RES_OK;
-    case GET_SECTOR_COUNT:
-        *((DWORD *) buff) = wl_size(wl_handle) / wl_sector_size(wl_handle);
-        return RES_OK;
-    case GET_SECTOR_SIZE:
-        *((WORD *) buff) = wl_sector_size(wl_handle);
-        return RES_OK;
-    case GET_BLOCK_SIZE:
-        return RES_ERROR;
-    }
-    return RES_ERROR;
-}
-
-
-esp_err_t ff_diskio_register_wl_partition(BYTE pdrv, wl_handle_t flash_handle)
-{
-    if (pdrv >= FF_VOLUMES) {
-        return ESP_ERR_INVALID_ARG;
-    }
-    static const ff_diskio_impl_t wl_impl = {
-        .init = &ff_wl_initialize,
-        .status = &ff_wl_status,
-        .read = &ff_wl_read,
-        .write = &ff_wl_write,
-        .ioctl = &ff_wl_ioctl
-    };
-    ff_wl_handles[pdrv] = flash_handle;
-    ff_diskio_register(pdrv, &wl_impl);
-    return ESP_OK;
-}
-
-BYTE ff_diskio_get_pdrv_wl(wl_handle_t flash_handle)
-{
-    for (int i = 0; i < FF_VOLUMES; i++) {
-        if (flash_handle == ff_wl_handles[i]) {
-            return i;
-        }
-    }
-    return 0xff;
-}
-
-void ff_diskio_clear_pdrv_wl(wl_handle_t flash_handle)
-{
-    for (int i = 0; i < FF_VOLUMES; i++) {
-        if (flash_handle == ff_wl_handles[i]) {
-            ff_wl_handles[i] = WL_INVALID_HANDLE;
-        }
-    }
-}

code/components/esp-fatfs/diskio/diskio_wl_mh.h

@@ -1,39 +0,0 @@
-// Copyright 2015-2017 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef _DISKIO_WL_DEFINED
-#define _DISKIO_WL_DEFINED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "wear_levelling.h"
-
-
-/**
- * Register spi flash partition
- *
- * @param pdrv  drive number
- * @param flash_handle  handle of the wear levelling partition.
- */
-esp_err_t ff_diskio_register_wl_partition(unsigned char pdrv, wl_handle_t flash_handle);
-unsigned char ff_diskio_get_pdrv_wl(wl_handle_t flash_handle);
-void ff_diskio_clear_pdrv_wl(wl_handle_t flash_handle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _DISKIO_WL_DEFINED

code/components/esp-fatfs/port/freertos/ffsystem_mh.c

@@ -1,108 +0,0 @@
-/*------------------------------------------------------------------------*/
-/* Sample Code of OS Dependent Functions for FatFs                        */
-/* (C)ChaN, 2017                                                          */
-/*------------------------------------------------------------------------*/
-
-
-#include <string.h>
-#include <stdlib.h>
-#include "ff_mh.h"
-#include "sdkconfig.h"
-#ifdef CONFIG_FATFS_ALLOC_PREFER_EXTRAM
-#include "esp_heap_caps.h"
-#endif
-
-void* ff_memalloc (    /* Returns pointer to the allocated memory block (null on not enough core) */
-    unsigned msize     /* Number of bytes to allocate */
-)
-{
-#ifdef CONFIG_FATFS_ALLOC_PREFER_EXTRAM
-    return heap_caps_malloc_prefer(msize, 2, MALLOC_CAP_DEFAULT | MALLOC_CAP_SPIRAM,
-                                            MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL);
-#else
-    return malloc(msize);
-#endif
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Free a memory block                                                    */
-/*------------------------------------------------------------------------*/
-
-void ff_memfree (
-    void* mblock    /* Pointer to the memory block to free (nothing to do for null) */
-)
-{
-    free(mblock);   /* Free the memory block with POSIX API */
-}
-
-
-
-
-#if FF_FS_REENTRANT    /* Mutal exclusion */
-
-/*------------------------------------------------------------------------*/
-/* Create a Synchronization Object                                        */
-/*------------------------------------------------------------------------*/
-/* This function is called in f_mount() function to create a new
-/  synchronization object for the volume, such as semaphore and mutex.
-/  When a 0 is returned, the f_mount() function fails with FR_INT_ERR.
-*/
-
-
-int ff_cre_syncobj (    /* 1:Function succeeded, 0:Could not create the sync object */
-    BYTE vol,           /* Corresponding volume (logical drive number) */
-    FF_SYNC_t *sobj     /* Pointer to return the created sync object */
-)
-{
-    *sobj = xSemaphoreCreateMutex();
-    return (*sobj != NULL) ? 1 : 0;
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Delete a Synchronization Object                                        */
-/*------------------------------------------------------------------------*/
-/* This function is called in f_mount() function to delete a synchronization
-/  object that created with ff_cre_syncobj() function. When a 0 is returned,
-/  the f_mount() function fails with FR_INT_ERR.
-*/
-
-int ff_del_syncobj (    /* 1:Function succeeded, 0:Could not delete due to an error */
-    FF_SYNC_t sobj      /* Sync object tied to the logical drive to be deleted */
-)
-{
-    vSemaphoreDelete(sobj);
-    return 1;
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Request Grant to Access the Volume                                     */
-/*------------------------------------------------------------------------*/
-/* This function is called on entering file functions to lock the volume.
-/  When a 0 is returned, the file function fails with FR_TIMEOUT.
-*/
-
-int ff_req_grant (    /* 1:Got a grant to access the volume, 0:Could not get a grant */
-    FF_SYNC_t sobj    /* Sync object to wait */
-)
-{
-    return (xSemaphoreTake(sobj, FF_FS_TIMEOUT) == pdTRUE) ? 1 : 0;
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Release Grant to Access the Volume                                     */
-/*------------------------------------------------------------------------*/
-/* This function is called on leaving file functions to unlock the volume.
-*/
-
-void ff_rel_grant (
-    FF_SYNC_t sobj    /* Sync object to be signaled */
-)
-{
-    xSemaphoreGive(sobj);
-}
-
-#endif // FF_FS_REENTRANT

code/components/esp-fatfs/src/00history.txt

@@ -1,329 +0,0 @@
-----------------------------------------------------------------------------
-  Revision history of FatFs module
-----------------------------------------------------------------------------
-
-R0.00 (February 26, 2006)
-
-  Prototype.
-
-
-
-R0.01 (April 29, 2006)
-
-  The first release.
-
-
-
-R0.02 (June 01, 2006)
-
-  Added FAT12 support.
-  Removed unbuffered mode.
-  Fixed a problem on small (<32M) partition.
-
-
-
-R0.02a (June 10, 2006)
-
-  Added a configuration option (_FS_MINIMUM).
-
-
-
-R0.03 (September 22, 2006)
-
-  Added f_rename().
-  Changed option _FS_MINIMUM to _FS_MINIMIZE.
-
-
-
-R0.03a (December 11, 2006)
-
-  Improved cluster scan algorithm to write files fast.
-  Fixed f_mkdir() creates incorrect directory on FAT32.
-
-
-
-R0.04 (February 04, 2007)
-
-  Added f_mkfs().
-  Supported multiple drive system.
-  Changed some interfaces for multiple drive system.
-  Changed f_mountdrv() to f_mount().
-
-
-
-R0.04a (April 01, 2007)
-
-  Supported multiple partitions on a physical drive.
-  Added a capability of extending file size to f_lseek().
-  Added minimization level 3.
-  Fixed an endian sensitive code in f_mkfs().
-
-
-
-R0.04b (May 05, 2007)
-
-  Added a configuration option _USE_NTFLAG.
-  Added FSINFO support.
-  Fixed DBCS name can result FR_INVALID_NAME.
-  Fixed short seek (<= csize) collapses the file object.
-
-
-
-R0.05 (August 25, 2007)
-
-  Changed arguments of f_read(), f_write() and f_mkfs().
-  Fixed f_mkfs() on FAT32 creates incorrect FSINFO.
-  Fixed f_mkdir() on FAT32 creates incorrect directory.
-
-
-
-R0.05a (February 03, 2008)
-
-  Added f_truncate() and f_utime().
-  Fixed off by one error at FAT sub-type determination.
-  Fixed btr in f_read() can be mistruncated.
-  Fixed cached sector is not flushed when create and close without write.
-
-
-
-R0.06 (April 01, 2008)
-
-  Added fputc(), fputs(), fprintf() and fgets().
-  Improved performance of f_lseek() on moving to the same or following cluster.
-
-
-
-R0.07 (April 01, 2009)
-
-  Merged Tiny-FatFs as a configuration option. (_FS_TINY)
-  Added long file name feature. (_USE_LFN)
-  Added multiple code page feature. (_CODE_PAGE)
-  Added re-entrancy for multitask operation. (_FS_REENTRANT)
-  Added auto cluster size selection to f_mkfs().
-  Added rewind option to f_readdir().
-  Changed result code of critical errors.
-  Renamed string functions to avoid name collision.
-
-
-
-R0.07a (April 14, 2009)
-
-  Septemberarated out OS dependent code on reentrant cfg.
-  Added multiple sector size feature.
-
-
-
-R0.07c (June 21, 2009)
-
-  Fixed f_unlink() can return FR_OK on error.
-  Fixed wrong cache control in f_lseek().
-  Added relative path feature.
-  Added f_chdir() and f_chdrive().
-  Added proper case conversion to extended character.
-
-
-
-R0.07e (November 03, 2009)
-
-  Septemberarated out configuration options from ff.h to ffconf.h.
-  Fixed f_unlink() fails to remove a sub-directory on _FS_RPATH.
-  Fixed name matching error on the 13 character boundary.
-  Added a configuration option, _LFN_UNICODE.
-  Changed f_readdir() to return the SFN with always upper case on non-LFN cfg.
-
-
-
-R0.08 (May 15, 2010)
-
-  Added a memory configuration option. (_USE_LFN = 3)
-  Added file lock feature. (_FS_SHARE)
-  Added fast seek feature. (_USE_FASTSEEK)
-  Changed some types on the API, XCHAR->TCHAR.
-  Changed .fname in the FILINFO structure on Unicode cfg.
-  String functions support UTF-8 encoding files on Unicode cfg.
-
-
-
-R0.08a (August 16, 2010)
-
-  Added f_getcwd(). (_FS_RPATH = 2)
-  Added sector erase feature. (_USE_ERASE)
-  Moved file lock semaphore table from fs object to the bss.
-  Fixed f_mkfs() creates wrong FAT32 volume.
-
-
-
-R0.08b (January 15, 2011)
-
-  Fast seek feature is also applied to f_read() and f_write().
-  f_lseek() reports required table size on creating CLMP.
-  Extended format syntax of f_printf().
-  Ignores duplicated directory separators in given path name.
-
-
-
-R0.09 (September 06, 2011)
-
-  f_mkfs() supports multiple partition to complete the multiple partition feature.
-  Added f_fdisk().
-
-
-
-R0.09a (August 27, 2012)
-
-  Changed f_open() and f_opendir() reject null object pointer to avoid crash.
-  Changed option name _FS_SHARE to _FS_LOCK.
-  Fixed assertion failure due to OS/2 EA on FAT12/16 volume.
-
-
-
-R0.09b (January 24, 2013)
-
-  Added f_setlabel() and f_getlabel().
-
-
-
-R0.10 (October 02, 2013)
-
-  Added selection of character encoding on the file. (_STRF_ENCODE)
-  Added f_closedir().
-  Added forced full FAT scan for f_getfree(). (_FS_NOFSINFO)
-  Added forced mount feature with changes of f_mount().
-  Improved behavior of volume auto detection.
-  Improved write throughput of f_puts() and f_printf().
-  Changed argument of f_chdrive(), f_mkfs(), disk_read() and disk_write().
-  Fixed f_write() can be truncated when the file size is close to 4GB.
-  Fixed f_open(), f_mkdir() and f_setlabel() can return incorrect value on error.
-
-
-
-R0.10a (January 15, 2014)
-
-  Added arbitrary strings as drive number in the path name. (_STR_VOLUME_ID)
-  Added a configuration option of minimum sector size. (_MIN_SS)
-  2nd argument of f_rename() can have a drive number and it will be ignored.
-  Fixed f_mount() with forced mount fails when drive number is >= 1. (appeared at R0.10)
-  Fixed f_close() invalidates the file object without volume lock.
-  Fixed f_closedir() returns but the volume lock is left acquired. (appeared at R0.10)
-  Fixed creation of an entry with LFN fails on too many SFN collisions. (appeared at R0.07)
-
-
-
-R0.10b (May 19, 2014)
-
-  Fixed a hard error in the disk I/O layer can collapse the directory entry.
-  Fixed LFN entry is not deleted when delete/rename an object with lossy converted SFN. (appeared at R0.07)
-
-
-
-R0.10c (November 09, 2014)
-
-  Added a configuration option for the platforms without RTC. (_FS_NORTC)
-  Changed option name _USE_ERASE to _USE_TRIM.
-  Fixed volume label created by Mac OS X cannot be retrieved with f_getlabel(). (appeared at R0.09b)
-  Fixed a potential problem of FAT access that can appear on disk error.
-  Fixed null pointer dereference on attempting to delete the root direcotry. (appeared at R0.08)
-
-
-
-R0.11 (February 09, 2015)
-
-  Added f_findfirst(), f_findnext() and f_findclose(). (_USE_FIND)
-  Fixed f_unlink() does not remove cluster chain of the file. (appeared at R0.10c)
-  Fixed _FS_NORTC option does not work properly. (appeared at R0.10c)
-
-
-
-R0.11a (September 05, 2015)
-
-  Fixed wrong media change can lead a deadlock at thread-safe configuration.
-  Added code page 771, 860, 861, 863, 864, 865 and 869. (_CODE_PAGE)
-  Removed some code pages actually not exist on the standard systems. (_CODE_PAGE)
-  Fixed errors in the case conversion teble of code page 437 and 850 (ff.c).
-  Fixed errors in the case conversion teble of Unicode (cc*.c).
-
-
-
-R0.12 (April 12, 2016)
-
-  Added support for exFAT file system. (_FS_EXFAT)
-  Added f_expand(). (_USE_EXPAND)
-  Changed some members in FINFO structure and behavior of f_readdir().
-  Added an option _USE_CHMOD.
-  Removed an option _WORD_ACCESS.
-  Fixed errors in the case conversion table of Unicode (cc*.c).
-
-
-
-R0.12a (July 10, 2016)
-
-  Added support for creating exFAT volume with some changes of f_mkfs().
-  Added a file open method FA_OPEN_APPEND. An f_lseek() following f_open() is no longer needed.
-  f_forward() is available regardless of _FS_TINY.
-  Fixed f_mkfs() creates wrong volume. (appeared at R0.12)
-  Fixed wrong memory read in create_name(). (appeared at R0.12)
-  Fixed compilation fails at some configurations, _USE_FASTSEEK and _USE_FORWARD.
-
-
-
-R0.12b (September 04, 2016)
-
-  Made f_rename() be able to rename objects with the same name but case.
-  Fixed an error in the case conversion teble of code page 866. (ff.c)
-  Fixed writing data is truncated at the file offset 4GiB on the exFAT volume. (appeared at R0.12)
-  Fixed creating a file in the root directory of exFAT volume can fail. (appeared at R0.12)
-  Fixed f_mkfs() creating exFAT volume with too small cluster size can collapse unallocated memory. (appeared at R0.12)
-  Fixed wrong object name can be returned when read directory at Unicode cfg. (appeared at R0.12)
-  Fixed large file allocation/removing on the exFAT volume collapses allocation bitmap. (appeared at R0.12)
-  Fixed some internal errors in f_expand() and f_lseek(). (appeared at R0.12)
-
-
-
-R0.12c (March 04, 2017)
-
-  Improved write throughput at the fragmented file on the exFAT volume.
-  Made memory usage for exFAT be able to be reduced as decreasing _MAX_LFN.
-  Fixed successive f_getfree() can return wrong count on the FAT12/16 volume. (appeared at R0.12)
-  Fixed configuration option _VOLUMES cannot be set 10. (appeared at R0.10c)
-
-
-
-R0.13 (May 21, 2017)
-
-  Changed heading character of configuration keywords "_" to "FF_".
-  Removed ASCII-only configuration, FF_CODE_PAGE = 1. Use FF_CODE_PAGE = 437 instead.
-  Added f_setcp(), run-time code page configuration. (FF_CODE_PAGE = 0)
-  Improved cluster allocation time on stretch a deep buried cluster chain.
-  Improved processing time of f_mkdir() with large cluster size by using FF_USE_LFN = 3.
-  Improved NoFatChain flag of the fragmented file to be set after it is truncated and got contiguous.
-  Fixed archive attribute is left not set when a file on the exFAT volume is renamed. (appeared at R0.12)
-  Fixed exFAT FAT entry can be collapsed when write or lseek operation to the existing file is done. (appeared at R0.12c)
-  Fixed creating a file can fail when a new cluster allocation to the exFAT directory occures. (appeared at R0.12c)
-
-
-
-R0.13a (October 14, 2017)
-
-  Added support for UTF-8 encoding on the API. (FF_LFN_UNICODE = 2)
-  Added options for file name output buffer. (FF_LFN_BUF, FF_SFN_BUF).
-  Added dynamic memory allocation option for working buffer of f_mkfs() and f_fdisk().
-  Fixed f_fdisk() and f_mkfs() create the partition table with wrong CHS parameters. (appeared at R0.09)
-  Fixed f_unlink() can cause lost clusters at fragmented file on the exFAT volume. (appeared at R0.12c)
-  Fixed f_setlabel() rejects some valid characters for exFAT volume. (appeared at R0.12)
-
-
-
-R0.13b (April 07, 2018)
-
-  Added support for UTF-32 encoding on the API. (FF_LFN_UNICODE = 3)
-  Added support for Unix style volume ID. (FF_STR_VOLUME_ID = 2)
-  Fixed accesing any object on the exFAT root directory beyond the cluster boundary can fail. (appeared at R0.12c)
-  Fixed f_setlabel() does not reject some invalid characters. (appeared at R0.09b)
-
-
-
-R0.13c (October 14, 2018)
-  Supported stdint.h for C99 and later. (integer.h was included in ff.h)
-  Fixed reading a directory gets infinite loop when the last directory entry is not empty. (appeared at R0.12)
-  Fixed creating a sub-directory in the fragmented sub-directory on the exFAT volume collapses FAT chain of the parent directory. (appeared at R0.12)
-  Fixed f_getcwd() cause output buffer overrun when the buffer has a valid drive number. (appeared at R0.13b)

code/components/esp-fatfs/src/00readme.txt

@@ -1,20 +0,0 @@
-FatFs Module Source Files R0.13c
-
-
-FILES
-
-  00readme.txt   This file.
-  00history.txt  Revision history.
-  ff.c           FatFs module.
-  ffconf.h       Configuration file of FatFs module.
-  ff.h           Common include file for FatFs and application module.
-  diskio.h       Common include file for FatFs and disk I/O module.
-  diskio.c       An example of glue function to attach existing disk I/O module to FatFs.
-  ffunicode.c    Optional Unicode utility functions.
-  ffsystem.c     An example of optional O/S related functions.
-
-
-  Low level disk I/O module is not included in this archive because the FatFs
-  module is only a generic file system layer and it does not depend on any specific
-  storage device. You need to provide a low level disk I/O module written to
-  control the storage device that attached to the target system.

code/components/esp-fatfs/src/diskio_mh.c

@@ -1,228 +0,0 @@
-/*-----------------------------------------------------------------------*/
-/* Low level disk I/O module SKELETON for FatFs     (C)ChaN, 2019        */
-/*-----------------------------------------------------------------------*/
-/* If a working storage control module is available, it should be        */
-/* attached to the FatFs via a glue function rather than modifying it.   */
-/* This is an example of glue functions to attach various exsisting      */
-/* storage control modules to the FatFs module with a defined API.       */
-/*-----------------------------------------------------------------------*/
-
-#include "ff_mh.h"			/* Obtains integer types */
-#include "diskio_mh.h"		/* Declarations of disk functions */
-
-/* Definitions of physical drive number for each drive */
-#define DEV_RAM		0	/* Example: Map Ramdisk to physical drive 0 */
-#define DEV_MMC		1	/* Example: Map MMC/SD card to physical drive 1 */
-#define DEV_USB		2	/* Example: Map USB MSD to physical drive 2 */
-
-
-/*-----------------------------------------------------------------------*/
-/* Get Drive Status                                                      */
-/*-----------------------------------------------------------------------*/
-
-DSTATUS disk_status (
-	BYTE pdrv		/* Physical drive nmuber to identify the drive */
-)
-{
-	DSTATUS stat;
-	int result;
-
-	switch (pdrv) {
-	case DEV_RAM :
-		result = RAM_disk_status();
-
-		// translate the reslut code here
-
-		return stat;
-
-	case DEV_MMC :
-		result = MMC_disk_status();
-
-		// translate the reslut code here
-
-		return stat;
-
-	case DEV_USB :
-		result = USB_disk_status();
-
-		// translate the reslut code here
-
-		return stat;
-	}
-	return STA_NOINIT;
-}
-
-
-
-/*-----------------------------------------------------------------------*/
-/* Inidialize a Drive                                                    */
-/*-----------------------------------------------------------------------*/
-
-DSTATUS disk_initialize (
-	BYTE pdrv				/* Physical drive nmuber to identify the drive */
-)
-{
-	DSTATUS stat;
-	int result;
-
-	switch (pdrv) {
-	case DEV_RAM :
-		result = RAM_disk_initialize();
-
-		// translate the reslut code here
-
-		return stat;
-
-	case DEV_MMC :
-		result = MMC_disk_initialize();
-
-		// translate the reslut code here
-
-		return stat;
-
-	case DEV_USB :
-		result = USB_disk_initialize();
-
-		// translate the reslut code here
-
-		return stat;
-	}
-	return STA_NOINIT;
-}
-
-
-
-/*-----------------------------------------------------------------------*/
-/* Read Sector(s)                                                        */
-/*-----------------------------------------------------------------------*/
-
-DRESULT disk_read (
-	BYTE pdrv,		/* Physical drive nmuber to identify the drive */
-	BYTE *buff,		/* Data buffer to store read data */
-	LBA_t sector,	/* Start sector in LBA */
-	UINT count		/* Number of sectors to read */
-)
-{
-	DRESULT res;
-	int result;
-
-	switch (pdrv) {
-	case DEV_RAM :
-		// translate the arguments here
-
-		result = RAM_disk_read(buff, sector, count);
-
-		// translate the reslut code here
-
-		return res;
-
-	case DEV_MMC :
-		// translate the arguments here
-
-		result = MMC_disk_read(buff, sector, count);
-
-		// translate the reslut code here
-
-		return res;
-
-	case DEV_USB :
-		// translate the arguments here
-
-		result = USB_disk_read(buff, sector, count);
-
-		// translate the reslut code here
-
-		return res;
-	}
-
-	return RES_PARERR;
-}
-
-
-
-/*-----------------------------------------------------------------------*/
-/* Write Sector(s)                                                       */
-/*-----------------------------------------------------------------------*/
-
-#if FF_FS_READONLY == 0
-
-DRESULT disk_write (
-	BYTE pdrv,			/* Physical drive nmuber to identify the drive */
-	const BYTE *buff,	/* Data to be written */
-	LBA_t sector,		/* Start sector in LBA */
-	UINT count			/* Number of sectors to write */
-)
-{
-	DRESULT res;
-	int result;
-
-	switch (pdrv) {
-	case DEV_RAM :
-		// translate the arguments here
-
-		result = RAM_disk_write(buff, sector, count);
-
-		// translate the reslut code here
-
-		return res;
-
-	case DEV_MMC :
-		// translate the arguments here
-
-		result = MMC_disk_write(buff, sector, count);
-
-		// translate the reslut code here
-
-		return res;
-
-	case DEV_USB :
-		// translate the arguments here
-
-		result = USB_disk_write(buff, sector, count);
-
-		// translate the reslut code here
-
-		return res;
-	}
-
-	return RES_PARERR;
-}
-
-#endif
-
-
-/*-----------------------------------------------------------------------*/
-/* Miscellaneous Functions                                               */
-/*-----------------------------------------------------------------------*/
-
-DRESULT disk_ioctl (
-	BYTE pdrv,		/* Physical drive nmuber (0..) */
-	BYTE cmd,		/* Control code */
-	void *buff		/* Buffer to send/receive control data */
-)
-{
-	DRESULT res;
-	int result;
-
-	switch (pdrv) {
-	case DEV_RAM :
-
-		// Process of the command for the RAM drive
-
-		return res;
-
-	case DEV_MMC :
-
-		// Process of the command for the MMC/SD card
-
-		return res;
-
-	case DEV_USB :
-
-		// Process of the command the USB drive
-
-		return res;
-	}
-
-	return RES_PARERR;
-}

code/components/esp-fatfs/src/diskio_mh.h

@@ -1,79 +0,0 @@
-/*-----------------------------------------------------------------------/
-/  Low level disk interface modlue include file   (C)ChaN, 2019          /
-/-----------------------------------------------------------------------*/
-
-#ifndef _DISKIO_DEFINED
-#define _DISKIO_DEFINED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ff_mh.h"
-
-/* Status of Disk Functions */
-typedef BYTE	DSTATUS;
-
-/* Results of Disk Functions */
-typedef enum {
-	RES_OK = 0,		/* 0: Successful */
-	RES_ERROR,		/* 1: R/W Error */
-	RES_WRPRT,		/* 2: Write Protected */
-	RES_NOTRDY,		/* 3: Not Ready */
-	RES_PARERR		/* 4: Invalid Parameter */
-} DRESULT;
-
-
-/*---------------------------------------*/
-/* Prototypes for disk control functions */
-
-
-DSTATUS disk_initialize (BYTE pdrv);
-DSTATUS disk_status (BYTE pdrv);
-DRESULT disk_read (BYTE pdrv, BYTE* buff, LBA_t sector, UINT count);
-DRESULT disk_write (BYTE pdrv, const BYTE* buff, LBA_t sector, UINT count);
-DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
-
-
-/* Disk Status Bits (DSTATUS) */
-
-#define STA_NOINIT		0x01	/* Drive not initialized */
-#define STA_NODISK		0x02	/* No medium in the drive */
-#define STA_PROTECT		0x04	/* Write protected */
-
-
-/* Command code for disk_ioctrl fucntion */
-
-/* Generic command (Used by FatFs) */
-#define CTRL_SYNC			0	/* Complete pending write process (needed at FF_FS_READONLY == 0) */
-#define GET_SECTOR_COUNT	1	/* Get media size (needed at FF_USE_MKFS == 1) */
-#define GET_SECTOR_SIZE		2	/* Get sector size (needed at FF_MAX_SS != FF_MIN_SS) */
-#define GET_BLOCK_SIZE		3	/* Get erase block size (needed at FF_USE_MKFS == 1) */
-#define CTRL_TRIM			4	/* Inform device that the data on the block of sectors is no longer used (needed at FF_USE_TRIM == 1) */
-
-/* Generic command (Not used by FatFs) */
-#define CTRL_POWER			5	/* Get/Set power status */
-#define CTRL_LOCK			6	/* Lock/Unlock media removal */
-#define CTRL_EJECT			7	/* Eject media */
-#define CTRL_FORMAT			8	/* Create physical format on the media */
-
-/* MMC/SDC specific ioctl command */
-#define MMC_GET_TYPE		10	/* Get card type */
-#define MMC_GET_CSD			11	/* Get CSD */
-#define MMC_GET_CID			12	/* Get CID */
-#define MMC_GET_OCR			13	/* Get OCR */
-#define MMC_GET_SDSTAT		14	/* Get SD status */
-#define ISDIO_READ			55	/* Read data form SD iSDIO register */
-#define ISDIO_WRITE			56	/* Write data to SD iSDIO register */
-#define ISDIO_MRITE			57	/* Masked write data to SD iSDIO register */
-
-/* ATA/CF specific ioctl command */
-#define ATA_GET_REV			20	/* Get F/W revision */
-#define ATA_GET_MODEL		21	/* Get model name */
-#define ATA_GET_SN			22	/* Get serial number */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

code/components/esp-fatfs/src/ff_mh.h

@@ -1,422 +0,0 @@
-/*----------------------------------------------------------------------------/
-/  FatFs - Generic FAT Filesystem module  R0.14b                              /
-/-----------------------------------------------------------------------------/
-/
-/ Copyright (C) 2021, ChaN, all right reserved.
-/
-/ FatFs module is an open source software. Redistribution and use of FatFs in
-/ source and binary forms, with or without modification, are permitted provided
-/ that the following condition is met:
-
-/ 1. Redistributions of source code must retain the above copyright notice,
-/    this condition and the following disclaimer.
-/
-/ This software is provided by the copyright holder and contributors "AS IS"
-/ and any warranties related to this software are DISCLAIMED.
-/ The copyright owner or contributors be NOT LIABLE for any damages caused
-/ by use of this software.
-/
-/----------------------------------------------------------------------------*/
-
-
-#ifndef FF_DEFINED
-#define FF_DEFINED	86631	/* Revision ID */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ffconf_mh.h"		/* FatFs configuration options */
-
-#if FF_DEFINED != FFCONF_DEF
-#error Wrong configuration file (ffconf.h).
-#endif
-
-
-/* Integer types used for FatFs API */
-
-#if defined(_WIN32)		/* Windows VC++ (for development only) */
-#define FF_INTDEF 2
-#include <windows.h>
-typedef unsigned __int64 QWORD;
-#include <float.h>
-#define isnan(v) _isnan(v)
-#define isinf(v) (!_finite(v))
-
-#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus)	/* C99 or later */
-#define FF_INTDEF 2
-#include <stdint.h>
-typedef unsigned int	UINT;	/* int must be 16-bit or 32-bit */
-typedef unsigned char	BYTE;	/* char must be 8-bit */
-typedef uint16_t		WORD;	/* 16-bit unsigned integer */
-typedef uint32_t		DWORD;	/* 32-bit unsigned integer */
-typedef uint64_t		QWORD;	/* 64-bit unsigned integer */
-typedef WORD			WCHAR;	/* UTF-16 character type */
-
-#else  	/* Earlier than C99 */
-#define FF_INTDEF 1
-typedef unsigned int	UINT;	/* int must be 16-bit or 32-bit */
-typedef unsigned char	BYTE;	/* char must be 8-bit */
-typedef unsigned short	WORD;	/* 16-bit unsigned integer */
-typedef unsigned long	DWORD;	/* 32-bit unsigned integer */
-typedef WORD			WCHAR;	/* UTF-16 character type */
-#endif
-
-
-/* Type of file size and LBA variables */
-
-#if FF_FS_EXFAT
-#if FF_INTDEF != 2
-#error exFAT feature wants C99 or later
-#endif
-typedef QWORD FSIZE_t;
-#if FF_LBA64
-typedef QWORD LBA_t;
-#else
-typedef DWORD LBA_t;
-#endif
-#else
-#if FF_LBA64
-#error exFAT needs to be enabled when enable 64-bit LBA
-#endif
-typedef DWORD FSIZE_t;
-typedef DWORD LBA_t;
-#endif
-
-
-
-/* Type of path name strings on FatFs API (TCHAR) */
-
-#if FF_USE_LFN && FF_LFN_UNICODE == 1 	/* Unicode in UTF-16 encoding */
-typedef WCHAR TCHAR;
-#define _T(x) L ## x
-#define _TEXT(x) L ## x
-#elif FF_USE_LFN && FF_LFN_UNICODE == 2	/* Unicode in UTF-8 encoding */
-typedef char TCHAR;
-#define _T(x) u8 ## x
-#define _TEXT(x) u8 ## x
-#elif FF_USE_LFN && FF_LFN_UNICODE == 3	/* Unicode in UTF-32 encoding */
-typedef DWORD TCHAR;
-#define _T(x) U ## x
-#define _TEXT(x) U ## x
-#elif FF_USE_LFN && (FF_LFN_UNICODE < 0 || FF_LFN_UNICODE > 3)
-#error Wrong FF_LFN_UNICODE setting
-#else									/* ANSI/OEM code in SBCS/DBCS */
-typedef char TCHAR;
-#define _T(x) x
-#define _TEXT(x) x
-#endif
-
-
-
-/* Definitions of volume management */
-
-#if FF_MULTI_PARTITION		/* Multiple partition configuration */
-typedef struct {
-	BYTE pd;	/* Physical drive number */
-	BYTE pt;	/* Partition: 0:Auto detect, 1-4:Forced partition) */
-} PARTITION;
-extern const PARTITION VolToPart[];	/* Volume - Partition mapping table */
-#endif
-
-#if FF_STR_VOLUME_ID
-#ifndef FF_VOLUME_STRS
-extern const char* VolumeStr[FF_VOLUMES];	/* User defied volume ID */
-#endif
-#endif
-
-
-
-/* Filesystem object structure (FATFS) */
-
-typedef struct {
-	BYTE	fs_type;		/* Filesystem type (0:not mounted) */
-	BYTE	pdrv;			/* Associated physical drive */
-	BYTE	n_fats;			/* Number of FATs (1 or 2) */
-	BYTE	wflag;			/* win[] flag (b0:dirty) */
-	BYTE	fsi_flag;		/* FSINFO flags (b7:disabled, b0:dirty) */
-	WORD	id;				/* Volume mount ID */
-	WORD	n_rootdir;		/* Number of root directory entries (FAT12/16) */
-	WORD	csize;			/* Cluster size [sectors] */
-#if FF_MAX_SS != FF_MIN_SS
-	WORD	ssize;			/* Sector size (512, 1024, 2048 or 4096) */
-#endif
-#if FF_USE_LFN
-	WCHAR*	lfnbuf;			/* LFN working buffer */
-#endif
-#if FF_FS_EXFAT
-	BYTE*	dirbuf;			/* Directory entry block scratchpad buffer for exFAT */
-#endif
-#if FF_FS_REENTRANT
-	FF_SYNC_t	sobj;		/* Identifier of sync object */
-#endif
-#if !FF_FS_READONLY
-	DWORD	last_clst;		/* Last allocated cluster */
-	DWORD	free_clst;		/* Number of free clusters */
-#endif
-#if FF_FS_RPATH
-	DWORD	cdir;			/* Current directory start cluster (0:root) */
-#if FF_FS_EXFAT
-	DWORD	cdc_scl;		/* Containing directory start cluster (invalid when cdir is 0) */
-	DWORD	cdc_size;		/* b31-b8:Size of containing directory, b7-b0: Chain status */
-	DWORD	cdc_ofs;		/* Offset in the containing directory (invalid when cdir is 0) */
-#endif
-#endif
-	DWORD	n_fatent;		/* Number of FAT entries (number of clusters + 2) */
-	DWORD	fsize;			/* Size of an FAT [sectors] */
-	LBA_t	volbase;		/* Volume base sector */
-	LBA_t	fatbase;		/* FAT base sector */
-	LBA_t	dirbase;		/* Root directory base sector/cluster */
-	LBA_t	database;		/* Data base sector */
-#if FF_FS_EXFAT
-	LBA_t	bitbase;		/* Allocation bitmap base sector */
-#endif
-	LBA_t	winsect;		/* Current sector appearing in the win[] */
-	BYTE	win[FF_MAX_SS];	/* Disk access window for Directory, FAT (and file data at tiny cfg) */
-} FATFS;
-
-
-
-/* Object ID and allocation information (FFOBJID) */
-
-typedef struct {
-	FATFS*	fs;				/* Pointer to the hosting volume of this object */
-	WORD	id;				/* Hosting volume mount ID */
-	BYTE	attr;			/* Object attribute */
-	BYTE	stat;			/* Object chain status (b1-0: =0:not contiguous, =2:contiguous, =3:fragmented in this session, b2:sub-directory stretched) */
-	DWORD	sclust;			/* Object data start cluster (0:no cluster or root directory) */
-	FSIZE_t	objsize;		/* Object size (valid when sclust != 0) */
-#if FF_FS_EXFAT
-	DWORD	n_cont;			/* Size of first fragment - 1 (valid when stat == 3) */
-	DWORD	n_frag;			/* Size of last fragment needs to be written to FAT (valid when not zero) */
-	DWORD	c_scl;			/* Containing directory start cluster (valid when sclust != 0) */
-	DWORD	c_size;			/* b31-b8:Size of containing directory, b7-b0: Chain status (valid when c_scl != 0) */
-	DWORD	c_ofs;			/* Offset in the containing directory (valid when file object and sclust != 0) */
-#endif
-#if FF_FS_LOCK
-	UINT	lockid;			/* File lock ID origin from 1 (index of file semaphore table Files[]) */
-#endif
-} FFOBJID;
-
-
-
-/* File object structure (FIL) */
-
-typedef struct {
-	FFOBJID	obj;			/* Object identifier (must be the 1st member to detect invalid object pointer) */
-	BYTE	flag;			/* File status flags */
-	BYTE	err;			/* Abort flag (error code) */
-	FSIZE_t	fptr;			/* File read/write pointer (Zeroed on file open) */
-	DWORD	clust;			/* Current cluster of fpter (invalid when fptr is 0) */
-	LBA_t	sect;			/* Sector number appearing in buf[] (0:invalid) */
-#if !FF_FS_READONLY
-	LBA_t	dir_sect;		/* Sector number containing the directory entry (not used at exFAT) */
-	BYTE*	dir_ptr;		/* Pointer to the directory entry in the win[] (not used at exFAT) */
-#endif
-#if FF_USE_FASTSEEK
-	DWORD*	cltbl;			/* Pointer to the cluster link map table (nulled on open, set by application) */
-#endif
-#if !FF_FS_TINY
-	BYTE	buf[FF_MAX_SS];	/* File private data read/write window */
-#endif
-} FIL;
-
-
-
-/* Directory object structure (FF_DIR) */
-
-typedef struct {
-	FFOBJID	obj;			/* Object identifier */
-	DWORD	dptr;			/* Current read/write offset */
-	DWORD	clust;			/* Current cluster */
-	LBA_t	sect;			/* Current sector (0:Read operation has terminated) */
-	BYTE*	dir;			/* Pointer to the directory item in the win[] */
-	BYTE	fn[12];			/* SFN (in/out) {body[8],ext[3],status[1]} */
-#if FF_USE_LFN
-	DWORD	blk_ofs;		/* Offset of current entry block being processed (0xFFFFFFFF:Invalid) */
-#endif
-#if FF_USE_FIND
-	const TCHAR* pat;		/* Pointer to the name matching pattern */
-#endif
-} FF_DIR;
-
-
-
-/* File information structure (FILINFO) */
-
-typedef struct {
-	FSIZE_t	fsize;			/* File size */
-	WORD	fdate;			/* Modified date */
-	WORD	ftime;			/* Modified time */
-	BYTE	fattrib;		/* File attribute */
-#if FF_USE_LFN
-	TCHAR	altname[FF_SFN_BUF + 1];/* Altenative file name */
-	TCHAR	fname[FF_LFN_BUF + 1];	/* Primary file name */
-#else
-	TCHAR	fname[12 + 1];	/* File name */
-#endif
-} FILINFO;
-
-
-
-/* Format parameter structure (MKFS_PARM) */
-
-typedef struct {
-	BYTE fmt;			/* Format option (FM_FAT, FM_FAT32, FM_EXFAT and FM_SFD) */
-	BYTE n_fat;			/* Number of FATs */
-	UINT align;			/* Data area alignment (sector) */
-	UINT n_root;		/* Number of root directory entries */
-	DWORD au_size;		/* Cluster size (byte) */
-} MKFS_PARM;
-
-
-
-/* File function return code (FRESULT) */
-
-typedef enum {
-	FR_OK = 0,				/* (0) Succeeded */
-	FR_DISK_ERR,			/* (1) A hard error occurred in the low level disk I/O layer */
-	FR_INT_ERR,				/* (2) Assertion failed */
-	FR_NOT_READY,			/* (3) The physical drive cannot work */
-	FR_NO_FILE,				/* (4) Could not find the file */
-	FR_NO_PATH,				/* (5) Could not find the path */
-	FR_INVALID_NAME,		/* (6) The path name format is invalid */
-	FR_DENIED,				/* (7) Access denied due to prohibited access or directory full */
-	FR_EXIST,				/* (8) Access denied due to prohibited access */
-	FR_INVALID_OBJECT,		/* (9) The file/directory object is invalid */
-	FR_WRITE_PROTECTED,		/* (10) The physical drive is write protected */
-	FR_INVALID_DRIVE,		/* (11) The logical drive number is invalid */
-	FR_NOT_ENABLED,			/* (12) The volume has no work area */
-	FR_NO_FILESYSTEM,		/* (13) There is no valid FAT volume */
-	FR_MKFS_ABORTED,		/* (14) The f_mkfs() aborted due to any problem */
-	FR_TIMEOUT,				/* (15) Could not get a grant to access the volume within defined period */
-	FR_LOCKED,				/* (16) The operation is rejected according to the file sharing policy */
-	FR_NOT_ENOUGH_CORE,		/* (17) LFN working buffer could not be allocated */
-	FR_TOO_MANY_OPEN_FILES,	/* (18) Number of open files > FF_FS_LOCK */
-	FR_INVALID_PARAMETER	/* (19) Given parameter is invalid */
-} FRESULT;
-
-
-
-/*--------------------------------------------------------------*/
-/* FatFs module application interface                           */
-
-FRESULT f_open (FIL* fp, const TCHAR* path, BYTE mode);				/* Open or create a file */
-FRESULT f_close (FIL* fp);											/* Close an open file object */
-FRESULT f_read (FIL* fp, void* buff, UINT btr, UINT* br);			/* Read data from the file */
-FRESULT f_write (FIL* fp, const void* buff, UINT btw, UINT* bw);	/* Write data to the file */
-FRESULT f_lseek (FIL* fp, FSIZE_t ofs);								/* Move file pointer of the file object */
-FRESULT f_truncate (FIL* fp);										/* Truncate the file */
-FRESULT f_sync (FIL* fp);											/* Flush cached data of the writing file */
-FRESULT f_opendir (FF_DIR* dp, const TCHAR* path);						/* Open a directory */
-FRESULT f_closedir (FF_DIR* dp);										/* Close an open directory */
-FRESULT f_readdir (FF_DIR* dp, FILINFO* fno);							/* Read a directory item */
-FRESULT f_findfirst (FF_DIR* dp, FILINFO* fno, const TCHAR* path, const TCHAR* pattern);	/* Find first file */
-FRESULT f_findnext (FF_DIR* dp, FILINFO* fno);							/* Find next file */
-FRESULT f_mkdir (const TCHAR* path);								/* Create a sub directory */
-FRESULT f_unlink (const TCHAR* path);								/* Delete an existing file or directory */
-FRESULT f_rename (const TCHAR* path_old, const TCHAR* path_new);	/* Rename/Move a file or directory */
-FRESULT f_stat (const TCHAR* path, FILINFO* fno);					/* Get file status */
-FRESULT f_chmod (const TCHAR* path, BYTE attr, BYTE mask);			/* Change attribute of a file/dir */
-FRESULT f_utime (const TCHAR* path, const FILINFO* fno);			/* Change timestamp of a file/dir */
-FRESULT f_chdir (const TCHAR* path);								/* Change current directory */
-FRESULT f_chdrive (const TCHAR* path);								/* Change current drive */
-FRESULT f_getcwd (TCHAR* buff, UINT len);							/* Get current directory */
-FRESULT f_getfree (const TCHAR* path, DWORD* nclst, FATFS** fatfs);	/* Get number of free clusters on the drive */
-FRESULT f_getlabel (const TCHAR* path, TCHAR* label, DWORD* vsn);	/* Get volume label */
-FRESULT f_setlabel (const TCHAR* label);							/* Set volume label */
-FRESULT f_forward (FIL* fp, UINT(*func)(const BYTE*,UINT), UINT btf, UINT* bf);	/* Forward data to the stream */
-FRESULT f_expand (FIL* fp, FSIZE_t fsz, BYTE opt);					/* Allocate a contiguous block to the file */
-FRESULT f_mount (FATFS* fs, const TCHAR* path, BYTE opt);			/* Mount/Unmount a logical drive */
-FRESULT f_mkfs (const TCHAR* path, const MKFS_PARM* opt, void* work, UINT len);	/* Create a FAT volume */
-FRESULT f_fdisk (BYTE pdrv, const LBA_t ptbl[], void* work);		/* Divide a physical drive into some partitions */
-FRESULT f_setcp (WORD cp);											/* Set current code page */
-int f_putc (TCHAR c, FIL* fp);										/* Put a character to the file */
-int f_puts (const TCHAR* str, FIL* cp);								/* Put a string to the file */
-int f_printf (FIL* fp, const TCHAR* str, ...);						/* Put a formatted string to the file */
-TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the file */
-
-#define f_eof(fp) ((int)((fp)->fptr == (fp)->obj.objsize))
-#define f_error(fp) ((fp)->err)
-#define f_tell(fp) ((fp)->fptr)
-#define f_size(fp) ((fp)->obj.objsize)
-#define f_rewind(fp) f_lseek((fp), 0)
-#define f_rewinddir(dp) f_readdir((dp), 0)
-#define f_rmdir(path) f_unlink(path)
-#define f_unmount(path) f_mount(0, path, 0)
-
-
-
-
-/*--------------------------------------------------------------*/
-/* Additional user defined functions                            */
-
-/* RTC function */
-#if !FF_FS_READONLY && !FF_FS_NORTC
-DWORD get_fattime (void);
-#endif
-
-/* LFN support functions */
-#if FF_USE_LFN >= 1						/* Code conversion (defined in unicode.c) */
-WCHAR ff_oem2uni (WCHAR oem, WORD cp);	/* OEM code to Unicode conversion */
-WCHAR ff_uni2oem (DWORD uni, WORD cp);	/* Unicode to OEM code conversion */
-DWORD ff_wtoupper (DWORD uni);			/* Unicode upper-case conversion */
-#endif
-#if FF_USE_LFN == 3						/* Dynamic memory allocation */
-void* ff_memalloc (UINT msize);			/* Allocate memory block */
-void ff_memfree (void* mblock);			/* Free memory block */
-#endif
-
-/* Sync functions */
-#if FF_FS_REENTRANT
-int ff_cre_syncobj (BYTE vol, FF_SYNC_t* sobj);	/* Create a sync object */
-int ff_req_grant (FF_SYNC_t sobj);		/* Lock sync object */
-void ff_rel_grant (FF_SYNC_t sobj);		/* Unlock sync object */
-int ff_del_syncobj (FF_SYNC_t sobj);	/* Delete a sync object */
-#endif
-
-
-
-
-/*--------------------------------------------------------------*/
-/* Flags and offset address                                     */
-
-
-/* File access mode and open method flags (3rd argument of f_open) */
-#define	FA_READ				0x01
-#define	FA_WRITE			0x02
-#define	FA_OPEN_EXISTING	0x00
-#define	FA_CREATE_NEW		0x04
-#define	FA_CREATE_ALWAYS	0x08
-#define	FA_OPEN_ALWAYS		0x10
-#define	FA_OPEN_APPEND		0x30
-
-/* Fast seek controls (2nd argument of f_lseek) */
-#define CREATE_LINKMAP	((FSIZE_t)0 - 1)
-
-/* Format options (2nd argument of f_mkfs) */
-#define FM_FAT		0x01
-#define FM_FAT32	0x02
-#define FM_EXFAT	0x04
-#define FM_ANY		0x07
-#define FM_SFD		0x08
-
-/* Filesystem type (FATFS.fs_type) */
-#define FS_FAT12	1
-#define FS_FAT16	2
-#define FS_FAT32	3
-#define FS_EXFAT	4
-
-/* File attribute bits for directory entry (FILINFO.fattrib) */
-#define	AM_RDO	0x01	/* Read only */
-#define	AM_HID	0x02	/* Hidden */
-#define	AM_SYS	0x04	/* System */
-#define AM_DIR	0x10	/* Directory */
-#define AM_ARC	0x20	/* Archive */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* FF_DEFINED */

code/components/esp-fatfs/src/ffconf_mh.h

@@ -1,309 +0,0 @@
-#include "sdkconfig.h"
-
-/*---------------------------------------------------------------------------/
-/  FatFs Functional Configurations
-/---------------------------------------------------------------------------*/
-
-#define FFCONF_DEF 86631 /* Revision ID */
-
-/*---------------------------------------------------------------------------/
-/ Function Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_FS_READONLY 0
-/* This option switches read-only configuration. (0:Read/Write or 1:Read-only)
-/  Read-only configuration removes writing API functions, f_write(), f_sync(),
-/  f_unlink(), f_mkdir(), f_chmod(), f_rename(), f_truncate(), f_getfree()
-/  and optional writing functions as well. */
-
-#define FF_FS_MINIMIZE 0
-/* This option defines minimization level to remove some basic API functions.
-/
-/   0: Basic functions are fully enabled.
-/   1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_truncate() and f_rename()
-/      are removed.
-/   2: f_opendir(), f_readdir() and f_closedir() are removed in addition to 1.
-/   3: f_lseek() function is removed in addition to 2. */
-
-#define FF_USE_FIND 0
-/* This option switches filtered directory read functions, f_findfirst() and
-/  f_findnext(). (0:Disable, 1:Enable 2:Enable with matching altname[] too) */
-
-#define FF_USE_MKFS 1
-/* This option switches f_mkfs() function. (0:Disable or 1:Enable) */
-
-#define FF_USE_FASTSEEK CONFIG_FATFS_USE_FASTSEEK
-/* This option switches fast seek function. (0:Disable or 1:Enable) */
-
-#define FF_USE_EXPAND 0
-/* This option switches f_expand function. (0:Disable or 1:Enable) */
-
-#define FF_USE_CHMOD 1
-/* This option switches attribute manipulation functions, f_chmod() and f_utime().
-/  (0:Disable or 1:Enable) Also FF_FS_READONLY needs to be 0 to enable this option. */
-
-#define FF_USE_LABEL 0
-/* This option switches volume label functions, f_getlabel() and f_setlabel().
-/  (0:Disable or 1:Enable) */
-
-#define FF_USE_FORWARD 0
-/* This option switches f_forward() function. (0:Disable or 1:Enable) */
-
-#define FF_USE_STRFUNC 0
-#define FF_PRINT_LLI 0
-#define FF_PRINT_FLOAT 0
-#define FF_STRF_ENCODE 3
-/* FF_USE_STRFUNC switches string functions, f_gets(), f_putc(), f_puts() and
-/  f_printf().
-/
-/   0: Disable. FF_PRINT_LLI, FF_PRINT_FLOAT and FF_STRF_ENCODE have no effect.
-/   1: Enable without LF-CRLF conversion.
-/   2: Enable with LF-CRLF conversion.
-/
-/  FF_PRINT_LLI = 1 makes f_printf() support long long argument and FF_PRINT_FLOAT = 1/2
-   makes f_printf() support floating point argument. These features want C99 or later.
-/  When FF_LFN_UNICODE >= 1 with LFN enabled, string functions convert the character
-/  encoding in it. FF_STRF_ENCODE selects assumption of character encoding ON THE FILE
-/  to be read/written via those functions.
-/
-/   0: ANSI/OEM in current CP
-/   1: Unicode in UTF-16LE
-/   2: Unicode in UTF-16BE
-/   3: Unicode in UTF-8
-*/
-
-/*---------------------------------------------------------------------------/
-/ Locale and Namespace Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_CODE_PAGE CONFIG_FATFS_CODEPAGE
-/* This option specifies the OEM code page to be used on the target system.
-/  Incorrect code page setting can cause a file open failure.
-/
-/   437 - U.S.
-/   720 - Arabic
-/   737 - Greek
-/   771 - KBL
-/   775 - Baltic
-/   850 - Latin 1
-/   852 - Latin 2
-/   855 - Cyrillic
-/   857 - Turkish
-/   860 - Portuguese
-/   861 - Icelandic
-/   862 - Hebrew
-/   863 - Canadian French
-/   864 - Arabic
-/   865 - Nordic
-/   866 - Russian
-/   869 - Greek 2
-/   932 - Japanese (DBCS)
-/   936 - Simplified Chinese (DBCS)
-/   949 - Korean (DBCS)
-/   950 - Traditional Chinese (DBCS)
-/     0 - Include all code pages above and configured by f_setcp()
-*/
-
-#if defined(CONFIG_FATFS_LFN_STACK)
-#define FF_USE_LFN 2
-#elif defined(CONFIG_FATFS_LFN_HEAP)
-#define FF_USE_LFN 3
-#else /* CONFIG_FATFS_LFN_NONE */
-#define FF_USE_LFN 0
-#endif
-
-#ifdef CONFIG_FATFS_MAX_LFN
-#define FF_MAX_LFN CONFIG_FATFS_MAX_LFN
-#endif
-
-/* The FF_USE_LFN switches the support for LFN (long file name).
-/
-/   0: Disable LFN. FF_MAX_LFN has no effect.
-/   1: Enable LFN with static  working buffer on the BSS. Always NOT thread-safe.
-/   2: Enable LFN with dynamic working buffer on the STACK.
-/   3: Enable LFN with dynamic working buffer on the HEAP.
-/
-/  To enable the LFN, ffunicode.c needs to be added to the project. The LFN function
-/  requiers certain internal working buffer occupies (FF_MAX_LFN + 1) * 2 bytes and
-/  additional (FF_MAX_LFN + 44) / 15 * 32 bytes when exFAT is enabled.
-/  The FF_MAX_LFN defines size of the working buffer in UTF-16 code unit and it can
-/  be in range of 12 to 255. It is recommended to be set it 255 to fully support LFN
-/  specification.
-/  When use stack for the working buffer, take care on stack overflow. When use heap
-/  memory for the working buffer, memory management functions, ff_memalloc() and
-/  ff_memfree() exemplified in ffsystem.c, need to be added to the project. */
-
-#ifdef CONFIG_FATFS_API_ENCODING_UTF_8
-#define FF_LFN_UNICODE 2
-#else /* CONFIG_FATFS_API_ENCODING_ANSI_OEM */
-#define FF_LFN_UNICODE 0
-#endif
-/* This option switches the character encoding on the API when LFN is enabled.
-/
-/   0: ANSI/OEM in current CP (TCHAR = char)
-/   1: Unicode in UTF-16 (TCHAR = WCHAR)
-/   2: Unicode in UTF-8 (TCHAR = char)
-/   3: Unicode in UTF-32 (TCHAR = DWORD)
-/
-/  Also behavior of string I/O functions will be affected by this option.
-/  When LFN is not enabled, this option has no effect. */
-
-#define FF_LFN_BUF 255
-#define FF_SFN_BUF 12
-/* This set of options defines size of file name members in the FILINFO structure
-/  which is used to read out directory items. These values should be suffcient for
-/  the file names to read. The maximum possible length of the read file name depends
-/  on character encoding. When LFN is not enabled, these options have no effect. */
-
-#define FF_FS_RPATH 0
-/* This option configures support for relative path.
-/
-/   0: Disable relative path and remove related functions.
-/   1: Enable relative path. f_chdir() and f_chdrive() are available.
-/   2: f_getcwd() function is available in addition to 1.
-*/
-
-/*---------------------------------------------------------------------------/
-/ Drive/Volume Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_VOLUMES CONFIG_FATFS_VOLUME_COUNT
-/* Number of volumes (logical drives) to be used. (1-10) */
-
-#define FF_STR_VOLUME_ID 0
-#define FF_VOLUME_STRS "RAM", "NAND", "CF", "SD", "SD2", "USB", "USB2", "USB3"
-/* FF_STR_VOLUME_ID switches support for volume ID in arbitrary strings.
-/  When FF_STR_VOLUME_ID is set to 1 or 2, arbitrary strings can be used as drive
-/  number in the path name. FF_VOLUME_STRS defines the volume ID strings for each
-/  logical drives. Number of items must not be less than FF_VOLUMES. Valid
-/  characters for the volume ID strings are A-Z, a-z and 0-9, however, they are
-/  compared in case-insensitive. If FF_STR_VOLUME_ID >= 1 and FF_VOLUME_STRS is
-/  not defined, a user defined volume string table needs to be defined as:
-/
-/  const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
-*/
-
-#define FF_MULTI_PARTITION 1
-/* This option switches support for multiple volumes on the physical drive.
-/  By default (0), each logical drive number is bound to the same physical drive
-/  number and only an FAT volume found on the physical drive will be mounted.
-/  When this function is enabled (1), each logical drive number can be bound to
-/  arbitrary physical drive and partition listed in the VolToPart[]. Also f_fdisk()
-/  funciton will be available. */
-
-/* SD card sector size */
-#define FF_SS_SDCARD 512
-/* wear_levelling library sector size */
-#define FF_SS_WL CONFIG_WL_SECTOR_SIZE
-
-#define FF_MIN_SS MIN(FF_SS_SDCARD, FF_SS_WL)
-#define FF_MAX_SS MAX(FF_SS_SDCARD, FF_SS_WL)
-/* This set of options configures the range of sector size to be supported. (512,
-/  1024, 2048 or 4096) Always set both 512 for most systems, generic memory card and
-/  harddisk, but a larger value may be required for on-board flash memory and some
-/  type of optical media. When FF_MAX_SS is larger than FF_MIN_SS, FatFs is configured
-/  for variable sector size mode and disk_ioctl() function needs to implement
-/  GET_SECTOR_SIZE command. */
-
-#define FF_LBA64 0
-/* This option switches support for 64-bit LBA. (0:Disable or 1:Enable)
-/  To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */
-
-#define FF_MIN_GPT 0x10000000
-/* Minimum number of sectors to switch GPT as partitioning format in f_mkfs and
-/  f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */
-
-#define FF_USE_TRIM 1
-/* This option switches support for ATA-TRIM. (0:Disable or 1:Enable)
-/  To enable Trim function, also CTRL_TRIM command should be implemented to the
-/  disk_ioctl() function. */
-
-/*---------------------------------------------------------------------------/
-/ System Configurations
-/---------------------------------------------------------------------------*/
-
-#define FF_FS_TINY (!CONFIG_FATFS_PER_FILE_CACHE)
-/* This option switches tiny buffer configuration. (0:Normal or 1:Tiny)
-/  At the tiny configuration, size of file object (FIL) is shrinked FF_MAX_SS bytes.
-/  Instead of private sector buffer eliminated from the file object, common sector
-/  buffer in the filesystem object (FATFS) is used for the file data transfer. */
-
-#define FF_FS_EXFAT 0
-/* This option switches support for exFAT filesystem. (0:Disable or 1:Enable)
-/  To enable exFAT, also LFN needs to be enabled. (FF_USE_LFN >= 1)
-/  Note that enabling exFAT discards ANSI C (C89) compatibility. */
-
-#define FF_FS_NORTC 0
-#define FF_NORTC_MON 1
-#define FF_NORTC_MDAY 1
-#define FF_NORTC_YEAR 2020
-/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have
-/  any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
-/  the timestamp function. Every object modified by FatFs will have a fixed timestamp
-/  defined by FF_NORTC_MON, FF_NORTC_MDAY and FF_NORTC_YEAR in local time.
-/  To enable timestamp function (FF_FS_NORTC = 0), get_fattime() function need to be
-/  added to the project to read current time form real-time clock. FF_NORTC_MON,
-/  FF_NORTC_MDAY and FF_NORTC_YEAR have no effect.
-/  These options have no effect in read-only configuration (FF_FS_READONLY = 1). */
-
-#define FF_FS_NOFSINFO 0
-/* If you need to know correct free space on the FAT32 volume, set bit 0 of this
-/  option, and f_getfree() function at first time after volume mount will force
-/  a full FAT scan. Bit 1 controls the use of last allocated cluster number.
-/
-/  bit0=0: Use free cluster count in the FSINFO if available.
-/  bit0=1: Do not trust free cluster count in the FSINFO.
-/  bit1=0: Use last allocated cluster number in the FSINFO if available.
-/  bit1=1: Do not trust last allocated cluster number in the FSINFO.
-*/
-
-#define FF_FS_LOCK CONFIG_FATFS_FS_LOCK
-/* The option FF_FS_LOCK switches file lock function to control duplicated file open
-/  and illegal operation to open objects. This option must be 0 when FF_FS_READONLY
-/  is 1.
-/
-/  0:  Disable file lock function. To avoid volume corruption, application program
-/      should avoid illegal open, remove and rename to the open objects.
-/  >0: Enable file lock function. The value defines how many files/sub-directories
-/      can be opened simultaneously under file lock control. Note that the file
-/      lock control is independent of re-entrancy. */
-
-/* #include <somertos.h>	// O/S definitions */
-#define FF_FS_REENTRANT 1
-#define FF_FS_TIMEOUT (CONFIG_FATFS_TIMEOUT_MS / portTICK_PERIOD_MS)
-#define FF_SYNC_t SemaphoreHandle_t
-/* The option FF_FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
-/  module itself. Note that regardless of this option, file access to different
-/  volume is always re-entrant and volume control functions, f_mount(), f_mkfs()
-/  and f_fdisk() function, are always not re-entrant. Only file/directory access
-/  to the same volume is under control of this function.
-/
-/   0: Disable re-entrancy. FF_FS_TIMEOUT and FF_SYNC_t have no effect.
-/   1: Enable re-entrancy. Also user provided synchronization handlers,
-/      ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()
-/      function, must be added to the project. Samples are available in
-/      option/syscall.c.
-/
-/  The FF_FS_TIMEOUT defines timeout period in unit of time tick.
-/  The FF_SYNC_t defines O/S dependent sync object type. e.g. HANDLE, ID, OS_EVENT*,
-/  SemaphoreHandle_t and etc. A header file for O/S definitions needs to be
-/  included somewhere in the scope of ff.h. */
-
-#include <sys/param.h>
-#include "freertos/FreeRTOS.h"
-#include "freertos/semphr.h"
-
-/* Some memory allocation functions are declared here in addition to ff.h, so that
-   they can be used also by external code when LFN feature is disabled.
- */
-void *ff_memalloc(unsigned msize);
-void ff_memfree(void *);
-
-/*--- End of configuration options ---*/
-
-/* Redefine names of disk IO functions to prevent name collisions */
-#define disk_initialize ff_disk_initialize
-#define disk_status ff_disk_status
-#define disk_read ff_disk_read
-#define disk_write ff_disk_write
-#define disk_ioctl ff_disk_ioctl

code/components/esp-fatfs/src/ffsystem_mh.c

@@ -1,169 +0,0 @@
-/*------------------------------------------------------------------------*/
-/* Sample Code of OS Dependent Functions for FatFs                        */
-/* (C)ChaN, 2018                                                          */
-/*------------------------------------------------------------------------*/
-
-
-#include "ff_mh.h"
-
-
-#if FF_USE_LFN == 3	/* Dynamic memory allocation */
-
-/*------------------------------------------------------------------------*/
-/* Allocate a memory block                                                */
-/*------------------------------------------------------------------------*/
-
-void* ff_memalloc (	/* Returns pointer to the allocated memory block (null if not enough core) */
-	UINT msize		/* Number of bytes to allocate */
-)
-{
-	return malloc(msize);	/* Allocate a new memory block with POSIX API */
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Free a memory block                                                    */
-/*------------------------------------------------------------------------*/
-
-void ff_memfree (
-	void* mblock	/* Pointer to the memory block to free (nothing to do if null) */
-)
-{
-	free(mblock);	/* Free the memory block with POSIX API */
-}
-
-#endif
-
-
-
-#if FF_FS_REENTRANT	/* Mutal exclusion */
-
-/*------------------------------------------------------------------------*/
-/* Create a Synchronization Object                                        */
-/*------------------------------------------------------------------------*/
-/* This function is called in f_mount() function to create a new
-/  synchronization object for the volume, such as semaphore and mutex.
-/  When a 0 is returned, the f_mount() function fails with FR_INT_ERR.
-*/
-
-//const osMutexDef_t Mutex[FF_VOLUMES];	/* Table of CMSIS-RTOS mutex */
-
-
-int ff_cre_syncobj (	/* 1:Function succeeded, 0:Could not create the sync object */
-	BYTE vol,			/* Corresponding volume (logical drive number) */
-	FF_SYNC_t* sobj		/* Pointer to return the created sync object */
-)
-{
-	/* Win32 */
-	*sobj = CreateMutex(NULL, FALSE, NULL);
-	return (int)(*sobj != INVALID_HANDLE_VALUE);
-
-	/* uITRON */
-//	T_CSEM csem = {TA_TPRI,1,1};
-//	*sobj = acre_sem(&csem);
-//	return (int)(*sobj > 0);
-
-	/* uC/OS-II */
-//	OS_ERR err;
-//	*sobj = OSMutexCreate(0, &err);
-//	return (int)(err == OS_NO_ERR);
-
-	/* FreeRTOS */
-//	*sobj = xSemaphoreCreateMutex();
-//	return (int)(*sobj != NULL);
-
-	/* CMSIS-RTOS */
-//	*sobj = osMutexCreate(&Mutex[vol]);
-//	return (int)(*sobj != NULL);
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Delete a Synchronization Object                                        */
-/*------------------------------------------------------------------------*/
-/* This function is called in f_mount() function to delete a synchronization
-/  object that created with ff_cre_syncobj() function. When a 0 is returned,
-/  the f_mount() function fails with FR_INT_ERR.
-*/
-
-int ff_del_syncobj (	/* 1:Function succeeded, 0:Could not delete due to an error */
-	FF_SYNC_t sobj		/* Sync object tied to the logical drive to be deleted */
-)
-{
-	/* Win32 */
-	return (int)CloseHandle(sobj);
-
-	/* uITRON */
-//	return (int)(del_sem(sobj) == E_OK);
-
-	/* uC/OS-II */
-//	OS_ERR err;
-//	OSMutexDel(sobj, OS_DEL_ALWAYS, &err);
-//	return (int)(err == OS_NO_ERR);
-
-	/* FreeRTOS */
-//  vSemaphoreDelete(sobj);
-//	return 1;
-
-	/* CMSIS-RTOS */
-//	return (int)(osMutexDelete(sobj) == osOK);
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Request Grant to Access the Volume                                     */
-/*------------------------------------------------------------------------*/
-/* This function is called on entering file functions to lock the volume.
-/  When a 0 is returned, the file function fails with FR_TIMEOUT.
-*/
-
-int ff_req_grant (	/* 1:Got a grant to access the volume, 0:Could not get a grant */
-	FF_SYNC_t sobj	/* Sync object to wait */
-)
-{
-	/* Win32 */
-	return (int)(WaitForSingleObject(sobj, FF_FS_TIMEOUT) == WAIT_OBJECT_0);
-
-	/* uITRON */
-//	return (int)(wai_sem(sobj) == E_OK);
-
-	/* uC/OS-II */
-//	OS_ERR err;
-//	OSMutexPend(sobj, FF_FS_TIMEOUT, &err));
-//	return (int)(err == OS_NO_ERR);
-
-	/* FreeRTOS */
-//	return (int)(xSemaphoreTake(sobj, FF_FS_TIMEOUT) == pdTRUE);
-
-	/* CMSIS-RTOS */
-//	return (int)(osMutexWait(sobj, FF_FS_TIMEOUT) == osOK);
-}
-
-
-/*------------------------------------------------------------------------*/
-/* Release Grant to Access the Volume                                     */
-/*------------------------------------------------------------------------*/
-/* This function is called on leaving file functions to unlock the volume.
-*/
-
-void ff_rel_grant (
-	FF_SYNC_t sobj	/* Sync object to be signaled */
-)
-{
-	/* Win32 */
-	ReleaseMutex(sobj);
-
-	/* uITRON */
-//	sig_sem(sobj);
-
-	/* uC/OS-II */
-//	OSMutexPost(sobj);
-
-	/* FreeRTOS */
-//	xSemaphoreGive(sobj);
-
-	/* CMSIS-RTOS */
-//	osMutexRelease(sobj);
-}
-
-#endif

code/components/esp-fatfs/vfs/esp_vfs_fat_mh.h

@@ -1,321 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-#include <stddef.h>
-#include "esp_err.h"
-#include "driver/gpio.h"
-#include "driver/sdmmc_types.h"
-#include "driver/sdspi_host.h"
-#include "ff_mh.h"
-#include "wear_levelling.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @brief Register FATFS with VFS component
- *
- * This function registers given FAT drive in VFS, at the specified base path.
- * If only one drive is used, fat_drive argument can be an empty string.
- * Refer to FATFS library documentation on how to specify FAT drive.
- * This function also allocates FATFS structure which should be used for f_mount
- * call.
- *
- * @note This function doesn't mount the drive into FATFS, it just connects
- *       POSIX and C standard library IO function with FATFS. You need to mount
- *       desired drive into FATFS separately.
- *
- * @param base_path  path prefix where FATFS should be registered
- * @param fat_drive  FATFS drive specification; if only one drive is used, can be an empty string
- * @param max_files  maximum number of files which can be open at the same time
- * @param[out] out_fs  pointer to FATFS structure which can be used for FATFS f_mount call is returned via this argument.
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_register was already called
- *      - ESP_ERR_NO_MEM if not enough memory or too many VFSes already registered
- */
-esp_err_t esp_vfs_fat_register(const char* base_path, const char* fat_drive,
-        size_t max_files, FATFS** out_fs);
-
-/**
- * @brief Un-register FATFS from VFS
- *
- * @note FATFS structure returned by esp_vfs_fat_register is destroyed after
- *       this call. Make sure to call f_mount function to unmount it before
- *       calling esp_vfs_fat_unregister_ctx.
- *       Difference between this function and the one above is that this one
- *       will release the correct drive, while the one above will release
- *       the last registered one
- *
- * @param base_path     path prefix where FATFS is registered. This is the same
- *                      used when esp_vfs_fat_register was called
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if FATFS is not registered in VFS
- */
-esp_err_t esp_vfs_fat_unregister_path(const char* base_path);
-
-
-/**
- * @brief Configuration arguments for esp_vfs_fat_sdmmc_mount and esp_vfs_fat_spiflash_mount_rw_wl functions
- */
-typedef struct {
-    /**
-     * If FAT partition can not be mounted, and this parameter is true,
-     * create partition table and format the filesystem.
-     */
-    bool format_if_mount_failed;
-    int max_files;                  ///< Max number of open files
-    /**
-     * If format_if_mount_failed is set, and mount fails, format the card
-     * with given allocation unit size. Must be a power of 2, between sector
-     * size and 128 * sector size.
-     * For SD cards, sector size is always 512 bytes. For wear_levelling,
-     * sector size is determined by CONFIG_WL_SECTOR_SIZE option.
-     *
-     * Using larger allocation unit size will result in higher read/write
-     * performance and higher overhead when storing small files.
-     *
-     * Setting this field to 0 will result in allocation unit set to the
-     * sector size.
-     */
-    size_t allocation_unit_size;
-    /**
-     * Enables real ff_disk_status function implementation for SD cards
-     * (ff_sdmmc_status). Possibly slows down IO performance.
-     *
-     * Try to enable if you need to handle situations when SD cards
-     * are not unmounted properly before physical removal
-     * or you are experiencing issues with SD cards.
-     *
-     * Doesn't do anything for other memory storage media.
-     */
-    bool disk_status_check_enable;
-} esp_vfs_fat_mount_config_t;
-
-// Compatibility definition
-typedef esp_vfs_fat_mount_config_t esp_vfs_fat_sdmmc_mount_config_t;
-
-/**
- * @brief Convenience function to get FAT filesystem on SD card registered in VFS
- *
- * This is an all-in-one function which does the following:
- * - initializes SDMMC driver or SPI driver with configuration in host_config
- * - initializes SD card with configuration in slot_config
- * - mounts FAT partition on SD card using FATFS library, with configuration in mount_config
- * - registers FATFS library with VFS, with prefix given by base_prefix variable
- *
- * This function is intended to make example code more compact.
- * For real world applications, developers should implement the logic of
- * probing SD card, locating and mounting partition, and registering FATFS in VFS,
- * with proper error checking and handling of exceptional conditions.
- *
- * @note Use this API to mount a card through SDSPI is deprecated. Please call
- *       `esp_vfs_fat_sdspi_mount()` instead for that case.
- *
- * @param base_path     path where partition should be registered (e.g. "/sdcard")
- * @param host_config   Pointer to structure describing SDMMC host. When using
- *                      SDMMC peripheral, this structure can be initialized using
- *                      SDMMC_HOST_DEFAULT() macro. When using SPI peripheral,
- *                      this structure can be initialized using SDSPI_HOST_DEFAULT()
- *                      macro.
- * @param slot_config   Pointer to structure with slot configuration.
- *                      For SDMMC peripheral, pass a pointer to sdmmc_slot_config_t
- *                      structure initialized using SDMMC_SLOT_CONFIG_DEFAULT.
- * @param mount_config  pointer to structure with extra parameters for mounting FATFS
- * @param[out] out_card  if not NULL, pointer to the card information structure will be returned via this argument
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_sdmmc_mount was already called
- *      - ESP_ERR_NO_MEM if memory can not be allocated
- *      - ESP_FAIL if partition can not be mounted
- *      - other error codes from SDMMC or SPI drivers, SDMMC protocol, or FATFS drivers
- */
-esp_err_t esp_vfs_fat_sdmmc_mount(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);
-
-/**
- * @brief Convenience function to get FAT filesystem on SD card registered in VFS
- *
- * This is an all-in-one function which does the following:
- * - initializes an SPI Master device based on the SPI Master driver with configuration in
- *   slot_config, and attach it to an initialized SPI bus.
- * - initializes SD card with configuration in host_config_input
- * - mounts FAT partition on SD card using FATFS library, with configuration in mount_config
- * - registers FATFS library with VFS, with prefix given by base_prefix variable
- *
- * This function is intended to make example code more compact.
- * For real world applications, developers should implement the logic of
- * probing SD card, locating and mounting partition, and registering FATFS in VFS,
- * with proper error checking and handling of exceptional conditions.
- *
- * @note This function try to attach the new SD SPI device to the bus specified in host_config.
- *       Make sure the SPI bus specified in `host_config->slot` have been initialized by
- *       `spi_bus_initialize()` before.
- *
- * @param base_path     path where partition should be registered (e.g. "/sdcard")
- * @param host_config_input Pointer to structure describing SDMMC host. This structure can be
- *                          initialized using SDSPI_HOST_DEFAULT() macro.
- * @param slot_config   Pointer to structure with slot configuration.
- *                      For SPI peripheral, pass a pointer to sdspi_device_config_t
- *                      structure initialized using SDSPI_DEVICE_CONFIG_DEFAULT().
- * @param mount_config  pointer to structure with extra parameters for mounting FATFS
- * @param[out] out_card If not NULL, pointer to the card information structure will be returned via
- *                      this argument. It is suggested to hold this handle and use it to unmount the card later if
- *                      needed. Otherwise it's not suggested to use more than one card at the same time and unmount one
- *                      of them in your application.
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_sdmmc_mount was already called
- *      - ESP_ERR_NO_MEM if memory can not be allocated
- *      - ESP_FAIL if partition can not be mounted
- *      - other error codes from SDMMC or SPI drivers, SDMMC protocol, or FATFS drivers
- */
-esp_err_t esp_vfs_fat_sdspi_mount(const char* base_path,
-                                  const sdmmc_host_t* host_config_input,
-                                  const sdspi_device_config_t* slot_config,
-                                  const esp_vfs_fat_mount_config_t* mount_config,
-                                  sdmmc_card_t** out_card);
-
-/**
- * @brief Unmount FAT filesystem and release resources acquired using esp_vfs_fat_sdmmc_mount
- *
- * @deprecated Use `esp_vfs_fat_sdcard_unmount()` instead.
- *
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_sdmmc_mount hasn't been called
- */
-esp_err_t esp_vfs_fat_sdmmc_unmount(void);
-
-/**
- * @brief Unmount an SD card from the FAT filesystem and release resources acquired using
- *        `esp_vfs_fat_sdmmc_mount()` or `esp_vfs_fat_sdspi_mount()`
- *
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_ARG if the card argument is unregistered
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_sdmmc_mount hasn't been called
- */
-esp_err_t esp_vfs_fat_sdcard_unmount(const char* base_path, sdmmc_card_t *card);
-
-/**
- * @brief Convenience function to initialize FAT filesystem in SPI flash and register it in VFS
- *
- * This is an all-in-one function which does the following:
- *
- * - finds the partition with defined partition_label. Partition label should be
- *   configured in the partition table.
- * - initializes flash wear levelling library on top of the given partition
- * - mounts FAT partition using FATFS library on top of flash wear levelling
- *   library
- * - registers FATFS library with VFS, with prefix given by base_prefix variable
- *
- * This function is intended to make example code more compact.
- *
- * @param base_path        path where FATFS partition should be mounted (e.g. "/spiflash")
- * @param partition_label  label of the partition which should be used
- * @param mount_config     pointer to structure with extra parameters for mounting FATFS
- * @param[out] wl_handle   wear levelling driver handle
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_NOT_FOUND if the partition table does not contain FATFS partition with given label
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_spiflash_mount_rw_wl was already called
- *      - ESP_ERR_NO_MEM if memory can not be allocated
- *      - ESP_FAIL if partition can not be mounted
- *      - other error codes from wear levelling library, SPI flash driver, or FATFS drivers
- */
-esp_err_t esp_vfs_fat_spiflash_mount_rw_wl(const char* base_path,
-    const char* partition_label,
-    const esp_vfs_fat_mount_config_t* mount_config,
-    wl_handle_t* wl_handle);
-
-/**
- * @brief Unmount FAT filesystem and release resources acquired using esp_vfs_fat_spiflash_mount_rw_wl
- *
- * @param base_path  path where partition should be registered (e.g. "/spiflash")
- * @param wl_handle  wear levelling driver handle returned by esp_vfs_fat_spiflash_mount_rw_wl
- *
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_spiflash_mount_rw_wl hasn't been called
- */
-esp_err_t esp_vfs_fat_spiflash_unmount_rw_wl(const char* base_path, wl_handle_t wl_handle);
-
-/**
- * @brief Convenience function to initialize read-only FAT filesystem and register it in VFS
- *
- * This is an all-in-one function which does the following:
- *
- * - finds the partition with defined partition_label. Partition label should be
- *   configured in the partition table.
- * - mounts FAT partition using FATFS library
- * - registers FATFS library with VFS, with prefix given by base_prefix variable
- *
- * @note Wear levelling is not used when FAT is mounted in read-only mode using this function.
- *
- * @param base_path        path where FATFS partition should be mounted (e.g. "/spiflash")
- * @param partition_label  label of the partition which should be used
- * @param mount_config     pointer to structure with extra parameters for mounting FATFS
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_NOT_FOUND if the partition table does not contain FATFS partition with given label
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_spiflash_mount_ro was already called for the same partition
- *      - ESP_ERR_NO_MEM if memory can not be allocated
- *      - ESP_FAIL if partition can not be mounted
- *      - other error codes from SPI flash driver, or FATFS drivers
- */
-esp_err_t esp_vfs_fat_spiflash_mount_ro(const char* base_path,
-    const char* partition_label,
-    const esp_vfs_fat_mount_config_t* mount_config);
-
-/**
- * @brief Unmount FAT filesystem and release resources acquired using esp_vfs_fat_spiflash_mount_ro
- *
- * @param base_path  path where partition should be registered (e.g. "/spiflash")
- * @param partition_label label of partition to be unmounted
- *
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if esp_vfs_fat_spiflash_mount_rw_wl hasn't been called
- */
-esp_err_t esp_vfs_fat_spiflash_unmount_ro(const char* base_path, const char* partition_label);
-
-esp_err_t esp_vfs_fat_spiflash_mount(const char* base_path,
-    const char* partition_label,
-    const esp_vfs_fat_mount_config_t* mount_config,
-    wl_handle_t* wl_handle)
-    __attribute__((deprecated("esp_vfs_fat_spiflash_mount is deprecated, please use esp_vfs_fat_spiflash_mount_rw_wl instead")));
-esp_err_t esp_vfs_fat_spiflash_unmount(const char* base_path, wl_handle_t wl_handle)
-    __attribute__((deprecated("esp_vfs_fat_spiflash_unmount is deprecated, please use esp_vfs_fat_spiflash_unmount_rw_wl instead")));
-esp_err_t esp_vfs_fat_rawflash_mount(const char* base_path,
-    const char* partition_label,
-    const esp_vfs_fat_mount_config_t* mount_config)
-    __attribute__((deprecated("esp_vfs_fat_rawflash_mount is deprecated, please use esp_vfs_fat_spiflash_mount_ro instead")));
-esp_err_t esp_vfs_fat_rawflash_unmount(const char* base_path, const char* partition_label)
-    __attribute__((deprecated("esp_vfs_fat_rawflash_unmount is deprecated, please use esp_vfs_fat_spiflash_unmount_ro instead")));
-
-/**
- * @brief  Get information for FATFS partition
- *
- * @param base_path  Path where partition should be registered (e.g. "/spiflash")
- * @param[out] out_total_bytes  Size of the file system
- * @param[out] out_free_bytes   Current used bytes in the file system
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_STATE if partition not found
- *      - ESP_FAIL if another FRESULT error (saved in errno)
- */
-esp_err_t esp_vfs_fat_info(const char* base_path, uint64_t* out_total_bytes, uint64_t* out_free_bytes);
-
-#ifdef __cplusplus
-}
-#endif

code/components/esp-fatfs/vfs/vfs_fat_internal_mh.h

@@ -1,30 +0,0 @@
-// Copyright 2018 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#pragma once
-
-#include "esp_vfs_fat_mh.h"
-#include <sys/param.h>
-#include <stddef.h>
-
-static inline size_t esp_vfs_fat_get_allocation_unit_size(
-        size_t sector_size, size_t requested_size)
-{
-    size_t alloc_unit_size = requested_size;
-    const size_t max_sectors_per_cylinder = 128;
-    const size_t max_size = sector_size * max_sectors_per_cylinder;
-    alloc_unit_size = MAX(alloc_unit_size, sector_size);
-    alloc_unit_size = MIN(alloc_unit_size, max_size);
-    return alloc_unit_size;
-}

code/components/esp-fatfs/vfs/vfs_fat_sdmmc_mh.c

@@ -1,375 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "esp_log.h"
-#include "esp_vfs.h"
-#include "esp_vfs_fat_mh.h"
-#include "vfs_fat_internal_mh.h"
-#include "driver/sdspi_host.h"
-#include "sdmmc_cmd_mh.h"
-#include "diskio_impl_mh.h"
-#include "diskio_sdmmc_mh.h"
-#include "soc/soc_caps.h"
-#include "driver/sdmmc_defs.h"
-
-#if SOC_SDMMC_HOST_SUPPORTED
-#include "driver/sdmmc_host.h"
-#endif
-
-static const char* TAG = "vfs_fat_sdmmc";
-static sdmmc_card_t* s_card = NULL;
-static uint8_t s_pdrv = FF_DRV_NOT_USED;
-static char * s_base_path = NULL;
-
-#define CHECK_EXECUTE_RESULT(err, str) do { \
-    if ((err) !=ESP_OK) { \
-        ESP_LOGE(TAG, str" (0x%x).", err); \
-        goto cleanup; \
-    } \
-    } while(0)
-
-static void call_host_deinit(const sdmmc_host_t *host_config);
-static esp_err_t partition_card(const esp_vfs_fat_mount_config_t *mount_config,
-                                const char *drv, sdmmc_card_t *card, BYTE pdrv);
-
-static esp_err_t mount_prepare_mem(const char *base_path,
-        BYTE *out_pdrv,
-        char **out_dup_path,
-        sdmmc_card_t** out_card)
-{
-    esp_err_t err = ESP_OK;
-    char* dup_path = NULL;
-    sdmmc_card_t* card = NULL;
-
-    // connect SDMMC driver to FATFS
-    BYTE pdrv = FF_DRV_NOT_USED;
-    if (ff_diskio_get_drive(&pdrv) != ESP_OK || pdrv == FF_DRV_NOT_USED) {
-        ESP_LOGD(TAG, "the maximum count of volumes is already mounted");
-        return ESP_ERR_NO_MEM;
-
-    }
-
-    // not using ff_memalloc here, as allocation in internal RAM is preferred
-    card = (sdmmc_card_t*)malloc(sizeof(sdmmc_card_t));
-    if (card == NULL) {
-        ESP_LOGD(TAG, "could not locate new sdmmc_card_t");
-        err = ESP_ERR_NO_MEM;
-        goto cleanup;
-    }
-
-    dup_path = strdup(base_path);
-    if(!dup_path){
-        ESP_LOGD(TAG, "could not copy base_path");
-        err = ESP_ERR_NO_MEM;
-        goto cleanup;
-    }
-
-    *out_card = card;
-    *out_pdrv = pdrv;
-    *out_dup_path = dup_path;
-    return ESP_OK;
-cleanup:
-    free(card);
-    free(dup_path);
-    return err;
-}
-
-static esp_err_t mount_to_vfs_fat(const esp_vfs_fat_mount_config_t *mount_config, sdmmc_card_t *card, uint8_t pdrv,
-                                  const char *base_path)
-{
-    FATFS* fs = NULL;
-    esp_err_t err;
-    ff_diskio_register_sdmmc(pdrv, card);
-    ff_sdmmc_set_disk_status_check(pdrv, mount_config->disk_status_check_enable);
-    ESP_LOGD(TAG, "using pdrv=%i", pdrv);
-    char drv[3] = {(char)('0' + pdrv), ':', 0};
-
-    // connect FATFS to VFS
-    err = esp_vfs_fat_register(base_path, drv, mount_config->max_files, &fs);
-    if (err == ESP_ERR_INVALID_STATE) {
-        // it's okay, already registered with VFS
-    } else if (err != ESP_OK) {
-        ESP_LOGD(TAG, "esp_vfs_fat_register failed 0x(%x)", err);
-        goto fail;
-    }
-
-    // Try to mount partition
-    FRESULT res = f_mount(fs, drv, 1);
-    if (res != FR_OK) {
-        err = ESP_FAIL;
-        ESP_LOGW(TAG, "failed to mount card (%d)", res);
-        if (!((res == FR_NO_FILESYSTEM || res == FR_INT_ERR)
-              && mount_config->format_if_mount_failed)) {
-            goto fail;
-        }
-
-        err = partition_card(mount_config, drv, card, pdrv);
-        if (err != ESP_OK) {
-            goto fail;
-        }
-
-        ESP_LOGW(TAG, "mounting again");
-        res = f_mount(fs, drv, 0);
-        if (res != FR_OK) {
-            err = ESP_FAIL;
-            ESP_LOGD(TAG, "f_mount failed after formatting (%d)", res);
-            goto fail;
-        }
-    }
-    return ESP_OK;
-
-fail:
-    if (fs) {
-        f_mount(NULL, drv, 0);
-    }
-    esp_vfs_fat_unregister_path(base_path);
-    ff_diskio_unregister(pdrv);
-    return err;
-}
-
-static esp_err_t partition_card(const esp_vfs_fat_mount_config_t *mount_config,
-                                const char *drv, sdmmc_card_t *card, BYTE pdrv)
-{
-    FRESULT res = FR_OK;
-    esp_err_t err;
-    const size_t workbuf_size = 4096;
-    void* workbuf = NULL;
-    ESP_LOGW(TAG, "partitioning card");
-
-    workbuf = ff_memalloc(workbuf_size);
-    if (workbuf == NULL) {
-        return ESP_ERR_NO_MEM;
-    }
-
-    LBA_t plist[] = {100, 0, 0, 0};
-    res = f_fdisk(pdrv, plist, workbuf);
-    if (res != FR_OK) {
-        err = ESP_FAIL;
-        ESP_LOGD(TAG, "f_fdisk failed (%d)", res);
-        goto fail;
-    }
-    size_t alloc_unit_size = esp_vfs_fat_get_allocation_unit_size(
-                card->csd.sector_size,
-                mount_config->allocation_unit_size);
-    ESP_LOGW(TAG, "formatting card, allocation unit size=%d", alloc_unit_size);
-    const MKFS_PARM opt = {(BYTE)FM_ANY, 0, 0, 0, alloc_unit_size};
-    res = f_mkfs(drv, &opt, workbuf, workbuf_size);
-    if (res != FR_OK) {
-        err = ESP_FAIL;
-        ESP_LOGD(TAG, "f_mkfs failed (%d)", res);
-        goto fail;
-    }
-
-    free(workbuf);
-    return ESP_OK;
-fail:
-    free(workbuf);
-    return err;
-}
-
-#if SOC_SDMMC_HOST_SUPPORTED
-static esp_err_t init_sdmmc_host(int slot, const void *slot_config, int *out_slot)
-{
-    *out_slot = slot;
-    return sdmmc_host_init_slot(slot, (const sdmmc_slot_config_t*) slot_config);
-}
-
-
-esp_err_t esp_vfs_fat_sdmmc_mount(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;
-    int card_handle = -1;   //uninitialized
-    sdmmc_card_t* card = NULL;
-    BYTE pdrv = FF_DRV_NOT_USED;
-    char* dup_path = NULL;
-    bool host_inited = false;
-
-    err = mount_prepare_mem(base_path, &pdrv, &dup_path, &card);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "mount_prepare failed");
-        return err;
-    }
-
-    err = (*host_config->init)();
-    CHECK_EXECUTE_RESULT(err, "host init failed");
-    //deinit() needs to be called to revert the init
-    host_inited = true;
-    //If this failed (indicated by card_handle != -1), slot deinit needs to called()
-    //leave card_handle as is to indicate that (though slot deinit not implemented yet.
-    err = init_sdmmc_host(host_config->slot, slot_config, &card_handle);
-    CHECK_EXECUTE_RESULT(err, "slot init failed");
-
-    // probe and initialize card
-    err = sdmmc_card_init(host_config, card);
-    CHECK_EXECUTE_RESULT(err, "sdmmc_card_init failed");
-
-    err = mount_to_vfs_fat(mount_config, card, pdrv, dup_path);
-    CHECK_EXECUTE_RESULT(err, "mount_to_vfs failed");
-
-    if (out_card != NULL) {
-        *out_card = card;
-    }
-    if (s_card == NULL) {
-        //store the ctx locally to be back-compatible
-        s_card = card;
-        s_pdrv = pdrv;
-        s_base_path = dup_path;
-    } else {
-        free(dup_path);
-    }
-    return ESP_OK;
-cleanup:
-    if (host_inited) {
-        call_host_deinit(host_config);
-    }
-    free(card);
-    free(dup_path);
-    return err;
-}
-#endif
-
-static esp_err_t init_sdspi_host(int slot, const void *slot_config, int *out_slot)
-{
-    esp_err_t err = sdspi_host_init_device((const sdspi_device_config_t*)slot_config, out_slot);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG,
-"Failed to attach sdspi device onto an SPI bus (rc=0x%x), please initialize the \
-bus first and check the device parameters."
-            , err);
-    }
-    return err;
-}
-
-esp_err_t esp_vfs_fat_sdspi_mount(const char* base_path,
-                                  const sdmmc_host_t* host_config_input,
-                                  const sdspi_device_config_t* slot_config,
-                                  const esp_vfs_fat_mount_config_t* mount_config,
-                                  sdmmc_card_t** out_card)
-{
-    const sdmmc_host_t* host_config = host_config_input;
-    esp_err_t err;
-    int card_handle = -1;   //uninitialized
-    bool host_inited = false;
-    BYTE pdrv = FF_DRV_NOT_USED;
-    sdmmc_card_t* card = NULL;
-    char* dup_path = NULL;
-
-    err = mount_prepare_mem(base_path, &pdrv, &dup_path, &card);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "mount_prepare failed");
-        return err;
-    }
-
-    //the init() function is usually empty, doesn't require any deinit to revert it
-    err = (*host_config->init)();
-    CHECK_EXECUTE_RESULT(err, "host init failed");
-
-    err = init_sdspi_host(host_config->slot, slot_config, &card_handle);
-    CHECK_EXECUTE_RESULT(err, "slot init failed");
-    //Set `host_inited` to true to indicate that host_config->deinit() needs
-    //to be called to revert `init_sdspi_host`
-    host_inited = true;
-
-    /*
-     * The `slot` argument inside host_config should be replaced by the SD SPI handled returned
-     * above. But the input pointer is const, so create a new variable.
-     */
-    sdmmc_host_t new_config;
-    if (card_handle != host_config->slot) {
-        new_config = *host_config_input;
-        host_config = &new_config;
-        new_config.slot = card_handle;
-    }
-
-    // probe and initialize card
-    err = sdmmc_card_init(host_config, card);
-    CHECK_EXECUTE_RESULT(err, "sdmmc_card_init failed");
-
-    err = mount_to_vfs_fat(mount_config, card, pdrv, dup_path);
-    CHECK_EXECUTE_RESULT(err, "mount_to_vfs failed");
-
-    if (out_card != NULL) {
-        *out_card = card;
-    }
-    if (s_card == NULL) {
-        //store the ctx locally to be back-compatible
-        s_card = card;
-        s_pdrv = pdrv;
-        s_base_path = dup_path;
-    } else {
-        free(dup_path);
-    }
-    return ESP_OK;
-
-cleanup:
-    if (host_inited) {
-        call_host_deinit(host_config);
-    }
-    free(card);
-    free(dup_path);
-    return err;
-
-}
-
-static void local_card_remove(void)
-{
-    s_card = NULL;
-    free(s_base_path);
-    s_base_path = NULL;
-    s_pdrv = FF_DRV_NOT_USED;
-}
-
-static void call_host_deinit(const sdmmc_host_t *host_config)
-{
-    if (host_config->flags & SDMMC_HOST_FLAG_DEINIT_ARG) {
-        host_config->deinit_p(host_config->slot);
-    } else {
-        host_config->deinit();
-    }
-}
-
-static esp_err_t unmount_card_core(const char *base_path, sdmmc_card_t *card)
-{
-    BYTE pdrv = ff_diskio_get_pdrv_card(card);
-    if (pdrv == 0xff) {
-        return ESP_ERR_INVALID_ARG;
-    }
-
-    // unmount
-    char drv[3] = {(char)('0' + pdrv), ':', 0};
-    f_mount(0, drv, 0);
-    // release SD driver
-    ff_diskio_unregister(pdrv);
-
-    call_host_deinit(&card->host);
-    free(card);
-
-    esp_err_t err = esp_vfs_fat_unregister_path(base_path);
-    return err;
-}
-
-esp_err_t esp_vfs_fat_sdmmc_unmount(void)
-{
-    sdmmc_card_t* card = s_card;
-    esp_err_t err = unmount_card_core(s_base_path, card);
-    local_card_remove();
-    return err;
-}
-
-esp_err_t esp_vfs_fat_sdcard_unmount(const char *base_path, sdmmc_card_t *card)
-{
-    esp_err_t err = unmount_card_core(base_path, card);
-    if (s_card == card) {
-        local_card_remove();
-    }
-    return err;
-}

code/components/esp-fatfs/vfs/vfs_fat_spiflash_mh.c

@@ -1,218 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "esp_log.h"
-#include "esp_vfs.h"
-#include "esp_vfs_fat_mh.h"
-#include "vfs_fat_internal_mh.h"
-#include "diskio_impl_mh.h"
-
-#include "diskio_rawflash_mh.h"
-
-#include "wear_levelling.h"
-#include "diskio_wl_mh.h"
-
-static const char* TAG = "vfs_fat_spiflash";
-
-esp_err_t esp_vfs_fat_spiflash_mount_rw_wl(const char* base_path,
-    const char* partition_label,
-    const esp_vfs_fat_mount_config_t* mount_config,
-    wl_handle_t* wl_handle)
-{
-    esp_err_t result = ESP_OK;
-    const size_t workbuf_size = 4096;
-    void *workbuf = NULL;
-
-    esp_partition_subtype_t subtype = partition_label ?
-            ESP_PARTITION_SUBTYPE_ANY : ESP_PARTITION_SUBTYPE_DATA_FAT;
-    const esp_partition_t *data_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
-                                                subtype, partition_label);
-    if (data_partition == NULL) {
-        ESP_LOGE(TAG, "Failed to find FATFS partition (type='data', subtype='fat', partition_label='%s'). Check the partition table.", partition_label);
-        return ESP_ERR_NOT_FOUND;
-    }
-
-    result = wl_mount(data_partition, wl_handle);
-    if (result != ESP_OK) {
-        ESP_LOGE(TAG, "failed to mount wear levelling layer. result = %i", result);
-        return result;
-    }
-    // connect driver to FATFS
-    BYTE pdrv = 0xFF;
-    if (ff_diskio_get_drive(&pdrv) != ESP_OK) {
-        ESP_LOGD(TAG, "the maximum count of volumes is already mounted");
-        return ESP_ERR_NO_MEM;
-    }
-    ESP_LOGD(TAG, "using pdrv=%i", pdrv);
-    char drv[3] = {(char)('0' + pdrv), ':', 0};
-
-    result = ff_diskio_register_wl_partition(pdrv, *wl_handle);
-    if (result != ESP_OK) {
-        ESP_LOGE(TAG, "ff_diskio_register_wl_partition failed pdrv=%i, error - 0x(%x)", pdrv, result);
-        goto fail;
-    }
-    FATFS *fs;
-    result = esp_vfs_fat_register(base_path, drv, mount_config->max_files, &fs);
-    if (result == ESP_ERR_INVALID_STATE) {
-        // it's okay, already registered with VFS
-    } else if (result != ESP_OK) {
-        ESP_LOGD(TAG, "esp_vfs_fat_register failed 0x(%x)", result);
-        goto fail;
-    }
-
-    // Try to mount partition
-    FRESULT fresult = f_mount(fs, drv, 1);
-    if (fresult != FR_OK) {
-        ESP_LOGW(TAG, "f_mount failed (%d)", fresult);
-        if (!((fresult == FR_NO_FILESYSTEM || fresult == FR_INT_ERR)
-              && mount_config->format_if_mount_failed)) {
-            result = ESP_FAIL;
-            goto fail;
-        }
-        workbuf = ff_memalloc(workbuf_size);
-        if (workbuf == NULL) {
-            result = ESP_ERR_NO_MEM;
-            goto fail;
-        }
-        size_t alloc_unit_size = esp_vfs_fat_get_allocation_unit_size(
-                CONFIG_WL_SECTOR_SIZE,
-                mount_config->allocation_unit_size);
-        ESP_LOGI(TAG, "Formatting FATFS partition, allocation unit size=%d", alloc_unit_size);
-        const MKFS_PARM opt = {(BYTE)(FM_ANY | FM_SFD), 0, 0, 0, alloc_unit_size};
-        fresult = f_mkfs(drv, &opt, workbuf, workbuf_size);
-        if (fresult != FR_OK) {
-            result = ESP_FAIL;
-            ESP_LOGE(TAG, "f_mkfs failed (%d)", fresult);
-            goto fail;
-        }
-        free(workbuf);
-        workbuf = NULL;
-        ESP_LOGI(TAG, "Mounting again");
-        fresult = f_mount(fs, drv, 0);
-        if (fresult != FR_OK) {
-            result = ESP_FAIL;
-            ESP_LOGE(TAG, "f_mount failed after formatting (%d)", fresult);
-            goto fail;
-        }
-    }
-    return ESP_OK;
-
-fail:
-    free(workbuf);
-    esp_vfs_fat_unregister_path(base_path);
-    ff_diskio_unregister(pdrv);
-    return result;
-}
-
-esp_err_t esp_vfs_fat_spiflash_unmount_rw_wl(const char* base_path, wl_handle_t wl_handle)
-{
-    BYTE pdrv = ff_diskio_get_pdrv_wl(wl_handle);
-    if (pdrv == 0xff) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    char drv[3] = {(char)('0' + pdrv), ':', 0};
-
-    f_mount(0, drv, 0);
-    ff_diskio_unregister(pdrv);
-    ff_diskio_clear_pdrv_wl(wl_handle);
-    // release partition driver
-    esp_err_t err_drv = wl_unmount(wl_handle);
-    esp_err_t err = esp_vfs_fat_unregister_path(base_path);
-    if (err == ESP_OK) err = err_drv;
-    return err;
-}
-
-
-esp_err_t esp_vfs_fat_spiflash_mount_ro(const char* base_path,
-    const char* partition_label,
-    const esp_vfs_fat_mount_config_t* mount_config)
-{
-    esp_err_t result = ESP_OK;
-
-    const esp_partition_t *data_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
-            ESP_PARTITION_SUBTYPE_DATA_FAT, partition_label);
-    if (data_partition == NULL) {
-        ESP_LOGE(TAG, "Failed to find FATFS partition (type='data', subtype='fat', partition_label='%s'). Check the partition table.", partition_label);
-        return ESP_ERR_NOT_FOUND;
-    }
-
-    // connect driver to FATFS
-    BYTE pdrv = 0xFF;
-    if (ff_diskio_get_drive(&pdrv) != ESP_OK) {
-        ESP_LOGD(TAG, "the maximum count of volumes is already mounted");
-        return ESP_ERR_NO_MEM;
-    }
-    ESP_LOGD(TAG, "using pdrv=%i", pdrv);
-    char drv[3] = {(char)('0' + pdrv), ':', 0};
-
-    result = ff_diskio_register_raw_partition(pdrv, data_partition);
-    if (result != ESP_OK) {
-        ESP_LOGE(TAG, "ff_diskio_register_raw_partition failed pdrv=%i, error - 0x(%x)", pdrv, result);
-        goto fail;
-    }
-
-    FATFS *fs;
-    result = esp_vfs_fat_register(base_path, drv, mount_config->max_files, &fs);
-    if (result == ESP_ERR_INVALID_STATE) {
-        // it's okay, already registered with VFS
-    } else if (result != ESP_OK) {
-        ESP_LOGD(TAG, "esp_vfs_fat_register failed 0x(%x)", result);
-        goto fail;
-    }
-
-    // Try to mount partition
-    FRESULT fresult = f_mount(fs, drv, 1);
-    if (fresult != FR_OK) {
-        ESP_LOGW(TAG, "f_mount failed (%d)", fresult);
-        result = ESP_FAIL;
-        goto fail;
-    }
-    return ESP_OK;
-
-fail:
-    esp_vfs_fat_unregister_path(base_path);
-    ff_diskio_unregister(pdrv);
-    return result;
-}
-
-esp_err_t esp_vfs_fat_spiflash_unmount_ro(const char* base_path, const char* partition_label)
-{
-    const esp_partition_t *data_partition = esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
-            ESP_PARTITION_SUBTYPE_DATA_FAT, partition_label);
-
-    if (data_partition == NULL) {
-        ESP_LOGE(TAG, "Failed to find FATFS partition (type='data', subtype='fat', partition_label='%s'). Check the partition table.", partition_label);
-        return ESP_ERR_NOT_FOUND;
-    }
-
-    BYTE pdrv = ff_diskio_get_pdrv_raw(data_partition);
-    if (pdrv == 0xff) {
-        return ESP_ERR_INVALID_STATE;
-    }
-    char drv[3] = {(char)('0' + pdrv), ':', 0};
-
-    f_mount(0, drv, 0);
-    ff_diskio_unregister(pdrv);
-    esp_err_t err = esp_vfs_fat_unregister_path(base_path);
-    return err;
-}
-
-
-esp_err_t esp_vfs_fat_spiflash_mount(const char* base_path,
-    const char* partition_label,
-    const esp_vfs_fat_mount_config_t* mount_config,
-    wl_handle_t* wl_handle)
-    __attribute__((alias("esp_vfs_fat_spiflash_mount_rw_wl")));
-esp_err_t esp_vfs_fat_spiflash_unmount(const char* base_path, wl_handle_t wl_handle)
-    __attribute__((alias("esp_vfs_fat_spiflash_unmount_rw_wl")));
-esp_err_t esp_vfs_fat_rawflash_mount(const char* base_path,
-    const char* partition_label,
-    const esp_vfs_fat_mount_config_t* mount_config)
-    __attribute__((alias("esp_vfs_fat_spiflash_mount_ro")));
-esp_err_t esp_vfs_fat_rawflash_unmount(const char* base_path, const char* partition_label)
-    __attribute__((alias("esp_vfs_fat_spiflash_unmount_ro")));

code/components/esp-sdmmc/CMakeLists.txt

@@ -1,11 +0,0 @@
-idf_component_register(SRCS "sdmmc_cmd_mh.c"
-                            "sdmmc_common_mh.c"
-                            "sdmmc_init_mh.c"
-                            "sdmmc_io_mh.c"
-                            "sdmmc_mmc_mh.c"
-                            "sdmmc_sd_mh.c"
-                    INCLUDE_DIRS "." "include"
-                    REQUIRES driver esp-fatfs
-                    PRIV_REQUIRES soc)
-
-target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

code/components/esp-sdmmc/README.md

@@ -1,279 +0,0 @@
-# AIOTED related changes, see https://github.com/jomjol/AI-on-the-edge-device/pull/2781
-These files/folders were copied from `framework-espidf@3.50002.230601/components/` and adapted to our own needs.
-Since not every SD/MMC was recognized and this was due to the implementation of ATA trim support, this was revised.
-Furthermore, files that we don't need were deleted from it.
-
-## The most relevant changes are:
-### fatfs/diskio/diskio_sdmmc.c
-DRESULT ff_sdmmc_ioctl (BYTE pdrv, BYTE cmd, void* buff), at lines 106 to 110 changed from:
-```c
-#if FF_USE_TRIM
-        case CTRL_TRIM:
-            return ff_sdmmc_trim (pdrv, *((DWORD*)buff), //start_sector
-                    (*((DWORD*)buff + 1) - *((DWORD*)buff) + 1)); //sector_count
-#endif //FF_USE_TRIM
-```
-to:
-```c
-#if (FF_USE_TRIM)
-        case CTRL_TRIM:
-            if(FF_CAN_TRIM){
-                return ff_sdmmc_trim (pdrv, *((DWORD*)buff), //start_sector
-                    (*((DWORD*)buff + 1) - *((DWORD*)buff) + 1)); //sector_count
-            }
-            else{
-                return RES_ERROR;
-            }
-#endif //FF_USE_TRIM
-```
-
-### fatfs/src/ff.c
-added:
-```c
-#include "sdmmc_cmd.h"
-```
-
-static FRESULT remove_chain(FFOBJID* obj, DWORD clst, DWORD pclst), at lines 1437 to 1454 changed from:
-```c
-#if FF_FS_EXFAT || FF_USE_TRIM
-		if (ecl + 1 == nxt) {	/* Is next cluster contiguous? */
-			ecl = nxt;
-		} else {				/* End of contiguous cluster block */
-#if FF_FS_EXFAT
-			if (fs->fs_type == FS_EXFAT) {
-				res = change_bitmap(fs, scl, ecl - scl + 1, 0);	/* Mark the cluster block 'free' on the bitmap */
-				if (res != FR_OK) return res;
-			}
-#endif
-#if FF_USE_TRIM
-			rt[0] = clst2sect(fs, scl);					/* Start of data area to be freed */
-			rt[1] = clst2sect(fs, ecl) + fs->csize - 1;	/* End of data area to be freed */
-			disk_ioctl(fs->pdrv, CTRL_TRIM, rt);		/* Inform storage device that the data in the block may be erased */
-#endif
-			scl = ecl = nxt;
-		}
-#endif
-```
-
-to:
-```c
-#if FF_FS_EXFAT || FF_USE_TRIM
-		if(FF_FS_EXFAT || FF_CAN_TRIM){
-			if (ecl + 1 == nxt) {	/* Is next cluster contiguous? */
-				ecl = nxt;
-			} 
-			else {				/* End of contiguous cluster block */
-#if FF_FS_EXFAT
-				if (fs->fs_type == FS_EXFAT) {
-					res = change_bitmap(fs, scl, ecl - scl + 1, 0);	/* Mark the cluster block 'free' on the bitmap */
-					if (res != FR_OK) return res;
-				}
-#endif
-#if FF_USE_TRIM
-				if(FF_CAN_TRIM){
-					rt[0] = clst2sect(fs, scl);					/* Start of data area to be freed */
-					rt[1] = clst2sect(fs, ecl) + fs->csize - 1;	/* End of data area to be freed */
-					disk_ioctl(fs->pdrv, CTRL_TRIM, rt);		/* Inform storage device that the data in the block may be erased */
-				}
-#endif
-				scl = ecl = nxt;
-			}
-		}
-#endif
-```
-
-FRESULT f_mkfs(const TCHAR* path, const MKFS_PARM* opt, void* work, UINT len), at lines 5946 to 5949 changed from:
-```c
-#if FF_USE_TRIM
-		lba[0] = b_vol; lba[1] = b_vol + sz_vol - 1;	/* Inform storage device that the volume area may be erased */
-		disk_ioctl(pdrv, CTRL_TRIM, lba);
-#endif
-```
-to:
-```c
-#if FF_USE_TRIM
-		if(FF_CAN_TRIM){
-			lba[0] = b_vol; lba[1] = b_vol + sz_vol - 1;	/* Inform storage device that the volume area may be erased */
-			disk_ioctl(pdrv, CTRL_TRIM, lba);
-		}
-#endif
-```
-
-FRESULT f_mkfs(const TCHAR* path, const MKFS_PARM* opt, void* work, UINT len), at lines 6175 to 6178 changed from:
-```c
-#if FF_USE_TRIM
-		lba[0] = b_vol; lba[1] = b_vol + sz_vol - 1;	/* Inform storage device that the volume area may be erased */
-		disk_ioctl(pdrv, CTRL_TRIM, lba);
-#endif
-```
-to:
-```c
-#if FF_USE_TRIM
-		if(FF_CAN_TRIM){
-			lba[0] = b_vol; lba[1] = b_vol + sz_vol - 1;	/* Inform storage device that the volume area may be erased */
-			disk_ioctl(pdrv, CTRL_TRIM, lba);
-		}
-#endif
-```
-
-### sdmmc/sdmmc_cmd.c
-added:
-```c
-int FF_CAN_TRIM = 0;
-```
-
-esp_err_t sdmmc_can_trim(sdmmc_card_t* card), at lines 630 to 636 changed from:
-```c
-esp_err_t sdmmc_can_trim(sdmmc_card_t* card)
-{
-    if ((card->is_mmc) && (card->ext_csd.sec_feature & EXT_CSD_SEC_GB_CL_EN)) {
-        return ESP_OK;
-    }
-    return ESP_FAIL;
-}
-```
-to:
-```c
-esp_err_t sdmmc_can_trim(sdmmc_card_t* card)
-{
-    if ((card->is_mmc) && (card->ext_csd.sec_feature & EXT_CSD_SEC_GB_CL_EN)) {
-        FF_CAN_TRIM = 1;
-        return ESP_OK;
-    }
-    FF_CAN_TRIM = 0;
-    return ESP_FAIL;
-}
-```
-
-### sdmmc/include/sdmmc_cmd.h
-
-added:
-```c
-extern int FF_CAN_TRIM;
-```
-
-
-# Espressif IoT Development Framework
-
-* [中文版](./README_CN.md)
-
-ESP-IDF is the development framework for Espressif SoCs supported on Windows, Linux and macOS.
-
-# ESP-IDF Release Support Schedule
-
-![Support Schedule](https://dl.espressif.com/dl/esp-idf/support-periods.svg)
-
-- Please read [the support policy](SUPPORT_POLICY.md) and [the documentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html) for more information about ESP-IDF versions.
-- Please see the [End-of-Life Advisories](https://www.espressif.com/en/support/documents/advisories?keys=&field_type_of_advisory_tid%5B%5D=817) for information about ESP-IDF releases with discontinued support.
-
-# ESP-IDF Release and SoC Compatibility
-
-The following table shows ESP-IDF support of Espressif SoCs where ![alt text][preview] and ![alt text][supported] denote preview status and support, respectively. The preview support is usually limited in time and intended for beta versions of chips. Please use an ESP-IDF release where the desired SoC is already supported.
-
-|Chip         |          v4.1         |          v4.2          |         v4.3           |          v4.4          |          v5.0          |                                                                                      |
-|:----------- |:---------------------:| :---------------------:| :---------------------:| :---------------------:| :---------------------:|:------------------------------------------------------------------------------------ |
-|ESP32        |![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                                                      |
-|ESP32-S2     |                       | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                                                      |
-|ESP32-C3     |                       |                        | ![alt text][supported] | ![alt text][supported] | ![alt text][supported] |                                                                                      |
-|ESP32-S3     |                       |                        |                        | ![alt text][supported] | ![alt text][supported] | [Announcement](https://www.espressif.com/en/news/ESP32_S3)                           |
-|ESP32-C2     |                       |                        |                        |                        | ![alt text][supported] | [Announcement](https://blog.espressif.com/esp32-c2-and-why-it-matter-s-bcf4d7d0b2c6) |
-|ESP32-H2     |                       |                        |                        | ![alt text][preview]   | ![alt text][preview]   | [Announcement](https://www.espressif.com/en/news/ESP32_H2)                           |
-
-[supported]: https://img.shields.io/badge/-supported-green "supported"
-[preview]: https://img.shields.io/badge/-preview-orange "preview"
-
-Espressif SoCs released before 2016 (ESP8266 and ESP8285) are supported by [RTOS SDK](https://github.com/espressif/ESP8266_RTOS_SDK) instead.
-
-# Developing With ESP-IDF
-
-## Setting Up ESP-IDF
-
-See https://idf.espressif.com/ for links to detailed instructions on how to set up the ESP-IDF depending on chip you use.
-
-**Note:** Each SoC series and each ESP-IDF release has its own documentation. Please see Section [Versions](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/versions.html) on how to find documentation and how to checkout specific release of ESP-IDF.
-
-### Non-GitHub forks
-
-ESP-IDF uses relative locations as its submodules URLs ([.gitmodules](.gitmodules)). So they link to GitHub. If ESP-IDF is forked to a Git repository which is not on GitHub, you will need to run the script [tools/set-submodules-to-github.sh](tools/set-submodules-to-github.sh) after git clone.
-
-The script sets absolute URLs for all submodules, allowing `git submodule update --init --recursive` to complete. If cloning ESP-IDF from GitHub, this step is not needed.
-
-## Finding a Project
-
-As well as the [esp-idf-template](https://github.com/espressif/esp-idf-template) project mentioned in Getting Started, ESP-IDF comes with some example projects in the [examples](examples) directory.
-
-Once you've found the project you want to work with, change to its directory and you can configure and build it.
-
-To start your own project based on an example, copy the example project directory outside of the ESP-IDF directory.
-
-# Quick Reference
-
-See the Getting Started guide links above for a detailed setup guide. This is a quick reference for common commands when working with ESP-IDF projects:
-
-## Setup Build Environment
-
-(See the Getting Started guide listed above for a full list of required steps with more details.)
-
-* Install host build dependencies mentioned in the Getting Started guide.
-* Run the install script to set up the build environment. The options include `install.bat` or `install.ps1` for Windows, and `install.sh` or `install.fish` for Unix shells.
-* Run the export script on Windows (`export.bat`) or source it on Unix (`source export.sh`) in every shell environment before using ESP-IDF.
-
-## Configuring the Project
-
-* `idf.py set-target <chip_name>` sets the target of the project to `<chip_name>`. Run `idf.py set-target` without any arguments to see a list of supported targets.
-* `idf.py menuconfig` opens a text-based configuration menu where you can configure the project.
-
-## Compiling the Project
-
-`idf.py build`
-
-... will compile app, bootloader and generate a partition table based on the config.
-
-## Flashing the Project
-
-When the build finishes, it will print a command line to use esptool.py to flash the chip. However you can also do this automatically by running:
-
-`idf.py -p PORT flash`
-
-Replace PORT with the name of your serial port (like `COM3` on Windows, `/dev/ttyUSB0` on Linux, or `/dev/cu.usbserial-X` on MacOS. If the `-p` option is left out, `idf.py flash` will try to flash the first available serial port.
-
-This will flash the entire project (app, bootloader and partition table) to a new chip. The settings for serial port flashing can be configured with `idf.py menuconfig`.
-
-You don't need to run `idf.py build` before running `idf.py flash`, `idf.py flash` will automatically rebuild anything which needs it.
-
-## Viewing Serial Output
-
-The `idf.py monitor` target uses the [idf_monitor tool](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html) to display serial output from Espressif SoCs. idf_monitor also has a range of features to decode crash output and interact with the device. [Check the documentation page for details](https://docs.espressif.com/projects/esp-idf/en/latest/get-started/idf-monitor.html).
-
-Exit the monitor by typing Ctrl-].
-
-To build, flash and monitor output in one pass, you can run:
-
-`idf.py flash monitor`
-
-## Compiling & Flashing Only the App
-
-After the initial flash, you may just want to build and flash just your app, not the bootloader and partition table:
-
-* `idf.py app` - build just the app.
-* `idf.py app-flash` - flash just the app.
-
-`idf.py app-flash` will automatically rebuild the app if any source files have changed.
-
-(In normal development there's no downside to reflashing the bootloader and partition table each time, if they haven't changed.)
-
-## Erasing Flash
-
-The `idf.py flash` target does not erase the entire flash contents. However it is sometimes useful to set the device back to a totally erased state, particularly when making partition table changes or OTA app updates. To erase the entire flash, run `idf.py erase-flash`.
-
-This can be combined with other targets, ie `idf.py -p PORT erase-flash flash` will erase everything and then re-flash the new app, bootloader and partition table.
-
-# Resources
-
-* Documentation for the latest version: https://docs.espressif.com/projects/esp-idf/. This documentation is built from the [docs directory](docs) of this repository.
-
-* The [esp32.com forum](https://esp32.com/) is a place to ask questions and find community resources.
-
-* [Check the Issues section on github](https://github.com/espressif/esp-idf/issues) if you find a bug or have a feature request. Please check existing Issues before opening a new one.
-
-* If you're interested in contributing to ESP-IDF, please check the [Contributions Guide](https://docs.espressif.com/projects/esp-idf/en/latest/contribute/index.html).

code/components/esp-sdmmc/include/sdmmc_cmd_mh.h

@@ -1,357 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#pragma once
-
-#include <stdio.h>
-#include "esp_err.h"
-#include "driver/sdmmc_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int FF_CAN_TRIM;
-
-/**
- * Probe and initialize SD/MMC card using given host
- *
- * @note Only SD cards (SDSC and SDHC/SDXC) are supported now.
- *       Support for MMC/eMMC cards will be added later.
- *
- * @param host  pointer to structure defining host controller
- * @param out_card  pointer to structure which will receive information
- *                  about the card when the function completes
- * @return
- *      - ESP_OK on success
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_card_init(const sdmmc_host_t* host,
-        sdmmc_card_t* out_card);
-
-/**
- * @brief Print information about the card to a stream
- * @param stream  stream obtained using fopen or fdopen
- * @param card  card information structure initialized using sdmmc_card_init
- */
-void sdmmc_card_print_info(FILE* stream, const sdmmc_card_t* card);
-
-/**
- * Get status of SD/MMC card
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @return
- *      - ESP_OK on success
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_get_status(sdmmc_card_t* card);
-
-/**
- * Write given number of sectors to SD/MMC card
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param src   pointer to data buffer to read data from; data size must be
- *              equal to sector_count * card->csd.sector_size
- * @param start_sector  sector where to start writing
- * @param sector_count  number of sectors to write
- * @return
- *      - ESP_OK on success
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_write_sectors(sdmmc_card_t* card, const void* src,
-        size_t start_sector, size_t sector_count);
-
-/**
- * Read given number of sectors from the SD/MMC card
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param dst   pointer to data buffer to write into; buffer size must be
- *              at least sector_count * card->csd.sector_size
- * @param start_sector  sector where to start reading
- * @param sector_count  number of sectors to read
- * @return
- *      - ESP_OK on success
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_read_sectors(sdmmc_card_t* card, void* dst,
-        size_t start_sector, size_t sector_count);
-
-/**
- * Erase given number of sectors from the SD/MMC card
- *
- * @note When sdmmc_erase_sectors used with cards in SDSPI mode, it was
- * observed that card requires re-init after erase operation.
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param start_sector  sector where to start erase
- * @param sector_count  number of sectors to erase
- * @param arg  erase command (CMD38) argument
- * @return
- *      - ESP_OK on success
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_erase_sectors(sdmmc_card_t* card, size_t start_sector,
-        size_t sector_count, sdmmc_erase_arg_t arg);
-
-/**
- * Check if SD/MMC card supports discard
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @return
- *      - ESP_OK if supported by the card/device
- *      - ESP_FAIL if not supported by the card/device
- */
-esp_err_t sdmmc_can_discard(sdmmc_card_t* card);
-
-/**
- * Check if SD/MMC card supports trim
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @return
- *      - ESP_OK if supported by the card/device
- *      - ESP_FAIL if not supported by the card/device
- */
-esp_err_t sdmmc_can_trim(sdmmc_card_t* card);
-
-/**
- * Check if SD/MMC card supports sanitize
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @return
- *      - ESP_OK if supported by the card/device
- *      - ESP_FAIL if not supported by the card/device
- */
-esp_err_t sdmmc_mmc_can_sanitize(sdmmc_card_t* card);
-
-/**
- * Sanitize the data that was unmapped by a Discard command
- *
- * @note  Discard command has to precede sanitize operation. To discard, use
- *        MMC_DICARD_ARG with sdmmc_erase_sectors argument
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param timeout_ms timeout value in milliseconds required to sanitize the
- *                   selected range of sectors.
- * @return
- *      - ESP_OK on success
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_mmc_sanitize(sdmmc_card_t* card, uint32_t timeout_ms);
-
-/**
- * Erase complete SD/MMC card
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @return
- *      - ESP_OK on success
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_full_erase(sdmmc_card_t* card);
-
-/**
- * Read one byte from an SDIO card using IO_RW_DIRECT (CMD52)
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param function  IO function number
- * @param reg  byte address within IO function
- * @param[out] out_byte  output, receives the value read from the card
- * @return
- *      - ESP_OK on success
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_io_read_byte(sdmmc_card_t* card, uint32_t function,
-        uint32_t reg, uint8_t *out_byte);
-
-/**
- * Write one byte to an SDIO card using IO_RW_DIRECT (CMD52)
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param function  IO function number
- * @param reg  byte address within IO function
- * @param in_byte  value to be written
- * @param[out] out_byte  if not NULL, receives new byte value read
- *                       from the card (read-after-write).
- * @return
- *      - ESP_OK on success
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_io_write_byte(sdmmc_card_t* card, uint32_t function,
-        uint32_t reg, uint8_t in_byte, uint8_t* out_byte);
-
-/**
- * Read multiple bytes from an SDIO card using IO_RW_EXTENDED (CMD53)
- *
- * This function performs read operation using CMD53 in byte mode.
- * For block mode, see sdmmc_io_read_blocks.
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param function  IO function number
- * @param addr  byte address within IO function where reading starts
- * @param dst  buffer which receives the data read from card
- * @param size  number of bytes to read
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_SIZE if size exceeds 512 bytes
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_io_read_bytes(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, void* dst, size_t size);
-
-/**
- * Write multiple bytes to an SDIO card using IO_RW_EXTENDED (CMD53)
- *
- * This function performs write operation using CMD53 in byte mode.
- * For block mode, see sdmmc_io_write_blocks.
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param function  IO function number
- * @param addr  byte address within IO function where writing starts
- * @param src  data to be written
- * @param size  number of bytes to write
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_SIZE if size exceeds 512 bytes
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_io_write_bytes(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, const void* src, size_t size);
-
-/**
- * Read blocks of data from an SDIO card using IO_RW_EXTENDED (CMD53)
- *
- * This function performs read operation using CMD53 in block mode.
- * For byte mode, see sdmmc_io_read_bytes.
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param function  IO function number
- * @param addr  byte address within IO function where writing starts
- * @param dst  buffer which receives the data read from card
- * @param size  number of bytes to read, must be divisible by the card block
- *              size.
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_SIZE if size is not divisible by 512 bytes
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_io_read_blocks(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, void* dst, size_t size);
-
-/**
- * Write blocks of data to an SDIO card using IO_RW_EXTENDED (CMD53)
- *
- * This function performs write operation using CMD53 in block mode.
- * For byte mode, see sdmmc_io_write_bytes.
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param function  IO function number
- * @param addr  byte address within IO function where writing starts
- * @param src  data to be written
- * @param size  number of bytes to read, must be divisible by the card block
- *              size.
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_INVALID_SIZE if size is not divisible by 512 bytes
- *      - One of the error codes from SDMMC host controller
- */
-esp_err_t sdmmc_io_write_blocks(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, const void* src, size_t size);
-
-/**
- * Enable SDIO interrupt in the SDMMC host
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @return
- *      - ESP_OK on success
- *      - ESP_ERR_NOT_SUPPORTED if the host controller does not support
- *        IO interrupts
- */
-esp_err_t sdmmc_io_enable_int(sdmmc_card_t* card);
-
-/**
- * Block until an SDIO interrupt is received
- *
- * Slave uses D1 line to signal interrupt condition to the host.
- * This function can be used to wait for the interrupt.
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param timeout_ticks  time to wait for the interrupt, in RTOS ticks
- * @return
- *      - ESP_OK if the interrupt is received
- *      - ESP_ERR_NOT_SUPPORTED if the host controller does not support
- *        IO interrupts
- *      - ESP_ERR_TIMEOUT if the interrupt does not happen in timeout_ticks
- */
-esp_err_t sdmmc_io_wait_int(sdmmc_card_t* card, TickType_t timeout_ticks);
-
-/**
- * Get the data of CIS region of an SDIO card.
- *
- * You may provide a buffer not sufficient to store all the CIS data. In this
- * case, this function stores as much data into your buffer as possible. Also,
- * this function will try to get and return the size required for you.
- *
- * @param card  pointer to card information structure previously initialized
- *              using sdmmc_card_init
- * @param out_buffer Output buffer of the CIS data
- * @param buffer_size Size of the buffer.
- * @param inout_cis_size Mandatory, pointer to a size, input and output.
- *              - input: Limitation of maximum searching range, should be 0 or larger than
- *                      buffer_size. The function searches for CIS_CODE_END until this range. Set to
- *                      0 to search infinitely.
- *              - output: The size required to store all the CIS data, if CIS_CODE_END is found.
- *
- * @return
- *      - ESP_OK: on success
- *      - ESP_ERR_INVALID_RESPONSE: if the card does not (correctly) support CIS.
- *      - ESP_ERR_INVALID_SIZE: CIS_CODE_END found, but buffer_size is less than
- *              required size, which is stored in the inout_cis_size then.
- *      - ESP_ERR_NOT_FOUND: if the CIS_CODE_END not found. Increase input value of
- *              inout_cis_size or set it to 0, if you still want to search for the end;
- *              output value of inout_cis_size is invalid in this case.
- *      - and other error code return from sdmmc_io_read_bytes
- */
-esp_err_t sdmmc_io_get_cis_data(sdmmc_card_t* card, uint8_t* out_buffer, size_t buffer_size, size_t* inout_cis_size);
-
-/**
- * Parse and print the CIS information of an SDIO card.
- *
- * @note Not all the CIS codes and all kinds of tuples are supported. If you
- * see some unresolved code, you can add the parsing of these code in
- * sdmmc_io.c and contribute to the IDF through the Github repository.
- *
- *              using sdmmc_card_init
- * @param buffer Buffer to parse
- * @param buffer_size Size of the buffer.
- * @param fp File pointer to print to, set to NULL to print to stdout.
- *
- * @return
- *      - ESP_OK: on success
- *      - ESP_ERR_NOT_SUPPORTED: if the value from the card is not supported to be parsed.
- *      - ESP_ERR_INVALID_SIZE: if the CIS size fields are not correct.
- */
-esp_err_t sdmmc_io_print_cis_info(uint8_t* buffer, size_t buffer_size, FILE* fp);
-
-
-#ifdef __cplusplus
-}
-#endif

code/components/esp-sdmmc/sdmmc_cmd_mh.c

@@ -1,701 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "sdmmc_common_mh.h"
-
-int FF_CAN_TRIM = 0;
-
-static const char* TAG = "sdmmc_cmd";
-
-
-esp_err_t sdmmc_send_cmd(sdmmc_card_t* card, sdmmc_command_t* cmd)
-{
-    if (card->host.command_timeout_ms != 0) {
-        cmd->timeout_ms = card->host.command_timeout_ms;
-    } else if (cmd->timeout_ms == 0) {
-        cmd->timeout_ms = SDMMC_DEFAULT_CMD_TIMEOUT_MS;
-    }
-
-    int slot = card->host.slot;
-    ESP_LOGV(TAG, "sending cmd slot=%d op=%d arg=%x flags=%x data=%p blklen=%d datalen=%d timeout=%d",
-            slot, cmd->opcode, cmd->arg, cmd->flags, cmd->data, cmd->blklen, cmd->datalen, cmd->timeout_ms);
-    esp_err_t err = (*card->host.do_transaction)(slot, cmd);
-    if (err != 0) {
-        ESP_LOGD(TAG, "cmd=%d, sdmmc_req_run returned 0x%x", cmd->opcode, err);
-        return err;
-    }
-    int state = MMC_R1_CURRENT_STATE(cmd->response);
-    ESP_LOGV(TAG, "cmd response %08x %08x %08x %08x err=0x%x state=%d",
-               cmd->response[0],
-               cmd->response[1],
-               cmd->response[2],
-               cmd->response[3],
-               cmd->error,
-               state);
-    return cmd->error;
-}
-
-esp_err_t sdmmc_send_app_cmd(sdmmc_card_t* card, sdmmc_command_t* cmd)
-{
-    sdmmc_command_t app_cmd = {
-        .opcode = MMC_APP_CMD,
-        .flags = SCF_CMD_AC | SCF_RSP_R1,
-        .arg = MMC_ARG_RCA(card->rca),
-    };
-    esp_err_t err = sdmmc_send_cmd(card, &app_cmd);
-    if (err != ESP_OK) {
-        return err;
-    }
-    // Check APP_CMD status bit (only in SD mode)
-    if (!host_is_spi(card) && !(MMC_R1(app_cmd.response) & MMC_R1_APP_CMD)) {
-        ESP_LOGW(TAG, "card doesn't support APP_CMD");
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    return sdmmc_send_cmd(card, cmd);
-}
-
-
-esp_err_t sdmmc_send_cmd_go_idle_state(sdmmc_card_t* card)
-{
-    sdmmc_command_t cmd = {
-        .opcode = MMC_GO_IDLE_STATE,
-        .flags = SCF_CMD_BC | SCF_RSP_R0,
-    };
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (host_is_spi(card)) {
-        /* To enter SPI mode, CMD0 needs to be sent twice (see figure 4-1 in
-         * SD Simplified spec v4.10). Some cards enter SD mode on first CMD0,
-         * so don't expect the above command to succeed.
-         * SCF_RSP_R1 flag below tells the lower layer to expect correct R1
-         * response (in SPI mode).
-         */
-        (void) err;
-        vTaskDelay(SDMMC_GO_IDLE_DELAY_MS / portTICK_PERIOD_MS);
-
-        cmd.flags |= SCF_RSP_R1;
-        err = sdmmc_send_cmd(card, &cmd);
-    }
-    if (err == ESP_OK) {
-        vTaskDelay(SDMMC_GO_IDLE_DELAY_MS / portTICK_PERIOD_MS);
-    }
-    return err;
-}
-
-
-esp_err_t sdmmc_send_cmd_send_if_cond(sdmmc_card_t* card, uint32_t ocr)
-{
-    const uint8_t pattern = 0xaa; /* any pattern will do here */
-    sdmmc_command_t cmd = {
-        .opcode = SD_SEND_IF_COND,
-        .arg = (((ocr & SD_OCR_VOL_MASK) != 0) << 8) | pattern,
-        .flags = SCF_CMD_BCR | SCF_RSP_R7,
-    };
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        return err;
-    }
-    uint8_t response = cmd.response[0] & 0xff;
-    if (response != pattern) {
-        ESP_LOGD(TAG, "%s: received=0x%x expected=0x%x", __func__, response, pattern);
-        return ESP_ERR_INVALID_RESPONSE;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_send_cmd_send_op_cond(sdmmc_card_t* card, uint32_t ocr, uint32_t *ocrp)
-{
-    esp_err_t err;
-
-    sdmmc_command_t cmd = {
-            .arg = ocr,
-            .flags = SCF_CMD_BCR | SCF_RSP_R3,
-            .opcode = SD_APP_OP_COND
-    };
-    int nretries = SDMMC_SEND_OP_COND_MAX_RETRIES;
-    int err_cnt = SDMMC_SEND_OP_COND_MAX_ERRORS;
-    for (; nretries != 0; --nretries)  {
-        bzero(&cmd, sizeof cmd);
-        cmd.arg = ocr;
-        cmd.flags = SCF_CMD_BCR | SCF_RSP_R3;
-        if (!card->is_mmc) { /* SD mode */
-            cmd.opcode = SD_APP_OP_COND;
-            err = sdmmc_send_app_cmd(card, &cmd);
-        } else { /* MMC mode */
-            cmd.arg &= ~MMC_OCR_ACCESS_MODE_MASK;
-            cmd.arg |= MMC_OCR_SECTOR_MODE;
-            cmd.opcode = MMC_SEND_OP_COND;
-            err = sdmmc_send_cmd(card, &cmd);
-        }
-
-        if (err != ESP_OK) {
-            if (--err_cnt == 0) {
-                ESP_LOGD(TAG, "%s: sdmmc_send_app_cmd err=0x%x", __func__, err);
-                return err;
-            } else {
-                ESP_LOGV(TAG, "%s: ignoring err=0x%x", __func__, err);
-                continue;
-            }
-        }
-        // In SD protocol, card sets MEM_READY bit in OCR when it is ready.
-        // In SPI protocol, card clears IDLE_STATE bit in R1 response.
-        if (!host_is_spi(card)) {
-            if ((MMC_R3(cmd.response) & MMC_OCR_MEM_READY) ||
-                ocr == 0) {
-                break;
-            }
-        } else {
-            if ((SD_SPI_R1(cmd.response) & SD_SPI_R1_IDLE_STATE) == 0) {
-                break;
-            }
-        }
-        vTaskDelay(10 / portTICK_PERIOD_MS);
-    }
-    if (nretries == 0) {
-        return ESP_ERR_TIMEOUT;
-    }
-    if (ocrp) {
-        *ocrp = MMC_R3(cmd.response);
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_send_cmd_read_ocr(sdmmc_card_t *card, uint32_t *ocrp)
-{
-    assert(ocrp);
-    sdmmc_command_t cmd = {
-        .opcode = SD_READ_OCR,
-        .flags = SCF_CMD_BCR | SCF_RSP_R2
-    };
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        return err;
-    }
-    *ocrp = SD_SPI_R3(cmd.response);
-    return ESP_OK;
-}
-
-
-esp_err_t sdmmc_send_cmd_all_send_cid(sdmmc_card_t* card, sdmmc_response_t* out_raw_cid)
-{
-    assert(out_raw_cid);
-    sdmmc_command_t cmd = {
-            .opcode = MMC_ALL_SEND_CID,
-            .flags = SCF_CMD_BCR | SCF_RSP_R2
-    };
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        return err;
-    }
-    memcpy(out_raw_cid, &cmd.response, sizeof(sdmmc_response_t));
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_send_cmd_send_cid(sdmmc_card_t *card, sdmmc_cid_t *out_cid)
-{
-    assert(out_cid);
-    assert(host_is_spi(card) && "SEND_CID should only be used in SPI mode");
-    assert(!card->is_mmc && "MMC cards are not supported in SPI mode");
-    sdmmc_response_t buf;
-    sdmmc_command_t cmd = {
-        .opcode = MMC_SEND_CID,
-        .flags = SCF_CMD_READ | SCF_CMD_ADTC,
-        .arg = 0,
-        .data = &buf[0],
-        .datalen = sizeof(buf)
-    };
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        return err;
-    }
-    sdmmc_flip_byte_order(buf, sizeof(buf));
-    return sdmmc_decode_cid(buf, out_cid);
-}
-
-
-esp_err_t sdmmc_send_cmd_set_relative_addr(sdmmc_card_t* card, uint16_t* out_rca)
-{
-    assert(out_rca);
-    sdmmc_command_t cmd = {
-            .opcode = SD_SEND_RELATIVE_ADDR,
-            .flags = SCF_CMD_BCR | SCF_RSP_R6
-    };
-
-    /* MMC cards expect us to set the RCA.
-     * Set RCA to 1 since we don't support multiple cards on the same bus, for now.
-     */
-    uint16_t mmc_rca = 1;
-    if (card->is_mmc) {
-        cmd.arg = MMC_ARG_RCA(mmc_rca);
-    }
-
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        return err;
-    }
-    *out_rca = (card->is_mmc) ? mmc_rca : SD_R6_RCA(cmd.response);
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_send_cmd_set_blocklen(sdmmc_card_t* card, sdmmc_csd_t* csd)
-{
-    sdmmc_command_t cmd = {
-            .opcode = MMC_SET_BLOCKLEN,
-            .arg = csd->sector_size,
-            .flags = SCF_CMD_AC | SCF_RSP_R1
-    };
-    return sdmmc_send_cmd(card, &cmd);
-}
-
-esp_err_t sdmmc_send_cmd_send_csd(sdmmc_card_t* card, sdmmc_csd_t* out_csd)
-{
-    /* The trick with SEND_CSD is that in SPI mode, it acts as a data read
-     * command, while in SD mode it is an AC command with R2 response.
-     */
-    sdmmc_response_t spi_buf;
-    const bool is_spi = host_is_spi(card);
-    sdmmc_command_t cmd = {
-            .opcode = MMC_SEND_CSD,
-            .arg = is_spi ? 0 : MMC_ARG_RCA(card->rca),
-            .flags = is_spi ? (SCF_CMD_READ | SCF_CMD_ADTC | SCF_RSP_R1) :
-                    (SCF_CMD_AC | SCF_RSP_R2),
-            .data = is_spi ? &spi_buf[0] : 0,
-            .datalen = is_spi ? sizeof(spi_buf) : 0,
-    };
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        return err;
-    }
-    uint32_t* ptr = cmd.response;
-    if (is_spi) {
-        sdmmc_flip_byte_order(spi_buf,  sizeof(spi_buf));
-        ptr = spi_buf;
-    }
-    if (card->is_mmc) {
-        err = sdmmc_mmc_decode_csd(cmd.response, out_csd);
-    } else {
-        err = sdmmc_decode_csd(ptr, out_csd);
-    }
-    return err;
-}
-
-esp_err_t sdmmc_send_cmd_select_card(sdmmc_card_t* card, uint32_t rca)
-{
-    /* Don't expect to see a response when de-selecting a card */
-    uint32_t response = (rca == 0) ? 0 : SCF_RSP_R1;
-    sdmmc_command_t cmd = {
-            .opcode = MMC_SELECT_CARD,
-            .arg = MMC_ARG_RCA(rca),
-            .flags = SCF_CMD_AC | response
-    };
-    return sdmmc_send_cmd(card, &cmd);
-}
-
-esp_err_t sdmmc_send_cmd_send_scr(sdmmc_card_t* card, sdmmc_scr_t *out_scr)
-{
-    size_t datalen = 8;
-    uint32_t* buf = (uint32_t*) heap_caps_malloc(datalen, MALLOC_CAP_DMA);
-    if (buf == NULL) {
-        return ESP_ERR_NO_MEM;
-    }
-    sdmmc_command_t cmd = {
-            .data = buf,
-            .datalen = datalen,
-            .blklen = datalen,
-            .flags = SCF_CMD_ADTC | SCF_CMD_READ | SCF_RSP_R1,
-            .opcode = SD_APP_SEND_SCR
-    };
-    esp_err_t err = sdmmc_send_app_cmd(card, &cmd);
-    if (err == ESP_OK) {
-        err = sdmmc_decode_scr(buf, out_scr);
-    }
-    free(buf);
-    return err;
-}
-
-esp_err_t sdmmc_send_cmd_set_bus_width(sdmmc_card_t* card, int width)
-{
-    sdmmc_command_t cmd = {
-            .opcode = SD_APP_SET_BUS_WIDTH,
-            .flags = SCF_RSP_R1 | SCF_CMD_AC,
-            .arg = (width == 4) ? SD_ARG_BUS_WIDTH_4 : SD_ARG_BUS_WIDTH_1,
-    };
-
-    return sdmmc_send_app_cmd(card, &cmd);
-}
-
-esp_err_t sdmmc_send_cmd_crc_on_off(sdmmc_card_t* card, bool crc_enable)
-{
-    assert(host_is_spi(card) && "CRC_ON_OFF can only be used in SPI mode");
-    sdmmc_command_t cmd = {
-            .opcode = SD_CRC_ON_OFF,
-            .arg = crc_enable ? 1 : 0,
-            .flags = SCF_CMD_AC | SCF_RSP_R1
-    };
-    return sdmmc_send_cmd(card, &cmd);
-}
-
-esp_err_t sdmmc_send_cmd_send_status(sdmmc_card_t* card, uint32_t* out_status)
-{
-    sdmmc_command_t cmd = {
-            .opcode = MMC_SEND_STATUS,
-            .arg = MMC_ARG_RCA(card->rca),
-            .flags = SCF_CMD_AC | SCF_RSP_R1
-    };
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        return err;
-    }
-    if (out_status) {
-        if (host_is_spi(card)) {
-            *out_status = SD_SPI_R2(cmd.response);
-        } else {
-            *out_status = MMC_R1(cmd.response);
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_write_sectors(sdmmc_card_t* card, const void* src,
-        size_t start_block, size_t block_count)
-{
-    esp_err_t err = ESP_OK;
-    size_t block_size = card->csd.sector_size;
-    if (esp_ptr_dma_capable(src) && (intptr_t)src % 4 == 0) {
-        err = sdmmc_write_sectors_dma(card, src, start_block, block_count);
-    } else {
-        // SDMMC peripheral needs DMA-capable buffers. Split the write into
-        // separate single block writes, if needed, and allocate a temporary
-        // DMA-capable buffer.
-        void* tmp_buf = heap_caps_malloc(block_size, MALLOC_CAP_DMA);
-        if (tmp_buf == NULL) {
-            return ESP_ERR_NO_MEM;
-        }
-        const uint8_t* cur_src = (const uint8_t*) src;
-        for (size_t i = 0; i < block_count; ++i) {
-            memcpy(tmp_buf, cur_src, block_size);
-            cur_src += block_size;
-            err = sdmmc_write_sectors_dma(card, tmp_buf, start_block + i, 1);
-            if (err != ESP_OK) {
-                ESP_LOGD(TAG, "%s: error 0x%x writing block %d+%d",
-                        __func__, err, start_block, i);
-                break;
-            }
-        }
-        free(tmp_buf);
-    }
-    return err;
-}
-
-esp_err_t sdmmc_write_sectors_dma(sdmmc_card_t* card, const void* src,
-        size_t start_block, size_t block_count)
-{
-    if (start_block + block_count > card->csd.capacity) {
-        return ESP_ERR_INVALID_SIZE;
-    }
-    size_t block_size = card->csd.sector_size;
-    sdmmc_command_t cmd = {
-            .flags = SCF_CMD_ADTC | SCF_RSP_R1,
-            .blklen = block_size,
-            .data = (void*) src,
-            .datalen = block_count * block_size,
-            .timeout_ms = SDMMC_WRITE_CMD_TIMEOUT_MS
-    };
-    if (block_count == 1) {
-        cmd.opcode = MMC_WRITE_BLOCK_SINGLE;
-    } else {
-        cmd.opcode = MMC_WRITE_BLOCK_MULTIPLE;
-    }
-    if (card->ocr & SD_OCR_SDHC_CAP) {
-        cmd.arg = start_block;
-    } else {
-        cmd.arg = start_block * block_size;
-    }
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x", __func__, err);
-        return err;
-    }
-    uint32_t status = 0;
-    size_t count = 0;
-    /* SD mode: wait for the card to become idle based on R1 status */
-    while (!host_is_spi(card) && !(status & MMC_R1_READY_FOR_DATA)) {
-        // TODO: add some timeout here
-        err = sdmmc_send_cmd_send_status(card, &status);
-        if (err != ESP_OK) {
-            return err;
-        }
-        if (++count % 10 == 0) {
-            ESP_LOGV(TAG, "waiting for card to become ready (%d)", count);
-        }
-    }
-    /* SPI mode: although card busy indication is based on the busy token,
-     * SD spec recommends that the host checks the results of programming by sending
-     * SEND_STATUS command. Some of the conditions reported in SEND_STATUS are not
-     * reported via a data error token.
-     */
-    if (host_is_spi(card)) {
-        err = sdmmc_send_cmd_send_status(card, &status);
-        if (err != ESP_OK) {
-            return err;
-        }
-        if (status & SD_SPI_R2_CARD_LOCKED) {
-            ESP_LOGE(TAG, "%s: write failed, card is locked: r2=0x%04x",
-                     __func__, status);
-            return ESP_ERR_INVALID_STATE;
-        }
-        if (status != 0) {
-            ESP_LOGE(TAG, "%s: card status indicates an error after write operation: r2=0x%04x",
-                     __func__, status);
-            return ESP_ERR_INVALID_RESPONSE;
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_read_sectors(sdmmc_card_t* card, void* dst,
-        size_t start_block, size_t block_count)
-{
-    esp_err_t err = ESP_OK;
-    size_t block_size = card->csd.sector_size;
-    if (esp_ptr_dma_capable(dst) && (intptr_t)dst % 4 == 0) {
-        err = sdmmc_read_sectors_dma(card, dst, start_block, block_count);
-    } else {
-        // SDMMC peripheral needs DMA-capable buffers. Split the read into
-        // separate single block reads, if needed, and allocate a temporary
-        // DMA-capable buffer.
-        void* tmp_buf = heap_caps_malloc(block_size, MALLOC_CAP_DMA);
-        if (tmp_buf == NULL) {
-            return ESP_ERR_NO_MEM;
-        }
-        uint8_t* cur_dst = (uint8_t*) dst;
-        for (size_t i = 0; i < block_count; ++i) {
-            err = sdmmc_read_sectors_dma(card, tmp_buf, start_block + i, 1);
-            if (err != ESP_OK) {
-                ESP_LOGD(TAG, "%s: error 0x%x writing block %d+%d",
-                        __func__, err, start_block, i);
-                break;
-            }
-            memcpy(cur_dst, tmp_buf, block_size);
-            cur_dst += block_size;
-        }
-        free(tmp_buf);
-    }
-    return err;
-}
-
-esp_err_t sdmmc_read_sectors_dma(sdmmc_card_t* card, void* dst,
-        size_t start_block, size_t block_count)
-{
-    if (start_block + block_count > card->csd.capacity) {
-        return ESP_ERR_INVALID_SIZE;
-    }
-    size_t block_size = card->csd.sector_size;
-    sdmmc_command_t cmd = {
-            .flags = SCF_CMD_ADTC | SCF_CMD_READ | SCF_RSP_R1,
-            .blklen = block_size,
-            .data = (void*) dst,
-            .datalen = block_count * block_size
-    };
-    if (block_count == 1) {
-        cmd.opcode = MMC_READ_BLOCK_SINGLE;
-    } else {
-        cmd.opcode = MMC_READ_BLOCK_MULTIPLE;
-    }
-    if (card->ocr & SD_OCR_SDHC_CAP) {
-        cmd.arg = start_block;
-    } else {
-        cmd.arg = start_block * block_size;
-    }
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x", __func__, err);
-        return err;
-    }
-    uint32_t status = 0;
-    size_t count = 0;
-    while (!host_is_spi(card) && !(status & MMC_R1_READY_FOR_DATA)) {
-        // TODO: add some timeout here
-        err = sdmmc_send_cmd_send_status(card, &status);
-        if (err != ESP_OK) {
-            return err;
-        }
-        if (++count % 10 == 0) {
-            ESP_LOGV(TAG, "waiting for card to become ready (%d)", count);
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_erase_sectors(sdmmc_card_t* card, size_t start_sector,
-        size_t sector_count, sdmmc_erase_arg_t arg)
-{
-    if (start_sector + sector_count > card->csd.capacity) {
-        return ESP_ERR_INVALID_SIZE;
-    }
-
-    uint32_t cmd38_arg;
-    if (arg == SDMMC_ERASE_ARG) {
-        cmd38_arg = card->is_mmc ? SDMMC_MMC_TRIM_ARG : SDMMC_SD_ERASE_ARG;
-    } else {
-        cmd38_arg = card->is_mmc ? SDMMC_MMC_DISCARD_ARG : SDMMC_SD_DISCARD_ARG;
-    }
-
-    /* validate the CMD38 argument against card supported features */
-    if (card->is_mmc) {
-        if ((cmd38_arg == SDMMC_MMC_TRIM_ARG) && (sdmmc_can_trim(card) != ESP_OK)) {
-            return ESP_ERR_NOT_SUPPORTED;
-        }
-        if ((cmd38_arg == SDMMC_MMC_DISCARD_ARG) && (sdmmc_can_discard(card) != ESP_OK)) {
-            return ESP_ERR_NOT_SUPPORTED;
-        }
-    } else { // SD card
-        if ((cmd38_arg == SDMMC_SD_DISCARD_ARG) && (sdmmc_can_discard(card) != ESP_OK)) {
-            return ESP_ERR_NOT_SUPPORTED;
-        }
-    }
-
-    /* default as block unit address */
-    size_t addr_unit_mult = 1;
-
-    if (!(card->ocr & SD_OCR_SDHC_CAP)) {
-        addr_unit_mult = card->csd.sector_size;
-    }
-
-    /* prepare command to set the start address */
-    sdmmc_command_t cmd = {
-            .flags = SCF_CMD_AC | SCF_RSP_R1 | SCF_WAIT_BUSY,
-            .opcode = card->is_mmc ? MMC_ERASE_GROUP_START :
-                    SD_ERASE_GROUP_START,
-            .arg = (start_sector * addr_unit_mult),
-    };
-
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: sdmmc_send_cmd (ERASE_GROUP_START) returned 0x%x", __func__, err);
-        return err;
-    }
-
-    /* prepare command to set the end address */
-    cmd.opcode = card->is_mmc ? MMC_ERASE_GROUP_END : SD_ERASE_GROUP_END;
-    cmd.arg = ((start_sector + (sector_count - 1)) * addr_unit_mult);
-
-    err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: sdmmc_send_cmd (ERASE_GROUP_END) returned 0x%x", __func__, err);
-        return err;
-    }
-
-    /* issue erase command */
-    memset((void *)&cmd, 0 , sizeof(sdmmc_command_t));
-    cmd.flags = SCF_CMD_AC | SCF_RSP_R1B | SCF_WAIT_BUSY;
-    cmd.opcode = MMC_ERASE;
-    cmd.arg = cmd38_arg;
-    cmd.timeout_ms = sdmmc_get_erase_timeout_ms(card, cmd38_arg, sector_count * card->csd.sector_size / 1024);
-
-    err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: sdmmc_send_cmd (ERASE) returned 0x%x", __func__, err);
-        return err;
-    }
-
-    if (host_is_spi(card)) {
-        uint32_t status;
-        err = sdmmc_send_cmd_send_status(card, &status);
-        if (err != ESP_OK) {
-            return err;
-        }
-        if (status != 0) {
-            ESP_LOGE(TAG, "%s: card status indicates an error after erase operation: r2=0x%04x",
-                     __func__, status);
-            return ESP_ERR_INVALID_RESPONSE;
-        }
-    }
-
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_can_discard(sdmmc_card_t* card)
-{
-    if ((card->is_mmc) && (card->ext_csd.rev >= EXT_CSD_REV_1_6)) {
-         return ESP_OK;
-    }
-    // SD card
-    if ((!card->is_mmc) && !host_is_spi(card) && (card->ssr.discard_support == 1)) {
-        return ESP_OK;
-    }
-    return ESP_FAIL;
-}
-
-esp_err_t sdmmc_can_trim(sdmmc_card_t* card)
-{
-    if ((card->is_mmc) && (card->ext_csd.sec_feature & EXT_CSD_SEC_GB_CL_EN)) {
-        FF_CAN_TRIM = 1;
-        return ESP_OK;
-    }
-    FF_CAN_TRIM = 0;
-    return ESP_FAIL;
-}
-
-esp_err_t sdmmc_mmc_can_sanitize(sdmmc_card_t* card)
-{
-    if ((card->is_mmc) && (card->ext_csd.sec_feature & EXT_CSD_SEC_SANITIZE)) {
-        return ESP_OK;
-    }
-    return ESP_FAIL;
-}
-
-esp_err_t sdmmc_mmc_sanitize(sdmmc_card_t* card, uint32_t timeout_ms)
-{
-    esp_err_t err;
-    uint8_t index = EXT_CSD_SANITIZE_START;
-    uint8_t set = EXT_CSD_CMD_SET_NORMAL;
-    uint8_t value = 0x01;
-
-    if (sdmmc_mmc_can_sanitize(card) != ESP_OK) {
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    /*
-     * A Sanitize operation is initiated by writing a value to the extended
-     * CSD[165] SANITIZE_START. While the device is performing the sanitize
-     * operation, the busy line is asserted.
-     * SWITCH command is used to write the EXT_CSD register.
-     */
-    sdmmc_command_t cmd = {
-            .opcode = MMC_SWITCH,
-            .arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) | (index << 16) | (value << 8) | set,
-            .flags = SCF_RSP_R1B | SCF_CMD_AC | SCF_WAIT_BUSY,
-            .timeout_ms = timeout_ms,
-    };
-    err = sdmmc_send_cmd(card, &cmd);
-    if (err == ESP_OK) {
-        //check response bit to see that switch was accepted
-        if (MMC_R1(cmd.response) & MMC_R1_SWITCH_ERROR) {
-            err = ESP_ERR_INVALID_RESPONSE;
-        }
-    }
-    return err;
-}
-
-esp_err_t sdmmc_full_erase(sdmmc_card_t* card)
-{
-    sdmmc_erase_arg_t arg = SDMMC_SD_ERASE_ARG; // erase by default for SD card
-    esp_err_t err;
-    if (card->is_mmc) {
-        arg = sdmmc_mmc_can_sanitize(card) == ESP_OK ? SDMMC_MMC_DISCARD_ARG: SDMMC_MMC_TRIM_ARG;
-    }
-    err = sdmmc_erase_sectors(card, 0, card->csd.capacity, arg);
-    if ((err == ESP_OK) && (arg == SDMMC_MMC_DISCARD_ARG)) {
-        uint32_t timeout_ms = sdmmc_get_erase_timeout_ms(card, SDMMC_MMC_DISCARD_ARG, card->csd.capacity * ((uint64_t) card->csd.sector_size) / 1024);
-        return sdmmc_mmc_sanitize(card, timeout_ms);
-    }
-    return err;
-}
-
-esp_err_t sdmmc_get_status(sdmmc_card_t* card)
-{
-    uint32_t stat;
-    return sdmmc_send_cmd_send_status(card, &stat);
-}

code/components/esp-sdmmc/sdmmc_common_mh.c

@@ -1,332 +0,0 @@
-/*
- * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
- * Adaptations to ESP-IDF Copyright (c) 2016-2018 Espressif Systems (Shanghai) PTE LTD
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "sdmmc_common_mh.h"
-
-bool card_is_mmc = 0;
-
-static const char* TAG = "sdmmc_common";
-
-esp_err_t sdmmc_init_ocr(sdmmc_card_t* card)
-{
-    esp_err_t err;
-    /* In SPI mode, READ_OCR (CMD58) command is used to figure out which voltage
-     * ranges the card can support. This step is skipped since 1.8V isn't
-     * supported on the ESP32.
-     */
-
-    uint32_t host_ocr = get_host_ocr(card->host.io_voltage);
-    if ((card->ocr & SD_OCR_SDHC_CAP) != 0) {
-        host_ocr |= SD_OCR_SDHC_CAP;
-    }
-    /* Send SEND_OP_COND (ACMD41) command to the card until it becomes ready. */
-    err = sdmmc_send_cmd_send_op_cond(card, host_ocr, &card->ocr);
-
-    /* If time-out, re-try send_op_cond as MMC */
-    if (err == ESP_ERR_TIMEOUT && !host_is_spi(card)) {
-        ESP_LOGD(TAG, "send_op_cond timeout, trying MMC");
-        card->is_mmc = 1;
-        card_is_mmc = 1;
-        err = sdmmc_send_cmd_send_op_cond(card, host_ocr, &card->ocr);
-    }
-
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: send_op_cond (1) returned 0x%x", __func__, err);
-        return err;
-    }
-    if (host_is_spi(card)) {
-        err = sdmmc_send_cmd_read_ocr(card, &card->ocr);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: read_ocr returned 0x%x", __func__, err);
-            return err;
-        }
-    }
-    ESP_LOGD(TAG, "host_ocr=0x%x card_ocr=0x%x", host_ocr, card->ocr);
-
-    /* Clear all voltage bits in host's OCR which the card doesn't support.
-     * Don't touch CCS bit because in SPI mode cards don't report CCS in ACMD41
-     * response.
-     */
-    host_ocr &= (card->ocr | (~SD_OCR_VOL_MASK));
-    ESP_LOGD(TAG, "sdmmc_card_init: host_ocr=%08x, card_ocr=%08x", host_ocr, card->ocr);
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_cid(sdmmc_card_t* card)
-{
-    esp_err_t err;
-    sdmmc_response_t raw_cid;
-    if (!host_is_spi(card)) {
-        err = sdmmc_send_cmd_all_send_cid(card, &raw_cid);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: all_send_cid returned 0x%x", __func__, err);
-            return err;
-        }
-        if (!card->is_mmc) {
-            err = sdmmc_decode_cid(raw_cid, &card->cid);
-            if (err != ESP_OK) {
-                ESP_LOGE(TAG, "%s: decoding CID failed (0x%x)", __func__, err);
-                return err;
-            }
-        } else {
-            /* For MMC, need to know CSD to decode CID. But CSD can only be read
-             * in data transfer mode, and it is not possible to read CID in data
-             * transfer mode. We temporiliy store the raw cid and do the
-             * decoding after the RCA is set and the card is in data transfer
-             * mode.
-             */
-            memcpy(card->raw_cid, raw_cid, sizeof(sdmmc_response_t));
-        }
-    } else {
-        err = sdmmc_send_cmd_send_cid(card, &card->cid);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: send_cid returned 0x%x", __func__, err);
-            return err;
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_rca(sdmmc_card_t* card)
-{
-    esp_err_t err;
-    err = sdmmc_send_cmd_set_relative_addr(card, &card->rca);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: set_relative_addr returned 0x%x", __func__, err);
-        return err;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_mmc_decode_cid(sdmmc_card_t* card)
-{
-    esp_err_t err;
-    sdmmc_response_t raw_cid;
-    memcpy(raw_cid, card->raw_cid, sizeof(raw_cid));
-    err = sdmmc_mmc_decode_cid(card->csd.mmc_ver, raw_cid, &card->cid);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: decoding CID failed (0x%x)", __func__, err);
-        return err;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_csd(sdmmc_card_t* card)
-{
-    assert(card->is_mem == 1);
-    /* Get and decode the contents of CSD register. Determine card capacity. */
-    esp_err_t err = sdmmc_send_cmd_send_csd(card, &card->csd);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: send_csd returned 0x%x", __func__, err);
-        return err;
-    }
-    const size_t max_sdsc_capacity = UINT32_MAX / card->csd.sector_size + 1;
-    if (!(card->ocr & SD_OCR_SDHC_CAP) &&
-         card->csd.capacity > max_sdsc_capacity) {
-        ESP_LOGW(TAG, "%s: SDSC card reports capacity=%u. Limiting to %u.",
-                __func__, card->csd.capacity, max_sdsc_capacity);
-        card->csd.capacity = max_sdsc_capacity;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_select_card(sdmmc_card_t* card)
-{
-    assert(!host_is_spi(card));
-    esp_err_t err = sdmmc_send_cmd_select_card(card, card->rca);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: select_card returned 0x%x", __func__, err);
-        return err;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_card_hs_mode(sdmmc_card_t* card)
-{
-    esp_err_t err = ESP_ERR_NOT_SUPPORTED;
-    if (card->is_mem && !card->is_mmc) {
-        err = sdmmc_enable_hs_mode_and_check(card);
-    } else if (card->is_sdio) {
-        err = sdmmc_io_enable_hs_mode(card);
-    } else if (card->is_mmc){
-        err = sdmmc_mmc_enable_hs_mode(card);
-    }
-    if (err == ESP_ERR_NOT_SUPPORTED) {
-        ESP_LOGD(TAG, "%s: host supports HS mode, but card doesn't", __func__);
-        card->max_freq_khz = SDMMC_FREQ_DEFAULT;
-    } else if (err != ESP_OK) {
-        return err;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_host_bus_width(sdmmc_card_t* card)
-{
-    int bus_width = 1;
-
-    if ((card->host.flags & SDMMC_HOST_FLAG_4BIT) &&
-        (card->log_bus_width == 2)) {
-        bus_width = 4;
-    } else if ((card->host.flags & SDMMC_HOST_FLAG_8BIT) &&
-        (card->log_bus_width == 3)) {
-        bus_width = 8;
-    }
-    ESP_LOGD(TAG, "%s: using %d-bit bus", __func__, bus_width);
-    if (bus_width > 1) {
-        esp_err_t err = (*card->host.set_bus_width)(card->host.slot, bus_width);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "host.set_bus_width failed (0x%x)", err);
-            return err;
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_host_frequency(sdmmc_card_t* card)
-{
-    assert(card->max_freq_khz <= card->host.max_freq_khz);
-
-    /* Find highest frequency in the following list,
-     * which is below card->max_freq_khz.
-     */
-    const uint32_t freq_values[] = {
-            SDMMC_FREQ_52M,
-            SDMMC_FREQ_HIGHSPEED,
-            SDMMC_FREQ_26M,
-            SDMMC_FREQ_DEFAULT
-            //NOTE: in sdspi mode, 20MHz may not work. in that case, add 10MHz here.
-    };
-    const int n_freq_values = sizeof(freq_values) / sizeof(freq_values[0]);
-
-    uint32_t selected_freq = SDMMC_FREQ_PROBING;
-    for (int i = 0; i < n_freq_values; ++i) {
-        uint32_t freq = freq_values[i];
-        if (card->max_freq_khz >= freq) {
-            selected_freq = freq;
-            break;
-        }
-    }
-
-    ESP_LOGD(TAG, "%s: using %d kHz bus frequency", __func__, selected_freq);
-    if (selected_freq > SDMMC_FREQ_PROBING) {
-        esp_err_t err = (*card->host.set_card_clk)(card->host.slot, selected_freq);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "failed to switch bus frequency (0x%x)", err);
-            return err;
-        }
-    }
-
-    if (card->is_ddr) {
-        if (card->host.set_bus_ddr_mode == NULL) {
-            ESP_LOGE(TAG, "host doesn't support DDR mode or voltage switching");
-            return ESP_ERR_NOT_SUPPORTED;
-        }
-        esp_err_t err = (*card->host.set_bus_ddr_mode)(card->host.slot, true);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "failed to switch bus to DDR mode (0x%x)", err);
-            return err;
-        }
-    }
-    return ESP_OK;
-}
-
-void sdmmc_flip_byte_order(uint32_t* response, size_t size)
-{
-    assert(size % (2 * sizeof(uint32_t)) == 0);
-    const size_t n_words = size / sizeof(uint32_t);
-    for (int i = 0; i < n_words / 2; ++i) {
-        uint32_t left = __builtin_bswap32(response[i]);
-        uint32_t right = __builtin_bswap32(response[n_words - i - 1]);
-        response[i] = right;
-        response[n_words - i - 1] = left;
-    }
-}
-
-void sdmmc_card_print_info(FILE* stream, const sdmmc_card_t* card)
-{
-    bool print_scr = false;
-    bool print_csd = false;
-    const char* type;
-    fprintf(stream, "Name: %s\n", card->cid.name);
-    if (card->is_sdio) {
-        type = "SDIO";
-        print_scr = true;
-        print_csd = true;
-    } else if (card->is_mmc) {
-        type = "MMC";
-        print_csd = true;
-    } else {
-        type = (card->ocr & SD_OCR_SDHC_CAP) ? "SDHC/SDXC" : "SDSC";
-        print_csd = true;
-    }
-    fprintf(stream, "Type: %s\n", type);
-    if (card->max_freq_khz < 1000) {
-        fprintf(stream, "Speed: %d kHz\n", card->max_freq_khz);
-    } else {
-        fprintf(stream, "Speed: %d MHz%s\n", card->max_freq_khz / 1000,
-                card->is_ddr ? ", DDR" : "");
-    }
-    fprintf(stream, "Size: %lluMB\n", ((uint64_t) card->csd.capacity) * card->csd.sector_size / (1024 * 1024));
-
-    if (print_csd) {
-        fprintf(stream, "CSD: ver=%d, sector_size=%d, capacity=%d read_bl_len=%d\n",
-                (card->is_mmc ? card->csd.csd_ver : card->csd.csd_ver + 1),
-                card->csd.sector_size, card->csd.capacity, card->csd.read_block_len);
-        if (card->is_mmc) {
-            fprintf(stream, "EXT CSD: bus_width=%d\n", (1 << card->log_bus_width));
-        } else if (!card->is_sdio){ // make sure card is SD
-            fprintf(stream, "SSR: bus_width=%d\n", (card->ssr.cur_bus_width ? 4 : 1));
-        }
-    }
-    if (print_scr) {
-        fprintf(stream, "SCR: sd_spec=%d, bus_width=%d\n", card->scr.sd_spec, card->scr.bus_width);
-    }
-}
-
-esp_err_t sdmmc_fix_host_flags(sdmmc_card_t* card)
-{
-    const uint32_t width_1bit = SDMMC_HOST_FLAG_1BIT;
-    const uint32_t width_4bit = SDMMC_HOST_FLAG_4BIT;
-    const uint32_t width_8bit = SDMMC_HOST_FLAG_8BIT;
-    const uint32_t width_mask = width_1bit | width_4bit | width_8bit;
-
-    int slot_bit_width = card->host.get_bus_width(card->host.slot);
-    if (slot_bit_width == 1 &&
-            (card->host.flags & (width_4bit | width_8bit))) {
-        card->host.flags &= ~width_mask;
-        card->host.flags |= width_1bit;
-    } else if (slot_bit_width == 4 && (card->host.flags & width_8bit)) {
-        if ((card->host.flags & width_4bit) == 0) {
-            ESP_LOGW(TAG, "slot width set to 4, but host flags don't have 4 line mode enabled; using 1 line mode");
-            card->host.flags &= ~width_mask;
-            card->host.flags |= width_1bit;
-        } else {
-            card->host.flags &= ~width_mask;
-            card->host.flags |= width_4bit;
-        }
-    }
-    return ESP_OK;
-}
-
-uint32_t sdmmc_get_erase_timeout_ms(const sdmmc_card_t* card, int arg, size_t erase_size_kb)
-{
-    if (card->is_mmc) {
-        return sdmmc_mmc_get_erase_timeout_ms(card, arg, erase_size_kb);
-    } else {
-        return sdmmc_sd_get_erase_timeout_ms(card, arg, erase_size_kb);
-    }
-}

code/components/esp-sdmmc/sdmmc_common_mh.h

@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
- * Adaptations to ESP-IDF Copyright (c) 2016-2018 Espressif Systems (Shanghai) PTE LTD
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#pragma once
-
-#include <string.h>
-#include "esp_log.h"
-#include "esp_heap_caps.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "driver/sdmmc_defs.h"
-#include "driver/sdmmc_types.h"
-#include "sdmmc_cmd_mh.h"
-#include "sys/param.h"
-#include "soc/soc_memory_layout.h"
-
-extern bool card_is_mmc;
-
-#define SDMMC_GO_IDLE_DELAY_MS              20
-#define SDMMC_IO_SEND_OP_COND_DELAY_MS      10
-
-/* These delay values are mostly useful for cases when CD pin is not used, and
- * the card is removed. In this case, SDMMC peripheral may not always return
- * CMD_DONE / DATA_DONE interrupts after signaling the error. These timeouts work
- * as a safety net in such cases.
- */
-#define SDMMC_DEFAULT_CMD_TIMEOUT_MS  1000   // Max timeout of ordinary commands
-#define SDMMC_WRITE_CMD_TIMEOUT_MS    5000   // Max timeout of write commands
-
-
-#define SDMMC_SD_DISCARD_TIMEOUT  250    // SD erase (discard) timeout
-
-/* Maximum retry/error count for SEND_OP_COND (CMD1).
- * These are somewhat arbitrary, values originate from OpenBSD driver.
- */
-#define SDMMC_SEND_OP_COND_MAX_RETRIES  100
-#define SDMMC_SEND_OP_COND_MAX_ERRORS   3
-
-/* supported arguments for erase command 38 */
-#define SDMMC_SD_ERASE_ARG      0
-#define SDMMC_SD_DISCARD_ARG    1
-#define SDMMC_MMC_TRIM_ARG      1
-#define SDMMC_MMC_DISCARD_ARG   3
-
-/* Functions to send individual commands */
-esp_err_t sdmmc_send_cmd(sdmmc_card_t* card, sdmmc_command_t* cmd);
-esp_err_t sdmmc_send_app_cmd(sdmmc_card_t* card, sdmmc_command_t* cmd);
-esp_err_t sdmmc_send_cmd_go_idle_state(sdmmc_card_t* card);
-esp_err_t sdmmc_send_cmd_send_if_cond(sdmmc_card_t* card, uint32_t ocr);
-esp_err_t sdmmc_send_cmd_send_op_cond(sdmmc_card_t* card, uint32_t ocr, uint32_t *ocrp);
-esp_err_t sdmmc_send_cmd_read_ocr(sdmmc_card_t *card, uint32_t *ocrp);
-esp_err_t sdmmc_send_cmd_send_cid(sdmmc_card_t *card, sdmmc_cid_t *out_cid);
-esp_err_t sdmmc_send_cmd_all_send_cid(sdmmc_card_t* card, sdmmc_response_t* out_raw_cid);
-esp_err_t sdmmc_send_cmd_set_relative_addr(sdmmc_card_t* card, uint16_t* out_rca);
-esp_err_t sdmmc_send_cmd_set_blocklen(sdmmc_card_t* card, sdmmc_csd_t* csd);
-esp_err_t sdmmc_send_cmd_switch_func(sdmmc_card_t* card,
-        uint32_t mode, uint32_t group, uint32_t function,
-        sdmmc_switch_func_rsp_t* resp);
-esp_err_t sdmmc_send_cmd_send_csd(sdmmc_card_t* card, sdmmc_csd_t* out_csd);
-esp_err_t sdmmc_send_cmd_select_card(sdmmc_card_t* card, uint32_t rca);
-esp_err_t sdmmc_send_cmd_send_scr(sdmmc_card_t* card, sdmmc_scr_t *out_scr);
-esp_err_t sdmmc_send_cmd_set_bus_width(sdmmc_card_t* card, int width);
-esp_err_t sdmmc_send_cmd_send_status(sdmmc_card_t* card, uint32_t* out_status);
-esp_err_t sdmmc_send_cmd_crc_on_off(sdmmc_card_t* card, bool crc_enable);
-
-/* Higher level functions */
-esp_err_t sdmmc_enable_hs_mode(sdmmc_card_t* card);
-esp_err_t sdmmc_enable_hs_mode_and_check(sdmmc_card_t* card);
-esp_err_t sdmmc_write_sectors_dma(sdmmc_card_t* card, const void* src,
-        size_t start_block, size_t block_count);
-esp_err_t sdmmc_read_sectors_dma(sdmmc_card_t* card, void* dst,
-        size_t start_block, size_t block_count);
-uint32_t sdmmc_get_erase_timeout_ms(const sdmmc_card_t* card, int arg, size_t erase_size_kb);
-
-/* SD specific */
-esp_err_t sdmmc_check_scr(sdmmc_card_t* card);
-esp_err_t sdmmc_decode_cid(sdmmc_response_t resp, sdmmc_cid_t* out_cid);
-esp_err_t sdmmc_decode_csd(sdmmc_response_t response, sdmmc_csd_t* out_csd);
-esp_err_t sdmmc_decode_scr(uint32_t *raw_scr, sdmmc_scr_t* out_scr);
-esp_err_t sdmmc_decode_ssr(uint32_t *raw_ssr, sdmmc_ssr_t* out_ssr);
-uint32_t sdmmc_sd_get_erase_timeout_ms(const sdmmc_card_t* card, int arg, size_t erase_size_kb);
-
-/* SDIO specific */
-esp_err_t sdmmc_io_reset(sdmmc_card_t* card);
-esp_err_t sdmmc_io_enable_hs_mode(sdmmc_card_t* card);
-esp_err_t sdmmc_io_send_op_cond(sdmmc_card_t* card, uint32_t ocr, uint32_t *ocrp);
-esp_err_t sdmmc_io_rw_direct(sdmmc_card_t* card, int function,
-        uint32_t reg, uint32_t arg, uint8_t *byte);
-esp_err_t sdmmc_io_rw_extended(sdmmc_card_t* card, int function,
-        uint32_t reg, int arg, void *data, size_t size);
-
-
-/* MMC specific */
-esp_err_t sdmmc_mmc_send_ext_csd_data(sdmmc_card_t* card, void *out_data, size_t datalen);
-esp_err_t sdmmc_mmc_switch(sdmmc_card_t* card, uint8_t set, uint8_t index, uint8_t value);
-esp_err_t sdmmc_mmc_decode_cid(int mmc_ver, sdmmc_response_t resp, sdmmc_cid_t* out_cid);
-esp_err_t sdmmc_mmc_decode_csd(sdmmc_response_t response, sdmmc_csd_t* out_csd);
-esp_err_t sdmmc_mmc_enable_hs_mode(sdmmc_card_t* card);
-uint32_t sdmmc_mmc_get_erase_timeout_ms(const sdmmc_card_t* card, int arg, size_t erase_size_kb);
-
-/* Parts of card initialization flow */
-esp_err_t sdmmc_init_sd_if_cond(sdmmc_card_t* card);
-esp_err_t sdmmc_init_select_card(sdmmc_card_t* card);
-esp_err_t sdmmc_init_csd(sdmmc_card_t* card);
-esp_err_t sdmmc_init_cid(sdmmc_card_t* card);
-esp_err_t sdmmc_init_rca(sdmmc_card_t* card);
-esp_err_t sdmmc_init_mmc_decode_cid(sdmmc_card_t* card);
-esp_err_t sdmmc_init_ocr(sdmmc_card_t* card);
-esp_err_t sdmmc_init_spi_crc(sdmmc_card_t* card);
-esp_err_t sdmmc_init_io(sdmmc_card_t* card);
-esp_err_t sdmmc_init_sd_blocklen(sdmmc_card_t* card);
-esp_err_t sdmmc_init_sd_scr(sdmmc_card_t* card);
-esp_err_t sdmmc_init_sd_ssr(sdmmc_card_t* card);
-esp_err_t sdmmc_init_sd_wait_data_ready(sdmmc_card_t* card);
-esp_err_t sdmmc_init_mmc_read_ext_csd(sdmmc_card_t* card);
-esp_err_t sdmmc_init_mmc_read_cid(sdmmc_card_t* card);
-esp_err_t sdmmc_init_host_bus_width(sdmmc_card_t* card);
-esp_err_t sdmmc_init_sd_bus_width(sdmmc_card_t* card);
-esp_err_t sdmmc_init_io_bus_width(sdmmc_card_t* card);
-esp_err_t sdmmc_init_mmc_bus_width(sdmmc_card_t* card);
-esp_err_t sdmmc_init_card_hs_mode(sdmmc_card_t* card);
-esp_err_t sdmmc_init_host_frequency(sdmmc_card_t* card);
-esp_err_t sdmmc_init_mmc_check_ext_csd(sdmmc_card_t* card);
-
-/* Various helper functions */
-static inline bool host_is_spi(const sdmmc_card_t* card)
-{
-    return (card->host.flags & SDMMC_HOST_FLAG_SPI) != 0;
-}
-
-static inline uint32_t get_host_ocr(float voltage)
-{
-    // TODO: report exact voltage to the card
-    // For now tell that the host has 2.8-3.6V voltage range
-    (void) voltage;
-    return SD_OCR_VOL_MASK;
-}
-
-void sdmmc_flip_byte_order(uint32_t* response, size_t size);
-
-esp_err_t sdmmc_fix_host_flags(sdmmc_card_t* card);

code/components/esp-sdmmc/sdmmc_init_mh.c

@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
- * Adaptations to ESP-IDF Copyright (c) 2016-2018 Espressif Systems (Shanghai) PTE LTD
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "sdmmc_common_mh.h"
-
-static const char* TAG = "sdmmc_init";
-
-#define SDMMC_INIT_STEP(condition, function) \
-    do { \
-        if ((condition)) { \
-            esp_err_t err = (function)(card); \
-            if (err != ESP_OK) { \
-                ESP_LOGD(TAG, "%s: %s returned 0x%x", __func__, #function, err); \
-                return err; \
-            } \
-        } \
-    } while(0);
-
-
-esp_err_t sdmmc_card_init(const sdmmc_host_t* config, sdmmc_card_t* card)
-{
-    memset(card, 0, sizeof(*card));
-    memcpy(&card->host, config, sizeof(*config));
-    const bool is_spi = host_is_spi(card);
-    const bool always = true;
-    const bool io_supported = true;
-
-    /* Check if host flags are compatible with slot configuration. */
-    SDMMC_INIT_STEP(!is_spi, sdmmc_fix_host_flags);
-
-    /* Reset SDIO (CMD52, RES) before re-initializing IO (CMD5). */
-    SDMMC_INIT_STEP(io_supported, sdmmc_io_reset);
-
-    /* GO_IDLE_STATE (CMD0) command resets the card */
-    SDMMC_INIT_STEP(always, sdmmc_send_cmd_go_idle_state);
-
-    /* SEND_IF_COND (CMD8) command is used to identify SDHC/SDXC cards. */
-    SDMMC_INIT_STEP(always, sdmmc_init_sd_if_cond);
-
-    /* IO_SEND_OP_COND(CMD5), Determine if the card is an IO card. */
-    SDMMC_INIT_STEP(io_supported, sdmmc_init_io);
-
-    const bool is_mem = card->is_mem;
-    const bool is_sdio = !is_mem;
-
-    /* Enable CRC16 checks for data transfers in SPI mode */
-    SDMMC_INIT_STEP(is_spi, sdmmc_init_spi_crc);
-
-    /* Use SEND_OP_COND to set up card OCR */
-    SDMMC_INIT_STEP(is_mem, sdmmc_init_ocr);
-
-    const bool is_mmc = is_mem && card->is_mmc;
-    const bool is_sdmem = is_mem && !is_mmc;
-
-    ESP_LOGD(TAG, "%s: card type is %s", __func__,
-            is_sdio ? "SDIO" : is_mmc ? "MMC" : "SD");
-
-    /* Read the contents of CID register*/
-    SDMMC_INIT_STEP(is_mem, sdmmc_init_cid);
-
-    /* Assign RCA */
-    SDMMC_INIT_STEP(!is_spi, sdmmc_init_rca);
-
-    /* Read and decode the contents of CSD register */
-    SDMMC_INIT_STEP(is_mem, sdmmc_init_csd);
-
-    /* Decode the contents of mmc CID register */
-    SDMMC_INIT_STEP(is_mmc && !is_spi, sdmmc_init_mmc_decode_cid);
-
-    /* Switch the card from stand-by mode to data transfer mode (not needed if
-     * SPI interface is used). This is needed to issue SET_BLOCKLEN and
-     * SEND_SCR commands.
-     */
-    SDMMC_INIT_STEP(!is_spi, sdmmc_init_select_card);
-
-    /* SD memory cards:
-     * Set block len for SDSC cards to 512 bytes (same as SDHC)
-     * Read SCR
-     * Wait to enter data transfer state
-     */
-    SDMMC_INIT_STEP(is_sdmem, sdmmc_init_sd_blocklen);
-    SDMMC_INIT_STEP(is_sdmem, sdmmc_init_sd_scr);
-    SDMMC_INIT_STEP(is_sdmem, sdmmc_init_sd_wait_data_ready);
-
-    /* MMC cards: read CXD */
-    SDMMC_INIT_STEP(is_mmc, sdmmc_init_mmc_read_ext_csd);
-
-    /* Try to switch card to HS mode if the card supports it.
-     * Set card->max_freq_khz value accordingly.
-     */
-    SDMMC_INIT_STEP(always, sdmmc_init_card_hs_mode);
-
-    /* Set bus width. One call for every kind of card, then one for the host */
-    if (!is_spi) {
-        SDMMC_INIT_STEP(is_sdmem, sdmmc_init_sd_bus_width);
-        SDMMC_INIT_STEP(is_sdio, sdmmc_init_io_bus_width);
-        SDMMC_INIT_STEP(is_mmc, sdmmc_init_mmc_bus_width);
-        SDMMC_INIT_STEP(always, sdmmc_init_host_bus_width);
-    }
-
-    /* SD card: read SD Status register */
-    SDMMC_INIT_STEP(is_sdmem, sdmmc_init_sd_ssr);
-
-    /* Switch to the host to use card->max_freq_khz frequency. */
-    SDMMC_INIT_STEP(always, sdmmc_init_host_frequency);
-
-    /* Sanity check after switching the bus mode and frequency */
-    SDMMC_INIT_STEP(is_sdmem, sdmmc_check_scr);
-    /* Sanity check after eMMC switch to HS mode */
-    SDMMC_INIT_STEP(is_mmc, sdmmc_init_mmc_check_ext_csd);
-    /* TODO: add similar checks for SDIO */
-
-    return ESP_OK;
-}

code/components/esp-sdmmc/sdmmc_io_mh.c

@@ -1,636 +0,0 @@
-/*
- * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
- * Adaptations to ESP-IDF Copyright (c) 2016-2018 Espressif Systems (Shanghai) PTE LTD
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "sdmmc_common_mh.h"
-#include "esp_attr.h"
-#include "esp_compiler.h"
-
-
-#define CIS_TUPLE(NAME)  (cis_tuple_t) {.code=CISTPL_CODE_##NAME, .name=#NAME, .func=&cis_tuple_func_default, }
-#define CIS_TUPLE_WITH_FUNC(NAME, FUNC)  (cis_tuple_t) {.code=CISTPL_CODE_##NAME, .name=#NAME, .func=&(FUNC), }
-
-#define CIS_CHECK_SIZE(SIZE, MINIMAL) do {int store_size = (SIZE); if((store_size) < (MINIMAL)) return ESP_ERR_INVALID_SIZE;} while(0)
-#define CIS_CHECK_UNSUPPORTED(COND) do {if(!(COND)) return ESP_ERR_NOT_SUPPORTED;} while(0)
-#define CIS_GET_MINIMAL_SIZE    32
-
-typedef esp_err_t (*cis_tuple_info_func_t)(const void* tuple_info, uint8_t* data, FILE* fp);
-
-typedef struct {
-    int code;
-    const char *name;
-    cis_tuple_info_func_t   func;
-} cis_tuple_t;
-
-static const char* TAG = "sdmmc_io";
-
-static esp_err_t cis_tuple_func_default(const void* p, uint8_t* data, FILE* fp);
-static esp_err_t cis_tuple_func_manfid(const void* p, uint8_t* data, FILE* fp);
-static esp_err_t cis_tuple_func_cftable_entry(const void* p, uint8_t* data, FILE* fp);
-static esp_err_t cis_tuple_func_end(const void* p, uint8_t* data, FILE* fp);
-
-static const cis_tuple_t cis_table[] = {
-    CIS_TUPLE(NULL),
-    CIS_TUPLE(DEVICE),
-    CIS_TUPLE(CHKSUM),
-    CIS_TUPLE(VERS1),
-    CIS_TUPLE(ALTSTR),
-    CIS_TUPLE(CONFIG),
-    CIS_TUPLE_WITH_FUNC(CFTABLE_ENTRY, cis_tuple_func_cftable_entry),
-    CIS_TUPLE_WITH_FUNC(MANFID, cis_tuple_func_manfid),
-    CIS_TUPLE(FUNCID),
-    CIS_TUPLE(FUNCE),
-    CIS_TUPLE(VENDER_BEGIN),
-    CIS_TUPLE(VENDER_END),
-    CIS_TUPLE(SDIO_STD),
-    CIS_TUPLE(SDIO_EXT),
-    CIS_TUPLE_WITH_FUNC(END, cis_tuple_func_end),
-};
-
-
-esp_err_t sdmmc_io_reset(sdmmc_card_t* card)
-{
-    uint8_t sdio_reset = CCCR_CTL_RES;
-    esp_err_t err = sdmmc_io_rw_direct(card, 0, SD_IO_CCCR_CTL, SD_ARG_CMD52_WRITE, &sdio_reset);
-    if (err == ESP_ERR_TIMEOUT || (host_is_spi(card) && err == ESP_ERR_NOT_SUPPORTED)) {
-        /* Non-IO cards are allowed to time out (in SD mode) or
-         * return "invalid command" error (in SPI mode).
-         */
-    } else if (err == ESP_ERR_NOT_FOUND) {
-        ESP_LOGD(TAG, "%s: card not present", __func__);
-        return err;
-    } else if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: unexpected return: 0x%x", __func__, err );
-        return err;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_io(sdmmc_card_t* card)
-{
-    /* IO_SEND_OP_COND(CMD5), Determine if the card is an IO card.
-     * Non-IO cards will not respond to this command.
-     */
-    esp_err_t err = sdmmc_io_send_op_cond(card, 0, &card->ocr);
-    if (err != ESP_OK) {
-        ESP_LOGD(TAG, "%s: io_send_op_cond (1) returned 0x%x; not IO card", __func__, err);
-        card->is_sdio = 0;
-        card->is_mem = 1;
-    } else {
-        card->is_sdio = 1;
-
-        if (card->ocr & SD_IO_OCR_MEM_PRESENT) {
-            ESP_LOGD(TAG, "%s: IO-only card", __func__);
-            card->is_mem = 0;
-        }
-        card->num_io_functions = SD_IO_OCR_NUM_FUNCTIONS(card->ocr);
-        ESP_LOGD(TAG, "%s: number of IO functions: %d", __func__, card->num_io_functions);
-        if (card->num_io_functions == 0) {
-            card->is_sdio = 0;
-        }
-        uint32_t host_ocr = get_host_ocr(card->host.io_voltage);
-        host_ocr &= card->ocr;
-        err = sdmmc_io_send_op_cond(card, host_ocr, &card->ocr);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: sdmmc_io_send_op_cond (1) returned 0x%x", __func__, err);
-            return err;
-        }
-        err = sdmmc_io_enable_int(card);
-        if (err != ESP_OK) {
-            ESP_LOGD(TAG, "%s: sdmmc_enable_int failed (0x%x)", __func__, err);
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_io_bus_width(sdmmc_card_t* card)
-{
-    esp_err_t err;
-    card->log_bus_width = 0;
-    if (card->host.flags & SDMMC_HOST_FLAG_4BIT) {
-        uint8_t card_cap = 0;
-        err = sdmmc_io_rw_direct(card, 0, SD_IO_CCCR_CARD_CAP,
-                SD_ARG_CMD52_READ, &card_cap);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: sdmmc_io_rw_direct (read SD_IO_CCCR_CARD_CAP) returned 0x%0x", __func__, err);
-            return err;
-        }
-        ESP_LOGD(TAG, "IO card capabilities byte: %02x", card_cap);
-        if (!(card_cap & CCCR_CARD_CAP_LSC) ||
-                (card_cap & CCCR_CARD_CAP_4BLS)) {
-            // This card supports 4-bit bus mode
-            uint8_t bus_width = CCCR_BUS_WIDTH_4;
-            err = sdmmc_io_rw_direct(card, 0, SD_IO_CCCR_BUS_WIDTH,
-                                SD_ARG_CMD52_WRITE, &bus_width);
-            if (err != ESP_OK) {
-                ESP_LOGE(TAG, "%s: sdmmc_io_rw_direct (write SD_IO_CCCR_BUS_WIDTH) returned 0x%0x", __func__, err);
-                return err;
-            }
-            card->log_bus_width = 2;
-        }
-    }
-    return ESP_OK;
-}
-
-
-esp_err_t sdmmc_io_enable_hs_mode(sdmmc_card_t* card)
-{
-    /* If the host is configured to use low frequency, don't attempt to switch */
-    if (card->host.max_freq_khz < SDMMC_FREQ_DEFAULT) {
-        card->max_freq_khz = card->host.max_freq_khz;
-        return ESP_OK;
-    } else if (card->host.max_freq_khz < SDMMC_FREQ_HIGHSPEED) {
-        card->max_freq_khz = SDMMC_FREQ_DEFAULT;
-        return ESP_OK;
-    }
-
-    /* For IO cards, do write + read operation on "High Speed" register,
-     * setting EHS bit. If both EHS and SHS read back as set, then HS mode
-     * has been enabled.
-     */
-    uint8_t val = CCCR_HIGHSPEED_ENABLE;
-    esp_err_t err = sdmmc_io_rw_direct(card, 0, SD_IO_CCCR_HIGHSPEED,
-            SD_ARG_CMD52_WRITE | SD_ARG_CMD52_EXCHANGE, &val);
-    if (err != ESP_OK) {
-        ESP_LOGD(TAG, "%s: sdmmc_io_rw_direct returned 0x%x", __func__, err);
-        return err;
-    }
-
-    ESP_LOGD(TAG, "%s: CCCR_HIGHSPEED=0x%02x", __func__, val);
-    const uint8_t hs_mask = CCCR_HIGHSPEED_ENABLE | CCCR_HIGHSPEED_SUPPORT;
-    if ((val & hs_mask) != hs_mask) {
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    card->max_freq_khz = SDMMC_FREQ_HIGHSPEED;
-    return ESP_OK;
-}
-
-
-esp_err_t sdmmc_io_send_op_cond(sdmmc_card_t* card, uint32_t ocr, uint32_t *ocrp)
-{
-    esp_err_t err = ESP_OK;
-    sdmmc_command_t cmd = {
-        .flags = SCF_CMD_BCR | SCF_RSP_R4,
-        .arg = ocr,
-        .opcode = SD_IO_SEND_OP_COND
-    };
-    for (size_t i = 0; i < 100; i++) {
-        err = sdmmc_send_cmd(card, &cmd);
-        if (err != ESP_OK) {
-            break;
-        }
-        if ((MMC_R4(cmd.response) & SD_IO_OCR_MEM_READY) ||
-            ocr == 0) {
-            break;
-        }
-        err = ESP_ERR_TIMEOUT;
-        vTaskDelay(SDMMC_IO_SEND_OP_COND_DELAY_MS / portTICK_PERIOD_MS);
-    }
-    if (err == ESP_OK && ocrp != NULL)
-        *ocrp = MMC_R4(cmd.response);
-
-    return err;
-}
-
-esp_err_t sdmmc_io_rw_direct(sdmmc_card_t* card, int func,
-        uint32_t reg, uint32_t arg, uint8_t *byte)
-{
-    esp_err_t err;
-    sdmmc_command_t cmd = {
-        .flags = SCF_CMD_AC | SCF_RSP_R5,
-        .arg = 0,
-        .opcode = SD_IO_RW_DIRECT
-    };
-
-    arg |= (func & SD_ARG_CMD52_FUNC_MASK) << SD_ARG_CMD52_FUNC_SHIFT;
-    arg |= (reg & SD_ARG_CMD52_REG_MASK) << SD_ARG_CMD52_REG_SHIFT;
-    arg |= (*byte & SD_ARG_CMD52_DATA_MASK) << SD_ARG_CMD52_DATA_SHIFT;
-    cmd.arg = arg;
-
-    err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        ESP_LOGV(TAG, "%s: sdmmc_send_cmd returned 0x%x", __func__, err);
-        return err;
-    }
-
-    *byte = SD_R5_DATA(cmd.response);
-
-    return ESP_OK;
-}
-
-
-esp_err_t sdmmc_io_read_byte(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, uint8_t *out_byte)
-{
-    esp_err_t ret = sdmmc_io_rw_direct(card, function, addr, SD_ARG_CMD52_READ, out_byte);
-    if (unlikely(ret != ESP_OK)) {
-        ESP_LOGE(TAG, "%s: sdmmc_io_rw_direct (read 0x%x) returned 0x%x", __func__, addr, ret);
-    }
-    return ret;
-}
-
-esp_err_t sdmmc_io_write_byte(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, uint8_t in_byte, uint8_t* out_byte)
-{
-    uint8_t tmp_byte = in_byte;
-    esp_err_t ret = sdmmc_io_rw_direct(card, function, addr,
-            SD_ARG_CMD52_WRITE | SD_ARG_CMD52_EXCHANGE, &tmp_byte);
-    if (unlikely(ret != ESP_OK)) {
-        ESP_LOGE(TAG, "%s: sdmmc_io_rw_direct (write 0x%x) returned 0x%x", __func__, addr, ret);
-        return ret;
-    }
-    if (out_byte != NULL) {
-        *out_byte = tmp_byte;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_io_rw_extended(sdmmc_card_t* card, int func,
-    uint32_t reg, int arg, void *datap, size_t datalen)
-{
-    esp_err_t err;
-    const size_t max_byte_transfer_size = 512;
-    sdmmc_command_t cmd = {
-        .flags = SCF_CMD_AC | SCF_RSP_R5,
-        .arg = 0,
-        .opcode = SD_IO_RW_EXTENDED,
-        .data = datap,
-        .datalen = datalen,
-        .blklen = max_byte_transfer_size /* TODO: read max block size from CIS */
-    };
-
-    uint32_t count; /* number of bytes or blocks, depending on transfer mode */
-    if (arg & SD_ARG_CMD53_BLOCK_MODE) {
-        if (cmd.datalen % cmd.blklen != 0) {
-            return ESP_ERR_INVALID_SIZE;
-        }
-        count = cmd.datalen / cmd.blklen;
-    } else {
-        if (datalen > max_byte_transfer_size) {
-            /* TODO: split into multiple operations? */
-            return ESP_ERR_INVALID_SIZE;
-        }
-        if (datalen == max_byte_transfer_size) {
-            count = 0;  // See 5.3.1 SDIO simplifed spec
-        } else {
-            count = datalen;
-        }
-        cmd.blklen = datalen;
-    }
-
-    arg |= (func & SD_ARG_CMD53_FUNC_MASK) << SD_ARG_CMD53_FUNC_SHIFT;
-    arg |= (reg & SD_ARG_CMD53_REG_MASK) << SD_ARG_CMD53_REG_SHIFT;
-    arg |= (count & SD_ARG_CMD53_LENGTH_MASK) << SD_ARG_CMD53_LENGTH_SHIFT;
-    cmd.arg = arg;
-
-    if ((arg & SD_ARG_CMD53_WRITE) == 0) {
-        cmd.flags |= SCF_CMD_READ;
-    }
-
-    err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x", __func__, err);
-        return err;
-    }
-
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_io_read_bytes(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, void* dst, size_t size)
-{
-    /* host quirk: SDIO transfer with length not divisible by 4 bytes
-     * has to be split into two transfers: one with aligned length,
-     * the other one for the remaining 1-3 bytes.
-     */
-    uint8_t *pc_dst = dst;
-    while (size > 0) {
-        size_t size_aligned = size & (~3);
-        size_t will_transfer = size_aligned > 0 ? size_aligned : size;
-
-        esp_err_t err = sdmmc_io_rw_extended(card, function, addr,
-                SD_ARG_CMD53_READ | SD_ARG_CMD53_INCREMENT,
-                pc_dst, will_transfer);
-        if (unlikely(err != ESP_OK)) {
-            return err;
-        }
-        pc_dst += will_transfer;
-        size -= will_transfer;
-        addr += will_transfer;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_io_write_bytes(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, const void* src, size_t size)
-{
-    /* same host quirk as in sdmmc_io_read_bytes */
-    const uint8_t *pc_src = (const uint8_t*) src;
-
-    while (size > 0) {
-        size_t size_aligned = size & (~3);
-        size_t will_transfer = size_aligned > 0 ? size_aligned : size;
-
-        esp_err_t err = sdmmc_io_rw_extended(card, function, addr,
-                SD_ARG_CMD53_WRITE | SD_ARG_CMD53_INCREMENT,
-                (void*) pc_src, will_transfer);
-        if (unlikely(err != ESP_OK)) {
-            return err;
-        }
-        pc_src += will_transfer;
-        size -= will_transfer;
-        addr += will_transfer;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_io_read_blocks(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, void* dst, size_t size)
-{
-    if (unlikely(size % 4 != 0)) {
-        return ESP_ERR_INVALID_SIZE;
-    }
-    return sdmmc_io_rw_extended(card, function, addr,
-            SD_ARG_CMD53_READ | SD_ARG_CMD53_INCREMENT | SD_ARG_CMD53_BLOCK_MODE,
-            dst, size);
-}
-
-esp_err_t sdmmc_io_write_blocks(sdmmc_card_t* card, uint32_t function,
-        uint32_t addr, const void* src, size_t size)
-{
-    if (unlikely(size % 4 != 0)) {
-        return ESP_ERR_INVALID_SIZE;
-    }
-    return sdmmc_io_rw_extended(card, function, addr,
-            SD_ARG_CMD53_WRITE | SD_ARG_CMD53_INCREMENT | SD_ARG_CMD53_BLOCK_MODE,
-            (void*) src, size);
-}
-
-esp_err_t sdmmc_io_enable_int(sdmmc_card_t* card)
-{
-    if (card->host.io_int_enable == NULL) {
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    return (*card->host.io_int_enable)(card->host.slot);
-}
-
-esp_err_t sdmmc_io_wait_int(sdmmc_card_t* card, TickType_t timeout_ticks)
-{
-    if (card->host.io_int_wait == NULL) {
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    return (*card->host.io_int_wait)(card->host.slot, timeout_ticks);
-}
-
-
-/*
- * Print the CIS information of a CIS card, currently only ESP slave supported.
- */
-
-static esp_err_t cis_tuple_func_default(const void* p, uint8_t* data, FILE* fp)
-{
-    const cis_tuple_t* tuple = (const cis_tuple_t*)p;
-    uint8_t code = *(data++);
-    int size = *(data++);
-    if (tuple) {
-        fprintf(fp, "TUPLE: %s, size: %d: ", tuple->name, size);
-    } else {
-        fprintf(fp, "TUPLE: unknown(%02X), size: %d: ", code, size);
-    }
-    for (int i = 0; i < size; i++) fprintf(fp, "%02X ", *(data++));
-    fprintf(fp, "\n");
-    return ESP_OK;
-}
-
-static esp_err_t cis_tuple_func_manfid(const void* p, uint8_t* data, FILE* fp)
-{
-    const cis_tuple_t* tuple = (const cis_tuple_t*)p;
-    data++;
-    int size = *(data++);
-    fprintf(fp, "TUPLE: %s, size: %d\n", tuple->name, size);
-    CIS_CHECK_SIZE(size, 4);
-    fprintf(fp, "  MANF: %04X, CARD: %04X\n", *(uint16_t*)(data), *(uint16_t*)(data+2));
-    return ESP_OK;
-}
-
-static esp_err_t cis_tuple_func_end(const void* p, uint8_t* data, FILE* fp)
-{
-    const cis_tuple_t* tuple = (const cis_tuple_t*)p;
-    data++;
-    fprintf(fp, "TUPLE: %s\n", tuple->name);
-    return ESP_OK;
-}
-
-static esp_err_t cis_tuple_func_cftable_entry(const void* p, uint8_t* data, FILE* fp)
-{
-    const cis_tuple_t* tuple = (const cis_tuple_t*)p;
-    data++;
-    int size = *(data++);
-    fprintf(fp, "TUPLE: %s, size: %d\n", tuple->name, size);
-    CIS_CHECK_SIZE(size, 2);
-
-    CIS_CHECK_SIZE(size--, 1);
-    bool interface = data[0] & BIT(7);
-    bool def = data[0] & BIT(6);
-    int conf_ent_num = data[0] & 0x3F;
-    fprintf(fp, "  INDX: %02X, Intface: %d, Default: %d, Conf-Entry-Num: %d\n", *(data++), interface, def, conf_ent_num);
-
-    if (interface) {
-        CIS_CHECK_SIZE(size--, 1);
-        fprintf(fp, "  IF: %02X\n", *(data++));
-    }
-
-    CIS_CHECK_SIZE(size--, 1);
-    bool misc = data[0] & BIT(7);
-    int mem_space = (data[0] >> 5 )&(0x3);
-    bool irq = data[0] & BIT(4);
-    bool io_sp = data[0] & BIT(3);
-    bool timing = data[0] & BIT(2);
-    int power = data[0] & 3;
-    fprintf(fp, "  FS: %02X, misc: %d, mem_space: %d, irq: %d, io_space: %d, timing: %d, power: %d\n", *(data++), misc, mem_space, irq, io_sp, timing, power);
-
-    CIS_CHECK_UNSUPPORTED(power == 0);  //power descriptor is not handled yet
-    CIS_CHECK_UNSUPPORTED(!timing);     //timing descriptor is not handled yet
-    CIS_CHECK_UNSUPPORTED(!io_sp);      //io space descriptor is not handled yet
-
-    if (irq) {
-        CIS_CHECK_SIZE(size--, 1);
-        bool mask = data[0] & BIT(4);
-        fprintf(fp, "  IR: %02X, mask: %d, ",*(data++), mask);
-        if (mask) {
-            CIS_CHECK_SIZE(size, 2);
-            size-=2;
-            fprintf(fp, "  IRQ: %02X %02X\n", data[0], data[1]);
-            data+=2;
-        }
-    }
-
-    if (mem_space) {
-        CIS_CHECK_SIZE(size, 2);
-        size-=2;
-        CIS_CHECK_UNSUPPORTED(mem_space==1); //other cases not handled yet
-        int len = *(uint16_t*)data;
-        fprintf(fp, "  LEN: %04X\n", len);
-        data+=2;
-    }
-
-    CIS_CHECK_UNSUPPORTED(misc==0);    //misc descriptor is not handled yet
-    return ESP_OK;
-}
-
-static const cis_tuple_t* get_tuple(uint8_t code)
-{
-    for (int i = 0; i < sizeof(cis_table)/sizeof(cis_tuple_t); i++) {
-        if (code == cis_table[i].code) return &cis_table[i];
-    }
-    return NULL;
-}
-
-esp_err_t sdmmc_io_print_cis_info(uint8_t* buffer, size_t buffer_size, FILE* fp)
-{
-    ESP_LOG_BUFFER_HEXDUMP("CIS", buffer, buffer_size, ESP_LOG_DEBUG);
-    if (!fp) fp = stdout;
-
-    uint8_t* cis = buffer;
-    do {
-        const cis_tuple_t* tuple = get_tuple(cis[0]);
-        int size = cis[1];
-        esp_err_t ret = ESP_OK;
-        if (tuple) {
-            ret = tuple->func(tuple, cis, fp);
-        } else {
-            ret = cis_tuple_func_default(NULL, cis, fp);
-        }
-        if (ret != ESP_OK) return ret;
-        cis += 2 + size;
-        if (tuple && tuple->code == CISTPL_CODE_END) break;
-    } while (cis < buffer + buffer_size) ;
-    return ESP_OK;
-}
-
-/**
- * Check tuples in the buffer.
- *
- * @param buf Buffer to check
- * @param buffer_size Size of the buffer
- * @param inout_cis_offset
- *          - input: the last cis_offset, relative to the beginning of the buf. -1 if
- *                      this buffer begin with the tuple length, otherwise should be no smaller than
- *                      zero.
- *          - output: when the end tuple found, output offset of the CISTPL_CODE_END
- *                      byte + 1 (relative to the beginning of the buffer; when not found, output
- *                      the address of next tuple code.
- *
- * @return true if found, false if haven't.
- */
-static bool check_tuples_in_buffer(uint8_t* buf, int buffer_size, int* inout_cis_offset)
-{
-    int cis_offset = *inout_cis_offset;
-    if (cis_offset == -1) {
-        //the CIS code is checked in the last buffer, skip to next tuple
-        cis_offset += buf[0] + 2;
-    }
-    assert(cis_offset >= 0);
-    while (1) {
-        if (cis_offset < buffer_size) {
-            //A CIS code in the buffer, check it
-            if (buf[cis_offset] == CISTPL_CODE_END) {
-                *inout_cis_offset = cis_offset + 1;
-                return true;
-            }
-        }
-        if (cis_offset + 1 < buffer_size) {
-            cis_offset += buf[cis_offset+1] + 2;
-        } else {
-            break;
-        }
-    }
-    *inout_cis_offset = cis_offset;
-    return false;
-}
-
-esp_err_t sdmmc_io_get_cis_data(sdmmc_card_t* card, uint8_t* out_buffer, size_t buffer_size, size_t* inout_cis_size)
-{
-    esp_err_t ret = ESP_OK;
-    WORD_ALIGNED_ATTR uint8_t buf[CIS_GET_MINIMAL_SIZE];
-
-    /* Pointer to size is a mandatory parameter */
-    assert(inout_cis_size);
-
-    /*
-     * CIS region exist in 0x1000~0x17FFF of FUNC 0, get the start address of it
-     * from CCCR register.
-     */
-    uint32_t addr;
-    ret = sdmmc_io_read_bytes(card, 0, 9, &addr, 3);
-    if (ret != ESP_OK) return ret;
-    //the sdmmc_io driver reads 4 bytes, the most significant byte is not the address.
-    addr &= 0xffffff;
-    if (addr < 0x1000 || addr > 0x17FFF) {
-        return ESP_ERR_INVALID_RESPONSE;
-    }
-
-    /*
-     * To avoid reading too long, take the input value as limitation if
-     * existing.
-     */
-    size_t max_reading = UINT32_MAX;
-    if (*inout_cis_size != 0) {
-        max_reading = *inout_cis_size;
-    }
-
-    /*
-     * Parse the length while reading. If find the end tuple, or reaches the
-     * limitation, read no more and return both the data and the size already
-     * read.
-     */
-    int buffer_offset = 0;
-    int cur_cis_offset = 0;
-    bool end_tuple_found = false;
-    do {
-        ret = sdmmc_io_read_bytes(card, 0, addr + buffer_offset, &buf, CIS_GET_MINIMAL_SIZE);
-        if (ret != ESP_OK) return ret;
-
-        //calculate relative to the beginning of the buffer
-        int offset = cur_cis_offset - buffer_offset;
-        bool finish = check_tuples_in_buffer(buf, CIS_GET_MINIMAL_SIZE, &offset);
-
-        int remain_size = buffer_size - buffer_offset;
-        int copy_len;
-        if (finish) {
-            copy_len = MIN(offset, remain_size);
-            end_tuple_found = true;
-        } else {
-            copy_len = MIN(CIS_GET_MINIMAL_SIZE, remain_size);
-        }
-        if (copy_len > 0) {
-            memcpy(out_buffer + buffer_offset, buf, copy_len);
-        }
-        cur_cis_offset = buffer_offset + offset;
-        buffer_offset += CIS_GET_MINIMAL_SIZE;
-    } while (!end_tuple_found && buffer_offset < max_reading);
-
-    if (end_tuple_found) {
-        *inout_cis_size = cur_cis_offset;
-        if (cur_cis_offset > buffer_size) {
-            return ESP_ERR_INVALID_SIZE;
-        } else {
-            return ESP_OK;
-        }
-    } else {
-        return ESP_ERR_NOT_FOUND;
-    }
-}

code/components/esp-sdmmc/sdmmc_mmc_mh.c

@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
- * Adaptations to ESP-IDF Copyright (c) 2016-2018 Espressif Systems (Shanghai) PTE LTD
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <unistd.h>
-#include "sdmmc_common_mh.h"
-
-static const char* TAG = "sdmmc_mmc";
-
-
-esp_err_t sdmmc_init_mmc_read_ext_csd(sdmmc_card_t* card)
-{
-    int card_type;
-    esp_err_t err = ESP_OK;
-
-    uint8_t* ext_csd = heap_caps_malloc(EXT_CSD_MMC_SIZE, MALLOC_CAP_DMA);
-    if (!ext_csd) {
-        ESP_LOGE(TAG, "%s: could not allocate ext_csd", __func__);
-        return ESP_ERR_NO_MEM;
-    }
-
-    uint32_t sectors = 0;
-
-    ESP_LOGD(TAG, "MMC version: %d", card->csd.mmc_ver);
-    if (card->csd.mmc_ver < MMC_CSD_MMCVER_4_0) {
-        err = ESP_ERR_NOT_SUPPORTED;
-        goto out;
-    }
-
-    /* read EXT_CSD */
-    err = sdmmc_mmc_send_ext_csd_data(card, ext_csd, EXT_CSD_MMC_SIZE);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: send_ext_csd_data error 0x%x", __func__, err);
-        goto out;
-    }
-    card_type = ext_csd[EXT_CSD_CARD_TYPE];
-    card->is_ddr = 0;
-    if (card_type & EXT_CSD_CARD_TYPE_F_52M_1_8V) {
-        card->max_freq_khz = SDMMC_FREQ_52M;
-        if ((card->host.flags & SDMMC_HOST_FLAG_DDR) &&
-                card->host.max_freq_khz >= SDMMC_FREQ_26M &&
-                card->host.get_bus_width(card->host.slot) == 4) {
-            ESP_LOGD(TAG, "card and host support DDR mode");
-            card->is_ddr = 1;
-        }
-    } else if (card_type & EXT_CSD_CARD_TYPE_F_52M) {
-        card->max_freq_khz = SDMMC_FREQ_52M;
-    } else if (card_type & EXT_CSD_CARD_TYPE_F_26M) {
-        card->max_freq_khz = SDMMC_FREQ_26M;
-    } else {
-        ESP_LOGW(TAG, "%s: unknown CARD_TYPE 0x%x", __func__, card_type);
-    }
-    /* For MMC cards, use speed value from EXT_CSD */
-    card->csd.tr_speed = card->max_freq_khz * 1000;
-    ESP_LOGD(TAG, "MMC card type %d, max_freq_khz=%d, is_ddr=%d", card_type, card->max_freq_khz, card->is_ddr);
-    card->max_freq_khz = MIN(card->max_freq_khz, card->host.max_freq_khz);
-
-    if (card->host.flags & SDMMC_HOST_FLAG_8BIT) {
-        card->ext_csd.power_class = ext_csd[(card->max_freq_khz > SDMMC_FREQ_26M) ?
-                EXT_CSD_PWR_CL_52_360 : EXT_CSD_PWR_CL_26_360] >> 4;
-        card->log_bus_width = 3;
-    } else if (card->host.flags & SDMMC_HOST_FLAG_4BIT) {
-        card->ext_csd.power_class = ext_csd[(card->max_freq_khz > SDMMC_FREQ_26M) ?
-                EXT_CSD_PWR_CL_52_360 : EXT_CSD_PWR_CL_26_360] & 0x0f;
-        card->log_bus_width = 2;
-    } else {
-        card->ext_csd.power_class = 0; //card must be able to do full rate at powerclass 0 in 1-bit mode
-        card->log_bus_width = 0;
-    }
-
-    sectors = ( ext_csd[EXT_CSD_SEC_COUNT + 0] << 0 )
-        | ( ext_csd[EXT_CSD_SEC_COUNT + 1] << 8 )
-        | ( ext_csd[EXT_CSD_SEC_COUNT + 2] << 16 )
-        | ( ext_csd[EXT_CSD_SEC_COUNT + 3] << 24 );
-
-    if (sectors > (2u * 1024 * 1024 * 1024) / 512) {
-        card->csd.capacity = sectors;
-    }
-
-    /* erased state of a bit, if 1 byte value read is 0xFF else 0x00 */
-    card->ext_csd.erase_mem_state = ext_csd[EXT_CSD_ERASED_MEM_CONT];
-    card->ext_csd.rev = ext_csd[EXT_CSD_REV];
-    card->ext_csd.sec_feature = ext_csd[EXT_CSD_SEC_FEATURE_SUPPORT];
-
-out:
-    free(ext_csd);
-    return err;
-}
-
-esp_err_t sdmmc_init_mmc_bus_width(sdmmc_card_t* card)
-{
-    esp_err_t err;
-    if (card->ext_csd.power_class != 0) {
-        err = sdmmc_mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                EXT_CSD_POWER_CLASS, card->ext_csd.power_class);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: can't change power class (%d bit), 0x%x"
-                    , __func__, card->ext_csd.power_class, err);
-            return err;
-        }
-    }
-
-    if (card->log_bus_width > 0) {
-        int csd_bus_width_value = EXT_CSD_BUS_WIDTH_1;
-        int bus_width = 1;
-        if (card->log_bus_width == 2) {
-            if (card->is_ddr) {
-                csd_bus_width_value = EXT_CSD_BUS_WIDTH_4_DDR;
-            } else {
-                csd_bus_width_value = EXT_CSD_BUS_WIDTH_4;
-            }
-            bus_width = 4;
-        } else if (card->log_bus_width == 3) {
-            if (card->is_ddr) {
-                csd_bus_width_value = EXT_CSD_BUS_WIDTH_8_DDR;
-            } else {
-                csd_bus_width_value = EXT_CSD_BUS_WIDTH_8;
-            }
-            bus_width = 8;
-        }
-        err = sdmmc_mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                EXT_CSD_BUS_WIDTH, csd_bus_width_value);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: can't change bus width (%d bit), 0x%x",
-                    __func__, bus_width, err);
-            return err;
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_mmc_enable_hs_mode(sdmmc_card_t* card)
-{
-    esp_err_t err;
-    if (card->max_freq_khz > SDMMC_FREQ_26M) {
-        /* switch to high speed timing */
-        err = sdmmc_mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                EXT_CSD_HS_TIMING, EXT_CSD_HS_TIMING_HS);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: mmc_switch EXT_CSD_HS_TIMING_HS error 0x%x",
-                    __func__, err);
-            return err;
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_mmc_decode_cid(int mmc_ver, sdmmc_response_t resp, sdmmc_cid_t* out_cid)
-{
-    if (mmc_ver == MMC_CSD_MMCVER_1_0 ||
-            mmc_ver == MMC_CSD_MMCVER_1_4) {
-        out_cid->mfg_id = MMC_CID_MID_V1(resp);
-        out_cid->oem_id = 0;
-        MMC_CID_PNM_V1_CPY(resp, out_cid->name);
-        out_cid->revision = MMC_CID_REV_V1(resp);
-        out_cid->serial = MMC_CID_PSN_V1(resp);
-        out_cid->date = MMC_CID_MDT_V1(resp);
-    } else if (mmc_ver == MMC_CSD_MMCVER_2_0 ||
-            mmc_ver == MMC_CSD_MMCVER_3_1 ||
-            mmc_ver == MMC_CSD_MMCVER_4_0) {
-        out_cid->mfg_id = MMC_CID_MID_V2(resp);
-        out_cid->oem_id = MMC_CID_OID_V2(resp);
-        MMC_CID_PNM_V1_CPY(resp, out_cid->name);
-        out_cid->revision = 0;
-        out_cid->serial = MMC_CID_PSN_V1(resp);
-        out_cid->date = 0;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_mmc_decode_csd(sdmmc_response_t response, sdmmc_csd_t* out_csd)
-{
-    out_csd->csd_ver = MMC_CSD_CSDVER(response);
-    if (out_csd->csd_ver == MMC_CSD_CSDVER_1_0 ||
-            out_csd->csd_ver == MMC_CSD_CSDVER_2_0 ||
-            out_csd->csd_ver == MMC_CSD_CSDVER_EXT_CSD) {
-        out_csd->mmc_ver = MMC_CSD_MMCVER(response);
-        out_csd->capacity = MMC_CSD_CAPACITY(response);
-        out_csd->read_block_len = MMC_CSD_READ_BL_LEN(response);
-    } else {
-        ESP_LOGE(TAG, "unknown MMC CSD structure version 0x%x\n", out_csd->csd_ver);
-        return 1;
-    }
-    int read_bl_size = 1 << out_csd->read_block_len;
-    out_csd->sector_size = MIN(read_bl_size, 512);
-    if (out_csd->sector_size < read_bl_size) {
-        out_csd->capacity *= read_bl_size / out_csd->sector_size;
-    }
-    /* tr_speed will be determined when reading CXD */
-    out_csd->tr_speed = 0;
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_mmc_send_ext_csd_data(sdmmc_card_t* card, void *out_data, size_t datalen)
-{
-    assert(esp_ptr_dma_capable(out_data));
-    sdmmc_command_t cmd = {
-        .data = out_data,
-        .datalen = datalen,
-        .blklen = datalen,
-        .opcode = MMC_SEND_EXT_CSD,
-        .arg = 0,
-        .flags = SCF_CMD_ADTC | SCF_RSP_R1 | SCF_CMD_READ
-    };
-    return sdmmc_send_cmd(card, &cmd);
-}
-
-esp_err_t sdmmc_mmc_switch(sdmmc_card_t* card, uint8_t set, uint8_t index, uint8_t value)
-{
-    sdmmc_command_t cmd = {
-            .opcode = MMC_SWITCH,
-            .arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) | (index << 16) | (value << 8) | set,
-            .flags = SCF_RSP_R1B | SCF_CMD_AC | SCF_WAIT_BUSY,
-    };
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err == ESP_OK) {
-        //check response bit to see that switch was accepted
-        if (MMC_R1(cmd.response) & MMC_R1_SWITCH_ERROR) {
-            err = ESP_ERR_INVALID_RESPONSE;
-        }
-    }
-
-    return err;
-}
-
-esp_err_t sdmmc_init_mmc_check_ext_csd(sdmmc_card_t* card)
-{
-    assert(card->is_mem == 1 && card->rca != 0);
-
-    /*
-     * Integrity check required if card switched to HS mode
-     * card->max_freq_khz = MIN(card->max_freq_khz, card->host.max_freq_khz)
-     * For 26MHz limit background see sdmmc_mmc_enable_hs_mode()
-     */
-    if (card->max_freq_khz <= SDMMC_FREQ_26M) {
-        return ESP_OK;
-    }
-
-    /* ensure EXT_CSD buffer is available before starting any SD-card operation */
-    uint8_t* ext_csd = heap_caps_malloc(EXT_CSD_MMC_SIZE, MALLOC_CAP_DMA);
-    if (!ext_csd) {
-        ESP_LOGE(TAG, "%s: could not allocate ext_csd", __func__);
-        return ESP_ERR_NO_MEM;
-    }
-
-    /* ensure card is in transfer state before read ext_csd */
-    uint32_t status;
-    esp_err_t err = sdmmc_send_cmd_send_status(card, &status);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: send_status returned 0x%x", __func__, err);
-        goto out;
-    }
-    status = ((status & MMC_R1_CURRENT_STATE_MASK) >> MMC_R1_CURRENT_STATE_POS);
-    if (status != MMC_R1_CURRENT_STATE_TRAN) {
-        ESP_LOGE(TAG, "%s: card not in transfer state", __func__);
-        err = ESP_ERR_INVALID_STATE;
-        goto out;
-    }
-
-    /* read EXT_CSD to ensure device works fine in HS mode */
-    err = sdmmc_mmc_send_ext_csd_data(card, ext_csd, EXT_CSD_MMC_SIZE);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: send_ext_csd_data error 0x%x", __func__, err);
-        goto out;
-    }
-
-    /* EXT_CSD static fields should match the previous read values in sdmmc_card_init */
-    if ((card->ext_csd.rev != ext_csd[EXT_CSD_REV]) ||
-            (card->ext_csd.sec_feature != ext_csd[EXT_CSD_SEC_FEATURE_SUPPORT])) {
-        ESP_LOGE(TAG, "%s: Data integrity test fail in HS mode", __func__);
-        err = ESP_FAIL;
-    }
-
-out:
-    free(ext_csd);
-    return err;
-}
-
-uint32_t sdmmc_mmc_get_erase_timeout_ms(const sdmmc_card_t* card, int arg, size_t erase_size_kb)
-{
-    /* TODO: calculate erase timeout based on ext_csd (trim_timeout) */
-    uint32_t timeout_ms = SDMMC_SD_DISCARD_TIMEOUT * erase_size_kb / card->csd.sector_size;
-    timeout_ms = MAX(1000, timeout_ms);
-    ESP_LOGD(TAG, "%s: erase timeout %u s (erasing %u kB, %ums per sector)",
-             __func__, timeout_ms / 1000, erase_size_kb, SDMMC_SD_DISCARD_TIMEOUT);
-    return timeout_ms;
-}

code/components/esp-sdmmc/sdmmc_sd_mh.c

@@ -1,449 +0,0 @@
-/*
- * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
- * Adaptations to ESP-IDF Copyright (c) 2016-2018 Espressif Systems (Shanghai) PTE LTD
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "sdmmc_common_mh.h"
-
-static const char* TAG = "sdmmc_sd";
-
-esp_err_t sdmmc_init_sd_if_cond(sdmmc_card_t* card)
-{
-    /* SEND_IF_COND (CMD8) command is used to identify SDHC/SDXC cards.
-     * SD v1 and non-SD cards will not respond to this command.
-     */
-    uint32_t host_ocr = get_host_ocr(card->host.io_voltage);
-    esp_err_t err = sdmmc_send_cmd_send_if_cond(card, host_ocr);
-    if (err == ESP_OK) {
-        ESP_LOGD(TAG, "SDHC/SDXC card");
-        host_ocr |= SD_OCR_SDHC_CAP;
-    } else if (err == ESP_ERR_TIMEOUT) {
-        ESP_LOGD(TAG, "CMD8 timeout; not an SD v2.00 card");
-    } else if (host_is_spi(card) && err == ESP_ERR_NOT_SUPPORTED) {
-        ESP_LOGD(TAG, "CMD8 rejected; not an SD v2.00 card");
-    } else {
-        ESP_LOGE(TAG, "%s: send_if_cond (1) returned 0x%x", __func__, err);
-        return err;
-    }
-    card->ocr = host_ocr;
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_sd_blocklen(sdmmc_card_t* card)
-{
-    /* SDSC cards support configurable data block lengths.
-     * We don't use this feature and set the block length to 512 bytes,
-     * same as the block length for SDHC cards.
-     */
-    if ((card->ocr & SD_OCR_SDHC_CAP) == 0) {
-        esp_err_t err = sdmmc_send_cmd_set_blocklen(card, &card->csd);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: set_blocklen returned 0x%x", __func__, err);
-            return err;
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_sd_scr(sdmmc_card_t* card)
-{
-    esp_err_t err;
-    /* Get the contents of SCR register: bus width and the version of SD spec
-     * supported by the card.
-     * In SD mode, this is the first command which uses D0 line. Errors at
-     * this step usually indicate connection issue or lack of pull-up resistor.
-     */
-    err = sdmmc_send_cmd_send_scr(card, &card->scr);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: send_scr (1) returned 0x%x", __func__, err);
-        return err;
-    }
-
-    if ((card->scr.bus_width & SCR_SD_BUS_WIDTHS_4BIT)
-            && (card->host.flags & SDMMC_HOST_FLAG_4BIT)) {
-        card->log_bus_width = 2;
-    } else {
-        card->log_bus_width = 0;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_sd_ssr(sdmmc_card_t* card)
-{
-    esp_err_t err = ESP_OK;
-    /* Get the contents of SSR register: SD additional information
-     * ACMD13 to read 512byte SD status information
-     */
-    uint32_t* sd_ssr = heap_caps_calloc(1, SD_SSR_SIZE, MALLOC_CAP_DMA);
-    if (!sd_ssr) {
-        ESP_LOGE(TAG, "%s: could not allocate sd_ssr", __func__);
-        return ESP_ERR_NO_MEM;
-    }
-
-    sdmmc_command_t cmd = {
-        .data = sd_ssr,
-        .datalen = SD_SSR_SIZE,
-        .blklen = SD_SSR_SIZE,
-        .opcode = SD_APP_SD_STATUS,
-        .arg = 0,
-        .flags = SCF_CMD_ADTC | SCF_RSP_R1 | SCF_CMD_READ
-    };
-
-    // read SD status register
-    err = sdmmc_send_app_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        free(sd_ssr);
-        ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x", __func__, err);
-        return err;
-    }
-
-    err = sdmmc_decode_ssr(sd_ssr, &card->ssr);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: error sdmmc_decode_scr returned 0x%x", __func__, err);
-    }
-    free(sd_ssr);
-    return err;
-}
-
-esp_err_t sdmmc_init_sd_bus_width(sdmmc_card_t* card)
-{
-    int width = 1;
-    if (card->log_bus_width == 2) {
-        width = 4;
-    } else if (card->log_bus_width == 3) {
-        width = 8;
-    }
-    esp_err_t err = sdmmc_send_cmd_set_bus_width(card, width);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "set_bus_width failed (0x%x)", err);
-        return err;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_sd_wait_data_ready(sdmmc_card_t* card)
-{
-    /* Wait for the card to be ready for data transfers */
-    uint32_t status = 0;
-    uint32_t count = 0;
-    while (!host_is_spi(card) && !(status & MMC_R1_READY_FOR_DATA)) {
-        // TODO: add some timeout here
-        esp_err_t err = sdmmc_send_cmd_send_status(card, &status);
-        if (err != ESP_OK) {
-            return err;
-        }
-        if (++count % 16 == 0) {
-            ESP_LOGV(TAG, "waiting for card to become ready (%d)", count);
-        }
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_send_cmd_switch_func(sdmmc_card_t* card,
-        uint32_t mode, uint32_t group, uint32_t function,
-        sdmmc_switch_func_rsp_t* resp)
-{
-    if (card->scr.sd_spec < SCR_SD_SPEC_VER_1_10 ||
-        ((card->csd.card_command_class & SD_CSD_CCC_SWITCH) == 0)) {
-            return ESP_ERR_NOT_SUPPORTED;
-    }
-
-    if (group == 0 ||
-        group > SD_SFUNC_GROUP_MAX ||
-        function > SD_SFUNC_FUNC_MAX) {
-        return ESP_ERR_INVALID_ARG;
-    }
-
-    if (mode > 1) {
-        return ESP_ERR_INVALID_ARG;
-    }
-
-    uint32_t group_shift = (group - 1) << 2;
-    /* all functions which should not be affected are set to 0xf (no change) */
-    uint32_t other_func_mask = (0x00ffffff & ~(0xf << group_shift));
-    uint32_t func_val = (function << group_shift) | other_func_mask;
-
-    sdmmc_command_t cmd = {
-            .opcode = MMC_SWITCH,
-            .flags = SCF_CMD_ADTC | SCF_CMD_READ | SCF_RSP_R1,
-            .blklen = sizeof(sdmmc_switch_func_rsp_t),
-            .data = resp->data,
-            .datalen = sizeof(sdmmc_switch_func_rsp_t),
-            .arg = (!!mode << 31) | func_val
-    };
-
-    esp_err_t err = sdmmc_send_cmd(card, &cmd);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: sdmmc_send_cmd returned 0x%x", __func__, err);
-        return err;
-    }
-    sdmmc_flip_byte_order(resp->data, sizeof(sdmmc_switch_func_rsp_t));
-    uint32_t resp_ver = SD_SFUNC_VER(resp->data);
-    if (resp_ver == 0) {
-        /* busy response is never sent */
-    } else if (resp_ver == 1) {
-        if (SD_SFUNC_BUSY(resp->data, group) & (1 << function)) {
-            ESP_LOGD(TAG, "%s: response indicates function %d:%d is busy",
-                    __func__, group, function);
-            return ESP_ERR_INVALID_STATE;
-        }
-    } else {
-        ESP_LOGD(TAG, "%s: got an invalid version of SWITCH_FUNC response: 0x%02x",
-                __func__, resp_ver);
-        return ESP_ERR_INVALID_RESPONSE;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_enable_hs_mode(sdmmc_card_t* card)
-{
-    /* This will determine if the card supports SWITCH_FUNC command,
-     * and high speed mode. If the cards supports both, this will enable
-     * high speed mode at the card side.
-     */
-    if (card->scr.sd_spec < SCR_SD_SPEC_VER_1_10 ||
-        ((card->csd.card_command_class & SD_CSD_CCC_SWITCH) == 0)) {
-            return ESP_ERR_NOT_SUPPORTED;
-    }
-    sdmmc_switch_func_rsp_t* response = (sdmmc_switch_func_rsp_t*)
-            heap_caps_malloc(sizeof(*response), MALLOC_CAP_DMA);
-    if (response == NULL) {
-        return ESP_ERR_NO_MEM;
-    }
-
-    esp_err_t err = sdmmc_send_cmd_switch_func(card, 0, SD_ACCESS_MODE, 0, response);
-    if (err != ESP_OK) {
-        ESP_LOGD(TAG, "%s: sdmmc_send_cmd_switch_func (1) returned 0x%x", __func__, err);
-        goto out;
-    }
-    uint32_t supported_mask = SD_SFUNC_SUPPORTED(response->data, 1);
-    if ((supported_mask & BIT(SD_ACCESS_MODE_SDR25)) == 0) {
-        err = ESP_ERR_NOT_SUPPORTED;
-        goto out;
-    }
-    err = sdmmc_send_cmd_switch_func(card, 1, SD_ACCESS_MODE, SD_ACCESS_MODE_SDR25, response);
-    if (err != ESP_OK) {
-        ESP_LOGD(TAG, "%s: sdmmc_send_cmd_switch_func (2) returned 0x%x", __func__, err);
-        goto out;
-    }
-
-out:
-    free(response);
-    return err;
-}
-
-esp_err_t sdmmc_enable_hs_mode_and_check(sdmmc_card_t* card)
-{
-    /* All cards should support at least default speed */
-    card->max_freq_khz = SDMMC_FREQ_DEFAULT;
-    if (card->host.max_freq_khz <= card->max_freq_khz) {
-        /* Host is configured to use low frequency, don't attempt to switch */
-        card->max_freq_khz = card->host.max_freq_khz;
-        return ESP_OK;
-    }
-
-    /* Try to enabled HS mode */
-    esp_err_t err = sdmmc_enable_hs_mode(card);
-    if (err != ESP_OK) {
-        return err;
-    }
-    /* HS mode has been enabled on the card.
-     * Read CSD again, it should now indicate that the card supports
-     * 50MHz clock.
-     * Since SEND_CSD is allowed only in standby mode, and the card is currently in data transfer
-     * mode, deselect the card first, then get the CSD, then select the card again. This step is
-     * not required in SPI mode, since CMD7 (select_card) is not supported.
-     */
-    const bool is_spi = host_is_spi(card);
-    if (!is_spi) {
-        err = sdmmc_send_cmd_select_card(card, 0);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: select_card (1) returned 0x%x", __func__, err);
-            return err;
-        }
-    }
-    err = sdmmc_send_cmd_send_csd(card, &card->csd);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: send_csd returned 0x%x", __func__, err);
-        return err;
-    }
-    if (!is_spi) {
-        err = sdmmc_send_cmd_select_card(card, card->rca);
-        if (err != ESP_OK) {
-            ESP_LOGE(TAG, "%s: select_card (2) returned 0x%x", __func__, err);
-            return err;
-        }
-    }
-
-    if (card->csd.tr_speed != 50000000) {
-        ESP_LOGW(TAG, "unexpected: after enabling HS mode, tr_speed=%d", card->csd.tr_speed);
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-
-    card->max_freq_khz = SDMMC_FREQ_HIGHSPEED;
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_check_scr(sdmmc_card_t* card)
-{
-    /* If frequency switch has been performed, read SCR register one more time
-     * and compare the result with the previous one. Use this simple check as
-     * an indicator of potential signal integrity issues.
-     */
-    sdmmc_scr_t scr_tmp = { 0 };
-    esp_err_t err = sdmmc_send_cmd_send_scr(card, &scr_tmp);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: send_scr returned 0x%x", __func__, err);
-        return err;
-    }
-    if (memcmp(&card->scr, &scr_tmp, sizeof(scr_tmp)) != 0) {
-        ESP_LOGE(TAG, "got corrupted data after increasing clock frequency");
-        return ESP_ERR_INVALID_RESPONSE;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_init_spi_crc(sdmmc_card_t* card)
-{
-    /* In SD mode, CRC checks of data transfers are mandatory and performed
-     * by the hardware. In SPI mode, CRC16 of data transfers is optional and
-     * needs to be enabled.
-     */
-    assert(host_is_spi(card));
-    esp_err_t err = sdmmc_send_cmd_crc_on_off(card, true);
-    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s: sdmmc_send_cmd_crc_on_off returned 0x%x", __func__, err);
-        return err;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_decode_cid(sdmmc_response_t resp, sdmmc_cid_t* out_cid)
-{
-    out_cid->mfg_id = SD_CID_MID(resp);
-    out_cid->oem_id = SD_CID_OID(resp);
-    SD_CID_PNM_CPY(resp, out_cid->name);
-    out_cid->revision = SD_CID_REV(resp);
-    out_cid->serial = SD_CID_PSN(resp);
-    out_cid->date = SD_CID_MDT(resp);
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_decode_csd(sdmmc_response_t response, sdmmc_csd_t* out_csd)
-{
-    out_csd->csd_ver = SD_CSD_CSDVER(response);
-    switch (out_csd->csd_ver) {
-    case SD_CSD_CSDVER_2_0:
-        out_csd->capacity = SD_CSD_V2_CAPACITY(response);
-        out_csd->read_block_len = SD_CSD_V2_BL_LEN;
-        break;
-    case SD_CSD_CSDVER_1_0:
-        out_csd->capacity = SD_CSD_CAPACITY(response);
-        out_csd->read_block_len = SD_CSD_READ_BL_LEN(response);
-        break;
-    default:
-        ESP_LOGE(TAG, "unknown SD CSD structure version 0x%x", out_csd->csd_ver);
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    out_csd->card_command_class = SD_CSD_CCC(response);
-    int read_bl_size = 1 << out_csd->read_block_len;
-    out_csd->sector_size = MIN(read_bl_size, 512);
-    if (out_csd->sector_size < read_bl_size) {
-        out_csd->capacity *= read_bl_size / out_csd->sector_size;
-    }
-    int speed = SD_CSD_SPEED(response);
-    if (speed == SD_CSD_SPEED_50_MHZ) {
-        out_csd->tr_speed = 50000000;
-    } else {
-        out_csd->tr_speed = 25000000;
-    }
-    return ESP_OK;
-}
-
-esp_err_t sdmmc_decode_scr(uint32_t *raw_scr, sdmmc_scr_t* out_scr)
-{
-    sdmmc_response_t resp = { 0 };
-    resp[1] = __builtin_bswap32(raw_scr[0]);
-    resp[0] = __builtin_bswap32(raw_scr[1]);
-    int ver = SCR_STRUCTURE(resp);
-    if (ver != 0) {
-        return ESP_ERR_NOT_SUPPORTED;
-    }
-    out_scr->sd_spec = SCR_SD_SPEC(resp);
-    out_scr->erase_mem_state = SCR_DATA_STAT_AFTER_ERASE(resp);
-    out_scr->bus_width = SCR_SD_BUS_WIDTHS(resp);
-    return ESP_OK;
-}
-
-static const uint32_t s_au_to_size_kb[] = {
-    0, 16, 32, 64,
-    128, 256, 512, 1024,
-    2 * 1024, 4 * 1024,
-    8 * 1024, 12 * 1024,
-    16 * 1024, 24 * 1024,
-    32 * 1024, 64 * 1024
-};
-_Static_assert(sizeof(s_au_to_size_kb)/sizeof(s_au_to_size_kb[0]) == 16, "invalid number of elements in s_au_to_size_kb");
-
-esp_err_t sdmmc_decode_ssr(uint32_t *raw_ssr, sdmmc_ssr_t* out_ssr)
-{
-    uint32_t ssr[(SD_SSR_SIZE/sizeof(uint32_t))] = { 0 };
-    size_t j = (SD_SSR_SIZE/sizeof(uint32_t) - 1);
-
-    for(size_t i = 0; i < (SD_SSR_SIZE/sizeof(uint32_t)); i++) {
-        ssr[j - i] = __builtin_bswap32(raw_ssr[i]);
-    }
-
-    out_ssr->cur_bus_width = SSR_DAT_BUS_WIDTH(ssr);
-    out_ssr->discard_support = SSR_DISCARD_SUPPORT(ssr);
-    out_ssr->fule_support = SSR_FULE_SUPPORT(ssr);
-    uint32_t au = SSR_AU_SIZE(ssr);
-    out_ssr->alloc_unit_kb = s_au_to_size_kb[au];
-    out_ssr->erase_timeout = SSR_ERASE_TIMEOUT(ssr);
-    out_ssr->erase_size_au = SSR_ERASE_SIZE(ssr);
-    out_ssr->erase_offset = SSR_ERASE_OFFSET(ssr);
-
-    return ESP_OK;
-}
-
-uint32_t sdmmc_sd_get_erase_timeout_ms(const sdmmc_card_t* card, int arg, size_t erase_size_kb)
-{
-    if (arg == SDMMC_SD_DISCARD_ARG) {
-        return SDMMC_SD_DISCARD_TIMEOUT;
-    } else if (arg == SDMMC_SD_ERASE_ARG) {
-        if (card->ssr.alloc_unit_kb != 0 &&
-                card->ssr.erase_size_au != 0 &&
-                card->ssr.erase_timeout != 0 &&
-                card->ssr.erase_offset != 0) {
-            /* Card supports erase timeout estimation. See the erase timeout equation in SD spec. */
-            uint32_t timeout_sec = card->ssr.erase_offset +
-                card->ssr.erase_timeout * (erase_size_kb + card->ssr.alloc_unit_kb - 1) /
-                    (card->ssr.erase_size_au * card->ssr.alloc_unit_kb);
-            ESP_LOGD(TAG, "%s: erase timeout %u s (erasing %u kB, ES=%u, ET=%u, EO=%u, AU=%u kB)",
-                     __func__, timeout_sec, erase_size_kb, card->ssr.erase_size_au,
-                     card->ssr.erase_timeout, card->ssr.erase_offset, card->ssr.alloc_unit_kb);
-            return timeout_sec * 1000;
-        } else {
-            uint32_t timeout_ms = SDMMC_SD_DISCARD_TIMEOUT * erase_size_kb / card->csd.sector_size;
-            timeout_ms = MAX(1000, timeout_ms);
-            ESP_LOGD(TAG, "%s: erase timeout %u s (erasing %u kB, %ums per sector)",
-                     __func__, timeout_ms / 1000, erase_size_kb, SDMMC_SD_DISCARD_TIMEOUT);
-            return timeout_ms;
-        }
-    } else {
-        assert(false && "unexpected SD erase argument");
-        return 0;
-    }
-}

code/components/jomjol_controlGPIO/Color.cpp

@@ -1,27 +1,53 @@
+/********************************************************************************
+ * 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 <cmath>
 #include <cassert>
+#include <cmath>
 
 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;
@@ -29,104 +55,133 @@ int iRgbSqrt( int num ) {
     return res;
 }
 
-Rgb::Rgb( Hsv y ) {
+Rgb::Rgb(const 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=( Hsv hsv ) {
-    Rgb r{ hsv };
-    swap( r );
+Rgb& Rgb::operator=(const Hsv& hsv) {
+    Rgb r { hsv };
+    swap(r);
     return *this;
 }
 
-Rgb Rgb::operator+( Rgb in ) const {
+Rgb Rgb::operator+(const Rgb& in) const {
     auto copy = *this;
     copy += in;
     return copy;
 }
 
-Rgb& Rgb::operator+=( Rgb in ) {
+Rgb& Rgb::operator+=(const 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::blend( Rgb in ) {
-    unsigned int inAlpha = in.a * ( 255 - a );
+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);
     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;
 }
 
-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 ) );
+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));
     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=( Rgb rgb ) {
-    Hsv h{ rgb };
-    swap( h );
+Hsv& Hsv::operator=(const Rgb& rgb) {
+    Hsv h { rgb };
+    swap(h);
     return *this;
 }

code/components/jomjol_controlGPIO/Color.h

@@ -1,51 +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.
+ *******************************************************************************/
+
 #pragma once
 
-#ifndef COLOR_H
-#define COLOR_H
-
-#include <cstdint>
 #include "esp_attr.h"
+#include <cstdint>
 union Hsv;
 
 union Rgb {
-    struct __attribute__ ((packed)) {
-        uint8_t r, g, b, a;
+    struct __attribute__((packed)) {
+        uint8_t g, r, b, a;
     };
     uint32_t 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; }
+    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; }
     void linearize() {
         r = channelGamma(r);
         g = channelGamma(g);
         b = channelGamma(b);
     }
 
-    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 );
+    inline uint8_t IRAM_ATTR getGrb(int idx) {
+        switch (idx) {
+        case 0:
+            return g;
+        case 1:
+            return r;
+        case 2:
+            return b;
+        }
+        __builtin_unreachable();
     }
 
-    void stretchChannelsEvenly( uint8_t max ) {
-        stretchChannels( max, max, max );
+    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); }
+
 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. */
@@ -53,22 +92,27 @@ 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( 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; }
+    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; }
 };
-
-#endif //COLOR_H

code/components/jomjol_controlGPIO/RmtDriver.h

@@ -0,0 +1,60 @@
+/********************************************************************************
+ * 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

@@ -0,0 +1,143 @@
+/********************************************************************************
+ * 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

@@ -0,0 +1,68 @@
+/********************************************************************************
+ * 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

@@ -0,0 +1,202 @@
+/********************************************************************************
+ * 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

@@ -0,0 +1,91 @@
+/********************************************************************************
+ * 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,90 +1,35 @@
+/********************************************************************************
+ * 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"
 
-
-/* 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;
-    }
+SmartLed*& IRAM_ATTR SmartLed::ledForChannel(int channel) {
+    static SmartLed* table[detail::CHANNEL_COUNT] = {};
+    assert(channel < detail::CHANNEL_COUNT);
+    return table[channel];
 }

code/components/jomjol_controlGPIO/SmartLeds.h

@@ -1,7 +1,30 @@
-#pragma once
+/********************************************************************************
+ * 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.
+ *******************************************************************************/
 
-#ifndef SMARTLEDS_H
-#define SMARTLEDS_H
+#pragma once
 
 /*
  * A C++ driver for the WS2812 LEDs using the RMT peripheral on the ESP32.
@@ -31,305 +54,196 @@
  * THE SOFTWARE.
  */
 
-#include <memory>
 #include <cassert>
 #include <cstring>
+#include <memory>
 
-#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 <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 "Color.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
+#include "RmtDriver.h"
 
 using LedType = detail::TimingParams;
 
-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 };
+// 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 };
 
+// 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.
-    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 );
+    //
+    // 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);
 
-        xSemaphoreGive( _finishedFlag );
+        xSemaphoreGive(_finishedFlag);
 
-        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 );
+        _driver.init();
 
-        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() ) {
+#if !defined(SOC_CPU_CORES_NUM) || SOC_CPU_CORES_NUM > 1
+        if (!anyAlive() && isrCore != CoreCurrent) {
             _interruptCore = isrCore;
-            if(isrCore != CoreCurrent) {
-                ESP_ERROR_CHECK(esp_ipc_call_blocking(isrCore, registerInterrupt, NULL));
-            } else {
-                registerInterrupt(NULL);
-            }
+            ESP_ERROR_CHECK(esp_ipc_call_blocking(isrCore, registerInterrupt, (void*)this));
+        } else
+#endif
+        {
+            registerInterrupt((void*)this);
         }
 
-        ledForChannel( channel ) = this;
+        ledForChannel(channel) = this;
     }
 
     ~SmartLed() {
-        ledForChannel( _channel ) = nullptr;
-        if ( !anyAlive() ) {
-            if(_interruptCore != CoreCurrent) {
-                ESP_ERROR_CHECK(esp_ipc_call_blocking(_interruptCore, unregisterInterrupt, NULL));
-            } else {
-                unregisterInterrupt(NULL);
-            }
+        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);
         }
-        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]; }
 
-    void show() {
-        _buffer = _firstBuffer.get();
-        startTransmission();
+    esp_err_t show() {
+        esp_err_t err = 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 size() const { return _count; }
+    int channel() const { return _channel; }
 
-    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 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 registerInterrupt(void* selfVoid) {
+        auto* self = (SmartLed*)selfVoid;
+        ESP_ERROR_CHECK(self->_driver.registerIsr(!anyAlive()));
     }
 
-    static void registerInterrupt(void *) {
-        ESP_ERROR_CHECK(esp_intr_alloc( ETS_RMT_INTR_SOURCE, 0, interruptHandler, nullptr, &_interruptHandle));
+    static void unregisterInterrupt(void* selfVoid) {
+        auto* self = (SmartLed*)selfVoid;
+        ESP_ERROR_CHECK(self->_driver.unregisterIsr());
     }
 
-    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 SmartLed*& IRAM_ATTR ledForChannel(int channel);
 
     static bool anyAlive() {
-        for ( int i = 0; i != 8; i++ )
-            if ( ledForChannel( i ) != nullptr ) return true;
+        for (int i = 0; i != detail::CHANNEL_COUNT; i++)
+            if (ledForChannel(i) != nullptr)
+                return true;
         return false;
     }
 
-    const LedType& _timing;
+    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;
     int _channel;
-    detail::RmtPulsePair _bitToRmt[ 2 ];
     int _count;
-    std::unique_ptr< Rgb[] > _firstBuffer;
-    std::unique_ptr< Rgb[] > _secondBuffer;
-    Rgb *_buffer;
-
-    xSemaphoreHandle _finishedFlag;
-
-    int _pixelPosition;
-    int _componentPosition;
-    int _halfIdx;
+    std::unique_ptr<Rgb[]> _firstBuffer;
+    std::unique_ptr<Rgb[]> _secondBuffer;
 };
 
+#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
+
 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;
         }
 
@@ -339,14 +253,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 )
-        : _count( count ),
-          _firstBuffer( new ApaRgb[ count ] ),
-          _secondBuffer( doubleBuffer ? new ApaRgb[ count ] : nullptr ),
-          _initFrame( 0 )
-    {
+    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) {
         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;
@@ -355,33 +269,29 @@ public:
         buscfg.max_transfer_sz = 65535;
 
         spi_device_interface_config_t devcfg;
-        memset( &devcfg, 0, sizeof( devcfg ) );
-        devcfg.clock_speed_hz = 1000000;
+        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;
         devcfg.pre_cb = nullptr;
 
-        auto ret = spi_bus_initialize( HSPI_HOST, &buscfg, 1 );
-        assert( ret == ESP_OK );
+        auto ret = spi_bus_initialize(_SMARTLEDS_SPI_HOST, &buscfg, _SMARTLEDS_SPI_DMA_CHAN);
+        assert(ret == ESP_OK);
 
-        ret = spi_bus_add_device( HSPI_HOST, &devcfg, &_spi );
-        assert( ret == ESP_OK );
+        ret = spi_bus_add_device(_SMARTLEDS_SPI_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();
@@ -390,93 +300,95 @@ 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;
@@ -485,33 +397,29 @@ 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( HSPI_HOST, &buscfg, 1 );
-        assert( ret == ESP_OK );
+        auto ret = spi_bus_initialize(_SMARTLEDS_SPI_HOST, &buscfg, _SMARTLEDS_SPI_DMA_CHAN);
+        assert(ret == ESP_OK);
 
-        ret = spi_bus_add_device( HSPI_HOST, &devcfg, &_spi );
-        assert( ret == ESP_OK );
+        ret = spi_bus_add_device(_SMARTLEDS_SPI_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();
@@ -520,51 +428,50 @@ 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,6 +25,7 @@
 #include "server_mqtt.h"
 #endif //ENABLE_MQTT
 
+#include "basic_auth.h"
 
 static const char *TAG = "GPIO";
 QueueHandle_t gpio_queue_handle = NULL;
@@ -458,7 +459,7 @@ void GpioHandler::registerGpioUri()
     httpd_uri_t camuri = { };
     camuri.method    = HTTP_GET;
     camuri.uri       = "/GPIO";
-    camuri.handler   = callHandleHttpRequest;
+    camuri.handler   = APPLY_BASIC_AUTH_FILTER(callHandleHttpRequest);
     camuri.user_ctx  = (void*)this;    
     httpd_register_uri_handler(_httpServer, &camuri);
 }

code/components/jomjol_controlcamera/ClassControllCamera.h

@@ -15,49 +15,103 @@
 #include "CImageBasis.h"
 #include "../../include/defines.h"
 
-class CCamera {
-    protected:
-        int ActualQuality;
-        framesize_t ActualResolution;
-        int brightness, contrast, saturation;
-        bool isFixedExposure;
-        int waitbeforepicture_org;
-        int led_intensity = 4095;
+typedef struct
+{
+    uint16_t CamSensor_id;
 
-        void ledc_init(void);
-        bool CameraInitSuccessful = false;
-        bool demoMode = false;
+    framesize_t ImageFrameSize = FRAMESIZE_VGA; // 0 - 10
+    gainceiling_t ImageGainceiling;             // Image gain (GAINCEILING_x2, x4, x8, x16, x32, x64 or x128)
 
-        bool loadNextDemoImage(camera_fb_t *fb);
-        long GetFileSize(std::string filename);
+    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)
 
-    public:
-        int image_height, image_width;
-        
-        CCamera();
-        esp_err_t InitCam();
+    int ImageDenoiseLevel; // The OV2640 does not support it, OV3660 and OV5640 (0 to 8)
 
-        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 ImageWidth;
+    int ImageHeight;
 
-        framesize_t TextToFramesize(const char * text);
+    int ImageLedIntensity;
 
-        esp_err_t CaptureToFile(std::string nm, int delay = 0);
-        esp_err_t CaptureToBasisImage(CImageBasis *_Image, int delay = 0);
+    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);
 };
 
-
 extern CCamera Camera;
-
 #endif

code/components/jomjol_controlcamera/ov2640_contrast_brightness.cpp

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

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

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

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

code/components/jomjol_controlcamera/ov2640_specialEffect.cpp

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

@@ -0,0 +1,10 @@
+#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,191 +5,200 @@
 
 #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);
 
-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);
+    // 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
 }
 
-
 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())
     {
-        int quality;
-        framesize_t res;
+        // 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", res, quality);
-        #endif
-
-        Camera.SetQualitySize(quality, res);
+#ifdef DEBUG_DETAIL_ON
+        ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
+#endif        
 
         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;
+                }
             }
         }
 
-        Camera.GetCameraParameter(req, quality, res);
+        // 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", res, quality);
-        #endif
+#ifdef DEBUG_DETAIL_ON
+        ESP_LOGD(TAG, "Size: %d, Quality: %d", CCstatus.ImageFrameSize, CCstatus.ImageQuality);
+#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];
@@ -197,94 +206,103 @@ 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");
+        }
 
-        Camera.GetCameraParameter(req, quality, res);
-        #ifdef DEBUG_DETAIL_ON   
-            ESP_LOGD(TAG, "Size: %d, Quality: %d", res, quality);
-        #endif
-        Camera.SetQualitySize(quality, res);
+        // 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        
 
         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   = handler_lightOn;
-    camuri.user_ctx  = (void*) "Light On";    
+    camuri.uri = "/lighton";
+    camuri.handler = APPLY_BASIC_AUTH_FILTER(handler_lightOn);
+    camuri.user_ctx = (void *)"Light On";
     httpd_register_uri_handler(server, &camuri);
 
-    camuri.uri       = "/lightoff";
-    camuri.handler   = handler_lightOff;
-    camuri.user_ctx  = (void*) "Light Off"; 
-    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       = "/capture";
-    camuri.handler   = handler_capture;
-    camuri.user_ctx  = NULL; 
-    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_with_flashlight";
-    camuri.handler   = handler_capture_with_light;
-    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       = "/save";
-    camuri.handler   = handler_capture_save_to_file;
-    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);
 }

code/components/jomjol_controlcamera/server_camera.h

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

code/components/jomjol_fileserver_ota/md5.cpp

@@ -0,0 +1,226 @@
+/* Src: https://github.com/Zunawe/md5-c, commit: f3529b6
+ * License: Unlicense */
+/*
+ * Derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm
+ * and modified slightly to be functionally identical but condensed into control structures.
+ */
+
+#include "md5.h"
+
+/*
+ * Constants defined by the MD5 algorithm
+ */
+#define A 0x67452301
+#define B 0xefcdab89
+#define C 0x98badcfe
+#define D 0x10325476
+
+static uint32_t S[] = {7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
+                       5,  9, 14, 20, 5,  9, 14, 20, 5,  9, 14, 20, 5,  9, 14, 20,
+                       4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
+                       6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21};
+
+static uint32_t K[] = {0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
+                       0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
+                       0x698098d8, 0x8b44f7af, 0xffff5bb1, 0x895cd7be,
+                       0x6b901122, 0xfd987193, 0xa679438e, 0x49b40821,
+                       0xf61e2562, 0xc040b340, 0x265e5a51, 0xe9b6c7aa,
+                       0xd62f105d, 0x02441453, 0xd8a1e681, 0xe7d3fbc8,
+                       0x21e1cde6, 0xc33707d6, 0xf4d50d87, 0x455a14ed,
+                       0xa9e3e905, 0xfcefa3f8, 0x676f02d9, 0x8d2a4c8a,
+                       0xfffa3942, 0x8771f681, 0x6d9d6122, 0xfde5380c,
+                       0xa4beea44, 0x4bdecfa9, 0xf6bb4b60, 0xbebfbc70,
+                       0x289b7ec6, 0xeaa127fa, 0xd4ef3085, 0x04881d05,
+                       0xd9d4d039, 0xe6db99e5, 0x1fa27cf8, 0xc4ac5665,
+                       0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
+                       0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
+                       0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
+                       0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391};
+
+/*
+ * Padding used to make the size (in bits) of the input congruent to 448 mod 512
+ */
+static uint8_t PADDING[] = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+/*
+ * Bit-manipulation functions defined by the MD5 algorithm
+ */
+#define F(X, Y, Z) ((X & Y) | (~X & Z))
+#define G(X, Y, Z) ((X & Z) | (Y & ~Z))
+#define H(X, Y, Z) (X ^ Y ^ Z)
+#define I(X, Y, Z) (Y ^ (X | ~Z))
+
+/*
+ * Rotates a 32-bit word left by n bits
+ */
+uint32_t rotateLeft(uint32_t x, uint32_t n){
+    return (x << n) | (x >> (32 - n));
+}
+
+
+/*
+ * Initialize a context
+ */
+void md5Init(MD5Context *ctx){
+    ctx->size = (uint64_t)0;
+
+    ctx->buffer[0] = (uint32_t)A;
+    ctx->buffer[1] = (uint32_t)B;
+    ctx->buffer[2] = (uint32_t)C;
+    ctx->buffer[3] = (uint32_t)D;
+}
+
+/*
+ * Add some amount of input to the context
+ *
+ * If the input fills out a block of 512 bits, apply the algorithm (md5Step)
+ * and save the result in the buffer. Also updates the overall size.
+ */
+void md5Update(MD5Context *ctx, uint8_t *input_buffer, size_t input_len){
+    uint32_t input[16];
+    unsigned int offset = ctx->size % 64;
+    ctx->size += (uint64_t)input_len;
+
+    // Copy each byte in input_buffer into the next space in our context input
+    for(unsigned int i = 0; i < input_len; ++i){
+        ctx->input[offset++] = (uint8_t)*(input_buffer + i);
+
+        // If we've filled our context input, copy it into our local array input
+        // then reset the offset to 0 and fill in a new buffer.
+        // Every time we fill out a chunk, we run it through the algorithm
+        // to enable some back and forth between cpu and i/o
+        if(offset % 64 == 0){
+            for(unsigned int j = 0; j < 16; ++j){
+                // Convert to little-endian
+                // The local variable `input` our 512-bit chunk separated into 32-bit words
+                // we can use in calculations
+                input[j] = (uint32_t)(ctx->input[(j * 4) + 3]) << 24 |
+                           (uint32_t)(ctx->input[(j * 4) + 2]) << 16 |
+                           (uint32_t)(ctx->input[(j * 4) + 1]) <<  8 |
+                           (uint32_t)(ctx->input[(j * 4)]);
+            }
+            md5Step(ctx->buffer, input);
+            offset = 0;
+        }
+    }
+}
+
+/*
+ * Pad the current input to get to 448 bytes, append the size in bits to the very end,
+ * and save the result of the final iteration into digest.
+ */
+void md5Finalize(MD5Context *ctx){
+    uint32_t input[16];
+    unsigned int offset = ctx->size % 64;
+    unsigned int padding_length = offset < 56 ? 56 - offset : (56 + 64) - offset;
+
+    // Fill in the padding and undo the changes to size that resulted from the update
+    md5Update(ctx, PADDING, padding_length);
+    ctx->size -= (uint64_t)padding_length;
+
+    // Do a final update (internal to this function)
+    // Last two 32-bit words are the two halves of the size (converted from bytes to bits)
+    for(unsigned int j = 0; j < 14; ++j){
+        input[j] = (uint32_t)(ctx->input[(j * 4) + 3]) << 24 |
+                   (uint32_t)(ctx->input[(j * 4) + 2]) << 16 |
+                   (uint32_t)(ctx->input[(j * 4) + 1]) <<  8 |
+                   (uint32_t)(ctx->input[(j * 4)]);
+    }
+    input[14] = (uint32_t)(ctx->size * 8);
+    input[15] = (uint32_t)((ctx->size * 8) >> 32);
+
+    md5Step(ctx->buffer, input);
+
+    // Move the result into digest (convert from little-endian)
+    for(unsigned int i = 0; i < 4; ++i){
+        ctx->digest[(i * 4) + 0] = (uint8_t)((ctx->buffer[i] & 0x000000FF));
+        ctx->digest[(i * 4) + 1] = (uint8_t)((ctx->buffer[i] & 0x0000FF00) >>  8);
+        ctx->digest[(i * 4) + 2] = (uint8_t)((ctx->buffer[i] & 0x00FF0000) >> 16);
+        ctx->digest[(i * 4) + 3] = (uint8_t)((ctx->buffer[i] & 0xFF000000) >> 24);
+    }
+}
+
+/*
+ * Step on 512 bits of input with the main MD5 algorithm.
+ */
+void md5Step(uint32_t *buffer, uint32_t *input){
+    uint32_t AA = buffer[0];
+    uint32_t BB = buffer[1];
+    uint32_t CC = buffer[2];
+    uint32_t DD = buffer[3];
+
+    uint32_t E;
+
+    unsigned int j;
+
+    for(unsigned int i = 0; i < 64; ++i){
+        switch(i / 16){
+            case 0:
+                E = F(BB, CC, DD);
+                j = i;
+                break;
+            case 1:
+                E = G(BB, CC, DD);
+                j = ((i * 5) + 1) % 16;
+                break;
+            case 2:
+                E = H(BB, CC, DD);
+                j = ((i * 3) + 5) % 16;
+                break;
+            default:
+                E = I(BB, CC, DD);
+                j = (i * 7) % 16;
+                break;
+        }
+
+        uint32_t temp = DD;
+        DD = CC;
+        CC = BB;
+        BB = BB + rotateLeft(AA + E + K[i] + input[j], S[i]);
+        AA = temp;
+    }
+
+    buffer[0] += AA;
+    buffer[1] += BB;
+    buffer[2] += CC;
+    buffer[3] += DD;
+}
+
+/*
+ * Functions that run the algorithm on the provided input and put the digest into result.
+ * result should be able to store 16 bytes.
+ */
+void md5String(char *input, uint8_t *result){
+    MD5Context ctx;
+    md5Init(&ctx);
+    md5Update(&ctx, (uint8_t *)input, strlen(input));
+    md5Finalize(&ctx);
+
+    memcpy(result, ctx.digest, 16);
+}
+
+
+void md5File(FILE *file, uint8_t *result){
+    void *input_buffer = malloc(1024);
+    size_t input_size = 0;
+
+    MD5Context ctx;
+    md5Init(&ctx);
+
+    while((input_size = fread(input_buffer, 1, 1024, file)) > 0){
+        md5Update(&ctx, (uint8_t *)input_buffer, input_size);
+    }
+
+    md5Finalize(&ctx);
+
+    free(input_buffer);
+
+    memcpy(result, ctx.digest, 16);
+}

code/components/jomjol_fileserver_ota/md5.h

@@ -0,0 +1,28 @@
+/* Src: https://github.com/Zunawe/md5-c, commit: f3529b6
+ * License: Unlicense */
+#pragma once
+
+#ifndef MD5_H
+#define MD5_H
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+
+typedef struct{
+    uint64_t size;        // Size of input in bytes
+    uint32_t buffer[4];   // Current accumulation of hash
+    uint8_t input[64];    // Input to be used in the next step
+    uint8_t digest[16];   // Result of algorithm
+}MD5Context;
+
+void md5Init(MD5Context *ctx);
+void md5Update(MD5Context *ctx, uint8_t *input, size_t input_len);
+void md5Finalize(MD5Context *ctx);
+void md5Step(uint32_t *buffer, uint32_t *input);
+
+void md5String(char *input, uint8_t *result);
+void md5File(FILE *file, uint8_t *result);
+
+#endif // MD5_H

code/components/jomjol_fileserver_ota/miniz/readme2.md

@@ -4,5 +4,5 @@ It should be possible to include the repo directly as a submodule, how ever it c
  - https://github.com/richgel999/miniz/issues/145
  - https://github.com/espressif/esptool/pull/500#issuecomment-574879468
 
- For sumplicity we therefore use the release files as suggested in the readme.
- Additionally we added the CMakeLists.txt and this readme.
+ For simplicity we therefore use the release files as suggested in the readme.
+ Additionally we added the CMakeLists.txt and this readme.

code/components/jomjol_fileserver_ota/server_file.cpp

@@ -6,11 +6,8 @@
    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>
@@ -39,6 +36,7 @@ extern "C" {
 #include "MainFlowControl.h"
 
 #include "server_help.h"
+#include "md5.h"
 #ifdef ENABLE_MQTT
     #include "interface_mqtt.h"
 #endif //ENABLE_MQTT
@@ -46,6 +44,7 @@ extern "C" {
 
 #include "Helper.h"
 #include "miniz.h"
+#include "basic_auth.h"
 
 static const char *TAG = "OTA FILE";
 
@@ -57,20 +56,17 @@ 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 = "_0xge";
-
+string SUFFIX_ZW = "_tmp";
 
 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();
@@ -86,7 +82,6 @@ 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;
@@ -130,7 +125,6 @@ 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;
@@ -174,12 +168,11 @@ 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];
@@ -191,82 +184,85 @@ 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;
-    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';
+    file_server_data *server_data = (file_server_data *)req->user_ctx;
 
-    DIR *dir = opendir(dirpath_corrected);
+    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);
 
     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 (!dir) {
+    if (!pdir) {
         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><body>");
+    // 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>");
 
-/////////////////////////////////////////////////
-    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");
-    }
-///////////////////////////////
+    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>");
 
     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(dir)) != NULL) {
-        if (strcmp("wlan.ini", entry->d_name) != 0 )        // wlan.ini soll nicht angezeigt werden!
-        {
+    // 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) {
             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 " + string(entrytype) + ": " + string(entry->d_name));
+                LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to stat " + std::string(entrytype) + ": " + std::string(entry->d_name));
                 continue;
             }
 
@@ -282,22 +278,25 @@ static esp_err_t http_resp_dir_html(httpd_req_t *req, const char *dirpath, const
                 }
             }
 
-            ESP_LOGI(TAG, "Found %s: %s (%s bytes)", entrytype, entry->d_name, entrysize);
+            ESP_LOGD(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");
@@ -305,31 +304,28 @@ 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);
 
-    /* Finish the file list table */
+    closedir(pdir);
+
+    // 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);
 }
@@ -338,7 +334,6 @@ 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);
 }
@@ -423,7 +418,6 @@ 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");
@@ -509,7 +503,6 @@ 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)
 {
@@ -527,7 +520,6 @@ 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 */
@@ -619,6 +611,8 @@ static esp_err_t upload_post_handler(httpd_req_t *req)
     FILE *fd = NULL;
     struct stat file_stat;
 
+    ESP_LOGI(TAG, "uri: %s", req->uri);
+
     httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
 
     /* Skip leading "/upload" from URI to get filename */
@@ -720,45 +714,77 @@ static esp_err_t upload_post_handler(httpd_req_t *req)
     LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "File saved: " + string(filename));
     ESP_LOGI(TAG, "File reception completed");
 
-    std::string directory = std::string(filepath);
-	size_t zw = directory.find("/");
-	size_t found = zw;
-	while (zw != std::string::npos)
-	{
-		zw = directory.find("/", found+1);  
-		if (zw != std::string::npos)
-			found = zw;
-	}
+    string s = req->uri;
+    if (isInString(s, "?md5")) {
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Calculate and return MD5 sum...");
+        
+        fd = fopen(filepath, "r");
+        if (!fd) {
+            LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to open file for reading: " + string(filepath));
+            /* Respond with 500 Internal Server Error */
+            httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to open file for reading");
+            return ESP_FAIL;
+        }
 
-    int start_fn = strlen(((struct file_server_data *)req->user_ctx)->base_path);
-    ESP_LOGD(TAG, "Directory: %s, start_fn: %d, found: %d", directory.c_str(), start_fn, found);
-	directory = directory.substr(start_fn, found - start_fn + 1);
-    directory = "/fileserver" + directory;
-//    ESP_LOGD(TAG, "Directory danach 2: %s", directory.c_str());
+        uint8_t result[16];
+        string md5hex = "";
+        string response = "{\"md5\":";
+        char hex[3];
 
-    /* Redirect onto root to see the updated file list */
-    if (strcmp(filename, "/config/config.ini") == 0 ||
-        strcmp(filename, "/config/ref0.jpg") == 0 ||
-        strcmp(filename, "/config/ref0_org.jpg") == 0 ||
-        strcmp(filename, "/config/ref1.jpg") == 0 ||
-        strcmp(filename, "/config/ref1_org.jpg") == 0 ||
-        strcmp(filename, "/config/reference.jpg") == 0 ||
-        strcmp(filename, "/img_tmp/ref0.jpg") == 0 ||
-        strcmp(filename, "/img_tmp/ref0_org.jpg") == 0 ||
-        strcmp(filename, "/img_tmp/ref1.jpg") == 0 ||
-        strcmp(filename, "/img_tmp/ref1_org.jpg") == 0 ||
-        strcmp(filename, "/img_tmp/reference.jpg") == 0 ) 
-    { 
-        httpd_resp_set_status(req, HTTPD_200); // Avoid reloading of folder content
+        md5File(fd, result);
+        fclose(fd);
+
+        for (int i = 0; i < sizeof(result); i++) {
+            snprintf(hex, sizeof(hex), "%02x", result[i]);
+            md5hex.append(hex);
+        }
+
+        LogFile.WriteToFile(ESP_LOG_INFO, TAG, "MD5 of " + string(filepath) + ": " + md5hex);
+        response.append("\"" + md5hex + "\"");
+        response.append("}");
+
+        httpd_resp_sendstr(req, response.c_str());
     }
-    else {
-        httpd_resp_set_status(req, "303 See Other"); // Reload folder content after upload
+    else {  // Return file server page
+        std::string directory = std::string(filepath);
+        size_t zw = directory.find("/");
+        size_t found = zw;
+        while (zw != std::string::npos)
+        {
+            zw = directory.find("/", found+1);  
+            if (zw != std::string::npos)
+                found = zw;
+        }
+
+        int start_fn = strlen(((struct file_server_data *)req->user_ctx)->base_path);
+        ESP_LOGD(TAG, "Directory: %s, start_fn: %d, found: %d", directory.c_str(), start_fn, found);
+        directory = directory.substr(start_fn, found - start_fn + 1);
+        directory = "/fileserver" + directory;
+    //    ESP_LOGD(TAG, "Directory danach 2: %s", directory.c_str());
+
+        /* Redirect onto root to see the updated file list */
+        if (strcmp(filename, "/config/config.ini") == 0 ||
+            strcmp(filename, "/config/ref0.jpg") == 0 ||
+            strcmp(filename, "/config/ref0_org.jpg") == 0 ||
+            strcmp(filename, "/config/ref1.jpg") == 0 ||
+            strcmp(filename, "/config/ref1_org.jpg") == 0 ||
+            strcmp(filename, "/config/reference.jpg") == 0 ||
+            strcmp(filename, "/img_tmp/ref0.jpg") == 0 ||
+            strcmp(filename, "/img_tmp/ref0_org.jpg") == 0 ||
+            strcmp(filename, "/img_tmp/ref1.jpg") == 0 ||
+            strcmp(filename, "/img_tmp/ref1_org.jpg") == 0 ||
+            strcmp(filename, "/img_tmp/reference.jpg") == 0 ) 
+        { 
+            httpd_resp_set_status(req, HTTPD_200); // Avoid reloading of folder content
+        }
+        else {
+            httpd_resp_set_status(req, "303 See Other"); // Reload folder content after upload
+        }
+
+        httpd_resp_set_hdr(req, "Location", directory.c_str());
+        httpd_resp_sendstr(req, "File uploaded successfully");
     }
 
-    httpd_resp_set_hdr(req, "Location", directory.c_str());
-    httpd_resp_sendstr(req, "File uploaded successfully");
-
-
     return ESP_OK;
 }
 
@@ -769,7 +795,6 @@ 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];    
@@ -892,13 +917,11 @@ 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;
@@ -924,7 +947,7 @@ void delete_all_in_directory(std::string _directory)
     closedir(dir);
 }
 
-std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::string _target_bin, std::string _main, bool _initial_setup)
+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)
 {
     int i, sort_iter;
     mz_bool status;
@@ -1006,10 +1029,15 @@ std::string unzip_new(std::string _in_zip_file, std::string _target_zip, std::st
                     }
                     else
                     {
-                        zw = _target_zip + zw;
+                        zw = _html_tmp + 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;
 
@@ -1136,8 +1164,6 @@ 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;
@@ -1163,8 +1189,6 @@ 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);
@@ -1174,25 +1198,23 @@ 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   = download_get_handler,
+        .handler = APPLY_BASIC_AUTH_FILTER(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   = datafileact_get_full_handler,
+        .handler = APPLY_BASIC_AUTH_FILTER(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   = datafileact_get_last_part_handler,
+        .handler = APPLY_BASIC_AUTH_FILTER(datafileact_get_last_part_handler),
         .user_ctx  = server_data    // Pass server data as context
     };
     httpd_register_uri_handler(server, &file_datafile_last_part_handle);
@@ -1200,26 +1222,24 @@ 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   = logfileact_get_full_handler,
+        .handler = APPLY_BASIC_AUTH_FILTER(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   = logfileact_get_last_part_handler,
+        .handler = APPLY_BASIC_AUTH_FILTER(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   = upload_post_handler,
+        .handler = APPLY_BASIC_AUTH_FILTER(upload_post_handler),
         .user_ctx  = server_data    // Pass server data as context
     };
     httpd_register_uri_handler(server, &file_upload);
@@ -1228,9 +1248,8 @@ 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   = delete_post_handler,
+        .handler = APPLY_BASIC_AUTH_FILTER(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 _target_zip, std::string _target_bin, std::string _main = "/sdcard/", bool _initial_setup = false);
+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);
 
 
 void delete_all_in_directory(std::string _directory);

code/components/jomjol_fileserver_ota/server_help.cpp

@@ -16,77 +16,101 @@ 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 24h */
+    /* For all files with the following file extention tell the webbrowser to cache them for 12h */
     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")) {
-
-    	if (filename == "/sdcard/html/setup.html") {    
+        endsWith(filename, ".png") ||
+        endsWith(filename, ".gif") ||
+        // endsWith(filename, ".zip") ||
+        endsWith(filename, ".gz"))	{
+        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=86400");
+            httpd_resp_set_hdr(req, "Cache-Control", "max-age=43200");
+            set_content_type_from_file(req, filename.c_str());
         }
     }
-
-    set_content_type_from_file(req, filename.c_str());
+    else {
+        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;
         }
 
@@ -95,13 +119,11 @@ 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)
@@ -131,25 +153,49 @@ 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/pdf");
-    } else if (IS_FILE_EXT(filename, ".html")) {
+        return httpd_resp_set_type(req, "application/x-pdf");
+    }
+    else if (IS_FILE_EXT(filename, ".htm")) {
         return httpd_resp_set_type(req, "text/html");
-    } else if (IS_FILE_EXT(filename, ".jpeg")) {
+    }
+    else if (IS_FILE_EXT(filename, ".html")) {
+        return httpd_resp_set_type(req, "text/html");
+    }
+    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, ".ico")) {
+    }
+    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")) {
         return httpd_resp_set_type(req, "image/x-icon");
-    } else if (IS_FILE_EXT(filename, ".js")) {
-        return httpd_resp_set_type(req, "text/javascript");
-    } else if (IS_FILE_EXT(filename, ".css")) {
+    }
+    else if (IS_FILE_EXT(filename, ".js")) {
+        return httpd_resp_set_type(req, "application/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,6 +42,7 @@ 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*/
@@ -75,20 +76,35 @@ 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, out, outbin, zw, retfirmware;
+        std::string in, outHtml, outHtmlTmp, outHtmlOld, outbin, zw, retfirmware;
 
-        out = "/sdcard/html";
+        outHtml = "/sdcard/html";
+        outHtmlTmp = "/sdcard/html_tmp";
+        outHtmlOld = "/sdcard/html_old";
         outbin = "/sdcard/firmware";
 
-        retfirmware = unzip_new(_file_name_update, out+"/", outbin+"/", "/sdcard/", initial_setup);
+        /* 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);
     	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);
         }
 
@@ -433,7 +449,6 @@ 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);
@@ -690,13 +705,13 @@ void register_server_ota_sdcard_uri(httpd_handle_t server)
     httpd_uri_t camuri = { };
     camuri.method    = HTTP_GET;
     camuri.uri       = "/ota";
-    camuri.handler   = handler_ota_update;
+    camuri.handler = APPLY_BASIC_AUTH_FILTER(handler_ota_update);
     camuri.user_ctx  = (void*) "Do OTA";    
     httpd_register_uri_handler(server, &camuri);
 
     camuri.method    = HTTP_GET;
     camuri.uri       = "/reboot";
-    camuri.handler   = handler_reboot;
+    camuri.handler = APPLY_BASIC_AUTH_FILTER(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_fileserver_ota jomjol_image_proc jomjol_wlan)
+                    REQUIRES esp_timer esp_wifi jomjol_tfliteclass jomjol_helper jomjol_controlcamera jomjol_mqtt jomjol_influxdb jomjol_webhook jomjol_fileserver_ota jomjol_image_proc jomjol_wlan openmetrics)
 
 

code/components/jomjol_flowcontroll/ClassFlow.cpp

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

code/components/jomjol_flowcontroll/ClassFlow.h

@@ -46,7 +46,6 @@ public:
 	virtual bool ReadParameter(FILE* pfile, string &aktparamgraph);
 	virtual bool doFlow(string time);
 	virtual string getHTMLSingleStep(string host);
-	virtual string getReadout();
 	virtual string name(){return "ClassFlow";};
 
 };

code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp

@@ -1,393 +1,374 @@
-#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);
-    }
-}
+#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);
+    }
+}

code/components/jomjol_flowcontroll/ClassFlowAlignment.h

@@ -1,54 +1,51 @@
-#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
+#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

code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.h

@@ -11,10 +11,10 @@ enum t_CNNType {
     AutoDetect,
     Analogue,
     Analogue100,
-    Digital,
-    DigitalHyprid10,
+    Digit,
+    DigitHyprid10,
     DoubleHyprid10,
-    Digital100,
+    Digit100,
     None
  };
 
@@ -26,15 +26,6 @@ protected:
     std::vector<general*> GENERAL;
     float CNNGoodThreshold;
 
-	//moved to define.h
-    //float Analog_error = 3.0;
-    //float AnalogToDigtalFehler = 0.8;
-    //float Digital_Uncertainty = 0.2;
-    //int DigitalBand = 3;
-    //float Digital_Transition_Range_Predecessor = 2;
-    //float Digital_Transition_Area_Predecessor = 0.7; // 9.3 - 0.7
-    //float Digital_Transition_Area_Forward = 9.7; // Pre-run zero crossing only happens from approx. 9.7 onwards
-
     string cnnmodelfile;
     int modelxsize, modelysize, modelchannel;
     bool isLogImageSelect;
@@ -44,8 +35,8 @@ protected:
     bool SaveAllFiles;   
 
     int PointerEvalAnalogNew(float zahl, int numeral_preceder);
-    int PointerEvalAnalogToDigitNew(float zahl, float numeral_preceder,  int eval_predecessors, float analogDigitalTransitionStart);
-    int PointerEvalHybridNew(float zahl, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors = false, float analogDigitalTransitionStart=9.2);
+    int PointerEvalAnalogToDigitNew(float zahl, float numeral_preceder,  int eval_predecessors, float AnalogToDigitTransitionStart);
+    int PointerEvalHybridNew(float zahl, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors = false, float AnalogToDigitTransitionStart=9.2);
 
 
 
@@ -61,7 +52,7 @@ public:
     bool doFlow(string time);
 
     string getHTMLSingleStep(string host);
-    string getReadout(int _analog, bool _extendedResolution = false, int prev = -1, float _before_narrow_Analog = -1, float analogDigitalTransitionStart=9.2); 
+    string getReadout(int _analog, bool _extendedResolution = false, int prev = -1, float _before_narrow_Analog = -1, float AnalogToDigitTransitionStart=9.2); 
 
     string getReadoutRawString(int _analog);  
 

code/components/jomjol_flowcontroll/ClassFlowControll.h

@@ -17,6 +17,9 @@
 	#include "ClassFlowInfluxDB.h"
 	#include "ClassFlowInfluxDBv2.h"
 #endif //ENABLE_INFLUXDB
+#ifdef ENABLE_WEBHOOK
+	#include "ClassFlowWebhook.h"
+#endif //ENABLE_WEBHOOK
 #include "ClassFlowCNNGeneral.h"
 
 class ClassFlowControll :
@@ -52,12 +55,13 @@ public:
 	string GetPrevalue(std::string _number = "");	
 	bool ReadParameter(FILE* pfile, string& aktparamgraph);	
 	string getJSON();
+	const std::vector<NumberPost*> &getNumbers();
 	string getNumbersName();
 
 	string TranslateAktstatus(std::string _input);
 
 	#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
-	void DigitalDrawROI(CImageBasis *_zw);
+	void DigitDrawROI(CImageBasis *_zw);
 	void AnalogDrawROI(CImageBasis *_zw);
 	#endif
 
@@ -73,10 +77,10 @@ public:
 	std::string* getActStatus();
 	void setActStatus(std::string _aktstatus);
 
-	std::vector<HTMLInfo*> GetAllDigital();
+	std::vector<HTMLInfo*> GetAllDigit();
 	std::vector<HTMLInfo*> GetAllAnalog();	
 
-	t_CNNType GetTypeDigital();
+	t_CNNType GetTypeDigit();
 	t_CNNType GetTypeAnalog();
 	
 	#ifdef ENABLE_MQTT

code/components/jomjol_flowcontroll/ClassFlowDefineTypes.h

@@ -5,6 +5,10 @@
 
 #include "ClassFlowImage.h"
 
+/**
+ * Properties of one ROI
+ * FIXME: naming of members could use some refactoring to comply with common C++ coding style guidelines
+ */
 struct roi {
     int posx, posy, deltax, deltay;
     float result_float;
@@ -14,57 +18,68 @@ struct roi {
     CImageBasis *image, *image_org;
 };
 
+/**
+ * FIXME: Why is this additional layer needed?
+ */
 struct general {
     string name;
     std::vector<roi*> ROI;
 };
 
 enum t_RateType {
-    AbsoluteChange,
-    RateChange
+    AbsoluteChange, // ignores the time difference; only the value difference is used comparison with NumberPost.maxRate
+    RateChange      // time difference is considered and a normalized rate is used for comparison with NumberPost.maxRate
  };
 
-
+/**
+ * Holds all properties and settings of a sequence. A sequence is a set of digit and/or analog ROIs that are combined to 
+ * provide one meter reading (value).
+ * FIXME: can be renamed to `Sequence`
+ */
 struct NumberPost {
-    float MaxRateValue;
-    bool useMaxRateValue;
-    t_RateType RateType;
-    bool ErrorMessage;
-    bool PreValueOkay;
-    bool AllowNegativeRates;
-    bool checkDigitIncreaseConsistency;
-    time_t lastvalue;
-    time_t timeStampTimeUTC;
-    string timeStamp;
-    double FlowRateAct; // m3 / min
-    double PreValue; // last value that was read out well
-    double Value; // last value read out, incl. corrections
-    string ReturnRateValue; // return value rate
-    string ReturnChangeAbsolute; // return value rate
-    string ReturnRawValue; // Raw value (with N & leading 0)    
-    string ReturnValue; // corrected return value, if necessary with error message
-    string ReturnPreValue; // corrected return value without error message
-    string ErrorMessageText; // Error message for consistency check
-    int AnzahlAnalog;
-    int AnzahlDigital;
-    int DecimalShift;
-    int DecimalShiftInitial;
-    float AnalogDigitalTransitionStart; // When is the digit > x.1, i.e. when does it start to tilt?
-    int Nachkomma;
+    float MaxRateValue;         // maxRate; upper bound for the difference between two consecutive readings; affected by maxRateType;
+    bool useMaxRateValue;       // consistencyChecksEnabled; enables consistency checks; uses maxRate and maxRateType
+    t_RateType MaxRateType;        // maxRateType; affects how the value of maxRate is used for comparing the current and previous value
+    bool ErrorMessage;          // FIXME: not used; can be removed
+    int ChangeRateThreshold;  // threshold parameter for negative rate detection
+    bool PreValueOkay;          // previousValueValid; indicates that the reading of the previous round has no errors
+    bool AllowNegativeRates;    // allowNegativeRate; defines if the consistency checks allow negative rates between consecutive meter readings.
+    bool IgnoreLeadingNaN;
+    bool checkDigitIncreaseConsistency; // extendedConsistencyCheck; performs an additional consistency check to avoid wrong readings
+    time_t timeStampLastValue;     // Timestamp for the last read value; is used for the log
+    time_t timeStampLastPreValue;  // Timestamp for the last PreValue set; is used for useMaxRateValue
+    time_t timeStampTimeUTC;    // FIXME: not used; can be removed.
+    string timeStamp;           // localTimeStr; timestamp of last valid reading formatted as local time
+    double FlowRateAct;         // currentRate; ΔValue/min; since usage is not limited to water meters, the physical unit is not known.
+    double PreValue;            // lastValidValue; most recent value that could be read w/o any errors
+    double Value;               // value; most recent readout; may include corrections
+    string ReturnRateValue;     // currentRateStr; current normalized rate; ΔValue/min
+    string ReturnChangeAbsolute; // currentChangeStr; absolute difference between current and previous measurement
+    string ReturnRawValue;      // rawValueStr; Raw value (with N & leading 0)    
+    string ReturnValue;         // valueStr; corrected return value, if necessary with error message
+    string ReturnPreValue;      // lastValidValueStr; corrected return value without error message
+    string ErrorMessageText;    // errorMessage; Error message for consistency checks
+    int AnzahlAnalog;           // numAnalogRoi; number of analog ROIs used in this sequence
+    int AnzahlDigit;          // numDigitRoi; number of digit ROIs used in this sequence
+    int DecimalShift;           // decimalShift; each increment shifts the decimal separator by one digit; value=value*10^decimalShift; pos. value shifts to the right
+    int DecimalShiftInitial;    // decimalShiftInitial; same as decimalShift but is a const to reset decimalShift after calculations
+    float AnalogToDigitTransitionStart; // AnalogToDigitTransitionStartValue; FIXME: need a better description; When is the digit > x.1, i.e. when does it start to tilt?
+    int Nachkomma;              // decimalPlaces; usually defined by the number of analog ROIs; affected by DecimalShift
 
-    string FieldV1; // Fieldname in InfluxDBv1  
-    string MeasurementV1;   // Measurement in InfluxDBv1
+    string 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 FieldV2;         // Fieldname in InfluxDBv2  
-    string MeasurementV2;   // Measurement in InfluxDBv2
+    string FieldV2;             // influxdbFieldName_v2; Name of the Field in InfluxDBv2
+    string MeasurementV2;       // influxdbMeasurementName_v2; Name of the Measurement in InfluxDBv2
 
-    bool isExtendedResolution;
+    bool isExtendedResolution;  // extendResolution; Adds the decimal place of the least significant analog ROI to the value
 
-    general *digit_roi;
-    general *analog_roi;
+    general *digit_roi;         // digitRoi; set of digit ROIs for the sequence
+    general *analog_roi;        // analogRoi; set of analog ROIs for the sequence
 
-    string name;
+    string name;                // name; Designation for the sequence 
 };
 
 #endif
-

code/components/jomjol_flowcontroll/ClassFlowInfluxDB.cpp

@@ -117,7 +117,12 @@ 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);
-        InfluxDBInit(uri, database, user, password); 
+
+/////////////////////// NEW //////////////////////////
+//        InfluxDBInit(uri, database, user, password);
+        influxDB.InfluxDBInitV1(uri, database, user, password);
+/////////////////////// NEW //////////////////////////
+
         InfluxDBenable = true;
     } else {
         LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "InfluxDB init skipped as we are missing some parameters");
@@ -169,7 +174,12 @@ bool ClassFlowInfluxDB::doFlow(string zwtime)
             }
 
             if (result.length() > 0)   
-                InfluxDBPublish(measurement, namenumber, result, timeutc);
+//////////////////////// NEW //////////////////////////            
+//                InfluxDBPublish(measurement, namenumber, result, timeutc);
+                influxDB.InfluxDBPublish(measurement, namenumber, result, timeutc);
+//////////////////////// NEW //////////////////////////
+
+
         }
     }
    

code/components/jomjol_flowcontroll/ClassFlowInfluxDB.h

@@ -8,6 +8,7 @@
 #include "ClassFlow.h"
 
 #include "ClassFlowPostProcessing.h"
+#include "interface_influxdb.h"
 
 #include <string>
 
@@ -21,6 +22,8 @@ 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,7 +123,14 @@ 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");
-        InfluxDB_V2_Init(uri, bucket, dborg, dbtoken); 
+
+
+////////////////////////////////////////// NEW ////////////////////////////////////////////
+//        InfluxDB_V2_Init(uri, bucket, dborg, dbtoken);
+//        InfluxDB_V2_Init(uri, bucket, dborg, dbtoken); 
+        influxdb.InfluxDBInitV2(uri, bucket, dborg, dbtoken);
+////////////////////////////////////////// NEW ////////////////////////////////////////////
+
 //        printf("nach V2 Init\n");
         InfluxDBenable = true;
     } else {
@@ -232,7 +239,8 @@ 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_V2_Publish(measurement, namenumber, result, resulttimeutc);
+                influxdb.InfluxDBPublish(measurement, namenumber, result, resulttimeutc);
+//                InfluxDB_V2_Publish(measurement, namenumber, result, resulttimeutc);
         }
     }
    

code/components/jomjol_flowcontroll/ClassFlowInfluxDBv2.h

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

code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp

@@ -40,6 +40,7 @@ void ClassFlowMQTT::SetInitialParameter(void)
     caCertFilename = "";
     clientCertFilename = "";
     clientKeyFilename = "";
+    validateServerCert = true;
     clientname = wlan_config.hostname;
 
     OldValue = "";
@@ -51,6 +52,7 @@ void ClassFlowMQTT::SetInitialParameter(void)
     ListFlowControll = NULL; 
     disabled = false;
     keepAlive = 25*60;
+    domoticzintopic = "";
 }       
 
 ClassFlowMQTT::ClassFlowMQTT()
@@ -105,43 +107,46 @@ bool ClassFlowMQTT::ReadParameter(FILE* pfile, string& aktparamgraph)
     while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
     {
         splitted = ZerlegeZeile(aktparamgraph);
-        if ((toUpper(splitted[0]) == "CACERT") && (splitted.size() > 1))
+        std::string _param = GetParameterName(splitted[0]);
+        if ((toUpper(_param) == "CACERT") && (splitted.size() > 1))
         {
-            this->caCertFilename = splitted[1];
-        }  
-        if ((toUpper(splitted[0]) == "CLIENTCERT") && (splitted.size() > 1))
+            this->caCertFilename = "/sdcard" + splitted[1];
+        }
+        if ((toUpper(_param) == "VALIDATESERVERCERT") && (splitted.size() > 1))
         {
-            this->clientCertFilename = splitted[1];
+            validateServerCert = alphanumericToBoolean(splitted[1]);
         }  
-        if ((toUpper(splitted[0]) == "CLIENTKEY") && (splitted.size() > 1))
+        if ((toUpper(_param) == "CLIENTCERT") && (splitted.size() > 1))
         {
-            this->clientKeyFilename = splitted[1];
+            this->clientCertFilename = "/sdcard" + splitted[1];
         }  
-        if ((toUpper(splitted[0]) == "USER") && (splitted.size() > 1))
+        if ((toUpper(_param) == "CLIENTKEY") && (splitted.size() > 1))
+        {
+            this->clientKeyFilename = "/sdcard" + splitted[1];
+        }  
+        if ((toUpper(_param) == "USER") && (splitted.size() > 1))
         {
             this->user = splitted[1];
         }  
-        if ((toUpper(splitted[0]) == "PASSWORD") && (splitted.size() > 1))
+        if ((toUpper(_param) == "PASSWORD") && (splitted.size() > 1))
         {
             this->password = splitted[1];
         }               
-        if ((toUpper(splitted[0]) == "URI") && (splitted.size() > 1))
+        if ((toUpper(_param) == "URI") && (splitted.size() > 1))
         {
             this->uri = splitted[1];
         }
-        if ((toUpper(splitted[0]) == "RETAINMESSAGES") && (splitted.size() > 1))
+        if ((toUpper(_param) == "RETAINMESSAGES") && (splitted.size() > 1))
         {
-            if (toUpper(splitted[1]) == "TRUE") {
-                SetRetainFlag = true;  
-                setMqtt_Server_Retain(SetRetainFlag);
-            }
+            SetRetainFlag = alphanumericToBoolean(splitted[1]);
+            setMqtt_Server_Retain(SetRetainFlag);
         }
-        if ((toUpper(splitted[0]) == "HOMEASSISTANTDISCOVERY") && (splitted.size() > 1))
+        if ((toUpper(_param) == "HOMEASSISTANTDISCOVERY") && (splitted.size() > 1))
         {
             if (toUpper(splitted[1]) == "TRUE")
                 SetHomeassistantDiscoveryEnabled(true);  
         }
-        if ((toUpper(splitted[0]) == "METERTYPE") && (splitted.size() > 1)) {
+        if ((toUpper(_param) == "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") {
@@ -151,7 +156,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"); // Minutes
+                mqttServer_setMeterType("water", "ft³", "min", "ft³/min"); // min = Minutes
             }
             else if (toUpper(splitted[1]) == "WATER_GAL") {
                 mqttServer_setMeterType("water", "gal", "h", "gal/h");
@@ -160,7 +165,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"); // Minutes
+                mqttServer_setMeterType("gas", "ft³", "min", "ft³/min"); // min = Minutes
             }
             else if (toUpper(splitted[1]) == "ENERGY_WH") {
                 mqttServer_setMeterType("energy", "Wh", "h", "W");
@@ -174,17 +179,37 @@ 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", "min", "°C/min"); // min = Minutes
+            }
+            else if (toUpper(splitted[1]) == "TEMPERATURE_F") {
+                mqttServer_setMeterType("temperature", "°F", "min", "°F/min"); // min = Minutes
+            }
+            else if (toUpper(splitted[1]) == "TEMPERATURE_K") {
+                mqttServer_setMeterType("temperature", "K", "min", "K/m"); // min = Minutes
+            }
         }
 
-        if ((toUpper(splitted[0]) == "CLIENTID") && (splitted.size() > 1))
+        if ((toUpper(_param) == "CLIENTID") && (splitted.size() > 1))
         {
             this->clientname = splitted[1];
         }
 
-        if (((toUpper(splitted[0]) == "TOPIC") || (toUpper(splitted[0]) == "MAINTOPIC")) && (splitted.size() > 1))
+        if (((toUpper(_param) == "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:
@@ -193,6 +218,7 @@ 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;
 }
@@ -210,8 +236,8 @@ bool ClassFlowMQTT::Start(float AutoInterval)
 
     mqttServer_setParameter(flowpostprocessing->GetNumbers(), keepAlive, roundInterval);
 
-    bool MQTTConfigCheck = MQTT_Configure(uri, clientname, user, password, maintopic, LWT_TOPIC, LWT_CONNECTED,
-                                     LWT_DISCONNECTED, caCertFilename, clientCertFilename, clientKeyFilename,
+    bool MQTTConfigCheck = MQTT_Configure(uri, clientname, user, password, maintopic, domoticzintopic, LWT_TOPIC, LWT_CONNECTED,
+                                     LWT_DISCONNECTED, caCertFilename, validateServerCert, clientCertFilename, clientKeyFilename,
                                      keepAlive, SetRetainFlag, (void *)&GotConnected);
 
     if (!MQTTConfigCheck) {
@@ -235,6 +261,8 @@ 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 */
@@ -258,16 +286,20 @@ 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);
 
@@ -286,7 +318,7 @@ bool ClassFlowMQTT::doFlow(string zwtime)
 
             if (resultchangabs.length() > 0) {
                 success |= MQTTPublish(namenumber + "changeabsolut", resultchangabs, qos, SetRetainFlag); // Legacy API
-                success |= MQTTPublish(namenumber + "rate_per_digitalization_round", resultchangabs, qos, SetRetainFlag);
+                success |= MQTTPublish(namenumber + "rate_per_digitization_round", resultchangabs, qos, SetRetainFlag);
             }
 
             if (resultraw.length() > 0)   
@@ -325,6 +357,26 @@ 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,13 +19,14 @@ protected:
     std::string OldValue;
 	ClassFlowPostProcessing* flowpostprocessing;  
     std::string user, password; 
-    std::string caCertFilename, clientCertFilename, clientKeyFilename; 
+    std::string caCertFilename, clientCertFilename, clientKeyFilename;
+    bool validateServerCert;
     bool SetRetainFlag;
     int keepAlive; // Seconds
     float roundInterval; // Minutes
-
-    std::string maintopic; 
+    std::string maintopic, domoticzintopic; 
 	void SetInitialParameter(void);        
+    void handleIdx(string _decsep, string _value);   
 
 public:
     ClassFlowMQTT();

code/components/jomjol_flowcontroll/ClassFlowPostProcessing.h

@@ -10,7 +10,6 @@
 
 #include <string>
 
-
 class ClassFlowPostProcessing :
     public ClassFlow
 {
@@ -19,13 +18,10 @@ protected:
 
     int PreValueAgeStartup; 
     bool ErrorMessage;
-    bool IgnoreLeadingNaN;          // SPECIAL CASE for User Gustl ???
-
-
+	
     ClassFlowCNNGeneral* flowAnalog;
     ClassFlowCNNGeneral* flowDigit;    
 
-
     string FilePreValue;
 
     ClassFlowTakeImage *flowTakeImage;
@@ -37,25 +33,23 @@ protected:
     float checkDigitConsistency(double input, int _decilamshift, bool _isanalog, double _preValue);
 
     void InitNUMBERS();
+	
     void handleDecimalSeparator(string _decsep, string _value);
     void handleMaxRateValue(string _decsep, string _value);
     void handleDecimalExtendedResolution(string _decsep, string _value); 
     void handleMaxRateType(string _decsep, string _value);
-    void handleAnalogDigitalTransitionStart(string _decsep, string _value);
+    void handleAnalogToDigitTransitionStart(string _decsep, string _value);
     void handleAllowNegativeRate(string _decsep, string _value);
-    
-    std::string GetStringReadouts(general);
+    void handleIgnoreLeadingNaN(string _decsep, string _value);
+    void handleChangeRateThreshold(string _decsep, string _value);
+    void handlecheckDigitIncreaseConsistency(std::string _decsep, std::string _value);
 
     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);
@@ -80,5 +74,4 @@ public:
     string name(){return "ClassFlowPostProcessing";};
 };
 
-
 #endif //CLASSFFLOWPOSTPROCESSING_H