automatically updated release notes for mega-20220328

Typo in comment of P074

.github/workflows/build.yml

@@ -0,0 +1,92 @@
+# Checks whether the pushed commit can be build with PIO. Only triggered on normal push to the mega branch without tag and with pull requests targeting mega
+
+name: Build
+
+on:
+  push:
+    branches: [mega]
+    tags-ignore: '**'
+    paths-ignore:
+      - 'dist/Release_notes.txt'
+  pull_request:
+    branches: [mega]
+
+jobs:
+  documentation:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-docs-${{ hashFiles('docs/requirements.txt') }}
+      - name: Build documentation
+        run: |
+          cd docs
+          sudo apt install imagemagick zip
+          pip install -r requirements.txt
+          make html
+          cd ..
+          zip -r -qq ESPEasy_docs.zip docs/build/*
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Documentation
+          path: ESPEasy_docs.zip
+  generate-matrix:
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+      - id: set-matrix
+        run: |
+          pip install platformio
+          python tools/ci/generate-matrix.py
+
+  build:
+    needs: generate-matrix
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-${{ hashFiles('requirements.txt') }}
+      - uses: actions/cache@v2
+        if: ${{ contains(matrix.env, 'esp32') }}
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-esp32-${{ hashFiles('platformio*.ini') }}
+      - uses: actions/cache@v2
+        if: ${{ contains(matrix.env, 'esp8266') }}
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-esp8266-${{ hashFiles('platformio*.ini') }}
+      - name: Dependencies
+        run: |
+          sudo apt install binutils build-essential libffi-dev python-dev libgit2-dev
+          pip install -r requirements.txt
+          platformio update
+      - name: Build and archive
+        id: build-and-archive
+        env:
+          CHIP: ${{ matrix.chip }}
+          ENV: ${{ matrix.env }}
+        run: |
+          python tools/ci/build-and-archive.py
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Binaries
+          path: ESPEasy_${{ matrix.env }}.zip
+          if-no-files-found: ignore

.github/workflows/release.yml

@@ -0,0 +1,145 @@
+# NOTICE the generate-matrix and build are c/p from the build workflow
+# NOTICE manual deletion following a re-created tag and push will also trigger this
+#
+# Checks whether the pushed commit is buildable and creates a release with the provided tag. Only triggered on mega-* tag push
+# Documentation and distribution files (tools, readme, etc.) are uploaded as .zip files prepared similarly to the build_ESPEasy.sh
+# Every .bin build artifact is merged in a single .zip file, which is then uploaded as a single release asset
+
+name: Release
+
+on:
+  push:
+    branches-ignore: '**'
+    tags: 'mega-*'
+
+jobs:
+  generate-matrix:
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+      - id: set-matrix
+        run: |
+          pip install platformio
+          python tools/ci/generate-matrix.py
+
+  build:
+    needs: generate-matrix
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-${{ hashFiles('requirements.txt') }}
+      - uses: actions/cache@v2
+        if: ${{ contains(matrix.env, 'esp32') }}
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-esp32-${{ hashFiles('platformio*.ini') }}
+      - uses: actions/cache@v2
+        if: ${{ contains(matrix.env, 'esp8266') }}
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-esp8266-${{ hashFiles('platformio*.ini') }}
+      - name: Dependencies
+        run: |
+          sudo apt install binutils build-essential libffi-dev python-dev libgit2-dev
+          pip install -r requirements.txt
+          platformio update
+      - name: Build and archive
+        id: build-and-archive
+        env:
+          CHIP: ${{ matrix.chip }}
+          ENV: ${{ matrix.env }}
+        run: |
+          python tools/ci/build-and-archive.py
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Binaries
+          path: ESPEasy_${{ matrix.env }}.zip
+          if-no-files-found: ignore
+
+  prepare-dist:
+    needs: build
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-docs-${{ hashFiles('docs/requirements.txt') }}
+      - name: Build documentation
+        run: |
+          cd docs
+          sudo apt install imagemagick zip
+          pip install -r requirements.txt
+          make html
+          cd ..
+          zip -r -qq ESPEasy_docs.zip docs/build/*
+      - name: Package utilities
+        run: |
+          cd dist
+          zip -r -qq ../ESPEasy_dist.zip *
+          cd ..
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Distribution
+          path: |
+            ESPEasy_docs.zip
+            ESPEasy_dist.zip
+
+  prepare-notes:
+    needs: build
+    runs-on: ubuntu-20.04
+    outputs:
+      notes: ${{ steps.release-notes.outputs.result }}
+    steps:
+      - id: release-notes
+        uses: actions/github-script@v4
+        with:
+          result-encoding: string
+          script: |
+            const tagRefObj = await github.git.getRef({
+              ...context.repo,
+              ref: context.ref.replace('refs/', '')
+            });
+
+            const tagObj = await github.git.getTag({
+              ...context.repo,
+              tag_sha: tagRefObj.data.object.sha
+            });
+
+            return tagObj.data.message;
+
+  release:
+    needs: [build, prepare-dist, prepare-notes]
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+      - uses: actions/download-artifact@v2
+        with:
+          path: artifacts/
+      - run: |
+          ls -R
+          sudo apt install zipmerge
+          zipmerge ESPEasy_binaries.zip artifacts/Binaries/*.zip
+      - uses: ncipollo/release-action@v1
+        with:
+          artifacts: "ESPEasy_binaries.zip,artifacts/Distribution/*.zip"
+          body: ${{ needs.prepare-notes.outputs.notes }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -42,9 +42,14 @@ tools/vagrant/.vagrant/
 tools/vagrant/build/
 
 tools/vagrant/Custom.h
-
-
-.buildcache/
-
+
+
+.buildcache/
+
+tools/vagrant/pio_envlist.txt
 
 build_output/
+
+**/__tmpfile.cpp
+
+src/_Custom.h

.travis.yml

@@ -1,103 +0,0 @@
-language: python
-python:
-  - '3.8'
-
-dist: bionic
-
-sudo: false
-
-cache: false
-
-addons:
-  apt:
-    packages:
-    - cppcheck
-    - binutils
-
-install:
-  - pip install -U platformio sphinx recommonmark sphinx_bootstrap_theme
-  - pip install -r requirements.txt
-  - platformio update
-  - cd patches; ./check_puya_patch; cd ..
-
-env:
-  - ENV=custom_ESP32_4M316k
-  - ENV=custom_ESP32_4M316k_ETH
-  #- ENV=custom_ESP8266_1M
-  - ENV=custom_ESP8266_4M1M
-  #- ENV=custom_ESP8266_4M2M
-  #- ENV=custom_ESP8266_4M2M_LittleFS
-  #- ENV=custom_alt_wifi_ESP8266_1M
-  - ENV=custom_alt_wifi_ESP8266_4M1M
-  #- ENV=custom_beta_ESP8266_1M
-  #- ENV=custom_beta_ESP8266_4M1M
-  - ENV=custom_sdk3_ESP8266_4M1M
-  - ENV=dev_ESP8266_4M1M
-  - ENV=hard_SONOFF_POW_4M1M
-  - ENV=hard_Shelly_1_2M256
-  - ENV=hard_Shelly_PLUG_S_2M256
-  - ENV=hard_Ventus_W266
-  - ENV=hard_LCtech_relay_x2_1M
-  - ENV=hard_other_POW_ESP8285_1M
-  - ENV=minimal_IRext_ESP8266_1M
-  - ENV=minimal_IRext_ESP8266_4M1M
-  - ENV=minimal_IRext_ESP8266_4M2M
-  #- ENV=minimal_core_242_ESP8266_1M_OTA
-  #- ENV=minimal_core_242_ESP8285_1M_OTA
-  - ENV=minimal_core_274_ESP8266_1M_OTA_Domoticz
-  - ENV=minimal_core_274_ESP8266_1M_OTA_FHEM_HA
-  - ENV=minimal_core_274_ESP8285_1M_OTA_Domoticz
-  - ENV=minimal_core_274_ESP8285_1M_OTA_FHEM_HA
-  #- ENV=minimal_core_274_sdk3_ESP8266_1M_OTA_Domoticz
-  #- ENV=minimal_core_274_sdk3_ESP8266_1M_OTA_FHEM_HA
-  #- ENV=minimal_core_274_sdk3_ESP8285_1M_OTA_Domoticz
-  #- ENV=minimal_core_274_sdk3_ESP8285_1M_OTA_FHEM_HA
-  #- ENV=normal_ESP8266_16M_LittleFS
-  - ENV=normal_ESP8266_1M
-  - ENV=normal_ESP8266_1M_VCC
-  - ENV=normal_ESP8266_4M1M
-  - ENV=normal_ESP8266_4M1M_VCC
-  - ENV=normal_ESP8285_1M
-  - ENV=normal_IRext_no_rx_ESP8266_4M2M
-  - ENV=normal_WROOM02_2M256
-  - ENV=normal_WROOM02_2M
-  - ENV=normal_alt_wifi_ESP8266_1M
-  - ENV=normal_alt_wifi_ESP8266_1M_VCC
-  - ENV=normal_alt_wifi_ESP8266_4M1M
-  #- ENV=normal_sdk3_ESP8266_1M
-  #- ENV=spec_debug_beta_custom_ESP8266_4M1M
-  #- ENV=spec_debug_custom_ESP32_4M316k
-  #- ENV=spec_debug_custom_ESP8266_4M1M
-  #- ENV=spec_memanalyze_ESP8266
-  - ENV=test_ESP32-wrover-kit_4M316k
-  - ENV=test_ESP32-wrover-kit_4M316k_ETH
-  - ENV=test_ESP32_4M316k
-  - ENV=test_ESP32_4M316k_ETH
-  - ENV=test_ESP32_lolin-d32-pro
-  - ENV=test_ESP8266_4M1M_VCC
-  #- ENV=test_ESP8266_4M1M_VCC_MDNS_SD
-  - ENV=test_alt_wifi_ESP8266_4M1M_VCC
-  #- ENV=test_beta_ESP8266_16M_LittleFS
-  - ENV=test_beta_ESP8266_4M1M
-
-script:
-  - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e $ENV
-
-before_deploy:
-  - ./before_deploy
-
-deploy:
-  provider: releases
-  prerelease: true
-  api_key:
-    secure: bZeuKI7evXeZYmGayfcvIC1fThBGcksAyOrCbZ8kAGeTbHGJqFLBBy8to5UpNBSZVfeDWo25Iqy8Pfbyb7p2c1hg6fG9jS0UzQkLnoUNMxpUM1dJACkZxvFdP4Br3Y3vUPWtrWUbo8rN/b3E6tjSNLE7vQiwsarj+eWTO2V6BGcsN0eHc04/UCM2+DcHvJ4y7Ec36yIUaClNAWMal1osBYaViruylOdBKT/WDs1ZMoJMceXCfxMQ/8J2moYvymKfSkXSmoMGmzlTuq8v5N4AweutjpC4Zba2BbxIJv+PwWjhfIgTviHFggSU90UPTKVWYv13vms92VVKz1CDVrUQNn+YQes9+ROPUnrMc9bJ+q7E1lWJRZeDMqGECB+8BjUtUk6H81K+XhOnW1mtZiMnvMCwkmE0OT1eBObGMcpR962/DUBoQDmulMs2IieB0dLobmUBhpc1syrKEPKxjY7yhhQMr6In82jODVLR3qDkNQ8xtIfevzCo/ocUjiOrXW4b/pDMy28Yh109DMb/KSWEsjjkkpXhsT1YVy2MwOa7FRhHFW+SNKX4Us8T75H+pO4mQ4afnPEtjYKodj7XD92zqNxKfMx3elEx5RK6HKekHjpXdYtuXzGONB9StA+2T43/2llt3n5fzv4BRfCumBEJ77/ufB0U/uhsCe6lVwJf34U=
-  file_glob: true
-  file: ESPEasy*.zip
-
-  skip_cleanup: true
-  on:
-      tags: true
-    # repo: psy0rz/ESPEasy-platformio
-
-notifications:
-  email: false

License.txt

@@ -1,5 +1,5 @@
-/****************************************************************************************************************************\
- * Arduino project "ESP Easy" © Copyright www.esp8266.nu
+/*****************************************************************************************************************************\
+ * Arduino project "ESP Easy" © Copyright 2018-2020 github.com/letscontrolit
  *
  * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
@@ -8,12 +8,18 @@
  * You received a copy of the GNU General Public License along with this program in file 'License.txt'.
  *
  * Additional information about licensing can be found at : http://www.gnu.org/licenses
-\*************************************************************************************************************************/
+\*****************************************************************************************************************************/
 
-// This file incorporates work covered by the following copyright and permission notice:  
+ // This project incorporates work covered by the following copyrights and permission notices:
+ //
+ // Notes:
+ // - Parts of the source files in this repository are made available under different licenses.
+ //   Refer to each individual source file/directory for more details.
+ // - Your copy of this product may not contain code covered by one or more of the licenses listed here,
+ //   depending on the exact product and version you choose.
 
-/****************************************************************************************************************************\
-* Arduino project "Nodo" © Copyright 2010..2015 Paul Tonkes 
+/*****************************************************************************************************************************\
+* Arduino project "Nodo" © Copyright 2010..2015 Paul Tonkes 
 * 
 * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License 
 * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
@@ -26,7 +32,100 @@
 * bugs kunnen worden gelogd op                      : https://code.google.com/p/arduino-nodo/
 * Compiler voor deze programmacode te downloaden op : http://arduino.cc
 * Voor vragen of suggesties, mail naar              : p.k.tonkes@gmail.com
-\*************************************************************************************************************************/
+\*****************************************************************************************************************************/
+
+/*****************************************************************************************************************************\
+ * esp8266/Arduino is licensed under the
+ * GNU Lesser General Public License v2.1
+ *
+ * Additional information about licensing can be found at : https://github.com/esp8266/Arduino/blob/master/LICENSE
+\*****************************************************************************************************************************/
+
+/*****************************************************************************************************************************\
+ * espressif/arduino-esp32 is licensed under the
+ * GNU Lesser General Public License v2.1
+ *
+ * Additional information about licensing can be found at : https://github.com/espressif/arduino-esp32/blob/master/LICENSE.md
+\*****************************************************************************************************************************/
+
+/*****************************************************************************************************************************\
+ * platformio/platformio-core        © Copyright 2014-present PlatformIO <contact@platformio.org>
+ * platformio/platform-espressif8266 © Copyright 2014-present PlatformIO <contact@platformio.org>
+ * platformio/platform-espressif32   © Copyright 2014-present PlatformIO <contact@platformio.org>
+ *
+ * is licensed under the Apache License 2.0
+ *
+ * Additional information about licensing can be found at : https://github.com/platformio/platformio-core/blob/develop/LICENSE
+\*****************************************************************************************************************************/
+
+/*****************************************************************************************************************************\
+ * espressif/esptool is licensed under the
+ * GNU General Public License v2.0
+ *
+ * Additional information about licensing can be found at : https://github.com/espressif/esptool/blob/master/LICENSE
+\*****************************************************************************************************************************/
+
+/*****************************************************************************************************************************\
+ * Grovkillen/ESP_Easy_Flasher is licensed under the
+ * GNU General Public License v3.0
+ *
+ * Additional information about licensing can be found at : https://github.com/Grovkillen/ESP_Easy_Flasher/blob/master/LICENSE
+\*****************************************************************************************************************************/
+
+/*****************************************************************************************************************************\
+ * ESPRESSIF MIT License
+ *
+ * Copyright (c) 2018 <ESPRESSIF SYSTEMS (SHANGHAI) PTE LTD>
+ *
+ * Permission is hereby granted for use on all ESPRESSIF SYSTEMS products, in which case,
+ * it is 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.
+ *
+ * Additional information about licensing can be found at : https://github.com/espressif/esp-at/blob/master/LICENSE
+\*****************************************************************************************************************************/
+
+/*****************************************************************************************************************************\
+ * sphinx-doc/sphinx © Copyright 2007-2020 by the Sphinx team (see AUTHORS file). All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Additional information about licensing can be found at : https://github.com/sphinx-doc/sphinx/blob/3.x/LICENSE
+\*****************************************************************************************************************************/
+
 
                      GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
@@ -701,4 +800,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,6 +1,6 @@
 |Latest Nightly  | Build Status | Downloads | Docs | Patreon | Ko-Fi | PayPal |
 |-------|-------|-------|-------|-------|-------|-------|
-| [![GitHub version](https://img.shields.io/github/release/letscontrolit/ESPEasy/all.svg)](https://github.com/letscontrolit/ESPEasy/releases/latest) | [![Build Status](https://travis-ci.org/letscontrolit/ESPEasy.svg?branch=mega)](https://travis-ci.org/letscontrolit/ESPEasy) | [![Downloads](https://img.shields.io/github/downloads/letscontrolit/ESPEasy/total.svg)](https://github.com/letscontrolit/ESPEasy/releases) | [![Documentation Status](https://readthedocs.org/projects/espeasy/badge/?version=latest)](https://espeasy.readthedocs.io/en/latest/?badge=latest) | [![donate](https://img.shields.io/badge/donate-Patreon-blue.svg)](https://www.patreon.com/GrovkillenTDer) | [![donate](https://img.shields.io/badge/donate-KoFi-blue.svg)](https://ko-fi.com/grovkillentder) | [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.me/espeasy) |
+| [![GitHub version](https://img.shields.io/github/release/letscontrolit/ESPEasy/all.svg)](https://github.com/letscontrolit/ESPEasy/releases/latest) | ![Build status](https://github.com/letscontrolit/ESPEasy/actions/workflows/build.yml/badge.svg) | [![Downloads](https://img.shields.io/github/downloads/letscontrolit/ESPEasy/total.svg)](https://github.com/letscontrolit/ESPEasy/releases) | [![Documentation Status](https://readthedocs.org/projects/espeasy/badge/?version=latest)](https://espeasy.readthedocs.io/en/latest/?badge=latest) | [![donate](https://img.shields.io/badge/donate-Patreon-blue.svg)](https://www.patreon.com/GrovkillenTDer) | [![donate](https://img.shields.io/badge/donate-KoFi-blue.svg)](https://ko-fi.com/grovkillentder) | [![donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.me/espeasy) |
 
 For ways to *support* us, see [this announcement on the forum](https://www.letscontrolit.com/forum/viewtopic.php?f=14&t=5787), or have a look at the [Patreon](https://www.patreon.com/GrovkillenTDer), [Ko-Fi](https://ko-fi.com/grovkillentder) or [PayPal](https://www.paypal.me/espeasy) links above.
 
@@ -15,26 +15,113 @@ Introduction and wiki: https://www.letscontrolit.com/wiki/index.php/ESPEasy#Intr
 
 Check here to learn how to use this branch and help us improving ESPEasy: http://www.letscontrolit.com/wiki/index.php/ESPEasy#Source_code_development
 
+## Web based flasher (experimental)
 
-## Automated binary releases
+To make it easier to get started, one may flash a build directly to the ESP from your browser.
+Currently only Chrome and Edge are supported.
 
-Every night our build-bot will build a new binary release: https://github.com/letscontrolit/ESPEasy/releases
+See [this flash page](https://td-er.nl/ESPEasy/) to try the new web flash feature.
 
-The releases are named something like 'mega-20190225' (last number is the build date)
+The web flasher is using [ESP Web Tools](https://esphome.github.io/esp-web-tools/) made by the people behind ESPHome and Home Assistant.
+
+
+## Binary releases
+
+On demand, controlled by the repo owner, our build-bot will build a new binary release: https://github.com/letscontrolit/ESPEasy/releases
+
+The releases are named something like 'mega-20210501' (last number is the build date)
 
 Depending on your needs, we release different types of files:
 
-Firmware name                                 | Hardware                | Included plugins            |
-----------------------------------------------|-------------------------|-----------------------------|
-ESPEasy_mega-20190225_normal_ESP8266_1M.bin  | ESP8266 with 1MB flash  | Stable                      |
-ESPEasy_mega-20190225_test_ESP8266_1M.bin    | ESP8266 with 1MB flash  | Stable + Test               |
-ESPEasy_mega-20190225_dev_ESP8266_1M.bin     | ESP8266 with 1MB flash  | Stable + Test + Development |
-ESPEasy_mega-20190225_normal_ESP8266_4M.bin  | ESP8266 with 4MB flash  | Stable                      |
-ESPEasy_mega-20190225_test_ESP8266_4M.bin    | ESP8266 with 4MB flash  | Stable + Test               |
-ESPEasy_mega-20190225_dev_ESP8266_4M.bin     | ESP8266 with 4MB flash  | Stable + Test + Development |
-ESPEasy_mega-20190225_normal_ESP8285_1M.bin  | ESP8285 with 1MB flash  | Stable                      |
-ESPEasy_mega-20190225_test_ESP8285_1M.bin    | ESP8285 with 1MB flash  | Stable + Test               |
-ESPEasy_mega-20190225_dev_ESP8285_1M.bin     | ESP8285 with 1MB flash  | Stable + Test + Development |
+The name is built up from a few key parts:
+
+ESPEasy_mega\__[releasedate]_\__[build-type]_\__[opt-arduino-library]_\__[hardware-type]_\__[flash-size]__[filesystem-size]_\__[opt-build-features]_.bin
+
+_[build-type]_ can be any of:
+Build type  | Description                               | included plugins               |
+------------|-------------------------------------------|--------------------------------|
+custom      | Custom predefined set/Defined in Custom.h | Specific                       |
+normal      | Standard plugins                          | Stable                         |
+test_A      | Normal + test set A                       | Stable + Testing base + set A  |
+test_B      | Normal + test set B                       | Stable + Testing base + set B  |
+test_C      | Normal + test set C                       | Stable + Testing base + set C  |
+test_D      | Normal + test set D                       | Stable + Testing base + set D  |
+test_E      | Normal + test set E                       | Stable + Testing base + set E  |
+max         | All available plugins                     | All available                  |
+energy      | All plugins related to energy measurement | Stable + Energy measurement    |
+display     | All plugins related to displays           | Stable + Displays              |
+hard        | hardware specific builds                  | Minimal                        |
+minimal     | minimal plugins for specific use-cases    | Switch and Controller          |
+spec_*      | specialized technical builds              | Not intended for regular use   |
+IRext       | Infra-red hardware specific               | Sending and receiving IR cmd   |
+
+
+_[opt-arduino-library]_ (optional) can be any of:
+Arduino library | Description                        |
+----------------|------------------------------------|
+alt_wifi        | Alternative WiFi configuration     |
+beta            | Arduino Beta release               |
+sdk3            | Arduino SDK v.3                    |
+core_274        | Arduino Core 2.7.4 release         |
+core_274_sdk3   | Arduino Core 2.7.4 SDK v.3 release |
+
+
+_[hardware-type]_ cn be any of:
+Hardware type    | Description                                 |
+-----------------|---------------------------------------------|
+ESP8266          | Espressif ESP8266 generic boards            |
+ESP8285          | Espressif ESP8285 generic boards 1MB Flash  |
+WROOM02          | Espressif ESP8266 WRoom02 boards            |
+ESP32            | Espressif ESP32 generic boards              |
+ESP32-wrover-kit | Espressif ESP32 wrover-kit boards           |
+SONOFF           | Sonoff hardware specific                    |
+other_POW        | Switch with power measurement               |
+Shelly_1         | Shelly 1 switch                             |
+Shelly_PLUG_S    | Shelly plug S switch with power measurement |
+Ventus           | Ventus W266 weather station                 |
+LCtech           | LC-tech serial switch                       |
+
+
+_[flash-size]_ can be any of:
+Flash size | Description                 |
+-----------|-----------------------------|
+1M         | 1 MB with 128 kB filesystem |
+2M         | 2 MB with 128 kB filesystem |
+2M256      | 2 MB with 256 kB filesystem |
+4M1M       | 4 MB with 1 MB filesystem   |
+4M2M       | 4 MB with 2 MB filesystem   |
+16M        | 16 MB with 14 MB filesystem |
+4M316k     | 4 MB with 316 kB filesystem |
+16M1M      | 16 MB with 1 MB filesystem  |
+16M2M      | 16 MB with 2 MB filesystem  |
+16M8M      | 16 MB with 8 MB filesystem  |
+
+
+_[opt-build-features]_ can be any of:
+Build features  | Description                                                              |
+----------------|--------------------------------------------------------------------------|
+LittleFS        | Use LittleFS instead of SPIFFS filesystem (SPIFFS is unstable \> 2 MB)    |
+VCC             | Analog input configured to measure VCC voltage                           |
+OTA             | Arduino OTA (Over The Air) update feature enabled                        |
+Domoticz        | Only Domoticz controllers (HTTP+MQTT) and plugins included               |
+FHEM_HA         | Only FHEM/OpenHAB/Home Assistant (MQTT) controllers and plugins included |
+lolin_d32_pro   | Specific Lolin hardware options enabled                                  |
+ETH             | Ethernet interface enabled (ESP32 only)                                  |
+
+Some example firmware names:
+Firmware name                                      | Hardware                | Included plugins              |
+---------------------------------------------------|-------------------------|-------------------------------|
+ESPEasy_mega-20210501_normal_ESP8266_1M.bin        | ESP8266 with 1MB flash  | Stable                        |
+ESPEasy_mega-20210501_normal_ESP8285_1M.bin        | ESP8285 with 1MB flash  | Stable                        |
+ESPEasy_mega-20210501_normal_ESP8266_4M1M.bin      | ESP8266 with 4MB flash  | Stable                        |
+ESPEasy_mega-20210501_test_A_ESP8266_4M1M.bin      | ESP8266 with 4MB flash  | Stable + Testing base + set A |
+ESPEasy_mega-20210501_normal_ESP32_4M316k.bin      | ESP32 with 4MB flash    | Stable                        |
+ESPEasy_mega-20210501_test_A_ESP32_4M316k.bin      | ESP32 with 4MB flash    | Stable + Testing base + set A |
+ESPEasy_mega-20210501_test_B_ESP32_4M316k.bin      | ESP32 with 4MB flash    | Stable + Testing base + set B |
+ESPEasy_mega-20210501_max_ESP32_16M1M.bin          | ESP32 with 16MB flash   | All available plugins         |
+ESPEasy_mega-20210501_max_ESP32_16M8M_LittleFS.bin | ESP32 with 16MB flash   | All available plugins         |
+
+To see what plugins are included in which testing set, you can find that on the [ESPEasy Plugin overview page](https://espeasy.readthedocs.io/en/latest/Plugin/_Plugin.html)
 
 ## Documentation & more info
 

before_deploy

@@ -1,7 +1,26 @@
 #!/bin/bash
 
 VERSION=$(git describe)
-TMP_DIST=`mktemp -d`
+TMP_DIR=`mktemp -d`
+if [ $? -eq 0 ]; then
+    # Make sure coreutils is installed.
+    # if not, these terrible things may happen:
+    # https://www.letscontrolit.com/forum/viewtopic.php?f=6&t=8542
+    echo "Created ${TMP_DIR}"
+else
+    echo "Could not create tmp dir, mktemp -d failed"
+    exit 1
+fi
+
+TMP_DIST=`echo "${TMP_DIR}/ESPEasy_collect_dist"`
+mkdir -p ${TMP_DIST}
+if [ $? -eq 0 ]; then
+    echo "Created ${TMP_DIST}"
+else
+    echo "Could not create tmp dir: ${TMP_DIST}"
+    exit 1
+fi
+
 CURPATH=`pwd`
 BUILD_LOG=`echo "${TMP_DIST}/buildlog.txt"`
 

boards/esp32s2.json

@@ -0,0 +1,31 @@
+{
+    "build": {
+      "arduino":{
+        "ldscript": "esp32s2_out.ld"
+      },
+      "core": "esp32",
+      "mcu": "esp32s2",
+      "extra_flags": "-Desp32S2_dev_module",
+      "f_cpu": "240000000L",
+      "f_flash": "80000000L",
+      "flash_mode": "qio",
+      "mcu": "esp32s2",
+      "variant": "esp32s2"
+    },
+    "connectivity": [
+      "wifi"
+    ],
+    "frameworks": [
+      "arduino"
+    ],
+    "name": "ESP32S2 Dev Module",
+    "upload": {
+      "flash_size": "4MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 4194304,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "url": "https://espressif.com",
+    "vendor": "espressif"
+  }

dist/Espressif_flash_download_tool_v3.8.5/combine/SUCCESS.txt

@@ -0,0 +1 @@
+SUCCESS

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32/hspi_download.conf

@@ -0,0 +1,104 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = c:\shared\flash_download_tool\src
+
+[LOCK]
+lock_setting_password = 1
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 2
+flashsize = 2
+crystal = 1
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = 
+baudrate1 = 0
+checkmac1 = 1
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOCK_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 
+log_check_timeout = 3
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_timeout = 3
+log_check_port = COM6
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+log_check_delaytime = 3
+
+[MAC SAVE]
+mac_save_enable = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32/multi_download.conf

@@ -0,0 +1,146 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = ./bin/
+
+[LOCK]
+lock_setting_password = 12345678
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 2
+flashsize = 2
+crystal = 1
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = COM21
+baudrate1 = 4
+checkmac1 = 1
+autostart2 = 0
+com_port2 = COM78
+baudrate2 = 5
+checkmac2 = 1
+autostart3 = 0
+com_port3 = 
+baudrate3 = 0
+checkmac3 = 1
+autostart4 = 0
+com_port4 = 
+baudrate4 = 0
+checkmac4 = 1
+autostart5 = 0
+com_port5 = COM23
+baudrate5 = 0
+checkmac5 = 1
+autostart6 = 0
+com_port6 = 
+baudrate6 = 0
+checkmac6 = 1
+autostart7 = 0
+com_port7 = 
+baudrate7 = 0
+checkmac7 = 1
+autostart8 = 0
+com_port8 = 
+baudrate8 = 0
+checkmac8 = 1
+erase_flash_en = True
+new_status = 0
+num_bytes = 0
+non_volatile = False
+
+[ESPTOOL_PARAM]
+after = hard_reset
+baud = 115200
+before = default_reset
+chip = auto
+compress = 0
+flash_freq = keep
+flash_mode = keep
+flash_size = keep
+no_compress = False
+no_progress = False
+no_stub = False
+operation = write_flash
+port = /dev/cu.SLAB_USBtoUART
+spi_connection = 0
+verify = False
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.26
+log_check_timeout = 3
+log_check_enable_cmd = False
+log_check_cmd_str = AT+GMR
+log_check_delaytime = 40
+
+[MAC SAVE]
+mac_save_enable = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32/security.conf

@@ -0,0 +1,30 @@
+[DEBUG MODE]
+debug_enable = False
+debug_pem_path = 
+
+[SECURE BOOT]
+secure_boot_en = False
+burn_secure_boot_key = False
+secure_boot_force_write = False
+secure_boot_rw_protect = False
+
+[FLASH ENCRYPTION]
+flash_encryption_en = False
+burn_flash_encryption_key = False
+flash_encrypt_force_write = False
+flash_encrypt_rw_protect = False
+reserved_burn_times = 3
+
+[SELF FLASH ENCRYPTION]
+self_flash_encryption_en = False
+self_reserved_burn_times = 1
+
+[AES KEY]
+aes_key_en = False
+burn_aes_key = False
+
+[DISABLE FUNC]
+jtag_disable = False
+dl_encrypt_disable = False
+dl_decrypt_disable = False
+dl_cache_disable = False

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32/spi_download.conf

@@ -0,0 +1,125 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = C:\bin
+
+[LOCK]
+lock_setting_password = 12345678
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 2
+flashsize = 2
+crystal = 0
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = COM90
+baudrate1 = 4
+checkmac1 = 1
+erase_flash_en = True
+new_status = 0
+num_bytes = 0
+non_volatile = False
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOCK_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 
+log_check_timeout = 3
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.26
+log_check_timeout = 3
+log_check_port = COM6
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+log_check_delaytime = 3
+
+[ESPTOOL_PARAM]
+after = hard_reset
+baud = 115200
+before = default_reset
+chip = auto
+compress = 0
+flash_freq = keep
+flash_mode = keep
+flash_size = keep
+no_compress = False
+no_progress = False
+no_stub = False
+operation = write_flash
+port = /dev/cu.SLAB_USBtoUART
+spi_connection = 0
+verify = False
+
+[MAC SAVE]
+mac_save_enable = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32/utility.conf

@@ -0,0 +1,36 @@
+[LOG_LEVEL]
+multi_log_level = INFO
+utility_log_level = INFO
+spi_log_level = INFO
+hspi_log_level = INFO
+
+[MAC SAVE]
+mac_save_enable = False
+
+[EFUSE_CONFIG]
+xpd_sdio_enable = False
+xpd_sdio_force = 0
+xpd_sdio_reg = 0
+xpd_sdio_tieh = 0
+
+[RF_INIT]
+backoffen = 0
+limiten = 0
+cryfreq = 0
+backoffval = 0.000000
+digitalgain = 0
+rfgain = 0
+targetlowpower = 0.000000
+limitval = 19.500000
+targetpower6 = 13.000000
+toutadc = 1
+targetpower4 = 15.000000
+targetpower5 = 14.000000
+targetpower2 = 18.000000
+targetpower3 = 16.500000
+lowpoweren = 0
+targetpower1 = 19.500000
+rfinitmode = 0
+toutvdd = 0
+vdd = 3.3
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32d2wd/hspi_download.conf

@@ -0,0 +1,104 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = c:\shared\flash_download_tool\src
+
+[LOCK]
+lock_setting_password = 1
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 2
+flashsize = 2
+crystal = 1
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = 
+baudrate1 = 0
+checkmac1 = 1
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOCK_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 
+log_check_timeout = 3
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_timeout = 3
+log_check_port = COM6
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+log_check_delaytime = 3
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32d2wd/multi_download.conf

@@ -0,0 +1,126 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = ./bin/
+
+[LOCK]
+lock_setting_password = 12345678
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 2
+flashsize = 2
+crystal = 1
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = 
+baudrate1 = 0
+checkmac1 = 1
+autostart2 = 0
+com_port2 = 
+baudrate2 = 0
+checkmac2 = 1
+autostart3 = 0
+com_port3 = 
+baudrate3 = 0
+checkmac3 = 1
+autostart4 = 0
+com_port4 = 
+baudrate4 = 0
+checkmac4 = 1
+autostart5 = 0
+com_port5 = 
+baudrate5 = 0
+checkmac5 = 1
+autostart6 = 0
+com_port6 = 
+baudrate6 = 0
+checkmac6 = 1
+autostart7 = 0
+com_port7 = 
+baudrate7 = 0
+checkmac7 = 1
+autostart8 = 0
+com_port8 = 
+baudrate8 = 0
+checkmac8 = 1
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_port = COM37
+log_check_baud = 115200
+log_check_str = 1.6.2.0
+log_check_timeout = 3
+log_check_enable_cmd = False
+log_check_cmd_str = AT+GMR
+log_check_delaytime = 3
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32d2wd/security.conf

@@ -0,0 +1,31 @@
+[DEBUG MODE]
+debug_enable = True
+debug_pem_path = 
+
+[SECURE BOOT]
+secure_boot_en = False
+burn_secure_boot_key = False
+secure_boot_force_write = False
+secure_boot_rw_protect = False
+
+[FLASH ENCRYPTION]
+flash_encryption_en = False
+burn_flash_encryption_key = False
+flash_encrypt_force_write = False
+flash_encrypt_rw_protect = False
+reserved_burn_times = 0
+
+[AES KEY]
+aes_key_en = False
+burn_aes_key = False
+
+[DISABLE FUNC]
+jtag_disable = False
+dl_encrypt_disable = False
+dl_decrypt_disable = False
+dl_cache_disable = False
+
+[SELF FLASH ENCRYPTION]
+self_flash_encryption_en = False
+self_reserved_burn_times = 0
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32d2wd/spi_download.conf

@@ -0,0 +1,121 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = C:\Users\QC\Desktop\ESP32_AT_V1.2\ESP32_AT_V1.2\ESP32_AT_V1.2\factory
+
+[LOCK]
+lock_setting_password = 1
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 2
+flashsize = 2
+crystal = 0
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = COM56
+baudrate1 = 4
+checkmac1 = 1
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOCK_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 
+log_check_timeout = 3
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_timeout = 3
+log_check_port = COM6
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+log_check_delaytime = 3
+
+[ESPTOOL_PARAM]
+after = hard_reset
+baud = 115200
+before = default_reset
+chip = auto
+compress = 0
+flash_freq = keep
+flash_mode = keep
+flash_size = keep
+no_compress = False
+no_progress = False
+no_stub = False
+operation = write_flash
+port = /dev/cu.SLAB_USBtoUART
+spi_connection = 0
+verify = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32d2wd/utility.conf

@@ -0,0 +1,42 @@
+[LOG_CHECK]
+log_check_enable = True
+log_check_baud = 115200
+log_check_str = "1.0.0"
+log_check_timeout = 3
+
+[LOG_LEVEL]
+multi_log_level = ERROR
+utility_log_level = ERROR
+spi_log_level = ERROR
+hspi_log_level = ERROR
+
+[MAC SAVE]
+mac_save_enable = False
+
+[EFUSE_CONFIG]
+xpd_sdio_enable = False
+xpd_sdio_force = 0
+xpd_sdio_reg = 0
+xpd_sdio_tieh = 0
+
+[RF_INIT]
+backoffen = 0
+limiten = 0
+cryfreq = 3
+backoffval = 0.000000
+digitalgain = 0
+rfgain = 0
+targetlowpower = 12.000000
+limitval = 19.500000
+targetpower6 = 13.000000
+toutadc = 0
+targetpower4 = 15.000000
+targetpower5 = 14.000000
+targetpower2 = 18.000000
+targetpower3 = 16.500000
+lowpoweren = 0
+targetpower1 = 19.500000
+rfinitmode = 0
+toutvdd = 1
+vdd = 3.3
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32s2/hspi_download.conf

@@ -0,0 +1,89 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = C:\shared\flash_download_tool\src
+
+[FLASH_CRYSTAL]
+spiautoset = 0
+spicfgdis = 1
+spispeed = 0
+spimode = 2
+flashsize = 2
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_delaytime = 3
+log_check_timeout = 3
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = 
+baudrate1 = 0
+checkmac1 = 1
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32s2/multi_download.conf

@@ -0,0 +1,137 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = ./bin/
+
+[LOCK]
+lock_setting_password = 
+
+[FLASH_CRYSTAL]
+spiautoset = 0
+spicfgdis = 1
+spispeed = 0
+spimode = 2
+flashsize = 2
+
+[MAC SAVE]
+mac_save_enable = False
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_delaytime = 3
+log_check_timeout = 3
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = COM45
+baudrate1 = 4
+checkmac1 = 1
+autostart2 = 0
+com_port2 = 
+baudrate2 = 0
+checkmac2 = 1
+autostart3 = 0
+com_port3 = 
+baudrate3 = 0
+checkmac3 = 1
+autostart4 = 0
+com_port4 = 
+baudrate4 = 0
+checkmac4 = 1
+autostart5 = 0
+com_port5 = 
+baudrate5 = 0
+checkmac5 = 1
+autostart6 = 0
+com_port6 = 
+baudrate6 = 0
+checkmac6 = 1
+autostart7 = 0
+com_port7 = 
+baudrate7 = 0
+checkmac7 = 1
+autostart8 = 0
+com_port8 = 
+baudrate8 = 0
+checkmac8 = 1
+
+[ESPTOOL_PARAM]
+after = hard_reset
+baud = 115200
+before = default_reset
+chip = auto
+compress = 0
+flash_freq = keep
+flash_mode = keep
+flash_size = keep
+no_compress = False
+no_progress = False
+no_stub = False
+operation = write_flash
+port = /dev/cu.SLAB_USBtoUART
+spi_connection = 0
+verify = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32s2/security.conf

@@ -0,0 +1,31 @@
+[DEBUG MODE]
+debug_enable = True
+debug_pem_path = 
+
+[SECURE BOOT]
+secure_boot_en = False
+burn_secure_boot_key = False
+secure_boot_force_write = False
+secure_boot_rw_protect = False
+
+[FLASH ENCRYPTION]
+flash_encryption_en = False
+burn_flash_encryption_key = False
+flash_encrypt_force_write = False
+flash_encrypt_rw_protect = False
+reserved_burn_times = 0
+
+[SELF FLASH ENCRYPTION]
+self_flash_encryption_en = False
+self_reserved_burn_times = 0
+
+[AES KEY]
+aes_key_en = False
+burn_aes_key = False
+
+[DISABLE FUNC]
+jtag_disable = False
+dl_encrypt_disable = False
+dl_decrypt_disable = False
+dl_cache_disable = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32s2/spi_download.conf

@@ -0,0 +1,110 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = C:\Users\qichuan\Desktop
+
+[FLASH_CRYSTAL]
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 2
+flashsize = 2
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_delaytime = 3
+log_check_timeout = 3
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = COM45
+baudrate1 = 5
+checkmac1 = 1
+erase_flash_en = True
+new_status = 0
+num_bytes = 0
+non_volatile = False
+
+[ESPTOOL_PARAM]
+after = hard_reset
+baud = 115200
+before = default_reset
+chip = auto
+compress = 0
+flash_freq = keep
+flash_mode = keep
+flash_size = keep
+no_compress = False
+no_progress = False
+no_stub = False
+operation = write_flash
+port = /dev/cu.SLAB_USBtoUART
+spi_connection = 0
+verify = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp32s2/utility.conf

@@ -0,0 +1,15 @@
+[LOG_LEVEL]
+utility_log_level = ERROR
+spi_log_level = ERROR
+hspi_log_level = ERROR
+multi_log_level = ERROR
+
+[MAC SAVE]
+mac_save_enable = False
+
+[EFUSE_CONFIG]
+xpd_sdio_enable = False
+xpd_sdio_force = 0
+xpd_sdio_reg = 0
+xpd_sdio_tieh = 0
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp8266/hspi_download.conf

@@ -0,0 +1,104 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = c:\shared\flash_download_tool\src
+
+[LOCK]
+lock_setting_password = 1
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+crystal = 1
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 0
+flashsize = 5
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = 
+baudrate1 = 0
+checkmac1 = 1
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOCK_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 
+log_check_timeout = 3
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_timeout = 3
+log_check_port = COM6
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+log_check_delaytime = 3
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp8266/multi_download.conf

@@ -0,0 +1,141 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_port = COM37
+log_check_baud = 115200
+log_check_str = 1.6.2.0
+log_check_timeout = 3
+log_check_enable_cmd = False
+log_check_cmd_str = AT+GMR
+log_check_delaytime = 3
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = ./bin/
+
+[LOCK]
+lock_setting_password = 12345678
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+crystal = 1
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 0
+flashsize = 5
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = COM37
+baudrate1 = 5
+checkmac1 = 1
+autostart2 = 0
+com_port2 = 
+baudrate2 = 0
+checkmac2 = 1
+autostart3 = 0
+com_port3 = 
+baudrate3 = 0
+checkmac3 = 1
+autostart4 = 0
+com_port4 = 
+baudrate4 = 0
+checkmac4 = 1
+autostart5 = 0
+com_port5 = 
+baudrate5 = 0
+checkmac5 = 1
+autostart6 = 0
+com_port6 = 
+baudrate6 = 0
+checkmac6 = 1
+autostart7 = 0
+com_port7 = 
+baudrate7 = 0
+checkmac7 = 1
+autostart8 = 0
+com_port8 = 
+baudrate8 = 0
+checkmac8 = 1
+new_status = 0
+
+[ESPTOOL_PARAM]
+after = hard_reset
+baud = 115200
+before = default_reset
+chip = auto
+compress = 0
+flash_freq = keep
+flash_mode = keep
+flash_size = keep
+no_compress = False
+no_progress = False
+no_stub = False
+operation = write_flash
+port = /dev/cu.SLAB_USBtoUART
+spi_connection = 0
+verify = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp8266/spi_download.conf

@@ -0,0 +1,112 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = C:\Users\QC\Desktop\bin\at\1024+1024
+
+[LOCK]
+lock_setting_password = 1
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+crystal = 1
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 0
+flashsize = 5
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = COM62
+baudrate1 = 4
+checkmac1 = 1
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_timeout = 3
+log_check_port = COM6
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+log_check_delaytime = 3
+
+[ESPTOOL_PARAM]
+after = hard_reset
+baud = 115200
+before = default_reset
+chip = auto
+compress = 0
+flash_freq = keep
+flash_mode = keep
+flash_size = keep
+no_compress = False
+no_progress = False
+no_stub = False
+operation = write_flash
+port = /dev/cu.SLAB_USBtoUART
+spi_connection = 0
+verify = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp8266/utility.conf

@@ -0,0 +1,73 @@
+[LOG_LEVEL]
+utility_log_level = ERROR
+multi_log_level = ERROR
+spi_log_level = ERROR
+hspi_log_level = ERROR
+_log_level = ERROR
+
+[MAC SAVE]
+mac_save_enable = True
+
+[RF_INIT]
+backoffen = 0
+limiten = 0
+cryfreq = 1
+backoffval = 0.000000
+digitalgain = 0
+rfgain = 0
+targetlowpower = 12.000000
+limitval = 19.500000
+targetpower6 = 14.000000
+toutadc = 0
+targetpower4 = 16.000000
+targetpower5 = 15.000000
+targetpower2 = 18.500000
+targetpower3 = 17.500000
+lowpoweren = 0
+targetpower1 = 19.500000
+rfinitmode = 0
+toutvdd = 1
+vdd = 3.3
+
+[GPIO_INIT]
+gpio10_status = 2
+gpio5_status = 2
+gpio14_status = 2
+gpio1_status = 2
+gpio12_status = 2
+gpio7_status = 2
+gpio8_status = 2
+gpio3_status = 2
+gpio6_status = 2
+gpio13_status = 2
+gpio4_status = 2
+gpio11_status = 2
+gpio2_status = 2
+gpio0_status = 2
+gpio15_status = 2
+gpio16_status = 2
+gpio9_status = 2
+
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = 
+baudrate1 = 0
+checkmac1 = 1
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_delaytime = 3
+log_check_timeout = 3
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+
+[DOWNLOAD PATH]
+file_sel0 = False
+file_path0 = 
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp8285/hspi_download.conf

@@ -0,0 +1,104 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = c:\shared\flash_download_tool\src
+
+[LOCK]
+lock_setting_password = 1
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+crystal = 1
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 3
+flashsize = 2
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = 
+baudrate1 = 0
+checkmac1 = 1
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOCK_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 
+log_check_timeout = 3
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_timeout = 3
+log_check_port = COM6
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+log_check_delaytime = 3
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp8285/multi_download.conf

@@ -0,0 +1,126 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = ./bin/
+
+[LOCK]
+lock_setting_password = 12345678
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+crystal = 1
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 3
+flashsize = 2
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = 
+baudrate1 = 0
+checkmac1 = 1
+autostart2 = 0
+com_port2 = 
+baudrate2 = 0
+checkmac2 = 1
+autostart3 = 0
+com_port3 = 
+baudrate3 = 0
+checkmac3 = 1
+autostart4 = 0
+com_port4 = 
+baudrate4 = 0
+checkmac4 = 1
+autostart5 = 0
+com_port5 = 
+baudrate5 = 0
+checkmac5 = 1
+autostart6 = 0
+com_port6 = 
+baudrate6 = 0
+checkmac6 = 1
+autostart7 = 0
+com_port7 = 
+baudrate7 = 0
+checkmac7 = 1
+autostart8 = 0
+com_port8 = 
+baudrate8 = 0
+checkmac8 = 1
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_port = COM37
+log_check_baud = 115200
+log_check_str = 1.6.2.0
+log_check_timeout = 3
+log_check_enable_cmd = False
+log_check_cmd_str = AT+GMR
+log_check_delaytime = 3
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp8285/spi_download.conf

@@ -0,0 +1,121 @@
+[EFUSE CHECK]
+efuse_mode = 1
+efuse_err_halt = 1
+
+[DOWNLOAD PATH]
+file_sel0 = 0
+file_path0 = 
+file_offset0 = 
+file_sel1 = 0
+file_path1 = 
+file_offset1 = 
+file_sel2 = 0
+file_path2 = 
+file_offset2 = 
+file_sel3 = 0
+file_path3 = 
+file_offset3 = 
+file_sel4 = 0
+file_path4 = 
+file_offset4 = 
+file_sel5 = 0
+file_path5 = 
+file_offset5 = 
+file_sel6 = 0
+file_path6 = 
+file_offset6 = 
+file_sel7 = 0
+file_path7 = 
+file_offset7 = 
+file_sel8 = 0
+file_path8 = 
+file_offset8 = 
+file_sel9 = 0
+file_path9 = 
+file_offset9 = 
+file_sel10 = 0
+file_path10 = 
+file_offset10 = 
+file_sel11 = 0
+file_path11 = 
+file_offset11 = 
+file_sel12 = 0
+file_path12 = 
+file_offset12 = 
+file_sel13 = 0
+file_path13 = 
+file_offset13 = 
+file_sel14 = 0
+file_path14 = 
+file_offset14 = 
+file_sel15 = 0
+file_path15 = 
+file_offset15 = 
+file_sel16 = 0
+file_path16 = 
+file_offset16 = 
+file_sel17 = 0
+file_path17 = 
+file_offset17 = 
+file_sel18 = 0
+file_path18 = 
+file_offset18 = 
+default_path = C:\Users\QC\Desktop
+
+[LOCK]
+lock_setting_password = 1
+lock_settings = 0
+
+[FLASH_CRYSTAL]
+crystal = 1
+spiautoset = 0
+spicfgdis = 0
+spispeed = 0
+spimode = 3
+flashsize = 2
+
+[MAC SAVE]
+mac_save_enable = False
+
+[DOWNLOAD]
+autostart1 = 0
+com_port1 = COM55
+baudrate1 = 0
+checkmac1 = 1
+
+[FACTORY_MODE]
+factory_mode_enable = False
+
+[LOCK_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 
+log_check_timeout = 3
+
+[LOG_CHECK]
+log_check_enable = False
+log_check_baud = 115200
+log_check_str = 1.0.0
+log_check_timeout = 3
+log_check_port = COM6
+log_check_cmd_str = AT+GMR
+log_check_enable_cmd = False
+log_check_delaytime = 3
+
+[ESPTOOL_PARAM]
+after = hard_reset
+baud = 115200
+before = default_reset
+chip = auto
+compress = 0
+flash_freq = keep
+flash_mode = keep
+flash_size = keep
+no_compress = False
+no_progress = False
+no_stub = False
+operation = write_flash
+port = /dev/cu.SLAB_USBtoUART
+spi_connection = 0
+verify = False
+

dist/Espressif_flash_download_tool_v3.8.5/configure/esp8285/utility.conf

@@ -0,0 +1,36 @@
+[LOG_CHECK]
+log_check_enable = True
+log_check_baud = 115200
+log_check_str = "1.0.0"
+log_check_timeout = 3
+
+[LOG_LEVEL]
+multi_log_level = ERROR
+utility_log_level = ERROR
+spi_log_level = ERROR
+hspi_log_level = ERROR
+
+[MAC SAVE]
+mac_save_enable = False
+
+[RF_INIT]
+backoffen = 0
+limiten = 0
+cryfreq = 1
+backoffval = 0.000000
+digitalgain = 0
+rfgain = 0
+targetlowpower = 12.000000
+limitval = 19.500000
+targetpower6 = 14.000000
+toutadc = 0
+targetpower4 = 16.000000
+targetpower5 = 15.000000
+targetpower2 = 18.500000
+targetpower3 = 17.500000
+lowpoweren = 0
+targetpower1 = 19.500000
+rfinitmode = 0
+toutvdd = 1
+vdd = 3.3
+

dist/Espressif_flash_download_tool_v3.8.5/doc/release_note.txt

@@ -0,0 +1,4 @@
+v3.8.5
+1. Divided into development mode and mass production mode, mass production mode can drag more
+2. Delete the RF parameter configuration interface
+3. Support ESP32-S2 chip download

dist/README.txt

@@ -16,8 +16,8 @@ The filename is quite descriptive:
 
 Build type can be:  (differ in included plugins)
 - normal  => Only Stable plugins and controllers
-- test    => Stable + Testing
-- dev     => Stable + Testing + Development
+- test    => Stable + Testing, divided in various build sets to fit max. build size.
+- max     => Only for ESP32 boards with large flash size, includes all plugins.
 
 There is also a number of special builds:
 - normal_IR => "Normal" + IR receiver/transmitter plugins and library
@@ -29,13 +29,13 @@ There is also a number of special builds:
 Chip can be:
 - ESP8266      => Most likely option
 - ESP8285      => Used in some Sonoff modules
-- ESP32        => Experimental support at this moment
+- ESP32        => Showing up in commercial products, but mainly seen on NodeMCU like boards.
 
 MemorySize can be:
 - 1M  => 1 MB flash modules (e.g. almost all Sonoff modules)
 - 2M  => 2 MB flash modules (e.g. Shelly1/WROOM02)
 - 4M  => 4 MB flash modules (e.g. NodeMCU/ESP32)
-- 16M => 16 MB flash modules (e.g. Wemos D1 mini pro)
+- 16M => 16 MB flash modules (e.g. Wemos D1 mini pro or some of the modern ESP32 boards)
 
 Please note that the performance of 14MB SPIFFS (16M flash modules) is really slow.
 All file access takes a lot longer and since the settings are also read from flash, the entire node will perform slower.
@@ -43,6 +43,11 @@ See [Arduino issue - SPIFFS file access slow on 16/14M flash config](https://git
 
 If these speed issues will be fixed, it is very likely the SPIFFS must then be re-partitioned, thus loosing all data in the SPIFFS.
 
+As alternative for SPIFFS, one can chose for LittleFS.
+This currently is very fast when using it, but extremely slow when storing settings as updating a part of a file is not suitable for LittleFS.
+However this will be dealt with in the future.
+N.B. SPIFFS and LittleFS are not compatible. Switching from one to the other will delete all existing settings and configuration stored on the file system.
+
 Special memory partitioning:
 - 2M256  => 2 MB flash modules (e.g. Shelly1/WROOM02) with 256k SPIFFS (only core 2.5.0 or newer)
 - 4M316k => For ESP32 with 4MB flash, sketch size is set to 1.8 MByte (default: 1.4 MByte)
@@ -55,10 +60,15 @@ Please note that this only can be used on installs already running a very recent
 This also means we still need to update the 2-step updater to support .bin.gz files.
 
 
-ESP32 now has 3 builds:
+ESP32 now has a number of builds:
 - custom_ESP32_4M316k  Build template using either the plugin set defined in ``Custom.h`` or ``tools/pio/pre_custom_esp32.py``
 - test_ESP32_4M316k  Build using the "testing" set of plugins for ESP32
 - test_ESP32-wrover-kit_4M316k  A build for ESP32 including build flags for the official WRover test kit.
+- max_ESP32_16M1M  A build for ESP32 with larger flash size including all plugins.
+
+ESP32 also supports Ethernet.
+Ethernet support is included in similar builds as mentioned before, only ending with "_ETH" in the file name.
+
 
 
 Since ESP32 does have its flash partitioned in several blocks, we have 2 bin files of each ESP32 build:
@@ -84,6 +94,12 @@ To help recover from a bad flash, there are also blank images included.
 When the wrong image is flashed, or the module behaves unstable, or is in a reboot loop,
 flash these images first and then the right image for the module.
 
+Sometimes an update performed via OTA (Over The Air) is not performing as stable as one might expect.
+It is yet unclear why this happens or what may cause it.
+The remedy is often to flash the same build another time via serial.
+There does seem to be some correlation to bad OTA flashes and flash chips made by XMC, but it is not exclusive to this brand of flash chips.
+
+
 ESP.Easy.Flasher.exe...
 ... is the new flashing tool for ESP Easy. You need to run it in elevated mode (as admin)
 for it to fetch the COM ports correctly. If you want you may save YOUR settings using the

docs/requirements.txt

@@ -1,11 +1,32 @@
-recommonmark==0.6.0
-Sphinx==3.1.2
-sphinx-autobuild==0.7.1
-sphinx-bootstrap-theme==0.7.1
+Jinja2==3.0.2
+MarkupSafe==2.0.1
+Pygments==2.10.0
+Sphinx==4.2.0
+alabaster==0.7.12
+babel==2.9.1
+certifi==2021.10.8
+charset-normalizer==2.0.7
+colorama==0.4.4
+commonmark==0.9.1
+docutils==0.17.1
+idna==3.3
+imagesize==1.2.0
+livereload==2.6.3
+packaging==21.0
+pyparsing==2.4.7
+pytz==2021.3
+recommonmark==0.7.1
+requests==2.26.0
+six==1.16.0
+snowballstemmer==2.1.0
+sphinx-autobuild==2021.3.14
+sphinx-bootstrap-theme==0.8.0
 sphinxcontrib-applehelp==1.0.2
 sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==1.0.3
+sphinxcontrib-htmlhelp==2.0.0
 sphinxcontrib-jsmath==1.0.1
 sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.4
-sphinxcontrib-websupport==1.2.3
+sphinxcontrib-serializinghtml==1.1.5
+sphinxcontrib-websupport==1.2.4
+tornado==6.1
+urllib3==1.26.7

docs/source/Config/Config.rst

@@ -111,6 +111,69 @@ This is often used to perform the initial configuration like connecting to the l
 Can also be set via the command ``WiFiAPKey``.
 
 
+Don't force /setup in AP-Mode
+-----------------------------
+
+Allow optional usage of ESPEasy without WIFI avaiable.
+
+When checked you can use ESPEasy in AP-Mode without beeing forced to ``/setup``.
+
+
+Do Not Start AP
+---------------
+
+Usually the AP will be started when no WiFi is defined, or the defined one cannot be found. 
+This flag may prevent to start an AP.
+
+Since this flag can lock out a user, there is a restricted command to uncheck this.
+
+``WifiAllowAP`` will uncheck this flag in the settings until a reboot.
+If the settings are saved, this flag will remain unchecked.
+
+N.B. Restricted means, not accepted from a remote source, only local or via serial.
+
+
+Custom Build WiFi credentials
+-----------------------------
+
+For custom builds, one can set default WiFi credentials by defining some default credentials at build.
+See the examples in `Custom-sample.h`:
+
+* ``#define DEFAULT_SSID  "MyHomeSSID"            // Enter your network SSID``
+* ``#define DEFAULT_KEY   "MySuperSecretPassword" // Enter your network WPA key``
+* ``#define DEFAULT_SSID2 ""                      // Enter your fallback network SSID``
+* ``#define DEFAULT_KEY2  ""                      // Enter your fallback network WPA key``
+
+Custom builds can also be customized a bit more to allow for a deployment SSID configuration and an emergency fallback.
+
+Deployment & Support SSID will be used only when the configured SSIDs are not reachable and/or no credentials are set.
+This to make deployment or support of large number of nodes easier.
+This configured set of credentials will be considered a "low priority" set, thus it will be tried as last resort.
+Therefore it may take a while for a unit to connect to it if there are lots of 'hidden SSID' APs and connecting to hidden SSIDs is allowed.
+
+* ``#define CUSTOM_DEPLOYMENT_SSID ""  // Enter SSID not shown in UI, to be used on custom builds to ease deployment``
+* ``#define CUSTOM_DEPLOYMENT_KEY  ""  // Enter key not shown in UI, to be used on custom builds to ease deployment``
+* ``#define CUSTOM_SUPPORT_SSID    ""  // Enter SSID not shown in UI, to be used on custom builds to ease support``
+* ``#define CUSTOM_SUPPORT_KEY     ""  // Enter key not shown in UI, to be used on custom builds to ease support``
+
+
+
+Emergency fallback SSID will only be attempted in the first 10 minutes after reboot.
+When found, the unit will connect to it and depending on the built in flag, it will either just connect to it, or clear set credentials.
+
+Use case: User connects to a public AP which does need to agree on an agreement page for the rules of conduct (e.g. open APs)
+This is seen as a valid connection, so the unit will not reconnect to another node and thus becomes inaccessible.
+The AP configured with these fallback credentials will then act as a master key to regain access to a node.
+
+These will never be set in nightly builds and only allowed for custom builds for obvious reasons.
+
+* ``#define CUSTOM_EMERGENCY_FALLBACK_SSID ""  // Enter SSID not shown in UI, to be used to regain access to the node``
+* ``#define CUSTOM_EMERGENCY_FALLBACK_KEY  ""  // Enter key not shown in UI, to be used to regain access to the node``
+* ``#define CUSTOM_EMERGENCY_FALLBACK_RESET_CREDENTIALS  false``
+* ``#define CUSTOM_EMERGENCY_FALLBACK_START_AP           false``
+* ``#define CUSTOM_EMERGENCY_FALLBACK_ALLOW_MINUTES_UPTIME 10``
+
+
 Client IP filtering
 ===================
 

docs/source/Controller/C013.rst

@@ -228,8 +228,11 @@ Extended Sysinfo message (13 + 28 = 41 bytes):
 The node type is defined as:
 
 *  1 = "ESP Easy"
+*  5 = "Rpi Easy"
 * 17 = "ESP Easy Mega"
 * 33 = "ESP Easy 32"
+* 34 = "ESP Easy 32-S2"
+* 35 = "ESP Easy 32-C3"
 * 65 = "Arduino Easy"
 * 81 = "Nano Easy"
 

docs/source/Controller/C016.rst

@@ -45,7 +45,7 @@ Each time a plugin sends data to this controller, a sample set is stored.
 
 A typical sample set contains:
 
-- UNIX timestamp
+- Timestamp (Default: Unix Time, but can be switched to "local time" in the controller settings)
 - task index delivering the data
 - 4 float values
 
@@ -63,8 +63,29 @@ Data Delivery
 
 The controller can deliver the data to:
 
+- JavaScript to process the data inside the browser. See the ``dump6.htm`` file in the ``misc`` folder.
 - Upload bin files to some server (HTTP post?) (TODO)
 - Provide a sample to any connected controller (TODO)
 - Do nothing and let some extern host pull the data from the node. (TODO)
-- JavaScript to process the data inside the browser. (TODO)
 - Feed it to some plugin (e.g. a display to show a chart) (TODO)
+
+
+Fetch and Decode data in the browser
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The ``dump6.htm`` (in ``misc`` directory) file should be uploaded to the file system of the ESP.
+When there are cache controller bin files present on the file system,
+open this htm file from the file browser in ESPEasy into a new tab in your browser.
+
+This presents a large button "Fetch cache files".
+When pressed, the JavaScript in this htm file will fetch JSON information from 
+ESPEasy describing the column names and the binary cache files present on the file system.
+
+Those bin files will be fetched and decoded in the browser.
+When done, a "Download" button will be presented which generates and downloads a new CSV file.
+
+This file can be opened in any spreadsheet program.
+LibreNMS has proven to be the easiest to parse the column separators and make the best guess on the data types in each cell.
+
+
+

docs/source/Controller/C018.rst

@@ -54,7 +54,7 @@ This layer is called LoRaWAN.
 There are several modules available:
 
 - RFM95  & SX127x.  These are LoRa modules which needs to have the LoRaWAN stack implemented in software
-- Microchip RN2384/RN2903. These are the modules supported in this controller. They have the full LoRaWAN stack present in the module.
+- Microchip RN2483/RN2903. These are the modules supported in this controller. They have the full LoRaWAN stack present in the module.
 
 
 Nodes, Gateways, Application
@@ -128,7 +128,7 @@ Prerequisites:
 
 - An user account on the TTN network.
 - A TTN gateway in range to send data to (and receive data from)
-- Microchip RN2384 or RN2903 LoRaWAN module connected to a node running ESPeasy. (UART connection)
+- Microchip RN2483 or RN2903 LoRaWAN module connected to a node running ESPeasy. (UART connection)
 
 On the TTN network:
 - Create an application
@@ -153,5 +153,39 @@ Decoding Data
 Controller Settings
 -------------------
 
+Since there are legal limitations on the amount of time you are allowed to send,
+it is even more important to understand what effect the Controller Queue parameters may have on the reliability of data transmission.
+
+You are allowed to send only 1% of the time.
+Meaning if your message takes 100 msec to send, you can only send a message every 10 seconds.
+
+As a rule of thumb, the time needed to send a message of N bytes doubles for every step up in the Spreading Factor.
+
+For example, a message sent at SF7 may take 100 msec to send.
+The same message sent at SF8, will take 200 msec.
+At SF9 takes 400 msec, etc. The slowest is SF12.
+
+The RN2483 module does keep track of the used air time, per channel.
+Meaning it is possible to send a burst of upto 8 messages (since we have 8 channels) after which we have to wait for a free channel to send out a new one.
+
+As with any other ESPEasy controller, there is a queue mechanism to manage the messages ready to be sent and also allow for a number of retries.
+
+This number of retries is even more important on this LoRaWAN TTN controller.
+If sending a message fails due to no free channels, the minimum send interval will be dynamically increased, based on the air time of the message to be sent.
+The dynamic adjustment is 10x the expected air time. So by setting the number of retries to 10, it is almost guaranteed the message will eventually be sent.
+10 retries with 10x the expected air time equals a maximum of 100x the expected air time, which eventually will be as low as 1% of the time sending.
+
+N.B. This expected air time is dependant on the set Spread Factor and the length of the message.
+
+In practice the messages will be sent in bursts, and thus the extra wait time is often 2 - 3x the expected air time of the message.
+So on setups with a large variation in message sizes, it makes sense to send the large ones at the start of a message burst.
+
+Setting the number of retries high (e.g. 10x), may be useful to make sure a sequence of messages in a burst will all get sent.
+But it may also lead to a large number of messages to be lost as the queue is full.
+So it depends on the use case what will be the best strategy here.
+
+At least the Minimum Send Interval can be kept low (e.g. the default 100 msec) to allow for quickly sending out a burst of upto 8 messages.
+
+
 
 

docs/source/Controller/_Controller.rst

@@ -61,6 +61,8 @@ before WiFi connection is made or during lost connection.
 - **Max Queue Depth** - Maximum length of the buffer queue to keep unsent messages.
 - **Max Retries** - Maximum number of retries to send a message.
 - **Full Queue Action** - How to handle when queue is full, ignore new or delete oldest message.
+- **Allow Expire** - Remove a queued message from the queue after <timeout> x <queue depth> x <retries>.
+- **De-duplicate** - Do not add a message to the queue if the same message from the same task is already present.
 - **Check Reply** - When set to false, a sent message is considered always successful.
 - **Client Timeout** - Timeout in msec for an network connection used by the controller.
 - **Sample Set Initiator** - Some controllers (e.g. C018 LoRa/TTN) can mark samples to belong to a set of samples. A new sample from set task index will increment this counter.

docs/source/Controller/_controller_substitutions.repl

@@ -184,6 +184,6 @@
 .. |C018_github| replace:: C018.ino
 .. _C018_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_C018.ino
 .. |C018_usedby| replace:: `.`
-.. |C018_shortinfo| replace:: `Controller for the LoRaWAN/TTN network supporting RN2384 (434/868 MHz) and RN2903 (915 MHz)`
+.. |C018_shortinfo| replace:: `Controller for the LoRaWAN/TTN network supporting RN2483 (434/868 MHz) and RN2903 (915 MHz)`
 .. |C018_maintainer| replace:: `TD-er`
 .. |C018_compileinfo| replace:: `.`

docs/source/ESPEasy/ESPchips.rst

@@ -0,0 +1,229 @@
+Supported ESP Chips
+*******************
+
+ESPEasy does support a number of variants of the processors manufactured by Espressif.
+
+* ESP8266 The original ESP processor, with external flash.
+* ESP8285 Mainly found in "Chinese" products. Has flash built in the processor. (almost always 1MByte flash)
+* ESP32 The first successor of the ESP82xx, supporting 2 CPU cores, Bluetooth and more RAM and more GPIO pins. (and other new features)
+* ESP32-S2 Has more GPIO pins than the ESP32, but only 1 CPU core. Initial support in ESPEasy added since 2021-09-19.
+* ESP32-S3 Not yet available to buy. (as of September 2021)
+* ESP32-C3 Support in ESPeasy will be added soon.
+
+
+.. list-table:: Espressif platforms
+   :header-rows: 1
+   :widths: 7 7 7 7
+   :stub-columns: 1
+
+   *  - 
+      - ESP8266
+      - ESP32
+      - ESP32-S2
+   *  - release Year
+      - 2014
+      - 2016
+      - 2019
+   *  - Microcontroller
+      - Xtensa single-core 32-bit L106
+      - Xtensa single/dual-core 32-bit LX6
+      - Xtensa single-core 32-bit LX7
+   *  - Clock Frequency
+      - 80 MHz
+      - 160/240 MHz
+      - 240 MHz
+   *  - Co-processor
+      - No
+      - ULP
+      - ULP (RISC-V)
+   *  - SRAM
+      - 160 KB
+      - 520 KB
+      - 320 KB
+   *  - ROM
+      - No
+      - 448 KB
+      - 128 KB
+   *  - RTC Memory
+      - No
+      - 16 KB
+      - 16 KB
+   *  - External SPIRAM
+      - No
+      - Up to 16MB
+      - Up to 128MB
+   *  - External Flash
+      - Up to 16MB
+      - Up to 16MB
+      - Up to 1GB
+   *  - Wi-Fi (802.11 b/g/n)
+      - HT20
+      - HT20
+      - HT20
+   *  - ESP-MESH
+      - Yes
+      - Yes
+      - Yes
+   *  - Bluetooth
+      - No
+      - BT 4.2 BR/EDR & BLE
+      - No
+   *  - Ethernet
+      - No
+      - 10/100 Mbps
+      - No
+   *  - CAN
+      - No
+      - 2.0
+      - No
+   *  - Time of Flight
+      - No
+      - No
+      - Yes
+   *  - GPIO (total)
+      - 16
+      - 34
+      - 43
+   *  - Touch Sensors
+      - No
+      - 10
+      - 14
+   *  - SPI
+      - 2
+      - 4
+      - 4 (OSPI)
+   *  - I2C
+      - 1 (soft)
+      - 2
+      - 2
+   *  - I2S
+      - 2
+      - 2
+      - 1
+   *  - UART
+      - 2 (1 ½ actually)
+      - 3
+      - 2
+   *  - ADC
+      - 1 (10-bit)
+      - 18 (12-bit)
+      - 20 (12-bit)
+   *  - DAC
+      - No
+      - 2 (8-bit)
+      - 2 (8-bit)
+   *  - PWM (soft)
+      - 8
+      - 16
+      - 8
+   *  - SDMMC
+      - No
+      - Yes
+      - No
+   *  - RMT (remote control)
+      - No
+      - Yes
+      - Yes
+   *  - USB OTG
+      - No
+      - No
+      - Yes
+   *  - LCD Interface
+      - No
+      - No
+      - Yes
+   *  - Camera Interface
+      - No
+      - No
+      - Yes
+   *  - Temperature sensor
+      - No
+      - Yes
+      - Yes
+   *  - Hall sensor
+      - No
+      - Yes
+      - No
+   *  - Security
+      - No
+      - Secure boot Flash encryption 1024-bit OTP
+      - Secure boot Flash encryption 4096-bit OTP
+   *  - Crypto
+      - No
+      - AES, SHA-2, RSA, ECC, RNG
+      - AES-128/192/256, SHA-2, RSA, RNG, HMAC, Digital Signature
+   *  - Low Power Consumption
+      - 20uA
+      - 10uA deep sleep
+      - Automatic RF power management 5uA in idle mode 24uA at 1% duty cycle
+
+
+`Table content source <https://maker.pro/esp8266/tutorial/a-comparison-of-the-new-esp32-s2-to-the-esp32>`_
+
+
+ESP8266/ESP8285
+===============
+
+The ESP8266 was the "original" ESP platform and was found in the original Sonoff Basic modules.
+The ESP8266 does need an external SPI flash module to store its progam data and configuration.
+
+Later a (probably) less expensive ESP8285 appeared, which does have the SPI flash integrated in the chip.
+This means you cannot upgrade it by soldering a larger flash chip on it.
+It does however free up 2 GPIO pins, which were previously unavailable as they were used to access the SPI flash.
+For some products like the Sonoff 4ch modules this chip was a must-have.
+
+The small 1MB flash does impose some issues when trying to perform an "OTA" update of the firmware as there is not enough space to store the active firmware and the new version at the same time.
+For 1MB modules (some ESP8266 modules were also sold with 1MB flash, like the ESP-01 modules) you need to take some extra steps to perform an OTA update.
+Otherwise the only way to upgrade to a newer build is by flashing using the serial port.
+
+
+
+
+ESP32
+=====
+
+The most important new features of the ESP32, compared to ESP82xx are:
+
+- Dual core CPU @ 240 MHz
+- Upto 320 kByte of RAM
+- 3 Hardware serial ports
+- Bluetooth (not supported yet in ESPEasy)
+- Extra GPIO pins
+- Upto 18 GPIO pins can operate as ADC.
+- Upto 10 touch pins
+- Support for Ethernet
+
+
+
+
+
+ESP32-S2
+========
+
+.. note:: Support for the ESP32-S2 is very preliminary, as in it is hardly tested (as of September 2021)
+
+
+The ESP32-S2 is a bit strange when looking at its features and taking into account it was introduced about 3 years after the ESP32.
+
+The ESP32-S2 is missing quite a lot of useful features its predecessor had:
+
+- No Bluetooth
+- Single core
+- No support for Ethernet
+- No support for CAN
+- 2 Harware Serial ports.
+- Less RAM
+
+The only advantages of the ESP32-S2 compared to its predecessor are:
+
+- More GPIO pins
+- 2 extra ADC capable pins
+- 4 extra touch capable pins
+- USB OTG (not yet supported in ESPEasy)
+- LCD interface (not yet supported in ESPEasy)
+- Camera interface (not yet supported in ESPEasy)
+- Extra hardware accelerated encryption functions (not yet supported in ESPEasy)
+- Supposedly lower power consumption (not yet verified)
+- Time of Flight (TOF) support that would (theoretically) allow indoor positioning
+
+

docs/source/Hardware/Hardware.rst

@@ -1,3 +1,5 @@
+.. _Hardware_page:
+
 Hardware page
 *************
 
@@ -135,7 +137,7 @@ NB: Only acceptable channel checkboxes (0-7/0-3/0-1) will be shown, depending on
 SPI Interface
 -------------
 
-When using devices that are connected via the SPI interface (`Wikipedia: SPI <https://en.wikipedia.org/wiki/Serial_Peripheral_Interface>`_), the interface must be initialized during boot. This can be enabled here. For ESP32 there is the option to select either the Hardware SPI (HSPI) interface or the Virtual SPI (VSPI) interface (software controlled).
+When using devices that are connected via the SPI interface (`Wikipedia: SPI <https://en.wikipedia.org/wiki/Serial_Peripheral_Interface>`_), the interface must be initialized during boot. This can be enabled here. For ESP32 there is the option to select the HSPI (often called Hardware SPI) interface, the VSPI (often called Virtual SPI) interface, or select User-defined GPIO pins for the ``SCLK``, ``MISO`` and ``MOSI`` signals.
 
 The common SPI pins are shown here.
 
@@ -149,11 +151,30 @@ Other SPI pins to be used are device specific, and need to be configured from th
 
 .. image:: Hardware_SPIInterfaceESP32.png
 
-*For ESP32, select the desired interface:*
+*For ESP32, select the desired configuration:*
 
 .. image:: Hardware_SPIInterfaceESP32_Select.png
 
-NB: When using the VSPI interface and also the I2C interface is used, another pin has to be selected for I2C GPIO -> SCL, as its configuration is fixed for the VSPI setting.
+NB: When using the VSPI configuration and also the I2C interface is used, another pin has to be selected for I2C GPIO -> SCL, as its configuration is fixed for the VSPI setting.
+
+When selecting the *User-defined* options, 3 extra input fields are displayed, where the ``SCLK``, ``MISO`` and ``MOSI`` GPIO pins have to be selected. Nearly all pins can be used, but for the output signals ``SCLK`` and ``MOSI`` **no** *input-only* pins should be selected!
+
+.. image:: Hardware_SPIInterfaceESP32_UserDefined.png
+
+.. warning::
+    When changing the setting for **Init SPI**, or changing any of the User-defined GPIO pins, the ESP32 unit needs a hardware reset. This can be achieved by pressing the reset button (when available, sometimes labelled ``EN`` or ``RST``), or by completely removing the power for ~30 seconds. Also take into account here that units with a backup battery (f.e. some LilyGo and Waveshare ESP32 models) may keep power on the unit, so specific measures may have to be taken!
+
+NB: When selecting the *User-defined* option, **all 3 GPIO pins should be set**, or an error message will be displayed when the page is saved, and the SPI interface will not be enabled at the next boot.
+
+.. image:: Hardware_SPIpinsError.png
+
+-------
+SD Card
+-------
+
+When the compile-time option for SD-card support is enabled, the ``CS`` pin for the SD-card interface can be configured here. For the SD-card interface to work, **Init SPI** should also be enabled.
+
+.. image:: Hardware_SDCard.png
 
 --------
 Ethernet

docs/source/Participate/ArduinoIDE.rst

@@ -87,7 +87,7 @@ Locate the file ``platform.txt`` in the esp8266 platform directory of ArduinoIDE
 
 The exact location depends on the installation, usually in a directory below the main application called ``hardware/esp8266.com/``.
 
-In the same directory add an (untraced) file called ``platform.local.txt`` with the following lines:
+In the same directory add an (untracked) file called ``platform.local.txt`` with the following lines:
 
 .. code-block:: none
 

docs/source/Participate/PlatformIO.rst

@@ -45,7 +45,9 @@ PlatformIO does use a PowerShell script to activate the Python virtual environme
 
 Default Windows security settings prevent execution of a PowerShell script.
 
-Enter in the PowerShell terminal window in VScode::
+Enter in the PowerShell terminal window in VScode:
+
+.. code-block:: none
 
     Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser
 
@@ -61,7 +63,7 @@ PlatformIO with Atom
 PlatformIO with VS-Code
 =======================
 
-install
+Install
 -------
 
 For development of ESPeasy, a number of extensions has to be installed in VS-Code:
@@ -69,15 +71,19 @@ For development of ESPeasy, a number of extensions has to be installed in VS-Cod
 * PlatformIO IDE (by PlatformIO)
 * C/C++ IntelliSense (by Microsoft)
 * Arduino for Visual Studio Code (by Microsoft)
-* Uncrustify (by Laurent Tréguier)
+* Uncrustify (by Zachary Flower, originally by Laurent Tréguier)
+
+Optional, but highly recommended:
 
-Optional:
 * Bookmarks (by Alessandro Fragnani)
-* Bracket Pair Colorizer 2 (by CoenraadS)
 * GitLens - Git supercharged (by Eric Amodio)
 * Todo Tree (by Gruntfuggly)
 * All Autocomplete (by Atishay Jain)
 * Excel Viewer (by GrapeCity)
+* esbonio - An extension for editing sphinx projects (by Swyddfa)
+* reStructuredText - for .rst language support (by LeXtudio Inc.)
+* reStructuredText Syntax highlighting (by Trond Snekvik)
+* Markdown All in One (by Yu Zhang)
 
 
 Uncrustify
@@ -94,6 +100,8 @@ To do so:
 
 The first time (after installing uncrustify) it must be confirmed to use Uncrustify as formatter and using the default suggested config file.
 
+After setting it as the default formatter, the hotkey Alt-Shift-F (Cmd-Shift-F on MacOS) can be used to format the entire document.
+
 
 Load a project using PlatformIO
 -------------------------------
@@ -113,6 +121,7 @@ An environment entry has several tasks, like:
 * Upload
 * Monitor
 * Upload and Monitor
+* Clean
 * ... many more.
 
 Some of these options only are available when you have registered with PlatformIO and some are only for paid subscriptions.
@@ -122,26 +131,32 @@ The environment definitions all have at least the used micro controller in the n
 
 For example:
 
-* ..._ESP8266_4M -> ESP8266 has external flash, which can vary in size from 512 kB to 16 MB.
+* ..._ESP8266_4Mnn -> ESP8266 has external flash, which can vary in size from 512 kB to 16 MB, with nn configured as filesystem.
 * ..._ESP8285_1M -> ESP8285 has the flash internal, so is always 1 MB.
 * ..._ESP32_4M316k -> ESP32 with 4 MB flash and a 1.8 MB partition for the sketch. (316k SPIFFS)
+* ..._ESP32_16M2M_LittleFS -> ESP32 with 16 MB flash and a 4 MB partition for the sketch. (2MB LittleFS)
+* ..._ESP32_16M1M_ETH -> ESP32 with 16 MB flash and a 4 MB partition for the sketch. (1MB SPIFFS, Wired ethernet support)
 
 Make a custom build using PlatformIO
 ------------------------------------
 
-The easiest is to go for the environment "env:custom_ESP8266_4M" and unfold that one.
+The easiest is to go for the environment "custom_ESP8266_4M1M" and unfold that one.
 Then select "Build" to see if it will start building.
 
-If that's working, you can open the file "pre_extra_script.py" and add or remove the plugins and controllers you need.
-That Python file is used in the "env:custom_ESP8266_4M" to define what should be embedded and what not.
+If that's working, you can open the file "pre_custom_esp8266.py" and add or remove the plugins and controllers you need.
+That Python file is used in the "env:custom_ESP8266_4M1M" (or any "custom" build environment) to define what should be embedded and what not.
 
 For example to have only the controller "C014", you can remove "CONTROLLER_SET_ALL", and just add "USES_C014", 
 The same for the plugins you need.
 
 The file is built in the ".pio/build/...." directory right under the main repository directory (the one with the platformio.ini in it)
 
+Instead of modifying "pre_custom_esp8266.py" (or "pre_custom_esp32.py" for that matter), one can also copy "src/Custom-sample.h" to "src/Custom.h" and make the desired changed in this file. This file is excluded from Github, so can be adjusted to your own requirements. When the Custom.h file is there (mind the uppercase C!), it will be used by the build scripts instead of the defaults set by "pre_custom_esp8266.py" (or "pre_custom_esp32.py").
+
 All builds will be made in a directory with the same name as the environment used.
 
+Once the build is successful, the .bin file(s) and .bin.gz file (where applicable) are copied to the ``build_output/bin`` folder.
+
 
 
 Upload to ESP
@@ -152,4 +167,300 @@ Upload to ESP
 Linux
 -----
 
-For Linux, you may need to install 99-platformio-udev.rules to make PlatformIO upload tools work in vscode.
+For Linux, you may need to install 99-platformio-udev.rules to make PlatformIO upload tools work in vscode.
+
+
+.. highlight::sh
+
+Starter guide for (local) development on ESPEasy
+================================================
+
+For those with less development experience, or less experience in using Github, this chapter is intended as a **How To** guide to get started with development on ESPEasy.
+
+It tries to help setting up Visual Studio Code (VSCode) with the PlatformIO development environment and additional VSCode plugins that aid in easier working on code and documentation.
+
+The global steps described here are:
+
+- Creating a private copy on Github
+- Getting VSCode and PlatformIO set up
+- Getting the source code from Github onto your system
+- Compiling the source code
+- Creating a branch to make your changes
+- Modify the source code, compile & test
+- Add a plugin (optional), compile & test
+- Write documentation on the changes you made
+- Commit your code and create a pull request on Github to publish your changes to the world
+- Regular maintenance of your fork (housekeeping)
+
+Let's get started!
+
+Github account
+--------------
+
+First requirement is to have a Github account. You can either use an existing account or create one (it's free), by opening a browser on https://github.com, and following the steps after clicking the Sign up (for Github) button.
+
+The Github flow
+---------------
+
+When you want to extend some function of the software at hand, ESPEasy in this case, there is a general flow, or 'how things are done here', that is common for Github, but most likely somewhat different from other software development flows or processes.
+
+The usual Github flow or way of working is described nicely on this page: `Understanding the GitHub flow <https://guides.github.com/introduction/flow/>`_ If you have not used git or github before, or have little knowledge on how all this works, this explanation can be very helpful.
+
+Fork the ESPEasy repository
+---------------------------
+
+ESPEasy uses the 'Fork and Pull' development method. This is probably the most used method for open source projects. This involves creating a copy (the fork) of the project, and request to incorporate changes into the original project by means of pull requests.
+
+`Reasons for forking <https://docs.github.com/en/get-started/quickstart/fork-a-repo>`_ Quote: "A fork is a copy of a repository. Forking a repository allows you to freely experiment with changes without affecting the original project."
+
+As an 'external' developer, no (direct) write-access is granted to the ESPEasy repository. To experiment with the code, and still be able to later have your development work included in the project, a 'fork' has to be made to your own account. So, log into your Github account from a webbrowser, browse to https://github.com/letscontrolit/ESPEasy and click the Fork button to create that copy:
+
+.. image:: Github_fork_button.png
+    :alt: Github fork button
+
+After this completes, you can view the fork in your Github dashboard at https://github.com/[your_github_handle]
+
+(You have to replace [your_github_handle] with the name you selected during the Github sign-up procedure)
+
+Install VSCode and PlatformIO
+------------------------------
+
+Earlier on this page, a complete description has been given on how to install **PlatformIO with VSCode** with the required and advised optional extensions and the git command-line tools.
+
+NB: PlatformIO is often shortened to PIO.
+
+Clone your forked repository to your computer
+---------------------------------------------
+
+To get the ESPEasy sources on your computer for compilation and making modifications, a 'clone' has to be made, using the ``git clone`` command
+
+`Cloning a repository <https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository>`_ Quote: "You can clone your repository to create a local copy on your computer and sync between the two locations."
+
+.. note::
+
+    If available, a clone can of course also be made using GUI tools like `Github Desktop <https://desktop.github.com/>`_, `GitKraken <https://www.gitkraken.com/>`_, `SourceTree <https://www.sourcetreeapp.com/>`_ or `TortoiseGIT <https://tortoisegit.org/>`_, etc., but, as the ``git`` command-line tools have been installed as part of setting up the development environment, that is used in the steps here.
+
+Open a Command prompt (Windows) or Terminal session (MacOS or Linux), and ``cd`` to a folder where the ESPEasy project can/should be a subfolder of.
+
+Then type this command to create the clone:
+
+.. code-block::
+
+    git clone https://github.com/[your_github_handle]/ESPEasy.git
+
+This will create a new folder called ``ESPEasy``, and download all files that make up the project into that folder.
+
+Working on it:
+
+.. image:: Github_clone_working.png
+    :alt: Github clone working
+
+Completed:
+
+.. image:: Github_clone_completed.png
+    :alt: Github clone completed
+
+To be able to get the latest changes from the original project into your local copy, and to bring your changes as a 'pull request' (git terminology, often referred to as a 'PR', further explained below) to the ESPEasy repository, a connection has to be made from your local clone to the 'upstream' source (git terminology, pointer to the repository the fork was taken from). This command needs to be issued **only once** after cloning the repository into a folder on your computer, and should be executed from the ``ESPEasy`` folder that was just created:
+
+.. code-block::
+
+    git remote add upstream https://github.com/letscontrolit/ESPEasy
+
+Now this Command prompt / terminal (or GUI tool) can be closed.
+
+Open the folder with ESPEasy project
+------------------------------------
+
+Start VSCode, and open the ESPEasy folder that was just created. In Windows you can right-click the ESPEasy folder and select the 'Open with Code' option. First thing when opening a git repository, VSCode will ask you if you trust the authors of the files. The easiest option is to respond by clicking the 'Yes, I trust the authors' button, as that is the only way to get unrestricted access to the sources. After that confirmation, VSCode will take a little time to initialize all plugins.
+
+Depending on your usual workflow, the current VSCode environment can be saved as a 'Workspace' (VSCode terminology), so it can be easily re-opened. This is especially useful if you also use VSCode for other projects/editing work.
+
+Compile an ESPEasy PIO environment
+----------------------------------
+
+ESPEasy supports several different configurations of ESP units, ESP8266, ESP8285 and ESP32, and also some predefined hardware configurations and sets of plugins & controllers. This has been turned into several different PlatformIO environments, to make managing the different builds as easy as possible.
+
+To compile such 'environment' (PIO terminology), select the PIO button (it looks like an alien) in VSCode:
+
+.. image:: VSCode_PIO_Environments.png
+    :alt: VSCode Platform IO environments
+
+Expand an environment from the list, so the PIO options become visible (this will take some time for PIO to scan the configuration of that environment).
+
+.. image:: VSCode_PIO_custom_ESP8266_4M1M.png
+    :alt: VSCode Platform IO custom ESP8266 4M 1M expanded
+
+Now, the ``Build`` option is visible, and clicking that will build the project for the selected environment (configuration).
+
+The first build will take some extra time, as PIO needs to first install some of its tooling and other required components and libraries, but as you haven't changed any files yet, the build should be successful:
+
+.. image:: VSCode_build_success.png
+    :alt: VSCode build success
+
+(NB: For this build all tools and libraries where already installed, and the computer isn't that slow, so total execution didn't take too much time.)
+
+Create a new branch
+-------------------
+
+As shown above, the git workflow starts by creating a new branch to do the development work in. This will record all changes to the sourcecode you make, and can be put in as a pull request (explained below) for ESPEasy.
+
+A new branch is created by clicking on the 'mega' branch name (lower left in the status bar of VSCode) and selecting the option 'Create new branch...' from the list presented at the mille-top of the VSCode window. Then a new braanch name should be typed. Branch naming does use some conventions. New features are often named like 'feature/purpose-of-the-feature', and bugfixes are usually named like 'bugfix/what-is-to-be-fixed'. For the addition of this documentation, I've created a branch named 'feature/how-to-guide-for-new-developers':
+
+.. image:: VSCode_create_branch.png
+    :alt: VSCode create branch
+
+.. image:: VSCode_type_branch_name.png
+    :alt: VSCode type the branch name
+
+.. image:: VSCode_statusbar_new_branch.png
+    :alt: VSCode statusbar with new branch name
+
+As an alternative, a new branch can also be created using command-line commands, you can type these after opening a Terminal in VSCode:
+
+.. code-block::
+
+    git checkout -b feature/how-to-guide-for-new-developers
+
+The nett result of this command is the same as from using the UI flow shown above.
+
+Change code of ESPEasy
+----------------------
+
+To improve or extend an existing plugin or other code of ESPEasy, after creating a new branch for it, open the source file and modify code the as needed. Then compile and see if it all is according to the requirements of the compiler. Errors (showing as red text messages) will abort the compilation process, warnings, yellow messages, allow to continue, but should be resolved as much as possible before committing the code.
+
+Testing is done by uploading the generated .bin file to an ESPEasy unit, testing the changed functionality to ensure no errors or undesired behavior remain in the code.
+
+This uploading can be done in 2 ways:
+
+* *Use the Upload feature of PIO*: If the ESP unit is connected to the computer via USB and the serial chip of the unit is recognized by the OS, the Upload option can be selected to compile the sources (only what was changed since the last compilation) and start the upload procedure. After uploading the ESP will restart.
+* *Use the Update Firmware option of ESPEasy*: On the Tools tab of ESPEasy, there is a button Update Firmware available (on units that have enough free Flash space) so a new .bin file can be uploaded. The latest successful compiled file can be found in the ``build_output/bin`` subfolder of your ``ESPEasy`` folder.
+
+Add a plugin to ESPEasy
+-----------------------
+
+Instead of just changing an existing plugin or some other feature of ESPEasy, also, new plugins can be added. Plugins can be created from scratch, starting with the template ``_Pxxx_PluginTemplate.ino`` that includes instructions what each section is supposed to do, take a proposed plugin from the ESPEasyPlayground repository at https://github.com/letscontrolit/ESPEasyPluginPlayground, or from other sources (some plugins are in personal Github repositories, but never submitted to the ESPEasyPluginPlayground).
+
+It requires sufficient testing, and analysis of the runtime behavior, of that piece of code, before it should be submitted for a pull request.
+
+Especially for new plugins, it is highly recommended to write documentation, as explained in the next paragraph.
+
+Writing documentation
+---------------------
+
+Updating, or adding if it does not yet exist, the documentation is a useful activity that should be part of changing or adding to the ESPEasy code. Some of the optional VSCode extensions are specifically aimed at that task.
+
+The documentation is created in the reStructuredText format, using mostly a ``.rst`` extension, and can be built locally by installing the sphinx tool. This can be installed manually by opening a Terminal window in VSCode (an already open Terminal can also be used) and issuing these commands:
+
+.. code-block::
+
+    cd docs
+    pip install -r requirements.txt
+
+The python tool ``pip`` will read the file ``requirements.txt`` and install all tools mentioned in the file. Depending on what is already installed, more or less of the modules will be installed. This should be a 1-time process, though sometimes updates to the tooling are made, and re-running these commands will then update all to the latest, possibly required, version.
+
+The sources for the documentation are in the repository in the ``docs`` folder and its subfolders.
+
+When adding screenshots it is advised to use the ``.png`` file format, as that usually has the best visible result for screenshots. When adding photos, the ``.jpg`` file format will do nicely.
+
+Documentation for writing in reStructuredtext format can be found on the `Sphinx website <https://www.sphinx-doc.org/en/master/>`_
+
+Building the documentation into html files, for reviewing locally, can be done by running this command from the ``docs`` folder:
+
+On Windows:
+
+.. highlight::bat
+
+.. code-block::
+
+    .\make.bat html
+
+On Linux or MacOS:
+
+.. highlight::sh
+
+.. code-block::
+
+    make html
+
+The resulting output can be found in this folder with the ESPEasy folder: ``docs/build/html`` and can be viewed by opening the file ``index.html`` in a browser. Then the normal navigation within the documentation is available.
+
+TODO: Add documentation about the (file) structure of the documentation.
+
+Commit and create a pull request
+--------------------------------
+
+After changing and testing your changed source code, using builds uploaded to an actual ESP unit, the time has come to present the changed code to ESPEasy to be included in the regular build. This is called a 'pull request', and is explained in this Github documentation `About pull requests <https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests>`_ Quote: "Pull requests let you tell others about changes you've pushed to a branch in a repository on GitHub."
+
+To make changes available for others they have to be 'staged' and 'committed' (git terminology) before it can be uploaded (pushed) to the repository. This stage and commit is a 2 step process, and easiest done from the VSCode UI. First select the GitLens plugin, and select the files that need to be staged and committed:
+
+.. image:: VSCode_stage_changes.png
+    :alt: VSCode stage changed files
+
+Selecting multiple files and clicking one of the ``+`` buttons next to the selected files, will put the files in the staging area, so they can be committed. Every commit will need a useful commit message, that describes what the commit is all about:
+
+.. image:: VSCode_staged_files.png
+    :alt: VSCode list of staged files and commit message
+
+Clicking the marked check button, or using the Ctrl-Enter key combination, will commit the staged files, using the commit message just typed.
+
+After the commit is completed, more commits can be added, if desired. It is good practice to commit separate functional changes in separate commits. That will make the review process, as explained in the Github flow documentation, easier.
+
+To have the commit(s) to be presented as a pull request, they must be published, and the easiest way to accomplish that is to use the Publish Changes button in VSCode:
+
+.. image:: VSCode_Publish_changes.png
+    :alt: VSCode publish change button
+
+After clicking that button, you have to select the source the changes should be published to. As we don't have (direct) write access to the upstream ESPEasy repository, we can only publish to the 'origin' (git terminology), our own fork of the repository, so that option should be selected by clicking it, or pressing the Enter key:
+
+.. image:: VSCode_select_publish_source.png
+    :alt: VSCode select publish source
+
+If this is the first time you try to push any changes to your repository, VSCode, or actually the GitLens plugin, will ask for your Github credentials, and will switch back and forth a few times between your webbrowser and VSCode to complete the authentication process. This is as intended.
+
+Now that the Publish Changes is done, the pull request can be created. We have to switch to the ESPEasy repository on Github to complete that task. The Github website will show the options for that, assuming you are still logged in to your Github account from that browser:
+
+When opening the https://github.com/letscontrolit/ESPEasy page (or refreshing it if it was already open), a message is shown that you have committed something to your forked repository, that can be pull-requested into the ESPEasy repository:
+
+.. image:: Github_start_new_pull_request.png
+    :alt: Github start new pull rquest
+
+After clicking the 'Compare and pull request' button, a description for the PR can be given, the title can be updated, and the pull request created. Helpful information can be found in `Creating a pull request from a fork <https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork>`_
+
+If needed, or requested during the review process, more changes can be made to files, or files added or deleted, then staged and committed, after which these can be pushed to Github, and the changes will be automatically added to the PR.
+
+Regular maintenance of your fork
+--------------------------------
+
+If you have forked ESPEasy before (or some time ago), and want to start (new) work on the code, it is required to update your fork with the latest state of affairs of ESPEasy, to avoid surprises, or difficulties when trying to merge, after submitting a PR.
+
+This expects the currently selected 'branch' to be ``mega``, as is visible in the VSCode statusbar:
+
+.. image:: VSCode_statusbar_mega.png
+    :alt: VSCode statusbar current branch mega
+
+The desired branch can be selected by clicking the currently selected branch name as shown in the VSCode status bar, or by typing this command from a VSCode terminal window:
+
+.. code-block::
+
+    git checkout mega
+
+The update is 'pulled' (git terminology) by getting the latest from the ``upstream`` source (we defined that source after the initial clone), by opening a terminal window in VSCode and issuing this command:
+
+.. code-block::
+
+    git pull upstream mega
+
+(NB: The current development branch of ESPEasy is called ``mega`` where other Github repos often use ``master``, or ``main``. ESPEasy *does* have a ``master`` branch, but it currently isn't actively maintained. The name of the 'main' branch of any repository can be chosen freely, the ``master`` or ``main`` name is just used by convention.)
+
+Depending on the time passed since the last update, some files will be updated from the git pull command.
+
+To update your fork on Github, these changes should be 'pushed' (git terminology) to your fork by using the command:
+
+.. code-block::
+
+    git push
+
+If this is the first time you try to push any changes to your repository, VSCode, or actually the GitLens plugin, will ask for your Github credentials, and will switch back and forth a few times between your webbrowser and VSCode to complete the authentication process. This is as intended.
+
+Updating your fork this way should be done at least every time before you start new work, and can be done more often if desired. If kept up to date you will avoid starting with an out-dated state of the repository.
+

docs/source/Participate/ProjectStructure.rst

@@ -23,8 +23,8 @@ Below a list of the most important directories and files used in this project.
 * ``static/`` Static files we use in ESPEasy, like CSS/JS/ICO files.
 * ``test/`` Test scripts to be used in the continous integration process.
 * ``tools/`` Tools to help build ESPeasy.
-* ``tools/pio/pre_custom_esp32.py`` Python helper script for building custom ESP32 binary
-* ``tools/pio/pre_extra_script.py`` Python helper script for building custom ESP8266 binary
+* ``tools/pio/pre_custom_esp32.py`` Python helper script for building custom ESP32 binary.
+* ``tools/pio/pre_custom_esp8266.py`` Python helper script for building custom ESP8266 binary.
 * ``venv/`` Directory to store the used Python Virtual Environment. (Ignored by Git)
 * ``platformio.ini``  Configuration file for PlatformIO to define various build setups.
 * ``uncrustify.cfg``  Configuration file for Uncrustify, to format source code using some uniform formatting rules.
@@ -50,9 +50,15 @@ The header and source files are organized in a few directories in ``src/src/``.
 
 * ``Commands`` Functions to process commands.
 * ``ControllerQueue`` Mainly macro definitions for the queue system used by controllers.
+* ``CustomBuild`` Header files for defining the ESPEasy project defaults and enabled plugins.
 * ``DataStructs`` Data structures used in ESPEasy. Note that some of them are stored in settings files, so take care when changing them.
+* ``DataTypes`` Definitions for data types used.
+* ``ESPEasyCore`` Core functionality of ESPEasy, managing controllers, plugins, networking, rules, etc.
 * ``Globals`` Declaration of global variables. Declare them using ``extern`` in .h files and construct them in .cpp files or else you may end up with several instances of the same object with the same name.
+* ``Helpers`` Shared helper classes and functions.
+* ``PluginStructs`` Data and code structs per plugin, to lower memory footprint split into separated source files.
 * ``Static`` C++ encoded version of objects which have to be included in the binary. N.B. JS and CSS files are minified.
+* ``WebServer`` Sources for web handling remote command processing and UI.
 
 The Arduino based .ino files are still in the ``src/`` directory. (and some .h files, which are not yet moved)
 
@@ -79,7 +85,7 @@ We have 2 main build platforms:
 For these platforms we also have a lot of different build setups.
 
 The filename is quite descriptive:
-  ESP_Easy_mega-<date>_<buildType>_<chip>_<memorySize>.bin
+  ESP_Easy_mega-<date>_<buildType>_<chip>_<memorySize>_<build-options>.bin
 
 Build Type
 ----------
@@ -87,15 +93,15 @@ Build Type
 Build type can be:  (differ in included plugins)
 
 * normal  => Only Stable plugins and controllers
-* test    => Stable + Testing
-* dev     => Stable + Testing + Development
+* test    => Stable + Testing (split into multiple sets, A/B/C/D)
+* max     => All available plugins
 
 There is also a number of special builds:
 
 * normal_IR => "Normal" + IR receiver/transmitter plugins and library
 * hard_xxxxx => Special builds for some off-the-shelf hardware.
 * minimal_ESP82xx_1M_OTA => Minimum number of plugins and a limited set of controllers included to be able to perform a 2-step OTA on 1 MB flash nodes.
-* normal_core_xxx => "Normal" using core xxx (e.g. 2.6.3)
+* normal_core_xxx => "Normal" using core xxx (e.g. 2.7.4)
 * normal_beta => "Normal" using the staged (beta) branch of the esp8266/Arduino repository.
 
 ESP Chip Type
@@ -111,7 +117,25 @@ Memory Size and Partitioning
 * ``1M`` 1 MB flash modules (e.g. almost all Sonoff modules)
 * ``2M`` 2 MB flash modules (e.g. Shelly1/WROOM02)
 * ``4M`` 4 MB flash modules (e.g. NodeMCU/ESP32)
-* ``16M`` 16 MB flash modules (e.g. Wemos D1 mini pro)
+* ``16M`` 16 MB flash modules (e.g. Wemos D1 mini pro) (has 14 MB LittleFS filesystem, as SPIFFS is unstable > 2 MB)
+* ``4M1M`` 4 MB flash modules with 1 MB filesystem (usually SPIFFS)
+* ``4M2M`` 4 MB flash modules with 2 MB filesystem (usually SPIFFS)
+* ``4M316k`` 4 MB flash modules using 1.8 MB sketch size, with 316 kB filesystem (usually SPIFFS) (for ESP32)
+* ``16M1M`` 16 MB flash modules using 4MB sketch size, with 1 MB filesystem (usually SPIFFS) (ESP32 only a.t.m.)
+* ``16M2M`` 16 MB flash modules using 4MB sketch size, with 2 MB filesystem (LittleFS) (ESP32 only a.t.m.)
+* ``16M8M`` 16 MB flash modules using 4MB sketch size, with 8 MB filesystem (LittleFS) (ESP32 only a.t.m.)
+
+Optional build options
+----------------------
+
+* ``LittleFS`` Use LittleFS instead of SPIFFS filesystem (SPIFFS is unstable > 2 MB)
+* ``VCC`` Analog input configured to measure VCC voltage
+* ``OTA`` Arduino OTA (Over The Air) update feature enabled
+* ``Domoticz`` Only Domoticz controllers (HTTP+MQTT) and plugins included
+* ``FHEM_HA`` Only FHEM/OpenHAB/Home Assistant (MQTT) controllers and plugins included
+* ``lolin_d32_pro`` Specific Lolin hardware options enabled
+* ``ETH`` Ethernet interface enabled (ESP32 only)
+
 
 Please note that the performance of 14MB SPIFFS (16M flash modules) is really slow.
 All file access takes a lot longer and since the settings are also read from flash, the entire node will perform slower.
@@ -150,16 +174,22 @@ This also means we still need to update the 2-step updater to support .bin.gz fi
 ESP32 builds
 ------------
 
-There are 3 builds for ESP32:
+There are several builds for ESP32:
 
+* ``normal_ESP32_4M316k``  Build using the "stable" set of plugins for ESP32
+* ``normal_ESP32_4M316k_ETH``  Build using the "stable" set of plugins for ESP32, with support for an on-board Ethernet controller
 * ``custom_ESP32_4M316k``  Build template using either the plugin set defined in ``Custom.h`` or ``tools/pio/pre_custom_esp32.py``
-* ``test_ESP32_4M316k``  Build using the "testing" set of plugins for ESP32
-* ``test_ESP32-wrover-kit_4M316k``  A build for ESP32 including build flags for the official WRover test kit.
+* ``test_A_ESP32_4M316k``  Build using the "testing" set "A" of plugins for ESP32
+* ``test_B_ESP32_4M316k``  Build using the "testing" set "B" of plugins for ESP32
+* ``test_C_ESP32_4M316k``  Build using the "testing" set "C" of plugins for ESP32
+* ``test_D_ESP32_4M316k``  Build using the "testing" set "D" of plugins for ESP32
+* ``test_A_ESP32-wrover-kit_4M316k``  A build for ESP32 including build flags for the official WRover test kit.
+* ``max_ESP32_16M8M_LittleFS``  Build using all available plugins and controllers for ESP32 with 16 MB flash (some lolin_d32_pro boards)
 
-Since ESP32 does have its flash partitioned in several blocks, we have 2 bin files of each ESP32 build:
+Since ESP32 does have its flash partitioned in several blocks, we have 2 bin files of each ESP32 build, f.e.:
 
-* ``test_ESP32_4M316k.bin`` Use for OTA upgrades.
-* ``test_ESP32_4M316k-factory.bin`` Use on clean nodes as initial inistall.
+* ``test_D_ESP32_4M316k.bin`` Use for OTA upgrades.
+* ``test_D_ESP32_4M316k-factory.bin`` Use on clean nodes as initial inistall.
 
 The binary with ``-factory`` in the name must be flashed on a new node, via the serial interface of the board.
 This flash must be started at address 0.