From 55aa5271c9f67de5d1bca20b81ae0186ee821b78 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 20 Jan 2021 15:47:25 +0000
Subject: [PATCH 01/91] Revise appveyor CI tests (#2193)

Further to #2192 this PR updates the appveyor CI scripts:

* Add linux builds
* Split scripts out into setup, build.setup and build.run stages as for travis
* Downloads from espressif are slow, so cache affected files in SmingTools
* Rename `appveyor` to `ci`, and use CI_BUILD_DIR variable to simplify future porting to other CI systems.
* Build documentation in separate stage, add sming-docs.zip artifact

[scan:coverity]
---
 .appveyor/build.cmd                           |  46 --------
 .appveyor/install.cmd                         |  28 -----
 .ci/build.cmd                                 |  37 +++++++
 .ci/build.sh                                  |  34 ++++++
 .ci/deploy.sh                                 |  54 ++++++++++
 .ci/install.cmd                               |   9 ++
 .ci/install.sh                                |  13 +++
 .ci/secrets.sh.enc                            |   7 ++
 .../Arch/Esp32/Components/esp32/component.mk  |   2 +
 Sming/Arch/Esp32/Tools/ci/build.run.cmd       |  11 ++
 Sming/Arch/Esp32/Tools/ci/build.run.sh        |   4 +
 Sming/Arch/Esp32/Tools/ci/build.setup.cmd     |   1 +
 Sming/Arch/Esp32/Tools/ci/build.setup.sh      |   1 +
 Sming/Arch/Esp32/Tools/ci/install.cmd         |  12 +++
 Sming/Arch/Esp32/Tools/ci/install.sh          |  14 +++
 Sming/Arch/Esp8266/Tools/ci/build.run.cmd     |  15 +++
 Sming/Arch/Esp8266/Tools/ci/build.run.sh      |   7 ++
 Sming/Arch/Esp8266/Tools/ci/build.setup.cmd   |   1 +
 Sming/Arch/Esp8266/Tools/ci/build.setup.sh    |   6 ++
 Sming/Arch/Esp8266/Tools/ci/install.cmd       |  10 ++
 Sming/Arch/Esp8266/Tools/ci/install.sh        |  14 +++
 Sming/Arch/Host/Tools/ci/build.run.cmd        |  13 +++
 Sming/Arch/Host/Tools/ci/build.run.sh         |  19 ++++
 Sming/Arch/Host/Tools/ci/build.setup.cmd      |  10 ++
 Sming/Arch/Host/Tools/ci/build.setup.sh       |  23 ++++
 Sming/Arch/Host/Tools/ci/coverity-scan.sh     |  99 +++++++++++++++++
 Sming/Arch/Host/Tools/ci/install.cmd          |   8 ++
 Sming/Arch/Host/Tools/ci/install.sh           |   8 ++
 Sming/Arch/Host/Tools/travis/install.sh       |   7 +-
 appveyor.yml                                  | 102 ++++++++++++++----
 tests/HostTests/{ => app}/.cs                 |   0
 tests/HostTests/include/.cs                   |   0
 tests/HostTests/modules/.cs                   |   0
 33 files changed, 516 insertions(+), 99 deletions(-)
 delete mode 100644 .appveyor/build.cmd
 delete mode 100644 .appveyor/install.cmd
 create mode 100755 .ci/build.cmd
 create mode 100755 .ci/build.sh
 create mode 100755 .ci/deploy.sh
 create mode 100755 .ci/install.cmd
 create mode 100755 .ci/install.sh
 create mode 100644 .ci/secrets.sh.enc
 create mode 100644 Sming/Arch/Esp32/Tools/ci/build.run.cmd
 create mode 100644 Sming/Arch/Esp32/Tools/ci/build.run.sh
 create mode 100644 Sming/Arch/Esp32/Tools/ci/build.setup.cmd
 create mode 100644 Sming/Arch/Esp32/Tools/ci/build.setup.sh
 create mode 100644 Sming/Arch/Esp32/Tools/ci/install.cmd
 create mode 100644 Sming/Arch/Esp32/Tools/ci/install.sh
 create mode 100644 Sming/Arch/Esp8266/Tools/ci/build.run.cmd
 create mode 100644 Sming/Arch/Esp8266/Tools/ci/build.run.sh
 create mode 100644 Sming/Arch/Esp8266/Tools/ci/build.setup.cmd
 create mode 100644 Sming/Arch/Esp8266/Tools/ci/build.setup.sh
 create mode 100644 Sming/Arch/Esp8266/Tools/ci/install.cmd
 create mode 100644 Sming/Arch/Esp8266/Tools/ci/install.sh
 create mode 100644 Sming/Arch/Host/Tools/ci/build.run.cmd
 create mode 100644 Sming/Arch/Host/Tools/ci/build.run.sh
 create mode 100644 Sming/Arch/Host/Tools/ci/build.setup.cmd
 create mode 100644 Sming/Arch/Host/Tools/ci/build.setup.sh
 create mode 100644 Sming/Arch/Host/Tools/ci/coverity-scan.sh
 create mode 100644 Sming/Arch/Host/Tools/ci/install.cmd
 create mode 100644 Sming/Arch/Host/Tools/ci/install.sh
 rename tests/HostTests/{ => app}/.cs (100%)
 create mode 100644 tests/HostTests/include/.cs
 create mode 100644 tests/HostTests/modules/.cs

diff --git a/.appveyor/build.cmd b/.appveyor/build.cmd
deleted file mode 100644
index c3beab0f5a..0000000000
--- a/.appveyor/build.cmd
+++ /dev/null
@@ -1,46 +0,0 @@
-REM Windows build script
-
-subst Z: %APPVEYOR_BUILD_FOLDER%
-set SMING_HOME=Z:\Sming
-
-if "%build_compiler%" == "udk" set ESP_HOME=%UDK_ROOT%
-if "%build_compiler%" == "eqt" set ESP_HOME=%EQT_ROOT%
-
-cd /d %SMING_HOME%
-gcc -v
-
-set MAKE_PARALLEL=make -j2
-
-REM Move samples and tests into directory outside of the Sming repo.
-set SMING_PROJECTS_DIR=%APPVEYOR_BUILD_FOLDER%\..
-move ..\samples %SMING_PROJECTS_DIR%
-move ..\tests %SMING_PROJECTS_DIR%
-
-REM This will build the Basic_Blink application and most of the framework Components
-cd %SMING_PROJECTS_DIR%/samples/Basic_Blink
-make help
-make list-config
-%MAKE_PARALLEL% || goto :error
-
-cd %SMING_HOME%
-
-if "%SMING_ARCH%" == "Host" (
-
-	REM Build a couple of basic applications
-	%MAKE_PARALLEL% Basic_Serial Basic_ProgMem STRICT=1 V=1 || goto :error
-
-	REM Run basic tests
-	%MAKE_PARALLEL% tests || goto :error
-
-) else (
-
-	%MAKE_PARALLEL% Basic_Ssl || goto :error
-	%MAKE_PARALLEL% Basic_SmartConfig || goto :error
-
-)
-
-goto :EOF
-
-:error
-echo Failed with error #%errorlevel%.
-exit /b %errorlevel%
diff --git a/.appveyor/install.cmd b/.appveyor/install.cmd
deleted file mode 100644
index 8f06ce2d35..0000000000
--- a/.appveyor/install.cmd
+++ /dev/null
@@ -1,28 +0,0 @@
-REM Windows install script
-
-rmdir /s /q c:\MinGW
-curl -Lo MinGW.7z %SMINGTOOLS%/MinGW-2020-10-19.7z
-7z -oC:\ x MinGW.7z
-
-goto :%SMING_ARCH%
-
-:Esp8266
-
-	REM Old toolchain
-	set TOOLCHAIN=esp-udk-win32.7z
-	curl -LO %SMINGTOOLS%/%TOOLCHAIN%
-	7z -o%UDK_ROOT% x %TOOLCHAIN%
-
-	REM New toolchain
-	mkdir %EQT_ROOT%
-	set TOOLCHAIN=x86_64-w64-mingw32.xtensa-lx106-elf-e6a192b.201211.zip
-	curl -LO %SMINGTOOLS%/%TOOLCHAIN%
-	7z -o%EQT_ROOT% x %TOOLCHAIN%
-
-	goto :EOF
-
-
-:Host
-
-	goto :EOF
-
diff --git a/.ci/build.cmd b/.ci/build.cmd
new file mode 100755
index 0000000000..9b53440f51
--- /dev/null
+++ b/.ci/build.cmd
@@ -0,0 +1,37 @@
+REM Windows build script
+
+REM Don't leak this
+set SMING_SECRET=
+
+subst z: %CI_BUILD_DIR%
+set SMING_HOME=z:\Sming
+
+cd /d %SMING_HOME%
+call Arch\%SMING_ARCH%\Tools\ci\build.setup.cmd || goto :error
+
+env
+
+set MAKE_PARALLEL=make -j2
+
+REM Move samples and tests into directory outside of the Sming repo.
+set SMING_PROJECTS_DIR=%CI_BUILD_DIR%\projects
+mkdir %SMING_PROJECTS_DIR%
+move ..\samples %SMING_PROJECTS_DIR%
+move ..\tests %SMING_PROJECTS_DIR%
+
+REM Full compile checks please
+set STRICT=1
+
+REM Diagnostic info
+cd /d %SMING_PROJECTS_DIR%/samples/Basic_Blink
+make help
+make list-config
+
+cd /d %SMING_HOME%
+call Arch\%SMING_ARCH%\Tools\ci\build.run.cmd || goto :error
+goto :EOF
+
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
diff --git a/.ci/build.sh b/.ci/build.sh
new file mode 100755
index 0000000000..55ec52efc3
--- /dev/null
+++ b/.ci/build.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -ex # exit with nonzero exit code if anything fails
+
+# Build times benefit from parallel building
+export MAKE_PARALLEL="make -j3"
+
+cd $SMING_HOME
+source Arch/$SMING_ARCH/Tools/ci/build.setup.sh
+
+# Don't leak this!
+unset SMING_SECRET
+
+env
+
+# Move samples and tests into directory outside of the Sming repo.
+export SMING_PROJECTS_DIR=$HOME/projects
+mkdir -p $SMING_PROJECTS_DIR
+cd $SMING_HOME/..
+mv samples $SMING_PROJECTS_DIR
+mv tests $SMING_PROJECTS_DIR
+
+# Full compile checks please
+export STRICT=1
+
+# Diagnostic info
+cd $SMING_PROJECTS_DIR/samples/Basic_Blink
+make help
+make list-config
+
+$MAKE_PARALLEL
+
+# Run ARCH build/tests
+cd $SMING_HOME
+source Arch/$SMING_ARCH/Tools/ci/build.run.sh
diff --git a/.ci/deploy.sh b/.ci/deploy.sh
new file mode 100755
index 0000000000..69c5e7c75f
--- /dev/null
+++ b/.ci/deploy.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -ex # exit with nonzero exit code if anything fails
+
+TAG=$1
+if [ -z $TAG ]; then
+	printf "Usage:\n\t$0 <tag>\n";
+	exit 1;
+fi
+
+# [ Create archive of all submodules used in this release (pulled in during documentation build stage) ] 
+cd $CI_BUILD_DIR
+ALL_SUBMODULE_DIRS=$(find $SMING_HOME -name '.submodule' | xargs dirname | sed 's/^\(.*\)\/\(Sming\/.*\)$/\2/')
+SUBMODULE_ARCHIVE=sming-submodules.tgz
+tar czf $SUBMODULE_ARCHIVE $ALL_SUBMODULE_DIRS
+
+# [ Create new draft release for this tag]
+set +x
+source /tmp/secrets.sh
+AUTH_HEADER="Authorization: token ${RELEASE_TOKEN}"
+RESPONSE=$(curl -H "Content-Type:application/json" -H "$AUTH_HEADER" \
+  -d "{\"tag_name\":\"$TAG\",\"target_commitish\": \"develop\",\"name\": \"$TAG\",\"body\":\"Coming soon\",\"draft\": true,\"prerelease\": true}" \
+  https://api.github.com/repos/${CI_REPO_NAME}/releases)
+
+# Get release id
+RELEASE_ID=$(echo "$RESPONSE" | jq -r .id)
+
+upload_asset() {
+  curl -H "$AUTH_HEADER" -H "Content-Type: $(file -b --mime-type $1)" --data-binary @$1 "https://uploads.github.com/repos/${CI_REPO_NAME}/releases/$RELEASE_ID/assets?name=$(basename $1)"
+}
+
+upload_asset $SUBMODULE_ARCHIVE
+upload_asset sming-docs.zip 
+set -x
+
+# [ Update the choco packages ]
+cd /tmp
+CHOCO_REPO="github.com/slaff/chocolatey-packages.git"
+git clone -q https://${CHOCO_REPO} choco
+cd choco
+PACKAGES_TO_CHANGE="sming sming.source"
+
+for PACKAGE in $PACKAGES_TO_CHANGE;
+do
+  xmlstarlet ed --inplace -N "ns=http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd" -u "/ns:package/ns:metadata/ns:version"  -v "$TAG" packages/$PACKAGE/*.nuspec;
+done
+
+git config user.email "appveyor@sminghub.local"
+git config user.name "appveyor"
+git commit -a -m "Updated chocolatey packages to latest stable $TAG version." || 1
+
+# Push upstream
+set +x
+git push https://${CHOCO_TOKEN}@${CHOCO_REPO} master
+set -x
diff --git a/.ci/install.cmd b/.ci/install.cmd
new file mode 100755
index 0000000000..9834f28957
--- /dev/null
+++ b/.ci/install.cmd
@@ -0,0 +1,9 @@
+REM Windows install script
+
+python -m pip install --upgrade pip
+
+rmdir /s /q c:\MinGW
+curl -Lo MinGW.7z %SMINGTOOLS%/MinGW-2020-10-19.7z
+7z -oC:\ x MinGW.7z
+
+call %SMING_HOME%\Arch\%SMING_ARCH%\Tools\ci\install.cmd
diff --git a/.ci/install.sh b/.ci/install.sh
new file mode 100755
index 0000000000..75b7fea9ca
--- /dev/null
+++ b/.ci/install.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -ex # exit with nonzero exit code if anything fails
+
+# Common install
+
+sudo apt-get update
+
+sudo update-alternatives --set gcc /usr/bin/gcc-9
+python -m pip install --upgrade pip
+
+sudo apt-get install -y gcc-9-multilib g++-9-multilib python3-setuptools
+
+source $SMING_HOME/Arch/$SMING_ARCH/Tools/ci/install.sh
diff --git a/.ci/secrets.sh.enc b/.ci/secrets.sh.enc
new file mode 100644
index 0000000000..a2e569f02f
--- /dev/null
+++ b/.ci/secrets.sh.enc
@@ -0,0 +1,7 @@
+U2FsdGVkX1/VhqomygkMFsRejvogd3R4GpBC1qAiF+f+drEyY81gn12gf1UnGiaa
+ZbLMqFqaBXMUmDxE5Ix0MR8uwSa5Bz1EGFBnhSY17iuMbQVfcAZOXDVpOJFB368G
+sctrjME3JSWuvUw66PjOyCdfkKoAlCpQsD1sNGR70nXEqK06IF0JDKPvyTrhJxCC
+RTx+Oc83fiLECmUcFityDAAwXkPAvv7A2iRBkoqCUjPmShhZz5niVUi9HuSZwOH6
+EPo6NE2P7B5Emvqh5Mx9qniIvN74KmUFb6JPuUT+tKqNWIVfbmSy/PHRfyGNGJ8v
+EH5eWX9SfmGBZwFS7EtV3v81GEWUO3dz8PJ/unzwUgvYOiHYgBIvUPgL9viDhhxF
+YzbTuxNjlY2UFHz172ZjxRJv5la7MW7NMI4GrSBHyr4=
diff --git a/Sming/Arch/Esp32/Components/esp32/component.mk b/Sming/Arch/Esp32/Components/esp32/component.mk
index 2bf48d5e6c..bb207b3ad9 100644
--- a/Sming/Arch/Esp32/Components/esp32/component.mk
+++ b/Sming/Arch/Esp32/Components/esp32/component.mk
@@ -252,7 +252,9 @@ SDK_PROJECT_PATH := $(COMPONENT_PATH)/project
 SDK_CONFIG_DEFAULTS := $(SDK_PROJECT_PATH)/sdkconfig.defaults
 
 SDKCONFIG_MAKEFILE ?= $(SDK_PROJECT_PATH)/sdkconfig
+ifeq ($(MAKE_DOCS),)
 -include $(SDKCONFIG_MAKEFILE)
+endif
 export SDKCONFIG_MAKEFILE  # sub-makes (like bootloader) will reuse this path
 
 $(SDK_BUILD_BASE) $(SDK_COMPONENT_LIBDIR):
diff --git a/Sming/Arch/Esp32/Tools/ci/build.run.cmd b/Sming/Arch/Esp32/Tools/ci/build.run.cmd
new file mode 100644
index 0000000000..49677d701a
--- /dev/null
+++ b/Sming/Arch/Esp32/Tools/ci/build.run.cmd
@@ -0,0 +1,11 @@
+REM Esp32 build.run.cmd
+
+%MAKE_PARALLEL% Basic_Blink Basic_WiFi HttpServer_ConfigNetwork DEBUG_VERBOSE_LEVEL=3 STRICT=1 || goto :error
+%MAKE_PARALLEL% Basic_Ssl ENABLE_SSL=Bearssl DEBUG_VERBOSE_LEVEL=3 STRICT=1 || goto :error
+
+goto :EOF
+
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
diff --git a/Sming/Arch/Esp32/Tools/ci/build.run.sh b/Sming/Arch/Esp32/Tools/ci/build.run.sh
new file mode 100644
index 0000000000..01209dfe4c
--- /dev/null
+++ b/Sming/Arch/Esp32/Tools/ci/build.run.sh
@@ -0,0 +1,4 @@
+# Esp32 build.run.sh
+
+$MAKE_PARALLEL Basic_Blink Basic_WiFi HttpServer_ConfigNetwork DEBUG_VERBOSE_LEVEL=3 STRICT=1
+$MAKE_PARALLEL Basic_Ssl ENABLE_SSL=Bearssl DEBUG_VERBOSE_LEVEL=3 STRICT=1
diff --git a/Sming/Arch/Esp32/Tools/ci/build.setup.cmd b/Sming/Arch/Esp32/Tools/ci/build.setup.cmd
new file mode 100644
index 0000000000..ea6e6a24cf
--- /dev/null
+++ b/Sming/Arch/Esp32/Tools/ci/build.setup.cmd
@@ -0,0 +1 @@
+REM Esp32 build.setup.cmd
diff --git a/Sming/Arch/Esp32/Tools/ci/build.setup.sh b/Sming/Arch/Esp32/Tools/ci/build.setup.sh
new file mode 100644
index 0000000000..4aaa83f008
--- /dev/null
+++ b/Sming/Arch/Esp32/Tools/ci/build.setup.sh
@@ -0,0 +1 @@
+# Esp32 build.setup.sh
diff --git a/Sming/Arch/Esp32/Tools/ci/install.cmd b/Sming/Arch/Esp32/Tools/ci/install.cmd
new file mode 100644
index 0000000000..087ec4fa00
--- /dev/null
+++ b/Sming/Arch/Esp32/Tools/ci/install.cmd
@@ -0,0 +1,12 @@
+REM Esp32 install.cmd
+
+git clone -b release/v4.1 https://github.com/espressif/esp-idf.git %IDF_PATH%
+
+REM Espressif downloads very slow, fetch from SmingTools
+mkdir %IDF_TOOLS_PATH%
+set ESPTOOLS=esp32-tools-windows-4.1.7z
+curl -LO %SMINGTOOLS%/%ESPTOOLS%
+7z -o%IDF_TOOLS_PATH%\dist x %ESPTOOLS% 
+
+python %IDF_PATH%\tools\idf_tools.py install
+python -m pip install -r %IDF_PATH%\requirements.txt
diff --git a/Sming/Arch/Esp32/Tools/ci/install.sh b/Sming/Arch/Esp32/Tools/ci/install.sh
new file mode 100644
index 0000000000..17a7577081
--- /dev/null
+++ b/Sming/Arch/Esp32/Tools/ci/install.sh
@@ -0,0 +1,14 @@
+# Esp32 install.sh
+
+sudo apt-get install -y git wget flex bison gperf ninja-build ccache libffi-dev libssl-dev dfu-util
+
+git clone -b release/v4.1 https://github.com/espressif/esp-idf.git $IDF_PATH
+
+# Espressif downloads very slow, fetch from SmingTools
+mkdir -p $IDF_TOOLS_PATH
+ESPTOOLS=esp32-tools-linux-4.1.zip
+wget --no-verbose $SMINGTOOLS/$ESPTOOLS
+unzip $ESPTOOLS -d $IDF_TOOLS_PATH/dist
+
+python $IDF_PATH/tools/idf_tools.py install
+python -m pip install -r $IDF_PATH/requirements.txt
diff --git a/Sming/Arch/Esp8266/Tools/ci/build.run.cmd b/Sming/Arch/Esp8266/Tools/ci/build.run.cmd
new file mode 100644
index 0000000000..830f5d6c46
--- /dev/null
+++ b/Sming/Arch/Esp8266/Tools/ci/build.run.cmd
@@ -0,0 +1,15 @@
+REM Esp8266 build.run.cmd
+
+make -C "%SMING_PROJECTS_DIR%\samples\HttpServer_FirmwareUpload" python-requirements
+%MAKE_PARALLEL% samples || goto :error
+
+make clean samples-clean
+%MAKE_PARALLEL% Basic_Blink ENABLE_CUSTOM_HEAP=1 DEBUG_VERBOSE_LEVEL=3 || goto :error
+%MAKE_PARALLEL% HttpServer_ConfigNetwork ENABLE_CUSTOM_LWIP=2 STRICT=1 || goto :error
+
+goto :EOF
+
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
diff --git a/Sming/Arch/Esp8266/Tools/ci/build.run.sh b/Sming/Arch/Esp8266/Tools/ci/build.run.sh
new file mode 100644
index 0000000000..678b068a60
--- /dev/null
+++ b/Sming/Arch/Esp8266/Tools/ci/build.run.sh
@@ -0,0 +1,7 @@
+# Esp8266 build.run.sh
+
+make -C "$SMING_PROJECTS_DIR/samples/HttpServer_FirmwareUpload" python-requirements
+$MAKE_PARALLEL samples
+make clean samples-clean
+$MAKE_PARALLEL Basic_Blink ENABLE_CUSTOM_HEAP=1 DEBUG_VERBOSE_LEVEL=3
+$MAKE_PARALLEL HttpServer_ConfigNetwork ENABLE_CUSTOM_LWIP=2 STRICT=1
diff --git a/Sming/Arch/Esp8266/Tools/ci/build.setup.cmd b/Sming/Arch/Esp8266/Tools/ci/build.setup.cmd
new file mode 100644
index 0000000000..f6f2238948
--- /dev/null
+++ b/Sming/Arch/Esp8266/Tools/ci/build.setup.cmd
@@ -0,0 +1 @@
+REM Esp8266 build.setup.cmd
diff --git a/Sming/Arch/Esp8266/Tools/ci/build.setup.sh b/Sming/Arch/Esp8266/Tools/ci/build.setup.sh
new file mode 100644
index 0000000000..941d5df444
--- /dev/null
+++ b/Sming/Arch/Esp8266/Tools/ci/build.setup.sh
@@ -0,0 +1,6 @@
+# Esp8266 build.setup.sh
+
+unset SPIFFY
+unset ESPTOOL2
+unset SDK_BASE
+
diff --git a/Sming/Arch/Esp8266/Tools/ci/install.cmd b/Sming/Arch/Esp8266/Tools/ci/install.cmd
new file mode 100644
index 0000000000..8aa477c552
--- /dev/null
+++ b/Sming/Arch/Esp8266/Tools/ci/install.cmd
@@ -0,0 +1,10 @@
+REM Esp8266 install.cmd
+
+call :install %UDK_ROOT% esp-udk-win32.7z
+call :install %EQT_ROOT% x86_64-w64-mingw32.xtensa-lx106-elf-e6a192b.201211.zip
+goto :EOF
+
+:install
+mkdir %1
+curl -LO %SMINGTOOLS%/%2
+7z -o%1 x %2
diff --git a/Sming/Arch/Esp8266/Tools/ci/install.sh b/Sming/Arch/Esp8266/Tools/ci/install.sh
new file mode 100644
index 0000000000..87a3918c0f
--- /dev/null
+++ b/Sming/Arch/Esp8266/Tools/ci/install.sh
@@ -0,0 +1,14 @@
+# Esp8266 install.sh
+
+# Old toolchain
+TOOLCHAIN=esp-open-sdk-linux-x86_64.tar.gz
+wget --no-verbose $SMINGTOOLS/$TOOLCHAIN
+tar -zxf $TOOLCHAIN
+mkdir -p $UDK_ROOT
+ln -s $(pwd)/esp-open-sdk/xtensa-lx106-elf $UDK_ROOT/.
+
+# New toolchain
+TOOLCHAIN=x86_64-linux-gnu.xtensa-lx106-elf-e6a192b.201211.tar.gz
+wget --no-verbose $SMINGTOOLS/$TOOLCHAIN
+mkdir -p $EQT_ROOT
+tar -zxf $TOOLCHAIN -C $EQT_ROOT --totals
diff --git a/Sming/Arch/Host/Tools/ci/build.run.cmd b/Sming/Arch/Host/Tools/ci/build.run.cmd
new file mode 100644
index 0000000000..735cc871f0
--- /dev/null
+++ b/Sming/Arch/Host/Tools/ci/build.run.cmd
@@ -0,0 +1,13 @@
+REM Host build.run.cmd
+
+REM Build a couple of basic applications
+%MAKE_PARALLEL% Basic_Serial Basic_ProgMem STRICT=1 V=1 || goto :error
+
+REM Run basic tests
+%MAKE_PARALLEL% tests || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
diff --git a/Sming/Arch/Host/Tools/ci/build.run.sh b/Sming/Arch/Host/Tools/ci/build.run.sh
new file mode 100644
index 0000000000..ada35bb8fb
--- /dev/null
+++ b/Sming/Arch/Host/Tools/ci/build.run.sh
@@ -0,0 +1,19 @@
+# Host build.run.sh
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
+
+if [[ $CHECK_SCA -eq 1 ]]; then
+	$DIR/coverity-scan.sh
+else
+	$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl LiveDebug DEBUG_VERBOSE_LEVEL=3
+fi
+
+# Build and run tests
+export SMING_TARGET_OPTIONS='--flashfile=$(FLASH_BIN) --flashsize=$(SPI_SIZE)'
+$MAKE_PARALLEL tests
diff --git a/Sming/Arch/Host/Tools/ci/build.setup.cmd b/Sming/Arch/Host/Tools/ci/build.setup.cmd
new file mode 100644
index 0000000000..27b7b02d62
--- /dev/null
+++ b/Sming/Arch/Host/Tools/ci/build.setup.cmd
@@ -0,0 +1,10 @@
+REM Host build.setup.cmd
+
+REM Build documentation
+make -C %SMING_HOME% docs || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
diff --git a/Sming/Arch/Host/Tools/ci/build.setup.sh b/Sming/Arch/Host/Tools/ci/build.setup.sh
new file mode 100644
index 0000000000..095cbd0cce
--- /dev/null
+++ b/Sming/Arch/Host/Tools/ci/build.setup.sh
@@ -0,0 +1,23 @@
+# Host build.setup.sh
+
+# Check coding style
+make cs
+DIFFS=$(git diff)
+if [ "$DIFFS" != "" ]; then
+  echo "!!! Coding Style issues Found!!!"
+  echo "    Run: 'make cs' to fix them. "
+  echo "$DIFFS"
+  exit 1
+fi
+
+# Make deployment keys, etc. available
+if [ -z "$CI_PULL_REQUEST" ]; then
+  set +x
+  openssl aes-256-cbc -d -a -iter 100 -in $CI_BUILD_DIR/.ci/secrets.sh.enc -out /tmp/secrets.sh -pass pass:$SMING_SECRET
+  source /tmp/secrets.sh
+  set -x
+fi
+unset SMING_SECRET
+
+# Build documentation
+make -C $SMING_HOME docs
diff --git a/Sming/Arch/Host/Tools/ci/coverity-scan.sh b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
new file mode 100644
index 0000000000..ae800b7472
--- /dev/null
+++ b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+set -e
+
+COVERITY_SCAN_PROJECT_NAME=${CI_PROJECT_SLUG}
+COVERITY_SCAN_NOTIFICATION_EMAIL="slaff@attachix.com"
+COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_FirmwareUpload SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"
+
+set +x
+source /tmp/secrets.sh
+
+# Environment check
+[ -z "$COVERITY_SCAN_PROJECT_NAME" ] && echo "ERROR: COVERITY_SCAN_PROJECT_NAME must be set" && exit 1
+[ -z "$COVERITY_SCAN_NOTIFICATION_EMAIL" ] && echo "ERROR: COVERITY_SCAN_NOTIFICATION_EMAIL must be set" && exit 1
+[ -z "$COVERITY_SCAN_BUILD_COMMAND" ] && echo "ERROR: COVERITY_SCAN_BUILD_COMMAND must be set" && exit 1
+[ -z "$COVERITY_SCAN_TOKEN" ] && echo "ERROR: COVERITY_SCAN_TOKEN must be set" && exit 1
+
+PLATFORM=$(uname)
+TOOL_ARCHIVE=/tmp/cov-analysis-${PLATFORM}.tgz
+TOOL_URL=https://scan.coverity.com/download/${PLATFORM}
+TOOL_BASE=/tmp/coverity-scan-analysis
+UPLOAD_URL="https://scan.coverity.com/builds"
+SCAN_URL="https://scan.coverity.com"
+
+# Do not run on pull requests
+if [ -n "${CI_PULL_REQUEST}" ]; then
+  echo -e "\033[33;1mINFO: Skipping Coverity Analysis: branch is a pull request.\033[0m"
+  exit 0
+fi
+
+# Verify upload is permitted
+permit=true
+AUTH_RES=$(curl -s --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" $SCAN_URL/api/upload_permitted)
+if [ "$AUTH_RES" = "Access denied" ]; then
+  echo -e "\033[33;1mCoverity Scan API access denied. Check COVERITY_SCAN_PROJECT_NAME and COVERITY_SCAN_TOKEN.\033[0m"
+  exit 1
+else
+  AUTH=$(echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['upload_permitted']")
+  if [ "$AUTH" = "true" ]; then
+    echo -e "\033[33;1mCoverity Scan analysis authorized per quota.\033[0m"
+  else
+    WHEN=$(echo $AUTH_RES | ruby -e "require 'rubygems'; require 'json'; puts JSON[STDIN.read]['next_upload_permitted_at']")
+    echo -e "\033[33;1mOops!Coverity Scan analysis engine NOT authorized until $WHEN.\033[0m"
+    permit=false
+  fi
+fi
+
+if [ "$permit" = true ]; then
+if [ ! -d $TOOL_BASE ]; then
+  # Download Coverity Scan Analysis Tool
+  if [ ! -e $TOOL_ARCHIVE ]; then
+    echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m"
+    wget -nv -O $TOOL_ARCHIVE $TOOL_URL --post-data "project=$COVERITY_SCAN_PROJECT_NAME&token=$COVERITY_SCAN_TOKEN"
+  fi
+
+  # Extract Coverity Scan Analysis Tool
+  echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m"
+  mkdir -p $TOOL_BASE
+  CURRENT_DIR=$(pwd)
+  cd $TOOL_BASE
+  tar xzf $TOOL_ARCHIVE
+  cd $CURRENT_DIR
+fi
+
+TOOL_DIR=$(find $TOOL_BASE -type d -name 'cov-analysis*')
+export PATH=$TOOL_DIR/bin:$PATH
+
+# Build
+echo -e "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m"
+COV_BUILD_OPTIONS=""
+#COV_BUILD_OPTIONS="--return-emit-failures 8 --parse-error-threshold 85"
+RESULTS_DIR="cov-int"
+eval "${COVERITY_SCAN_BUILD_COMMAND_PREPEND}"
+COVERITY_UNSUPPORTED=1 cov-build --dir $RESULTS_DIR $COV_BUILD_OPTIONS $COVERITY_SCAN_BUILD_COMMAND
+cov-import-scm --dir $RESULTS_DIR --scm git --log $RESULTS_DIR/scm_log.txt 2>&1
+
+# Upload results
+echo -e "\033[33;1mTarring Coverity Scan Analysis results...\033[0m"
+RESULTS_ARCHIVE=analysis-results.tgz
+tar czf $RESULTS_ARCHIVE $RESULTS_DIR
+SHA=$(git rev-parse --short HEAD)
+
+echo -e "\033[33;1mUploading Coverity Scan Analysis results...\033[0m"
+response=$(curl \
+  --silent --write-out "\n%{http_code}\n" \
+  --form project=$COVERITY_SCAN_PROJECT_NAME \
+  --form token=$COVERITY_SCAN_TOKEN \
+  --form email=$COVERITY_SCAN_NOTIFICATION_EMAIL \
+  --form file=@$RESULTS_ARCHIVE \
+  --form version=$SHA \
+  --form description="CI build" \
+  $UPLOAD_URL)
+status_code=$(echo "$response" | sed -n '$p')
+if [ "$status_code" -ge "400" ]; then
+  TEXT=$(echo "$response" | sed '$d')
+  echo -e "\033[33;1mCoverity Scan upload failed: $TEXT. Status code: $status_code.\033[0m"
+  exit 1
+fi
+fi
diff --git a/Sming/Arch/Host/Tools/ci/install.cmd b/Sming/Arch/Host/Tools/ci/install.cmd
new file mode 100644
index 0000000000..3cee90ae9a
--- /dev/null
+++ b/Sming/Arch/Host/Tools/ci/install.cmd
@@ -0,0 +1,8 @@
+REM Host install.cmd
+
+curl -LO https://doxygen.nl/files/doxygen-1.9.1-setup.exe
+doxygen-1.9.1-setup /silent
+
+choco install -y graphviz
+
+python -m pip install -r %SMING_HOME%/../docs/requirements.txt
diff --git a/Sming/Arch/Host/Tools/ci/install.sh b/Sming/Arch/Host/Tools/ci/install.sh
new file mode 100644
index 0000000000..673729e2fc
--- /dev/null
+++ b/Sming/Arch/Host/Tools/ci/install.sh
@@ -0,0 +1,8 @@
+# Host install.sh
+
+sudo apt-get install -y clang-format-6.0 \
+  python3-sphinx python3-setuptools python3-cairocffi \
+  doxygen graphviz-dev xmlstarlet jq
+sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 100
+
+python -m pip install -r $SMING_HOME/../docs/requirements.txt
diff --git a/Sming/Arch/Host/Tools/travis/install.sh b/Sming/Arch/Host/Tools/travis/install.sh
index 5db995b801..fd27cb5ba9 100755
--- a/Sming/Arch/Host/Tools/travis/install.sh
+++ b/Sming/Arch/Host/Tools/travis/install.sh
@@ -2,5 +2,8 @@
 set -ex # exit with nonzero exit code if anything fails
 
 sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 100
-python3 -m pip install --upgrade pip
-python3 -m pip install -r $TRAVIS_BUILD_DIR/docs/requirements.txt
+python3 -m pip install -q --upgrade pip
+
+if [ "$BUILD_DOCS" == "1" ]; then
+	python3 -m pip install -q -r $TRAVIS_BUILD_DIR/docs/requirements.txt
+fi
diff --git a/appveyor.yml b/appveyor.yml
index baf514cc46..26f19578bf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,30 +1,86 @@
-os: Windows Server 2012 R2
+image:
+- Ubuntu2004
+- Visual Studio 2019
+
+platform: x86
 
 environment:
   SMINGTOOLS: https://github.com/SmingHub/SmingTools/releases/download/1.0
-  PATH: C:\MinGW\msys\1.0\bin;C:\MinGW\bin;%PATH%
-  PYTHON: C:\Python38\python
-  UDK_ROOT: C:\Espressif
-  EQT_ROOT: C:\esp-quick-toolchain
+  SMING_SECRET:
+    secure: rCs19uNvDR07w1d2pfwJIzewiEQ2zpKXdqFp5BqHQAA=
+
   matrix:
-    - build_platform: "x86"
-      build_compiler: "mingw"
-      SMING_ARCH: Host
-
-    - build_platform: "x86"
-      build_compiler: "udk"
-      SMING_ARCH: Esp8266
-      SDK_VERSION: 3.0.1
-
-    - build_platform: "x86"
-      build_compiler: "eqt"
-      SMING_ARCH: Esp8266
-      SDK_VERSION: 3.0.1
-
-# cache:
-#   - src/  # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
+    - SMING_ARCH: Host
+
+    - SMING_ARCH: Esp8266
+      BUILD_COMPILER: udk
+
+    - SMING_ARCH: Esp8266
+      BUILD_COMPILER: eqt
+
+    - SMING_ARCH: Esp32
+
+
 install:
-  - cmd: .appveyor/install.cmd
+  - ps: |
+      # Set up environment variables for all environments and build types
+      $env:CI_BUILD_DIR = $env:APPVEYOR_BUILD_FOLDER
+      $env:CI_PROJECT_SLUG = $env:APPVEYOR_PROJECT_SLUG
+      $env:CI_REPO_NAME = $env:APPVEYOR_REPO_NAME
+      if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -ne $env:APPVEYOR_REPO_NAME) {
+        $env:CI_PULL_REQUEST = "true"
+      }
+      # Esp8266 
+      $env:UDK_ROOT = Join-Path $env:CI_BUILD_DIR "opt/esp-alt-sdk"
+      $env:EQT_ROOT = Join-Path $env:CI_BUILD_DIR "opt/esp-quick-toolchain"
+      if ($env:BUILD_COMPILER -eq "udk") {
+        $env:ESP_HOME = $env:UDK_ROOT
+      } else {
+        $env:ESP_HOME = $env:EQT_ROOT
+      }
+      # Esp32
+      $env:IDF_PATH = Join-Path $env:CI_BUILD_DIR "opt/esp-idf"
+      $env:IDF_TOOLS_PATH = Join-Path $env:CI_BUILD_DIR "opt/tools/esp32"
+      # General
+      $env:SMING_HOME = Join-Path $env:CI_BUILD_DIR "Sming"
+
+  - cmd: |
+      set PATH=C:\Python39;C:\MinGW\msys\1.0\bin;C:\MinGW\bin;%PATH%
+      set PYTHON=C:\Python39\python
+      set ESP32_PYTHON_PATH=C:\Python39
+      .ci\install.cmd
+      set PATH=C:\Python39\Scripts;%PATH%;C:\Program Files\doxygen\bin
+
+  - sh: |
+      export PYTHON=$HOME/venv3.9/bin/python
+      export ESP32_PYTHON_PATH=$HOME/venv3.9/bin
+      source $HOME/venv3.9/bin/activate
+      .ci/install.sh
+
+
+before_build:
+  - sh: |
+      # Check if we could run static code analysis
+      CHECK_SCA=0
+      if [[ $APPVEYOR_REPO_TAG_NAME != "" || ( $APPVEYOR_REPO_COMMIT_MESSAGE == *"[scan:coverity]"*  && $CI_PULL_REQUEST == "" ) ]]; then
+        CHECK_SCA=1
+      fi
 
 build_script:
-  - cmd: .appveyor/build.cmd
+  - cmd: .ci\build.cmd
+  - sh: .ci/build.sh
+
+after_build:
+  - ps: |
+       if ($env:SMING_ARCH -eq "Host") {
+          $docFile = "sming-docs.zip"
+          Compress-Archive -Path $env:CI_BUILD_DIR/docs/build/html -DestinationPath $docFile
+          Push-AppveyorArtifact $docFile
+       }
+
+
+deploy_script:
+  - sh: |
+      if [[ $APPVEYOR_REPO_TAG_NAME != "" && $APPVEYOR_BUILD_WORKER_IMAGE == "Ubuntu2004" && $SMING_ARCH == "Host" ]]; then
+        .ci/deploy.sh $APPVEYOR_REPO_TAG_NAME
+      fi
diff --git a/tests/HostTests/.cs b/tests/HostTests/app/.cs
similarity index 100%
rename from tests/HostTests/.cs
rename to tests/HostTests/app/.cs
diff --git a/tests/HostTests/include/.cs b/tests/HostTests/include/.cs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/HostTests/modules/.cs b/tests/HostTests/modules/.cs
new file mode 100644
index 0000000000..e69de29bb2

From 3df8e9486ae9c508a34d8b957cc741801c21f0b7 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Thu, 21 Jan 2021 10:30:37 +0100
Subject: [PATCH 02/91] Trigger coverity scan on merge ... (#2196)

* Trigger coverity scan on merge if the commit message contains [scan:coverity].
* Fix detection of pull request so coverity scan works

Co-authored-by: mikee47 <mike@sillyhouse.net>
---
 appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 26f19578bf..0f9fca8c40 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,7 +27,7 @@ install:
       $env:CI_BUILD_DIR = $env:APPVEYOR_BUILD_FOLDER
       $env:CI_PROJECT_SLUG = $env:APPVEYOR_PROJECT_SLUG
       $env:CI_REPO_NAME = $env:APPVEYOR_REPO_NAME
-      if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -ne $env:APPVEYOR_REPO_NAME) {
+      if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -ne "") {
         $env:CI_PULL_REQUEST = "true"
       }
       # Esp8266 
@@ -62,7 +62,7 @@ before_build:
   - sh: |
       # Check if we could run static code analysis
       CHECK_SCA=0
-      if [[ $APPVEYOR_REPO_TAG_NAME != "" || ( $APPVEYOR_REPO_COMMIT_MESSAGE == *"[scan:coverity]"*  && $CI_PULL_REQUEST == "" ) ]]; then
+      if [[ $APPVEYOR_REPO_TAG_NAME != "" || ( $APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED == *"[scan:coverity]"*  && $CI_PULL_REQUEST == "" ) ]]; then
         CHECK_SCA=1
       fi
 

From d4f99b5c836a0f9e78301d5fbfd53314ee68f089 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Thu, 21 Jan 2021 14:43:59 +0000
Subject: [PATCH 03/91] Check APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME for null or
 empty string; export CHECK_SCA (#2197)

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0f9fca8c40..f0886bc55d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -27,7 +27,7 @@ install:
       $env:CI_BUILD_DIR = $env:APPVEYOR_BUILD_FOLDER
       $env:CI_PROJECT_SLUG = $env:APPVEYOR_PROJECT_SLUG
       $env:CI_REPO_NAME = $env:APPVEYOR_REPO_NAME
-      if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -ne "") {
+      if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME) {
         $env:CI_PULL_REQUEST = "true"
       }
       # Esp8266 
@@ -61,9 +61,9 @@ install:
 before_build:
   - sh: |
       # Check if we could run static code analysis
-      CHECK_SCA=0
+      export CHECK_SCA=0
       if [[ $APPVEYOR_REPO_TAG_NAME != "" || ( $APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED == *"[scan:coverity]"*  && $CI_PULL_REQUEST == "" ) ]]; then
-        CHECK_SCA=1
+        export CHECK_SCA=1
       fi
 
 build_script:

From 30d705b3b8ce5048793b404989fea92947e12c16 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 25 Jan 2021 08:30:37 +0000
Subject: [PATCH 04/91] Update UPnP and UPnP-Schema libraries (#2199)

UPnP:

* Make class information optional (Control classes obtained this from  device description)

UPnP-Schema

* Remove 'device' directory, not required
* Device/Service `class_` doesn't need to be a reference
* Always invoke schema sub-make to ensure source code is up to date
---
 Sming/Libraries/UPnP        | 2 +-
 Sming/Libraries/UPnP-Schema | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sming/Libraries/UPnP b/Sming/Libraries/UPnP
index 066c84cf97..0dc7d07fe8 160000
--- a/Sming/Libraries/UPnP
+++ b/Sming/Libraries/UPnP
@@ -1 +1 @@
-Subproject commit 066c84cf971652a1d476468d9cd8796f337f54ab
+Subproject commit 0dc7d07fe8436c96f8c0072acea4d4eca0074139
diff --git a/Sming/Libraries/UPnP-Schema b/Sming/Libraries/UPnP-Schema
index 99a5fdbdee..1438502af5 160000
--- a/Sming/Libraries/UPnP-Schema
+++ b/Sming/Libraries/UPnP-Schema
@@ -1 +1 @@
-Subproject commit 99a5fdbdeed062680809329ffc8c533338d3ceb1
+Subproject commit 1438502af5a922bd04d81f158c6a820815fefe42

From 8066f473e0c1f136c7e931aa196ecbe103df4ceb Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Tue, 26 Jan 2021 08:23:17 +0000
Subject: [PATCH 05/91] Fix CI building before PR submitted (i.e. not a pull
 request) (#2198)

[scan:coverity]
---
 Sming/Arch/Host/Tools/ci/build.setup.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sming/Arch/Host/Tools/ci/build.setup.sh b/Sming/Arch/Host/Tools/ci/build.setup.sh
index 095cbd0cce..692cdae27a 100644
--- a/Sming/Arch/Host/Tools/ci/build.setup.sh
+++ b/Sming/Arch/Host/Tools/ci/build.setup.sh
@@ -11,13 +11,13 @@ if [ "$DIFFS" != "" ]; then
 fi
 
 # Make deployment keys, etc. available
-if [ -z "$CI_PULL_REQUEST" ]; then
-  set +x
+set +x
+if [ -n "$SMING_SECRET" ]; then
   openssl aes-256-cbc -d -a -iter 100 -in $CI_BUILD_DIR/.ci/secrets.sh.enc -out /tmp/secrets.sh -pass pass:$SMING_SECRET
   source /tmp/secrets.sh
-  set -x
+  unset SMING_SECRET
 fi
-unset SMING_SECRET
+set -x
 
 # Build documentation
 make -C $SMING_HOME docs

From c840b7cfa00ac7d1501e03f90b6aa41e2d7f3cb7 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 27 Jan 2021 09:37:07 +0100
Subject: [PATCH 06/91] Make shell files exutable. (#2200)

[scan:coverity]
---
 Sming/Arch/Esp32/Tools/ci/build.run.sh     | 0
 Sming/Arch/Esp32/Tools/ci/build.setup.sh   | 0
 Sming/Arch/Esp32/Tools/ci/install.sh       | 0
 Sming/Arch/Esp8266/Tools/ci/build.run.sh   | 0
 Sming/Arch/Esp8266/Tools/ci/build.setup.sh | 0
 Sming/Arch/Esp8266/Tools/ci/install.sh     | 0
 Sming/Arch/Host/Tools/ci/build.run.sh      | 0
 Sming/Arch/Host/Tools/ci/build.setup.sh    | 0
 Sming/Arch/Host/Tools/ci/coverity-scan.sh  | 0
 Sming/Arch/Host/Tools/ci/install.sh        | 0
 Sming/Components/ssl/Tools/make_certs.sh   | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 Sming/Arch/Esp32/Tools/ci/build.run.sh
 mode change 100644 => 100755 Sming/Arch/Esp32/Tools/ci/build.setup.sh
 mode change 100644 => 100755 Sming/Arch/Esp32/Tools/ci/install.sh
 mode change 100644 => 100755 Sming/Arch/Esp8266/Tools/ci/build.run.sh
 mode change 100644 => 100755 Sming/Arch/Esp8266/Tools/ci/build.setup.sh
 mode change 100644 => 100755 Sming/Arch/Esp8266/Tools/ci/install.sh
 mode change 100644 => 100755 Sming/Arch/Host/Tools/ci/build.run.sh
 mode change 100644 => 100755 Sming/Arch/Host/Tools/ci/build.setup.sh
 mode change 100644 => 100755 Sming/Arch/Host/Tools/ci/coverity-scan.sh
 mode change 100644 => 100755 Sming/Arch/Host/Tools/ci/install.sh
 mode change 100644 => 100755 Sming/Components/ssl/Tools/make_certs.sh

diff --git a/Sming/Arch/Esp32/Tools/ci/build.run.sh b/Sming/Arch/Esp32/Tools/ci/build.run.sh
old mode 100644
new mode 100755
diff --git a/Sming/Arch/Esp32/Tools/ci/build.setup.sh b/Sming/Arch/Esp32/Tools/ci/build.setup.sh
old mode 100644
new mode 100755
diff --git a/Sming/Arch/Esp32/Tools/ci/install.sh b/Sming/Arch/Esp32/Tools/ci/install.sh
old mode 100644
new mode 100755
diff --git a/Sming/Arch/Esp8266/Tools/ci/build.run.sh b/Sming/Arch/Esp8266/Tools/ci/build.run.sh
old mode 100644
new mode 100755
diff --git a/Sming/Arch/Esp8266/Tools/ci/build.setup.sh b/Sming/Arch/Esp8266/Tools/ci/build.setup.sh
old mode 100644
new mode 100755
diff --git a/Sming/Arch/Esp8266/Tools/ci/install.sh b/Sming/Arch/Esp8266/Tools/ci/install.sh
old mode 100644
new mode 100755
diff --git a/Sming/Arch/Host/Tools/ci/build.run.sh b/Sming/Arch/Host/Tools/ci/build.run.sh
old mode 100644
new mode 100755
diff --git a/Sming/Arch/Host/Tools/ci/build.setup.sh b/Sming/Arch/Host/Tools/ci/build.setup.sh
old mode 100644
new mode 100755
diff --git a/Sming/Arch/Host/Tools/ci/coverity-scan.sh b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
old mode 100644
new mode 100755
diff --git a/Sming/Arch/Host/Tools/ci/install.sh b/Sming/Arch/Host/Tools/ci/install.sh
old mode 100644
new mode 100755
diff --git a/Sming/Components/ssl/Tools/make_certs.sh b/Sming/Components/ssl/Tools/make_certs.sh
old mode 100644
new mode 100755

From 47d0f98cd99f1c6d4a4307948b21925279e01eaa Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 27 Jan 2021 09:57:35 +0100
Subject: [PATCH 07/91] Fix coverity scan project name. (#2201)

[scan:coverity]
---
 Sming/Arch/Host/Tools/ci/coverity-scan.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sming/Arch/Host/Tools/ci/coverity-scan.sh b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
index ae800b7472..f53b2afb6a 100755
--- a/Sming/Arch/Host/Tools/ci/coverity-scan.sh
+++ b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-COVERITY_SCAN_PROJECT_NAME=${CI_PROJECT_SLUG}
+COVERITY_SCAN_PROJECT_NAME=SmingHub/Sming
 COVERITY_SCAN_NOTIFICATION_EMAIL="slaff@attachix.com"
 COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_FirmwareUpload SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"
 

From bdf1d31db839385a8e1075f901b9cd95d6fb538d Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 27 Jan 2021 10:59:33 +0100
Subject: [PATCH 08/91] Make sure to install the python requirements for
 HttpServer_FirmwareUpload before running make. (#2202)

[scan:coverity]
---
 Sming/Arch/Host/Tools/ci/coverity-scan.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Sming/Arch/Host/Tools/ci/coverity-scan.sh b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
index f53b2afb6a..d914716e71 100755
--- a/Sming/Arch/Host/Tools/ci/coverity-scan.sh
+++ b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+make -C $SMING_HOME/../samples/HttpServer_FirmwareUpload python-requirements
+
 COVERITY_SCAN_PROJECT_NAME=SmingHub/Sming
 COVERITY_SCAN_NOTIFICATION_EMAIL="slaff@attachix.com"
 COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_FirmwareUpload SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"

From 1cc68c6dd1c1f467bbc7bad68a8812c340a07ec0 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 1 Feb 2021 09:06:35 +0000
Subject: [PATCH 09/91] Fix bug in `smg_uart_set_tx()` (#2210)

Sets pin on wrong uart
---
 Sming/Arch/Esp8266/Components/driver/uart.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sming/Arch/Esp8266/Components/driver/uart.cpp b/Sming/Arch/Esp8266/Components/driver/uart.cpp
index e6c50b94fc..22114d3818 100644
--- a/Sming/Arch/Esp8266/Components/driver/uart.cpp
+++ b/Sming/Arch/Esp8266/Components/driver/uart.cpp
@@ -910,9 +910,9 @@ void smg_uart_swap(smg_uart_t* uart, int tx_pin)
 bool smg_uart_set_tx(smg_uart_t* uart, int tx_pin)
 {
 	if(uart != nullptr && uart->uart_nr == UART0 && smg_uart_tx_enabled(uart)) {
-		uart1_pin_restore(uart->tx_pin);
+		uart0_pin_restore(uart->tx_pin);
 		uart->tx_pin = (tx_pin == 2) ? 2 : 1;
-		uart1_pin_select(uart->tx_pin);
+		uart0_pin_select(uart->tx_pin);
 		return true;
 	}
 

From 93ab2e7d3b7dcc3e4e77441287dc9ed328d3afac Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 3 Feb 2021 08:57:44 +0000
Subject: [PATCH 10/91] MacOS build fixes (#2212)

Also (probably) applies to FreeBSD.

* Archive format seems to be different for MacOS so must use correct version of `ar` for linking.
* `cp` command does not have `-u` option.
* Fix OtaUpgrade scripted timestamp computation for MacOS/FreeBSD compatibility. FreeBSD `date` variant does not support nanoseconds. Use python scriptlet.
---
 Sming/Arch/Esp8266/Components/esp8266/component.mk | 2 +-
 Sming/Libraries/OtaUpgrade/component.mk            | 2 +-
 Sming/project.mk                                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sming/Arch/Esp8266/Components/esp8266/component.mk b/Sming/Arch/Esp8266/Components/esp8266/component.mk
index dbbfcb4991..46c5d142c8 100644
--- a/Sming/Arch/Esp8266/Components/esp8266/component.mk
+++ b/Sming/Arch/Esp8266/Components/esp8266/component.mk
@@ -63,7 +63,7 @@ COMPONENT_TARGETS += $(LIBCRYPTO_ORIG)
 # Make backup then modify original
 $(COMPONENT_RULE)$(LIBCRYPTO_ORIG): $(LIBCRYPTO)
 	cp $^ $@
-	ar -d $^ aes-internal-dec.o
+	$(AR) -d $^ aes-internal-dec.o
 
 # Define linker symbols
 EXTRA_LDFLAGS += -Wl,--just-symbols=$(COMPONENT_PATH)/ld/crypto.sym
diff --git a/Sming/Libraries/OtaUpgrade/component.mk b/Sming/Libraries/OtaUpgrade/component.mk
index 572a4f1b10..d19bec3b07 100644
--- a/Sming/Libraries/OtaUpgrade/component.mk
+++ b/Sming/Libraries/OtaUpgrade/component.mk
@@ -96,7 +96,7 @@ OTA_DATE_REF := -2208988800000LL
 _ota-make-build-timestamp: | $(OTA_GENCODE_DIR)
 	$(Q) echo '#include <FakePgmSpace.h>' > $(OTA_BUILD_TIMESTAMP_SRC)
 	$(Q) echo 'namespace OtaUpgrade {' >> $(OTA_BUILD_TIMESTAMP_SRC)
-	$(Q) echo 'extern const uint64_t BuildTimestamp PROGMEM = $(shell date +%s%3NLL) - $(OTA_DATE_REF);' >> $(OTA_BUILD_TIMESTAMP_SRC)
+	$(Q) echo 'extern const uint64_t BuildTimestamp PROGMEM = $(shell $(PYTHON) -c "import time; print('%uLL' % (1000 * time.time()))") - $(OTA_DATE_REF);' >> $(OTA_BUILD_TIMESTAMP_SRC)
 	$(Q) echo '} // namespace OtaUpgrade' >> $(OTA_BUILD_TIMESTAMP_SRC)
 
 App-build: _ota-make-build-timestamp
diff --git a/Sming/project.mk b/Sming/project.mk
index b7ee31eed9..ec9440cbc1 100644
--- a/Sming/project.mk
+++ b/Sming/project.mk
@@ -336,7 +336,7 @@ COMPONENT_DIRS := $(foreach d,$(ALL_SEARCH_DIRS),$(wildcard $d/*))
 %/component.mk:
 	@if [ -f $(@D)/../.patches/$(notdir $(@D))/component.mk ]; then \
 		echo Patching $(abspath $(@D)/../.patches/$(notdir $(@D))/component.mk); \
-		cp -u $(@D)/../.patches/$(notdir $(@D))/component.mk $@; \
+		cp $(@D)/../.patches/$(notdir $(@D))/component.mk $@; \
 	fi
 
 SUBMODULES_FOUND = $(wildcard $(SUBMODULES:=/.submodule))

From fdb772a76316c2697d3e0aa795bd67efd206ecd1 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 8 Feb 2021 08:37:37 +0000
Subject: [PATCH 11/91] Partition tables (#2171)

!!! WARNING: BREAKING CHANGE !!!

SPI_SIZE and DISABLE_SPIFFS directives are removed!
If you have an application that is using spiffs make sure to add the following line in your component.mk and remove the `DISABLE_SPIFFS` directive, if present.

```
HWCONFIG := spiffs
```

If your application is not using spiffs then just remove the `DISABLE_SPIFFS` directive.

For more information take a look at the [migration document](https://sming.readthedocs.io/en/feature-partition-tables/upgrading/4.2-4.3.html).

More information about the changes can be seen below:
==========================================

Implement class-based API for Sming with support for all architectures.
See #1676 for discussion.

Summary of changes:

* Create new `Storage` component and port low-level Esp32 partition support
* Use `gen_esp32part.py` tool as basis for new `hwconfig.py` tool. Integrate into build system. Add new targets.
* Implement a C++ API. `Partition::SubType::App` and `Partition::SubType::Data` are strong enums used to identify all the standard types, but the base API still uses type/subtype so custom types can be accommodated.
* Revise esp8266 sector layout - see updated documentation. This places all the critical information at the start of flash, whereas previously it was at the end. This avoids issues where flash size is set incorrectly.
* Custom `sysParam` data partition sub-type used for esp8266 system parameters and RF calibration data.
* Add support for 'external' devices (e.g. SPIRAM, supplementary flash, EEPROM, etc.) using a custom `Storage` partition type. Applications register a `Storage::Device` object implementation with the Partition API to register these external devices with a C++ interface for them.
* Disentangle SPIFFS from rBoot - OTA upgrading uses partition API.
* Drive SPIFFS image creation from partition table entries - more flexible, multiple images.
* Generate build variables directly from hardware config file (see `out/.../hwconfig.mk`). Preserve existing build variables where possible, document changes.
* Document hardware configuration with schema and incorporate validation. This can assist with fixing malformed configurations and supplements checks included in the partition tool.
* Add `Basic_Storage` sample to more thoroughly demonstrate usage
* Update documentation
* Test (HostTests) on all arches
* Remove `DISABLE_SPIFFS`, `SPI_SIZE` and `SPIFF_SIZE` build variables from all samples, including those in submodules.
* Include samples and tests within submodules to CI
* Add check to ensure image size will fit within partition
---
 .ci/install.cmd                               |   2 +-
 .ci/install.sh                                |   2 +-
 .github/workflows/codeql-analysis.yml         |  10 +-
 .../Components/esp32/sdk/partitions/base.csv  |   5 -
 .../Esp32/Components/esp32/src/startup.cpp    |   2 +
 Sming/Arch/Esp32/Components/esp_spiffs/.cs    |   0
 .../Esp32/Components/esp_spiffs/README.rst    |   4 -
 .../Esp32/Components/esp_spiffs/component.mk  |   1 -
 .../Components/esp_spiffs/spiffs_config.c     |  37 --
 .../Esp32/Components/sming-arch/component.mk  |   1 -
 Sming/Arch/Esp32/app.mk                       |  49 --
 Sming/Arch/Esp32/standard.hw                  |  35 ++
 .../Esp8266/Components/esp8266/component.mk   |   5 -
 .../Esp8266/Components/esp8266/startup.cpp    |  70 +--
 Sming/Arch/Esp8266/Tools/ci/build.run.sh      |   6 +-
 Sming/Arch/Esp8266/app.mk                     |  17 -
 Sming/Arch/Esp8266/spiffs-two-roms.hw         |  13 +
 Sming/Arch/Esp8266/standard.hw                |  36 ++
 Sming/Arch/Esp8266/two-rom-mode.hw            |  16 +
 .../Arch/Host/Components/hostlib/startup.cpp  |   3 +
 Sming/Arch/Host/Components/vflash/README.rst  |   2 +-
 .../Arch/Host/Components/vflash/component.mk  |  36 +-
 Sming/Arch/Host/Components/vflash/vflash.py   | 123 ++++
 Sming/Arch/Host/Tools/ci/coverity-scan.sh     |   2 -
 Sming/Arch/Host/Tools/setup-network-linux.sh  |   2 +-
 Sming/Arch/Host/app.mk                        |   3 -
 Sming/Arch/Host/standard.hw                   |  20 +
 Sming/Components/FlashString                  |   2 +-
 Sming/Components/Storage/README.rst           | 335 +++++++++++
 Sming/Components/Storage/Tools/README.rst     |   6 +
 .../Storage/Tools/hwconfig/common.py          |  96 ++++
 .../Storage/Tools/hwconfig/config.py          | 106 ++++
 .../Storage/Tools/hwconfig/hwconfig.py        | 111 ++++
 .../Storage/Tools/hwconfig/partition.py       | 541 ++++++++++++++++++
 .../Storage/Tools/hwconfig/storage.py         | 116 ++++
 .../Components/{esptool => Storage}/blank.bin |   0
 Sming/Components/Storage/component.mk         | 186 ++++++
 Sming/Components/Storage/notes.rst            |  69 +++
 Sming/Components/Storage/requirements.txt     |   1 +
 Sming/Components/Storage/schema.json          | 178 ++++++
 Sming/Components/Storage/src/CustomDevice.cpp |  42 ++
 Sming/Components/Storage/src/Device.cpp       | 112 ++++
 Sming/Components/Storage/src/Iterator.cpp     |  68 +++
 Sming/Components/Storage/src/ObjectList.cpp   |  65 +++
 Sming/Components/Storage/src/Partition.cpp    | 251 ++++++++
 .../Storage/src/PartitionStream.cpp           |  61 ++
 .../Components/Storage/src/PartitionTable.cpp |  37 ++
 Sming/Components/Storage/src/ProgMem.cpp      |  35 ++
 Sming/Components/Storage/src/SpiFlash.cpp     |  66 +++
 Sming/Components/Storage/src/Storage.cpp      |  75 +++
 Sming/Components/Storage/src/SysMem.cpp       |  25 +
 .../Components/Storage/src/include/Storage.h  |  62 ++
 .../src/include/Storage/CustomDevice.h        |  35 ++
 .../Storage/src/include/Storage/Device.h      | 140 +++++
 .../Storage/src/include/Storage/Iterator.h    |  78 +++
 .../Storage/src/include/Storage/Object.h      | 144 +++++
 .../Storage/src/include/Storage/ObjectList.h  | 137 +++++
 .../Storage/src/include/Storage/Partition.h   | 376 ++++++++++++
 .../src/include/Storage/PartitionStream.h     |  61 ++
 .../src/include/Storage/PartitionTable.h      |  92 +++
 .../Storage/src/include/Storage/ProgMem.h     |  89 +++
 .../Storage/src/include/Storage/SpiFlash.h    |  38 ++
 .../src/include/Storage/StreamDevice.h        |  67 +++
 .../Storage/src/include/Storage/SysMem.h      |  88 +++
 .../src/include/Storage/partition_info.h      |  32 ++
 Sming/Components/esptool/README.rst           |  10 +-
 Sming/Components/esptool/component.mk         |  60 +-
 Sming/Components/rboot/.patches/rboot.patch   |  39 +-
 Sming/Components/rboot/README.rst             |  98 +++-
 .../rboot/appcode/rboot-overrides.c           |  43 --
 Sming/Components/rboot/component.mk           |  47 +-
 .../rboot/include/Network/RbootHttpUpdater.h  |   2 +-
 .../{appcode => include}/rboot-integration.h  |   0
 Sming/Components/rboot/rboot                  |   2 +-
 .../rboot/{host => src/Arch/Host}/rboot.cpp   |   6 +-
 .../Components/rboot/src/RbootHttpUpdater.cpp |   2 +-
 .../rboot/src/RbootOutputStream.cpp           |   4 +-
 Sming/Components/spiffs/README.rst            |  43 +-
 Sming/Components/spiffs/blankfs.bin           |   1 -
 Sming/Components/spiffs/component.mk          |  80 +--
 Sming/Components/spiffs/spiffs_config.h       |   4 +-
 Sming/Components/spiffs/spiffs_sming.cpp      | 122 ++--
 Sming/Components/spiffs/spiffs_sming.h        |  45 +-
 Sming/Components/spiffs/spiffy/spiffy.c       |   8 +-
 Sming/Core/Data/CString.h                     |  62 +-
 Sming/Core/SmingCore.h                        |   2 +
 .../Arduino_TensorFlowLite/README.rst         |   8 -
 Sming/Libraries/ArduCAM/ArduCAMStream.cpp     |   2 +-
 Sming/Libraries/Arduino_TensorFlowLite        |   2 +-
 .../CS5460/samples/generic/component.mk       |   1 -
 Sming/Libraries/DIAL                          |   2 +-
 Sming/Libraries/HueEmulator                   |   2 +-
 .../ModbusMaster/samples/generic/component.mk |   1 -
 .../OtaUpgrade/OtaUpgrade/BasicStream.cpp     |   2 +-
 Sming/Libraries/RapidXML                      |   2 +-
 Sming/Libraries/RingTone                      |   2 +-
 Sming/Libraries/SmingTest                     |   2 +-
 Sming/Libraries/TFT_S1D13781                  |   2 +-
 Sming/Libraries/UPnP                          |   2 +-
 .../modbusino/samples/generic/component.mk    |   1 -
 Sming/Makefile                                |  45 +-
 Sming/build.mk                                |   8 +-
 Sming/building.rst                            |   9 +-
 Sming/component-wrapper.mk                    |   1 +
 Sming/component.mk                            |  23 +-
 Sming/project.mk                              |   3 +
 Sming/spiffs.hw                               |  17 +
 Sming/standard-4m.hw                          |   9 +
 Tools/requirements.txt                        |   2 +
 docs/Makefile                                 |   4 +-
 .../arch/esp8266/getting-started/config.rst   |  31 +-
 docs/source/information/flash.rst             |  59 +-
 docs/source/information/rboot-ota.rst         |  89 +--
 .../source/troubleshooting/random-restart.rst |  29 +-
 docs/source/upgrading/4.2-4.3.rst             |  98 ++++
 docs/source/upgrading/index.rst               |   1 +
 samples/Accelerometer_MMA7455/component.mk    |   2 -
 samples/Arducam/component.mk                  |   2 +-
 samples/Basic_APA102/component.mk             |   2 -
 samples/Basic_AWS/component.mk                |   1 -
 samples/Basic_Audio/component.mk              |   2 -
 samples/Basic_Blink/component.mk              |   8 +-
 samples/Basic_Capsense/component.mk           |   2 -
 samples/Basic_DateTime/component.mk           |   2 -
 samples/Basic_Delegates/component.mk          |   1 -
 samples/Basic_HwPWM/component.mk              |   2 -
 samples/Basic_Interrupts/component.mk         |   1 -
 samples/Basic_NFC/component.mk                |   2 -
 samples/Basic_Neopixel/component.mk           |   2 -
 samples/Basic_ProgMem/component.mk            |   1 -
 samples/Basic_ScannerI2C/component.mk         |   1 -
 samples/Basic_Serial/component.mk             |   3 +-
 samples/Basic_Servo/component.mk              |   2 -
 samples/Basic_SmartConfig/component.mk        |   1 -
 samples/Basic_Ssl/component.mk                |   5 -
 samples/Basic_Storage/.cproject               | 153 +++++
 samples/Basic_Storage/.project                |  28 +
 samples/Basic_Storage/Makefile                |   9 +
 samples/Basic_Storage/README.rst              |   7 +
 samples/Basic_Storage/app/application.cpp     |  99 ++++
 samples/Basic_Storage/basic_storage.hw        |  53 ++
 samples/Basic_Storage/component.mk            |   4 +
 .../files/spiffs0/file for spiffs0.txt        |   7 +
 .../files/spiffs1/file for spiffs1.txt        |   7 +
 .../files/spiffs2/file for spiffs2.txt        |   7 +
 samples/Basic_Storage/user0.bin               |   1 +
 samples/Basic_Tasks/component.mk              |   1 -
 samples/Basic_Utility/component.mk            |   3 -
 samples/Basic_WebSkeletonApp/README.rst       |   2 +-
 .../Basic_WebSkeletonApp/app/application.cpp  |   2 +
 .../Basic_WebSkeletonApp/app/webserver.cpp    |   2 +-
 samples/Basic_WebSkeletonApp/component.mk     |  10 +-
 samples/Basic_WebSkeletonApp_LTS/component.mk |   3 +-
 samples/Basic_WiFi/component.mk               |   1 -
 samples/Basic_rBoot/README.rst                |  18 +-
 samples/Basic_rBoot/app/application.cpp       |  92 ++-
 samples/Basic_rBoot/basic_rboot.hw            |  19 +
 samples/Basic_rBoot/component.mk              |  32 +-
 samples/CanBus/component.mk                   |   2 -
 samples/CommandProcessing_Debug/component.mk  |   2 +-
 samples/Compass_HMC5883L/component.mk         |   2 -
 samples/DFPlayerMini/component.mk             |   2 -
 samples/DS3232RTC_NTP_Setter/component.mk     |   2 -
 samples/Display_TM1637/component.mk           |   2 -
 samples/Distance_Vl53l0x/component.mk         |   2 -
 samples/DnsCaptivePortal/component.mk         |   1 -
 samples/Echo_Ssl/component.mk                 |   5 -
 samples/FtpServer_Files/component.mk          |   2 +
 samples/Gesture_APDS-9960/component.mk        |   2 -
 samples/HttpClient/component.mk               |   3 +-
 samples/HttpClient_Instapush/component.mk     |   3 +-
 samples/HttpClient_ThingSpeak/component.mk    |   3 +-
 samples/HttpServer_AJAX/component.mk          |   1 +
 samples/HttpServer_Bootstrap/component.mk     |   2 +
 samples/HttpServer_ConfigNetwork/component.mk |   1 +
 samples/HttpServer_FirmwareUpload/README.rst  |  10 +-
 .../HttpServer_FirmwareUpload/component.mk    |   1 +
 samples/HttpServer_WebSockets/component.mk    |   1 +
 samples/Humidity_AM2321/component.mk          |   2 -
 samples/Humidity_DHT22/component.mk           |   2 -
 samples/Humidity_SI7021/component.mk          |   2 -
 samples/IR_lib/component.mk                   |   2 -
 samples/LED_WS2812/component.mk               |   2 -
 samples/LED_YeelightBulb/component.mk         |   1 -
 samples/Light_BH1750/component.mk             |   2 -
 samples/LiquidCrystal_44780/component.mk      |   2 -
 samples/LiveDebug/component.mk                |   2 -
 samples/MeteoControl/component.mk             |   1 +
 samples/MeteoControl_mqtt/component.mk        |   2 -
 samples/MqttClient_Hello/component.mk         |   5 +-
 samples/Nextion_Button/component.mk           |   2 -
 samples/PortExpander_MCP23017/component.mk    |   2 -
 samples/Pressure_BMP180/component.mk          |   2 -
 samples/Radio_RCSwitch/component.mk           |   2 -
 samples/Radio_nRF24L01/component.mk           |   2 -
 samples/Radio_si4432/component.mk             |   2 -
 samples/SDCard/component.mk                   |   1 -
 samples/ScreenLCD_5110/component.mk           |   2 -
 samples/ScreenOLED_SSD1306/component.mk       |   2 -
 samples/ScreenTFT_ILI9163C/component.mk       |   2 -
 .../ScreenTFT_ILI9340-ILI9341/component.mk    |   1 +
 samples/ScreenTFT_ST7735/component.mk         |   1 +
 samples/SmtpClient/component.mk               |   1 +
 samples/SystemClock_NTP/component.mk          |   2 -
 samples/TcpClient_NarodMon/component.mk       |   1 -
 .../Telnet_TCPServer_TCPClient/component.mk   |   1 -
 samples/Temperature_DS1820/component.mk       |   2 -
 samples/UdpServer_Echo/component.mk           |   1 -
 samples/UdpServer_mDNS/component.mk           |   3 +-
 samples/Ultrasonic_HCSR04/component.mk        |   2 -
 samples/Websocket_Client/component.mk         |   5 +-
 samples/Wifi_Sniffer/component.mk             |   1 -
 tests/HostTests/component.mk                  |   3 +-
 tests/HostTests/host-tests.hw                 |  42 ++
 tests/HostTests/include/modules.h             |   1 +
 tests/HostTests/modules/ArduinoJson6.cpp      |  26 +-
 tests/HostTests/modules/Spiffs.cpp            |   8 +-
 tests/HostTests/modules/Storage.cpp           | 110 ++++
 tests/SharedComponent/Project/component.mk    |   5 -
 219 files changed, 5626 insertions(+), 949 deletions(-)
 delete mode 100644 Sming/Arch/Esp32/Components/esp32/sdk/partitions/base.csv
 delete mode 100644 Sming/Arch/Esp32/Components/esp_spiffs/.cs
 delete mode 100644 Sming/Arch/Esp32/Components/esp_spiffs/README.rst
 delete mode 100644 Sming/Arch/Esp32/Components/esp_spiffs/component.mk
 delete mode 100644 Sming/Arch/Esp32/Components/esp_spiffs/spiffs_config.c
 create mode 100644 Sming/Arch/Esp32/standard.hw
 create mode 100644 Sming/Arch/Esp8266/spiffs-two-roms.hw
 create mode 100644 Sming/Arch/Esp8266/standard.hw
 create mode 100644 Sming/Arch/Esp8266/two-rom-mode.hw
 create mode 100644 Sming/Arch/Host/Components/vflash/vflash.py
 create mode 100644 Sming/Arch/Host/standard.hw
 create mode 100644 Sming/Components/Storage/README.rst
 create mode 100644 Sming/Components/Storage/Tools/README.rst
 create mode 100644 Sming/Components/Storage/Tools/hwconfig/common.py
 create mode 100644 Sming/Components/Storage/Tools/hwconfig/config.py
 create mode 100644 Sming/Components/Storage/Tools/hwconfig/hwconfig.py
 create mode 100644 Sming/Components/Storage/Tools/hwconfig/partition.py
 create mode 100644 Sming/Components/Storage/Tools/hwconfig/storage.py
 rename Sming/Components/{esptool => Storage}/blank.bin (100%)
 create mode 100644 Sming/Components/Storage/component.mk
 create mode 100644 Sming/Components/Storage/notes.rst
 create mode 100644 Sming/Components/Storage/requirements.txt
 create mode 100644 Sming/Components/Storage/schema.json
 create mode 100644 Sming/Components/Storage/src/CustomDevice.cpp
 create mode 100644 Sming/Components/Storage/src/Device.cpp
 create mode 100644 Sming/Components/Storage/src/Iterator.cpp
 create mode 100644 Sming/Components/Storage/src/ObjectList.cpp
 create mode 100644 Sming/Components/Storage/src/Partition.cpp
 create mode 100644 Sming/Components/Storage/src/PartitionStream.cpp
 create mode 100644 Sming/Components/Storage/src/PartitionTable.cpp
 create mode 100644 Sming/Components/Storage/src/ProgMem.cpp
 create mode 100644 Sming/Components/Storage/src/SpiFlash.cpp
 create mode 100644 Sming/Components/Storage/src/Storage.cpp
 create mode 100644 Sming/Components/Storage/src/SysMem.cpp
 create mode 100644 Sming/Components/Storage/src/include/Storage.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/CustomDevice.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/Device.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/Iterator.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/Object.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/ObjectList.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/Partition.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/PartitionStream.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/PartitionTable.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/ProgMem.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/SpiFlash.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/StreamDevice.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/SysMem.h
 create mode 100644 Sming/Components/Storage/src/include/Storage/partition_info.h
 delete mode 100644 Sming/Components/rboot/appcode/rboot-overrides.c
 rename Sming/Components/rboot/{appcode => include}/rboot-integration.h (100%)
 rename Sming/Components/rboot/{host => src/Arch/Host}/rboot.cpp (89%)
 delete mode 100644 Sming/Components/spiffs/blankfs.bin
 delete mode 100644 Sming/Libraries/.patches/Arduino_TensorFlowLite/README.rst
 create mode 100644 Sming/spiffs.hw
 create mode 100644 Sming/standard-4m.hw
 create mode 100644 Tools/requirements.txt
 create mode 100644 docs/source/upgrading/4.2-4.3.rst
 delete mode 100644 samples/Basic_Interrupts/component.mk
 delete mode 100644 samples/Basic_ProgMem/component.mk
 create mode 100644 samples/Basic_Storage/.cproject
 create mode 100644 samples/Basic_Storage/.project
 create mode 100644 samples/Basic_Storage/Makefile
 create mode 100644 samples/Basic_Storage/README.rst
 create mode 100644 samples/Basic_Storage/app/application.cpp
 create mode 100644 samples/Basic_Storage/basic_storage.hw
 create mode 100644 samples/Basic_Storage/component.mk
 create mode 100644 samples/Basic_Storage/files/spiffs0/file for spiffs0.txt
 create mode 100644 samples/Basic_Storage/files/spiffs1/file for spiffs1.txt
 create mode 100644 samples/Basic_Storage/files/spiffs2/file for spiffs2.txt
 create mode 100644 samples/Basic_Storage/user0.bin
 delete mode 100644 samples/Basic_WiFi/component.mk
 create mode 100644 samples/Basic_rBoot/basic_rboot.hw
 delete mode 100644 samples/DnsCaptivePortal/component.mk
 create mode 100644 samples/FtpServer_Files/component.mk
 create mode 100644 samples/HttpServer_Bootstrap/component.mk
 create mode 100644 samples/HttpServer_WebSockets/component.mk
 delete mode 100644 samples/TcpClient_NarodMon/component.mk
 delete mode 100644 samples/Telnet_TCPServer_TCPClient/component.mk
 delete mode 100644 samples/UdpServer_Echo/component.mk
 delete mode 100644 samples/Wifi_Sniffer/component.mk
 create mode 100644 tests/HostTests/host-tests.hw
 create mode 100644 tests/HostTests/modules/Storage.cpp

diff --git a/.ci/install.cmd b/.ci/install.cmd
index 9834f28957..9dfc9811b3 100755
--- a/.ci/install.cmd
+++ b/.ci/install.cmd
@@ -1,6 +1,6 @@
 REM Windows install script
 
-python -m pip install --upgrade pip
+python -m pip install --upgrade pip -r %SMING_HOME%\..\Tools\requirements.txt
 
 rmdir /s /q c:\MinGW
 curl -Lo MinGW.7z %SMINGTOOLS%/MinGW-2020-10-19.7z
diff --git a/.ci/install.sh b/.ci/install.sh
index 75b7fea9ca..21a90b2d2c 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -6,7 +6,7 @@ set -ex # exit with nonzero exit code if anything fails
 sudo apt-get update
 
 sudo update-alternatives --set gcc /usr/bin/gcc-9
-python -m pip install --upgrade pip
+python -m pip install --upgrade pip -r $SMING_HOME/../Tools/requirements.txt
 
 sudo apt-get install -y gcc-9-multilib g++-9-multilib python3-setuptools
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 216059625b..634f26726d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -36,11 +36,6 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
@@ -68,13 +63,14 @@ jobs:
       run: |
        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
        sudo apt-get update -y
-       sudo apt-get install gcc-9-multilib g++-9-multilib
+       sudo apt-get install gcc-9-multilib g++-9-multilib python3-wheel python3-setuptools
        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
+       python3 -m pip install --upgrade pip wheel -r Tools/requirements.txt
        env
        cd Sming
        export SMING_HOME=$(pwd)
        cd ../samples/Basic_Blink
-       make SMING_ARCH=Host
+       make -j3 SMING_ARCH=Host
        
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/Sming/Arch/Esp32/Components/esp32/sdk/partitions/base.csv b/Sming/Arch/Esp32/Components/esp32/sdk/partitions/base.csv
deleted file mode 100644
index 97c8e0148e..0000000000
--- a/Sming/Arch/Esp32/Components/esp32/sdk/partitions/base.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-# Note: if you have increased the bootloader size, make sure to update the offsets to avoid overlap
-nvs,      data, nvs,     0x9000,  0x6000,
-phy_init, data, phy,     0xf000,  0x1000,
-factory,  app,  factory, 0x10000, 0x1F0000,
diff --git a/Sming/Arch/Esp32/Components/esp32/src/startup.cpp b/Sming/Arch/Esp32/Components/esp32/src/startup.cpp
index 602dd46c13..cdb1ff521b 100644
--- a/Sming/Arch/Esp32/Components/esp32/src/startup.cpp
+++ b/Sming/Arch/Esp32/Components/esp32/src/startup.cpp
@@ -20,6 +20,7 @@
 #include <Platform/System.h>
 #include <driver/hw_timer.h>
 #include <driver/uart.h>
+#include <Storage.h>
 
 #ifndef ESP32_STACK_SIZE
 #define ESP32_STACK_SIZE 16384U
@@ -63,6 +64,7 @@ void main(void*)
 	esp_init_flash();
 	esp_init_wifi();
 	ets_init_tasks();
+	Storage::initialize();
 	System.initialize();
 	init();
 
diff --git a/Sming/Arch/Esp32/Components/esp_spiffs/.cs b/Sming/Arch/Esp32/Components/esp_spiffs/.cs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Sming/Arch/Esp32/Components/esp_spiffs/README.rst b/Sming/Arch/Esp32/Components/esp_spiffs/README.rst
deleted file mode 100644
index 9869b71f45..0000000000
--- a/Sming/Arch/Esp32/Components/esp_spiffs/README.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Esp32 SPIFFS
-============
-
-SPIFFS implementation for ESP32 devices.
diff --git a/Sming/Arch/Esp32/Components/esp_spiffs/component.mk b/Sming/Arch/Esp32/Components/esp_spiffs/component.mk
deleted file mode 100644
index 12ce0a9792..0000000000
--- a/Sming/Arch/Esp32/Components/esp_spiffs/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_DEPENDS := spiffs
diff --git a/Sming/Arch/Esp32/Components/esp_spiffs/spiffs_config.c b/Sming/Arch/Esp32/Components/esp_spiffs/spiffs_config.c
deleted file mode 100644
index c8e5f095e9..0000000000
--- a/Sming/Arch/Esp32/Components/esp_spiffs/spiffs_config.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/****
- * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
- * Created 2015 by Skurydin Alexey
- * http://github.com/SmingHub/Sming
- * All files of the Sming Core are provided under the LGPL v3 license.
- *
- * rboot-overrides.c
- *
- ****/
-
-#include "spiffs_sming.h"
-#include <esp_spi_flash.h>
-#include <esp_partition.h>
-
-/*
- * rBoot uses different spiffs organization and we need to override this method
- * during application compile time  in order to make automatic
- * mounting with `spiffs_mount()` work as expected.
- */
-spiffs_config spiffs_get_storage_config()
-{
-	spiffs_config cfg = {0};
-
-	const esp_partition_t* partition =
-		esp_partition_find_first(ESP_PARTITION_TYPE_DATA, ESP_PARTITION_SUBTYPE_DATA_SPIFFS, NULL);
-
-	if(partition == NULL) {
-		debug_w("No SPIFFS partition registered");
-	} else {
-		cfg.phys_addr = partition->address;
-		cfg.phys_size = partition->size;
-		debug_w("SPIFFS partition found at 0x%08x, size 0x%08x", cfg.phys_addr, cfg.phys_size);
-		// TODO: Check partition->flash_chip is valid?
-	}
-
-	return cfg;
-}
diff --git a/Sming/Arch/Esp32/Components/sming-arch/component.mk b/Sming/Arch/Esp32/Components/sming-arch/component.mk
index 70ecd54254..d97a67fcac 100644
--- a/Sming/Arch/Esp32/Components/sming-arch/component.mk
+++ b/Sming/Arch/Esp32/Components/sming-arch/component.mk
@@ -18,7 +18,6 @@ COMPONENT_DEPENDS := \
 	driver \
 	heap \
 	fatfs \
-	esp_spiffs \
 	esp32 \
 	gdbstub \
 	esptool
diff --git a/Sming/Arch/Esp32/app.mk b/Sming/Arch/Esp32/app.mk
index a78c572e86..4c9fca76bd 100644
--- a/Sming/Arch/Esp32/app.mk
+++ b/Sming/Arch/Esp32/app.mk
@@ -42,52 +42,3 @@ $(TARGET_OUT): $(COMPONENTS_AR)
 
 $(TARGET_BIN): $(TARGET_OUT)
 	$(Q) $(ESPTOOL_CMDLINE) elf2image --min-rev 0 --elf-sha256-offset 0xb0 $(flashimageoptions) -o $@ $<
-
-##@Flashing
-
-# Partitions
-PARTITIONS_CSV ?= $(BUILD_BASE)/partitions.csv
-PARTITIONS_BIN = $(FW_BASE)/partitions.bin
-
-CUSTOM_TARGETS += $(PARTITIONS_CSV)
-
-$(BUILD_BASE)/partitions.csv: | $(BUILD_BASE)
-	$(Q) cp $(SDK_PARTITION_PATH)/base.csv $@
-	@echo "storage, data, spiffs, $(SPIFF_START_ADDR), $(SPIFF_SIZE)," >> $@
-
-$(PARTITIONS_BIN): $(PARTITIONS_CSV)
-	$(Q) $(ESP32_PYTHON) $(SDK_COMPONENTS_PATH)/partition_table/gen_esp32part.py $< $@
-
-.PHONY: partitions
-partitions: $(PARTITIONS_BIN) ##Generate partitions table
-
-
-FLASH_PARTITION_CHUNKS	:= 0x8000=$(PARTITIONS_BIN)
-
-# Application
-
-FLASH_APP_CHUNKS := 0x10000=$(TARGET_BIN)
-
-.PHONY: flashboot
-flashboot: $(FLASH_BOOT_LOADER) ##Write just the Bootloader
-	$(call WriteFlash,$(FLASH_BOOT_CHUNKS))
-
-.PHONY: flashconfig
- 
-flashconfig: partitions kill_term ##Write partition config
-	$(call WriteFlash,$(FLASH_PARTITION_CHUNKS))
-	
-flashpartition: flashconfig
- 
-.PHONY: flashapp
-flashapp: all kill_term ##Write just the application image
-	$(call WriteFlash,$(FLASH_APP_CHUNKS))
-
-.PHONY: flash
-flash: all partitions kill_term ##Write the boot loader, application image, partition table and (if enabled) SPIFFS image
-	$(call WriteFlash,$(FLASH_BOOT_CHUNKS) $(FLASH_APP_CHUNKS) $(FLASH_PARTITION_CHUNKS) $(FLASH_SPIFFS_CHUNKS))
-ifeq ($(ENABLE_GDB), 1)
-	$(GDB_CMDLINE)
-else
-	$(TERMINAL)
-endif
diff --git a/Sming/Arch/Esp32/standard.hw b/Sming/Arch/Esp32/standard.hw
new file mode 100644
index 0000000000..1f70b3ca4d
--- /dev/null
+++ b/Sming/Arch/Esp32/standard.hw
@@ -0,0 +1,35 @@
+{
+	"name": "Standard config with single ROM",
+	"comment": "Should work with any Esp32 variant",
+	"arch": "Esp32",
+	"partition_table_offset": "0x8000",
+	"devices": {
+		"spiFlash": {
+			"type": "flash",
+			"size": "4M",
+			"mode": "dio",
+			"speed": 40
+		}
+	},
+	"partitions": {
+		"phy_init": {
+			"address": "0x00f000",
+			"size": "0x1000",
+			"type": "data",
+			"subtype": "phy"
+		},
+		"nvs": {
+			"address": "0x009000",
+			"size": "0x6000",
+			"type": "data",
+			"subtype": "nvs"
+		},
+		"factory": {
+			"address": "0x010000",
+			"size": "0x1f0000",
+			"type": "app",
+			"subtype": "factory",
+			"filename": "$(TARGET_BIN)"
+		}
+	}
+}
diff --git a/Sming/Arch/Esp8266/Components/esp8266/component.mk b/Sming/Arch/Esp8266/Components/esp8266/component.mk
index 46c5d142c8..789d7aa24f 100644
--- a/Sming/Arch/Esp8266/Components/esp8266/component.mk
+++ b/Sming/Arch/Esp8266/Components/esp8266/component.mk
@@ -8,11 +8,6 @@ FLASH_INIT_DATA			= $(SDK_BASE)/bin/esp_init_data_default.bin
 
 CUSTOM_TARGETS			+= $(FLASH_INIT_DATA)
 
-FLASH_INIT_CHUNKS += \
-	$(call FlashOffset,0x5000)=$(BLANK_BIN) \
-	$(call FlashOffset,0x4000)=$(FLASH_INIT_DATA) \
-	$(call FlashOffset,0x2000)=$(BLANK_BIN)
-
 # => 'Internal' SDK - for SDK Version 3+ as submodule in Sming repository
 # SDK_BASE just needs to point into our repo as it's overridden with the correct submodule path
 # This provides backward-compatiblity, so $(SMING)/third-party/ESP8266_NONOS_SDK) still works
diff --git a/Sming/Arch/Esp8266/Components/esp8266/startup.cpp b/Sming/Arch/Esp8266/Components/esp8266/startup.cpp
index f2adb9e490..ef6d1d07d3 100644
--- a/Sming/Arch/Esp8266/Components/esp8266/startup.cpp
+++ b/Sming/Arch/Esp8266/Components/esp8266/startup.cpp
@@ -14,6 +14,7 @@
 #include <driver/hw_timer.h>
 #include <gdb/gdb_hooks.h>
 #include <esp_cplusplus.h>
+#include <Storage.h>
 
 extern void init();
 
@@ -54,46 +55,9 @@ extern "C" void WEAK_ATTR user_rf_pre_init(void)
 
 extern "C" uint32 ICACHE_FLASH_ATTR  WEAK_ATTR user_rf_cal_sector_set(void)
 {
-    enum flash_size_map size_map = system_get_flash_size_map();
-    uint32 rf_cal_sec = 0;
-
-    switch (int(size_map)) {
-        case FLASH_SIZE_2M:
-            rf_cal_sec = 64 - 5;
-            break;
-
-        case FLASH_SIZE_4M_MAP_256_256:
-            rf_cal_sec = 128 - 5;
-            break;
-
-        case FLASH_SIZE_8M_MAP_512_512:
-            rf_cal_sec = 256 - 5;
-            break;
-
-        case FLASH_SIZE_16M_MAP_512_512:
-        case FLASH_SIZE_16M_MAP_1024_1024:
-            rf_cal_sec = 512 - 5;
-            break;
-
-        case FLASH_SIZE_32M_MAP_512_512:
-        case FLASH_SIZE_32M_MAP_1024_1024:
-            rf_cal_sec = 1024 - 5;
-            break;
-
-        case 8: // FLASH_SIZE_64M_MAP_1024_1024
-            rf_cal_sec = 2048 - 5;
-            break;
-
-        case 9: // FLASH_SIZE_128M_MAP_1024_1024
-            rf_cal_sec = 4096 - 5;
-            break;
-
-        default:
-            rf_cal_sec = 0;
-            break;
-    }
-
-    return rf_cal_sec;
+	// RF calibration stored in last sector of sysParam
+	auto sysParam = *Storage::findPartition(Storage::Partition::SubType::Data::sysParam);
+	return ((sysParam.address() + sysParam.size()) / SPI_FLASH_SEC_SIZE) - 1;
 }
 
 #ifdef SDK_INTERNAL
@@ -104,25 +68,19 @@ extern "C" uint32 ICACHE_FLASH_ATTR  WEAK_ATTR user_rf_cal_sector_set(void)
 
 extern "C" void ICACHE_FLASH_ATTR WEAK_ATTR user_pre_init(void)
 {
-	const uint32_t MAX_PROGRAM_SECTORS = 0x100000 / SPI_FLASH_SEC_SIZE; // 1MB addressable
+	Storage::initialize();
 
-	// WARNING: Sming supports SDK 3.0 with rBoot enabled apps ONLY!
-	const partition_type_t SYSTEM_PARTITION_RBOOT_CONFIG = static_cast<partition_type_t>(SYSTEM_PARTITION_CUSTOMER_BEGIN + 0);
-	const partition_type_t SYSTEM_PARTITION_PROGRAM = static_cast<partition_type_t>(SYSTEM_PARTITION_CUSTOMER_BEGIN + 1);
+	auto sysParam = *Storage::findPartition(Storage::Partition::SubType::Data::sysParam);
+	auto phy = *Storage::findPartition(Storage::Partition::SubType::Data::phy);
 
-	// Partitions offsets and sizes must be in sector multiples, so work in sectors
-	#define PARTITION_ITEM(_type, _start, _length) \
-		{_type, (_start) * SPI_FLASH_SEC_SIZE, (_length) * SPI_FLASH_SEC_SIZE}
+	// RF calibration stored in last sector of sysParam
+	auto sysParamSize = sysParam.size() - SPI_FLASH_SEC_SIZE;
 
-	// Partitions in position order
-	uint32_t rfCalSector = user_rf_cal_sector_set();
 	static const partition_item_t partitions[] = {
-			PARTITION_ITEM(SYSTEM_PARTITION_BOOTLOADER,			0,					1),
-			PARTITION_ITEM(SYSTEM_PARTITION_RBOOT_CONFIG,		1,					1),
-			PARTITION_ITEM(SYSTEM_PARTITION_PROGRAM,			2,					std::min(MAX_PROGRAM_SECTORS, rfCalSector) - 2),
-			PARTITION_ITEM(SYSTEM_PARTITION_RF_CAL,				rfCalSector,		1),
-			PARTITION_ITEM(SYSTEM_PARTITION_PHY_DATA,			rfCalSector + 1,	1),
-			PARTITION_ITEM(SYSTEM_PARTITION_SYSTEM_PARAMETER,	rfCalSector + 2,	3),
+			{SYSTEM_PARTITION_BOOTLOADER,		0,						SPI_FLASH_SEC_SIZE},
+			{SYSTEM_PARTITION_PHY_DATA,			phy.address(),			phy.size()},
+			{SYSTEM_PARTITION_SYSTEM_PARAMETER,	sysParam.address(),		sysParamSize},
+			{SYSTEM_PARTITION_RF_CAL,			sysParam.address() + sysParamSize,	SPI_FLASH_SEC_SIZE},
 	};
 
 	enum flash_size_map sizeMap = system_get_flash_size_map();
@@ -134,7 +92,7 @@ extern "C" void ICACHE_FLASH_ATTR WEAK_ATTR user_pre_init(void)
 			os_printf("partition[%u]: %u, 0x%08x, 0x%08x\n", i, part.type, part.addr, part.size);
 		}
 		if(sizeMap < FLASH_SIZE_8M_MAP_512_512) {
-			os_printf("** Note: SDK 3.0.1 requires SPI_SIZE >= 1M\n");
+			os_printf("** Note: SDK 3.0.1 requires spiFlash size >= 1M\n");
 		}
 		while(1) {
 			// Cannot proceed
diff --git a/Sming/Arch/Esp8266/Tools/ci/build.run.sh b/Sming/Arch/Esp8266/Tools/ci/build.run.sh
index 678b068a60..9ffe3edc5f 100755
--- a/Sming/Arch/Esp8266/Tools/ci/build.run.sh
+++ b/Sming/Arch/Esp8266/Tools/ci/build.run.sh
@@ -1,7 +1,11 @@
 # Esp8266 build.run.sh
 
-make -C "$SMING_PROJECTS_DIR/samples/HttpServer_FirmwareUpload" python-requirements
 $MAKE_PARALLEL samples
 make clean samples-clean
 $MAKE_PARALLEL Basic_Blink ENABLE_CUSTOM_HEAP=1 DEBUG_VERBOSE_LEVEL=3
 $MAKE_PARALLEL HttpServer_ConfigNetwork ENABLE_CUSTOM_LWIP=2 STRICT=1
+
+# Some samples (UPnP, for example) require more recent compiler
+if [ "$BUILD_COMPILER" == "eqt" ]; then
+    $MAKE_PARALLEL component-samples
+fi
diff --git a/Sming/Arch/Esp8266/app.mk b/Sming/Arch/Esp8266/app.mk
index 88f45e491f..2521c1df13 100644
--- a/Sming/Arch/Esp8266/app.mk
+++ b/Sming/Arch/Esp8266/app.mk
@@ -71,24 +71,7 @@ $(TARGET_OUT_1): $(COMPONENTS_AR) $(LIBMAIN_DST)
 
 ##@Flashing
 
-.PHONY: flashboot
-flashboot: $(RBOOT_BIN) ##Write just the rBoot boot sector
-	$(call WriteFlash,$(FLASH_RBOOT_BOOT_CHUNKS))
-
 .PHONY: flashconfig
 flashconfig: kill_term ##Erase the rBoot config sector
 	$(info Erasing rBoot config sector)
 	$(call WriteFlash,$(FLASH_RBOOT_ERASE_CONFIG_CHUNKS))
- 
-.PHONY: flashapp
-flashapp: all kill_term ##Write just the application image
-	$(call WriteFlash,$(FLASH_RBOOT_APP_CHUNKS))
-
-.PHONY: flash
-flash: all kill_term ##Write the rBoot boot sector, application image and (if enabled) SPIFFS image
-	$(call WriteFlash,$(FLASH_RBOOT_BOOT_CHUNKS) $(FLASH_RBOOT_APP_CHUNKS) $(FLASH_SPIFFS_CHUNKS))
-ifeq ($(ENABLE_GDB), 1)
-	$(GDB_CMDLINE)
-else
-	$(TERMINAL)
-endif
diff --git a/Sming/Arch/Esp8266/spiffs-two-roms.hw b/Sming/Arch/Esp8266/spiffs-two-roms.hw
new file mode 100644
index 0000000000..9503891e2a
--- /dev/null
+++ b/Sming/Arch/Esp8266/spiffs-two-roms.hw
@@ -0,0 +1,13 @@
+{
+	"name": "Two ROM slots with single SPIFFS",
+	"base_config": "spiffs",
+	"partitions": {
+		"rom1": {
+			"address": "0x108000",
+			"size": "992K",
+			"type": "app",
+			"subtype": "ota_0",
+			"filename": "$(RBOOT_ROM_1_BIN)"
+		}
+	}
+}
diff --git a/Sming/Arch/Esp8266/standard.hw b/Sming/Arch/Esp8266/standard.hw
new file mode 100644
index 0000000000..240e56f679
--- /dev/null
+++ b/Sming/Arch/Esp8266/standard.hw
@@ -0,0 +1,36 @@
+{
+	"name": "Standard config with single ROM",
+	"comment": "Should work with any Esp8266 variant",
+	"arch": "Esp8266",
+	"partition_table_offset": "0x2000",
+	"devices": {
+		"spiFlash": {
+			"type": "flash",
+			"size": "1M",
+			"mode": "dio",
+			"speed": 40
+		}
+	},
+	"partitions": {
+		"phy_init": {
+			"address": "0x003000",
+			"size": "4K",
+			"type": "data",
+			"subtype": "phy",
+			"filename": "$(FLASH_INIT_DATA)"
+		},
+		"sys_param": {
+			"address": "0x004000",
+			"size": "16K",
+			"type": "data",
+			"subtype": "sysparam"
+		},
+		"rom0": {
+			"address": "0x008000",
+			"size": "992K",
+			"type": "app",
+			"subtype": "factory",
+			"filename": "$(RBOOT_ROM_0_BIN)"
+		}
+	}
+}
diff --git a/Sming/Arch/Esp8266/two-rom-mode.hw b/Sming/Arch/Esp8266/two-rom-mode.hw
new file mode 100644
index 0000000000..9d6399179f
--- /dev/null
+++ b/Sming/Arch/Esp8266/two-rom-mode.hw
@@ -0,0 +1,16 @@
+{
+	"name": "Two ROM slots in 1MB of flash",
+	"base_config": "standard",
+	"partitions": {
+		"rom0": {
+			"size": "480K"
+		},
+		"rom1": {
+			"address": "0x80000",
+			"size": "512K",
+			"type": "app",
+			"subtype": "ota_0",
+			"filename": "$(RBOOT_ROM_1_BIN)"
+		}
+	}
+}
diff --git a/Sming/Arch/Host/Components/hostlib/startup.cpp b/Sming/Arch/Host/Components/hostlib/startup.cpp
index 330c6c44f7..e9f95c91b2 100644
--- a/Sming/Arch/Host/Components/hostlib/startup.cpp
+++ b/Sming/Arch/Host/Components/hostlib/startup.cpp
@@ -32,6 +32,7 @@
 #include <host_lwip.h>
 #include <stdlib.h>
 #include "include/hostlib/CommandLine.h"
+#include <Storage.h>
 
 #include <Platform/System.h>
 #include <Platform/Timers.h>
@@ -213,6 +214,8 @@ int main(int argc, char* argv[])
 	if(config.initonly) {
 		hostmsg("Initialise-only requested");
 	} else {
+		Storage::initialize();
+
 		CThread::startup();
 
 		hw_timer_init();
diff --git a/Sming/Arch/Host/Components/vflash/README.rst b/Sming/Arch/Host/Components/vflash/README.rst
index f94b6416f1..862312c3af 100644
--- a/Sming/Arch/Host/Components/vflash/README.rst
+++ b/Sming/Arch/Host/Components/vflash/README.rst
@@ -19,7 +19,7 @@ The following options are interpreted and used to provide command-line parameter
 
    This defaults to a combination of the above variables, but you can override if necessary.
 
-The size of the flash memory is set via :envvar:`SPI_SIZE`.
+The size of the flash memory is set via :ref:`hardware_config`.
 
 See :component-esp8266:`esptool` for details and other applicable variables.
 
diff --git a/Sming/Arch/Host/Components/vflash/component.mk b/Sming/Arch/Host/Components/vflash/component.mk
index 10dc7b47cc..98410de609 100644
--- a/Sming/Arch/Host/Components/vflash/component.mk
+++ b/Sming/Arch/Host/Components/vflash/component.mk
@@ -7,32 +7,38 @@ DD					:= dd
 CACHE_VARS			+= FLASH_BIN
 FLASH_BIN			?= $(FW_BASE)/flash.bin
 
-CONFIG_VARS			+= SPI_SIZE
-SPI_SIZE			?= 4M
+DEBUG_VARS			+= SPI_SIZE
+SPI_SIZE			= $(STORAGE_DEVICE_spiFlash_SIZE)
 
 # Options to add when running emulator
 CACHE_VARS			+= HOST_FLASH_OPTIONS
 HOST_FLASH_OPTIONS	?= --flashfile=$(FLASH_BIN) --flashsize=$(SPI_SIZE)
 CLI_TARGET_OPTIONS += $(HOST_FLASH_OPTIONS)
 
-# Write data to flash
-# $1 -> Start offset
-# $2 -> File containing data to write
-define WriteFlashChunk
-	$(info WriteFlash $1 -> $2)
-	$(Q) if [ ! -f $(FLASH_BIN) ]; then \
-		$(EraseFlash); \
-	fi
-	$(Q) $(DD) if=$2 of=$(FLASH_BIN) obs=1 seek=$$(($1)) conv=notrunc
-endef
+# Virtual flasher tool
+VFLASH := $(PYTHON) $(COMPONENT_PATH)/vflash.py $(FLASH_BIN) $(STORAGE_DEVICE_spiFlash_SIZE_BYTES)
 
 # Write one or more chunks to flash
 # $1 -> List of `Offset=File` chunks
 define WriteFlash
-	$(foreach c,$1,$(call WriteFlashChunk,$(word 1,$(subst =, ,$c)),$(word 2,$(subst =, ,$c))))
+	$(if $1,$(Q) $(VFLASH) write-chunks $1)
+endef
+
+# Read flash memory into file
+# $1 -> `Offset,Size` chunk
+# $2 -> Output filename
+define ReadFlash
+	$(info ReadFlash $1,$2)
+	$(Q) $(VFLASH) read-chunks $1=$2
+endef
+
+# Erase a region of Flash
+# $1 -> List of `Offset,Size` chunks
+define EraseFlashRegion
+	$(Q) $(VFLASH) fill-regions $1
 endef
 
 # Reset/create flash backing file
 define EraseFlash
-	$(DD) if=/dev/zero ibs=1 count=$(SPI_SIZE) | tr "\000" "\377" > $(FLASH_BIN)
-endef 
+	$(Q) $(VFLASH) erase
+endef
diff --git a/Sming/Arch/Host/Components/vflash/vflash.py b/Sming/Arch/Host/Components/vflash/vflash.py
new file mode 100644
index 0000000000..cf91295cf5
--- /dev/null
+++ b/Sming/Arch/Host/Components/vflash/vflash.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python3
+#
+# Virtual flash tool to support operations on flash backing file for Sming Host.
+#
+# Copyright 2021 mikee47 <mike@sillyhouse.net>
+#
+# This file is part of the Sming Framework Project
+#
+# This library 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, version 3 or later.
+#
+# This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+
+import os, argparse
+
+# Interpret argument such as 0x1234
+def auto_int(x):
+    return int(x, 0)
+
+def fill_region(offset, length, value):
+    print("  fill_region(0x%08x, 0x%04x, 0x%02x)" % (offset, length, value))
+    flashImage.seek(offset, os.SEEK_SET)
+    tmp = bytearray([value] * length)
+    flashImage.write(tmp)
+
+def erase(args):
+    fill_region(0, args.imagesize, 0xff)
+
+def erase_region(args):
+    fill_region(args.offset, args.size, 0xff)
+
+# Offset,size
+def erase_regions(args):
+    for s in args.chunks:
+        offset, size = s.split(',')
+        fill_region(int(offset, 0), int(size, 0), 0xff)
+
+# Offset,size=value
+def fill_regions(args):
+    for s in args.chunks:
+        offset, tmp = s.split(',')
+        x = tmp.split('=')
+        if len(x) == 1:
+            size = x[0]
+            value = '0xff'
+        else:
+            size, value = x
+        fill_region(int(offset, 0), int(size, 0), int(value,0))
+
+def write_chunk(offset, filename):
+    print("  write_chunk(0x%08x, '%s')" % (offset, filename))
+    flashImage.seek(offset, os.SEEK_SET)
+    data = open(filename, "rb").read()
+    len = flashImage.write(data)
+    print("    - wrote 0x%04x bytes" % len)
+
+# Offset=filename
+def write_chunks(args):
+    for s in args.chunks:
+        offset, file = s.split('=')
+        write_chunk(int(offset, 0), file)
+
+
+def read_chunk(offset, size, filename):
+    print("  read_chunk(0x%08x, 0x%04x, '%s')" % (offset, size, filename))
+    flashImage.seek(offset, os.SEEK_SET)
+    data = flashImage.read(size)
+    open(filename, "wb").write(data)
+
+# Offset,size=filename
+def read_chunks(args):
+    for s in args.chunks:
+        offset, x = s.split(',')
+        size, filename = x.split('=')
+        read_chunk(int(offset, 0), int(size, 0), filename)
+
+
+if __name__ == "__main__":
+
+    parser = argparse.ArgumentParser(description='Virtual flash tool')
+    parser.add_argument('filename', help='Flash image filename')
+    parser.add_argument('imagesize', type=auto_int, help='Flash image size')
+    parser.set_defaults(func=None)
+    subparsers = parser.add_subparsers()
+
+    fill_regions_parser = subparsers.add_parser('fill-regions', help='Fill region(s) of flash')
+    fill_regions_parser.add_argument('chunks', nargs='+', help='List of "offset,size[=value]" chunks, default value is 0xff')
+    fill_regions_parser.set_defaults(func=fill_regions)
+
+    erase_parser = subparsers.add_parser('erase', help='Erase entire flash')
+    erase_parser.set_defaults(func=erase)
+
+    write_chunks_parser = subparsers.add_parser('write-chunks', help='Write chunks to flash')
+    write_chunks_parser.add_argument('chunks', nargs='+', help='List of "offset=file" chunks')
+    write_chunks_parser.set_defaults(func=write_chunks)
+
+    read_chunks_parser = subparsers.add_parser('read-chunks', help='Read chunks from flash')
+    read_chunks_parser.add_argument('chunks', nargs='+', help='List of "offset,size=file" chunks')
+    read_chunks_parser.set_defaults(func=read_chunks)
+
+    args = parser.parse_args()
+
+    flashImage = open(args.filename, "rb+" if os.path.isfile(args.filename) else "wb+")
+
+    print("vflash('%s')" % args.filename)
+
+    # Pad flash image file if it's not big enough
+    flashImage.seek(0, os.SEEK_END)
+    imgsize = flashImage.tell()
+    if imgsize < args.imagesize:
+        fill_region(imgsize, args.imagesize - imgsize, 0xff)
+
+    # Invoke any user-provided functions (optional)
+    fn = args.func
+    if fn is None:
+        parser.print_usage()
+    else:
+        fn(args)
+
+    flashImage.close()
diff --git a/Sming/Arch/Host/Tools/ci/coverity-scan.sh b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
index d914716e71..f53b2afb6a 100755
--- a/Sming/Arch/Host/Tools/ci/coverity-scan.sh
+++ b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-make -C $SMING_HOME/../samples/HttpServer_FirmwareUpload python-requirements
-
 COVERITY_SCAN_PROJECT_NAME=SmingHub/Sming
 COVERITY_SCAN_NOTIFICATION_EMAIL="slaff@attachix.com"
 COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_FirmwareUpload SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"
diff --git a/Sming/Arch/Host/Tools/setup-network-linux.sh b/Sming/Arch/Host/Tools/setup-network-linux.sh
index 1d2585241a..7f5b7c2df8 100755
--- a/Sming/Arch/Host/Tools/setup-network-linux.sh
+++ b/Sming/Arch/Host/Tools/setup-network-linux.sh
@@ -17,7 +17,7 @@ fi
 # Create a tap0 interface with IP network 192.168.13.1/24
 sudo ip tuntap add dev tap0 mode tap user $(whoami)
 sudo ip a a dev tap0 192.168.13.1/24
-sudo ifconfig tap0 up
+sudo ip link set tap0 up
 
 # The following lines are needed if you plan to access Internet
 sudo sysctl net.ipv4.ip_forward=1
diff --git a/Sming/Arch/Host/app.mk b/Sming/Arch/Host/app.mk
index 8e26c5a03f..9e4f858af4 100644
--- a/Sming/Arch/Host/app.mk
+++ b/Sming/Arch/Host/app.mk
@@ -43,6 +43,3 @@ $(RUN_SCRIPT)::
 	$(foreach id,$(ENABLE_HOST_UARTID),echo '$(call RunHostTerminal,$(id))' >> $@;) \
 	echo '$(TARGET_OUT_0) $(CLI_TARGET_OPTIONS) -- $(HOST_PARAMETERS)' >> $@; \
 	chmod a+x $@
-
-.PHONY: flash
-flash: all flashfs ##Write all images to (virtual) flash
diff --git a/Sming/Arch/Host/standard.hw b/Sming/Arch/Host/standard.hw
new file mode 100644
index 0000000000..7572825a4c
--- /dev/null
+++ b/Sming/Arch/Host/standard.hw
@@ -0,0 +1,20 @@
+{
+	"name": "Standard config with single ROM",
+	"arch": "Host",
+	"partition_table_offset": "0x2000",
+	"devices": {
+		"spiFlash": {
+			"type": "flash",
+			"size": "4M"
+		}
+	},
+	"partitions": {
+		"rom0": {
+			"address": "0x008000",
+			"size": "992K",
+			"type": "app",
+			"subtype": "factory",
+			"filename": "$(BLANK_BIN)"
+		}
+	}
+}
diff --git a/Sming/Components/FlashString b/Sming/Components/FlashString
index 4d0934f499..e0e95dbe53 160000
--- a/Sming/Components/FlashString
+++ b/Sming/Components/FlashString
@@ -1 +1 @@
-Subproject commit 4d0934f499d9d2a583d1de62c65ce5266f4ec82f
+Subproject commit e0e95dbe5399c15a4637eee9dbf46a7cb212ef36
diff --git a/Sming/Components/Storage/README.rst b/Sming/Components/Storage/README.rst
new file mode 100644
index 0000000000..e4afc51031
--- /dev/null
+++ b/Sming/Components/Storage/README.rst
@@ -0,0 +1,335 @@
+Storage Management
+==================
+
+.. highlight:: bash
+
+This Component provides support for using storage devices in a structured way by partitioning
+them into areas for specific uses.
+Partitions may can contain information such as:
+
+-  Application (firmware) images
+-  Filesystem(s)
+-  Configuration/calibration/parameter data
+-  Custom flash storage areas
+
+A single partition table is located on the main flash device, :cpp:var:`Storage::spiFlash`,
+and defines all partitions with a unique name and associated
+:cpp:enum:`Storage::Partition::Type` / :cpp:type:`Storage::Partition::SubType`.
+
+
+
+.. _hardware_config:
+
+Hardware configuration
+----------------------
+
+Each project has an associated ``Hardware configuration``, specified by the :envvar:`HWCONFIG` setting:
+this is a JSON file with a ``.hw`` extension.
+
+The build system locates the file by searching, in order:
+
+-  ``{PROJECT_DIR}`` the root project directory
+-  ``{SMING_HOME}/Arch/{SMING_ARCH}``
+-  ``{SMING_HOME}``
+
+Each architecture provides a ``standard`` configuration which defines such things as the
+partition table location and standard system partitions. Other configurations inherit
+from this by providing a ``base_config`` value.
+
+You can list the available configs like this::
+
+   make hwconfig-list
+
+This also shows the file path should you wish to view or edit it.
+
+To select and view the resulting configuration, do this::
+
+   make hwconfig HWCONFIG=spiffs
+
+or, to show the partition map::
+
+   make map HWCONFIG=spiffs
+
+.. note::
+
+   You can set :envvar:`HWCONFIG` in your project's ``component.mk`` file, however as with other
+   configuration variables it will be overridden by the cached value set on the command line.
+
+   For example, if you want to change from ``standard`` to ``standard-4m`` for your project,
+   first add this line to your component.mk file::
+
+      HWCONFIG := standard-4m
+
+   Then either run ``make HWCONFIG=standard-4m`` or ``make config-clean``.
+
+
+Custom configurations
+---------------------
+
+To customise the hardware configuration for a project, for example 'my_project':
+
+1. Create a new configuration file in your project root, such as ``my_project.hw``:
+
+   .. code-block:: json
+
+      {
+         "name": "My project config",
+         "base_config": "spiffs"
+      }
+
+   You can use any available configuration as the base_config.
+
+
+2. If required, modify any inherited settings:
+
+   .. code-block:: json
+
+      {
+         "name": "My config",
+         "base_config": "standard",
+         "devices": {
+            "spiFlash": {
+               "speed": 80,
+               "mode": "qio",
+               "size": "2M"
+            }
+         },
+         "partitions": {
+            "rom0": {
+               "address": "0x10000",
+               "size": "0x80000"
+            }
+         }
+      }
+
+   This will adjust flash parameters (previously via SPI_SPEED, SPI_MODE and SPI_SIZE),
+   and the location/size of the primary application partition.
+
+3. Add any additional partitions:
+
+   .. code-block:: json
+
+      {
+         "name": "My config",
+         "base_config": "standard-4m",
+         "partitions": {
+            "rom0": {
+               "address": "0x10000",
+               "size": "0x80000"
+            },
+            "spiffs1": {
+                  "address": "0x00280000",
+                  "size": "256K",
+                  "type": "data",
+                  "subtype": "spiffs",
+                  "filename": "$(FW_BASE)/spiffs1_rom.bin",
+                  "build": {
+                     "target": "spiffsgen",
+                     "files": "files/spiffs1"
+                  }
+            }
+         }
+      }
+
+   This adds a second SPIFFS partition, and instructs the build system to generate
+   an image file for it using the files in the project's ``files/spiffs1`` directory.
+
+4. Select the new configuration and re-build the project::
+
+      make HWCONFIG=my_project
+
+   You should also add this to your project's ``component.mk`` file::
+
+      HWCONFIG := my_project
+
+5. Program your device::
+
+      make flash
+
+   This will flash everything: bootloader, partition table and all defined partitions (those with a ``filename`` entry).
+
+
+Partition maps
+--------------
+
+This is a concise view of your flash partitions. Display it like this::
+
+   make map
+
+For the :sample:`Basic_Storage` sample application, we get this:
+
+.. code-block:: text
+
+   Basic_Storage: Invoking 'map' for Esp8266 (debug) architecture
+   Partition map:
+   Device            Start       End         Size        Type      SubType   Name              Filename
+   ----------------  ----------  ----------  ----------  --------  --------  ----------------  ------------
+   spiFlash          0x00000000  0x00001fff          8K                      Boot Sector
+   spiFlash          0x00002000  0x00002fff          4K                      Partition Table
+   spiFlash          0x00003000  0x00003fff          4K  data      phy       phy_init          $(FLASH_INIT_DATA)
+   spiFlash          0x00004000  0x00007fff         16K  data      sysparam  sys_param
+   spiFlash          0x00008000  0x000fffff        992K  app       factory   rom0              $(RBOOT_ROM_0_BIN)
+   spiFlash          0x00100000  0x001effff        960K                      (unused)
+   spiFlash          0x001f0000  0x001f3fff         16K  user      0         user0             user0.bin
+   spiFlash          0x001f4000  0x001f7fff         16K  user      1         user1
+   spiFlash          0x001f8000  0x001fffff         32K                      (unused)
+   spiFlash          0x00200000  0x0027ffff        512K  data      spiffs    spiffs0           $(SPIFF_BIN_OUT)
+   spiFlash          0x00280000  0x002bffff        256K  data      spiffs    spiffs1           $(FW_BASE)/spiffs1_rom.bin
+   spiFlash          0x002c0000  0x002fffff        256K  data      spiffs    spiffs2           $(FW_BASE)/spiffs2_rom.bin
+   spiFlash          0x00300000  0x003fffff          1M                      (unused)
+
+For comparison, here's the output for Esp32:
+
+.. code-block:: text
+
+   Basic_Storage: Invoking 'map' for Esp32 (debug) architecture
+   Partition map:
+   Device            Start       End         Size        Type      SubType   Name              Filename
+   ----------------  ----------  ----------  ----------  --------  --------  ----------------  ------------
+   spiFlash          0x00000000  0x00007fff         32K                      Boot Sector
+   spiFlash          0x00008000  0x00008fff          4K                      Partition Table
+   spiFlash          0x00009000  0x0000efff         24K  data      nvs       nvs
+   spiFlash          0x0000f000  0x0000ffff          4K  data      phy       phy_init
+   spiFlash          0x00010000  0x001fffff       1984K  app       factory   factory           $(TARGET_BIN)
+   spiFlash          0x001f0000  0x001f3fff         16K  user      0         user0             user0.bin
+   spiFlash          0x001f4000  0x001f7fff         16K  user      1         user1
+   spiFlash          0x001f8000  0x001fffff         32K                      (unused)
+   spiFlash          0x00200000  0x0027ffff        512K  data      spiffs    spiffs0           $(SPIFF_BIN_OUT)
+   spiFlash          0x00280000  0x002bffff        256K  data      spiffs    spiffs1           $(FW_BASE)/spiffs1_rom.bin
+   spiFlash          0x002c0000  0x002fffff        256K  data      spiffs    spiffs2           $(FW_BASE)/spiffs2_rom.bin
+   spiFlash          0x00300000  0x003fffff          1M                      (unused)
+
+
+To compare this with the partition map programmed into a device, do this::
+
+   make readmap map
+
+
+JSON validation
+---------------
+
+When the binary partition table is built or updated, the configuration is first
+validated against a schema :source:`Sming/Components/Storage/schema.json`.
+
+This complements the checks performed by the ``hwconfig`` tool.
+
+You can run the validation manually like this::
+
+   make hwconfig-validate
+
+See `JSON Schema <https://json-schema.org/>`__ for details about JSON schemas.
+
+
+Configuration
+-------------
+
+.. envvar:: HWCONFIG
+
+   default: standard
+
+   Set this to the hardware configuration to use for your project.
+
+   Default configurations:
+
+   standard
+      Base profile with 1MB flash size which should work on all device variants.
+      Located in the ``Sming/Arch/{SMING_ARCH}`` directory.
+
+      standard-4m
+         Overrides ``standard`` to set 4Mbyte flash size
+   
+         spiffs
+            Adds a single SPIFFS partition. See :component:`spiffs`.
+
+   Other configurations may be available, depending on architecture.
+   You can see these by running ``make hwconfig-list``.
+
+   For example, to select ``spiffs`` add the following line to your project::
+
+        HWCONFIG := spiffs
+
+   You will also need to run ``make HWCONFIG=spiffs`` to change the cached value
+   (or ``make config-clean`` to reset everything).
+
+
+Binary partition table
+----------------------
+
+Sming uses the same binary partition table structure as ESP-IDF, located immediately after the boot sector.
+However, it is organised slighly differently to allow partitions to be registered for multiple storage devices.
+
+Entries are fixed 32-byte structures, :cpp:class:`Storage::esp_partition_info_t`, organised as follows:
+
+-  The first entry is always a ``storage`` type defining the main :cpp:var:`spiFlash` device.
+-  This is followed by regular partition entries sorted in ascending address order.
+   There may be gaps between the partitions.
+-  The partition table md5sum entry is inserted as normal
+-  If any external devices are defined:
+   -  A SMING_EXTENSION entry, which the esp32 bootloader interprets as the end of the partition table.
+   -  The next entry is a ``storage`` type for the ``external`` device.
+   -  This is followed by regular partition entries as before.
+   -  A second md5sum entry is inserted for the entire partition table thus far
+-  The end of the partition table is identified by an empty sector (i.e. all bytes 0xFF).
+
+
+
+Partition API
+-------------
+
+This is a C++ interface. Some examples::
+
+   Storage::Partition part = Storage::findPartition("spiffs0"); // Find by name
+   if(part) {
+     debugf("Partition '%s' found", part.name().c_str());
+   } else {
+     debugf("Partition NOT found");
+   }
+
+   // Enumerate all partitions
+   for(auto it = Storage::findPartition(); it; ++it) {
+      auto part = *it;
+      debugf("Found '%s' at 0x%08x, size 0x%08x", part.name().c_str(), part.address(), part.size());
+   }
+
+   // Enumerate all SPIFFS partitions
+   for(auto it = Storage::findPartition(Partition::SubType::Data::spiffs; it; it++) {
+      debugf("Found '%s' at 0x%08x, size 0x%08x", it->name().c_str(), it->address(), it->size());
+   }
+
+
+A :cpp:class:`Storage::Partition` object is just a wrapper and can be freely copied around.
+It defines methods which should be used to read/write/erase the partition contents.
+
+Each partition has an associated :cpp:class:`Storage::Device`.
+This is usually :cpp:var:`Storage::spiFlash` for the main flash device.
+
+Other devices must be registed via :cpp:func:`Storage::PartitionTable::registerStorageDevice`.
+
+You can query partition entries from a Storage object directly, for example::
+
+   #include <Storage/SpiFlash.h>
+
+   for(auto part: Storage::spiFlash->partitions()) {
+      debugf("Found '%s' at 0x%08x, size 0x%08x", part.name().c_str(), part.address(), part.size());
+   }
+
+
+External Storage
+----------------
+
+If your design has additional fixed storage devices, such as SPI RAM, flash or EEPROM,
+you can take advantage of the partition API to manage them as follows:
+
+-  Implement a class to manage the storage, inheriting from :cpp:class:`Storage::Device`.
+-  Create a custom hardware configuration for your project and add a ``devices`` entry
+   describing your storage device, plus partition entries: the ``device`` field identifies
+   which device these entries relate to.
+-  Create an instance of your custom device and make a call to :cpp:func:`Storage::registerDevice`
+   in your ``init()`` function (or elsewhere if more appropriate).
+
+ 
+API
+---
+
+.. doxygennamespace:: Storage
+   :members:
diff --git a/Sming/Components/Storage/Tools/README.rst b/Sming/Components/Storage/Tools/README.rst
new file mode 100644
index 0000000000..04d56eacff
--- /dev/null
+++ b/Sming/Components/Storage/Tools/README.rst
@@ -0,0 +1,6 @@
+Partition tools
+===============
+
+hwconfig.py
+   Supports parsing and creation of hardware configuration files which include partition information.
+
diff --git a/Sming/Components/Storage/Tools/hwconfig/common.py b/Sming/Components/Storage/Tools/hwconfig/common.py
new file mode 100644
index 0000000000..8c28db32bb
--- /dev/null
+++ b/Sming/Components/Storage/Tools/hwconfig/common.py
@@ -0,0 +1,96 @@
+#
+# Common functions and definitions
+#
+
+import sys, json, platform
+
+quiet = False
+
+def status(msg):
+    """ Print status message to stderr """
+    if not quiet:
+        critical(msg)
+
+
+def critical(msg):
+    """ Print critical message to stderr """
+    sys.stderr.write(msg)
+    sys.stderr.write('\n')
+
+
+def fixpath(path):
+    """ Paths in Windows can get a little weird """
+    if len(path) > 2 and path[1] != ':' and platform.system() == 'Windows' and path[2] == '/':
+        return path[1] + ':' + path[2:]
+    return path
+
+
+def parse_int(v, keywords=None):
+    """Generic parser for integer fields - int(x,0) with provision for
+    k/m/K/M suffixes and 'keyword' value lookup.
+    """
+    if not isinstance(v, str):
+        return v
+    if keywords is None or len(keywords) == 0:
+        try:
+            for letter, multiplier in [("k", 1024), ("m", 1024 * 1024), ("g", 1024 * 1024 * 1024)]:
+                if v.lower().endswith(letter):
+                    return parse_int(v[:-1], keywords) * multiplier
+            return int(v, 0)
+        except ValueError:
+            raise InputError("Invalid field value %s" % v)
+    try:
+        return keywords[v.lower()]
+    except KeyError:
+        raise InputError("Value '%s' is not valid. Known keywords: %s" % (v, ", ".join(keywords)))
+
+
+def stringnum(s):
+    """Return number if s contains only digits, otherwise return the string
+    """
+    return int(s) if s.isdigit() else s
+
+
+def addr_format(a):
+    return "0x%08x" % a
+
+
+def size_format(a):
+    if a != 0:
+        for (val, suffix) in [(0x40000000, "G"), (0x100000, "M"), (0x400, "K")]:
+            if a % val == 0:
+                return "%d%s" % (a // val, suffix)
+    return "0x%08x" % a
+
+
+def quote(v):
+    return '"' + v + '"'
+
+
+def contains_whitespace(s):
+    return ''.join(s.split()) != s
+
+
+def to_json(obj):
+    return json.dumps(obj, indent=4)
+
+
+def lookup_keyword(t, keywords):
+    for k, v in keywords.items():
+        if t == v:
+            return k
+    return "%d" % t
+
+
+class InputError(RuntimeError):
+
+    def __init__(self, e):
+        super(InputError, self).__init__(e)
+
+
+class ValidationError(InputError):
+
+    def __init__(self, partition, message):
+        super(ValidationError, self).__init__(
+            "Partition %s invalid: %s" % (partition.name, message))
+
diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
new file mode 100644
index 0000000000..b4972375f6
--- /dev/null
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -0,0 +1,106 @@
+#
+# Configuration object
+#
+
+import os, partition, storage
+from common import *
+from builtins import classmethod
+
+def findConfig(name):
+    dirs = os.environ['HWCONFIG_DIRS'].split(' ')
+    for d in dirs:
+        path = os.path.join(fixpath(d), name + '.hw')
+        if os.path.exists(path):
+            return path
+    raise InputError("Config '%s' not found" % name)
+
+class Config(object):
+    def __init__(self):
+        self.partitions = partition.Table()
+        self.devices = storage.List()
+        self.depends = []
+
+    def __str__(self):
+        return "'%s' for %s" % (self.name, self.arch)
+
+    @classmethod
+    def from_name(cls, name):
+        config = Config()
+        config.load(name)
+        return config
+
+    def load(self, name):
+        filename = findConfig(name)
+        self.depends.append(filename)
+        data = json.load(open(filename))
+        self.parse_dict(data)
+
+    def parse_dict(self, data):
+        base_config = data.get('base_config')
+        if base_config is not None:
+            self.load(base_config)
+            del data['base_config']
+
+        for k, v in data.items():
+            if k == 'name':
+                self.name = v
+            elif k == 'arch':
+                self.arch = v
+            elif k == 'partition_table_offset':
+                self.partitions.offset = parse_int(v)
+            elif k == 'devices':
+                self.devices.parse_dict(v)
+            elif k == 'comment':
+                self.comment = v
+            elif k != 'partitions':
+                raise InputError("Unknown config key '%s'" % k)
+
+        v = data.get('partitions')
+        if not v is None:
+            self.partitions.parse_dict(v, self.devices)
+
+    def dict(self):
+        res = {}
+
+        res['name'] = self.name
+        if hasattr(self, 'comment'):
+            res['comment'] = self.comment
+        res['arch'] = self.arch;
+        res['partition_table_offset'] = self.partitions.offset_str()
+        res['devices'] = self.devices.dict()
+        res['partitions'] = self.partitions.dict()
+        return res
+
+    def to_json(self):
+        return to_json(self.dict())
+
+    def buildVars(self):
+        dict = {}
+
+        dict['SMING_ARCH_HW'] = self.arch
+        dict['PARTITION_TABLE_OFFSET'] = self.partitions.offset_str()
+        dict['PARTITION_TABLE_LENGTH'] = "0x%04x" % partition.MAX_PARTITION_LENGTH
+        dict['SPIFLASH_PARTITION_NAMES'] = " ".join(p.name for p in filter(lambda p: p.device == self.devices[0], self.partitions))
+        dict['HWCONFIG_DEPENDS'] = " ".join(self.depends)
+        dict.update(self.devices.buildVars())
+        dict.update(self.partitions.buildVars())
+
+        res = "# Generated from hardware configuration '%s'\r\n" % self.name
+        for k, v in dict.items():
+            res += "%s = %s\r\n" % (k, v)
+        return res
+
+    def verify(self, secure):
+        self.partitions.verify(self.arch, secure)
+
+    def map(self):
+        return partition.Map(self.partitions, self.devices)
+
+    @classmethod
+    def from_binary(cls, b):
+        res = Config()
+        res.name = 'from binary'
+        res.arch = os.environ.get('SMING_ARCH', 'Unknown')
+        res.partitions.offset = 0
+        res.partitions.parse_binary(b, res.devices)
+        return res
diff --git a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
new file mode 100644
index 0000000000..5a8cfbdf9b
--- /dev/null
+++ b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
@@ -0,0 +1,111 @@
+#!/usr/bin/env python3
+#
+# Sming hardware configuration tool
+#
+
+import common, argparse, os, partition
+from common import *
+from config import Config
+
+def openOutput(path):
+    if path == '-':
+        try:
+            stdout_binary = sys.stdout.buffer  # Python 3
+        except AttributeError:
+            stdout_binary = sys.stdout
+        return stdout_binary
+    status("Writing to '%s'" % path)
+    output_dir = os.path.abspath(os.path.dirname(path))
+    os.makedirs(output_dir, exist_ok=True)
+    return open(path, 'wb')
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Sming hardware configuration utility')
+
+    parser.add_argument('--no-verify', help="Don't verify partition table fields", action='store_true')
+    parser.add_argument('--quiet', '-q', help="Don't print non-critical status messages to stderr", action='store_true')
+    parser.add_argument('--secure', help="Require app partitions to be suitable for secure boot", action='store_true')
+    parser.add_argument('--part', help="Name of partition to operate on")
+    parser.add_argument('command', help='Action to perform', choices=['partgen', 'expr', 'validate', 'flashcheck'])
+    parser.add_argument('input', help='Name of hardware configuration or path to binary partition table')
+    parser.add_argument('output', help='Path to output file. Will use stdout if omitted.', nargs='?', default='-')
+    parser.add_argument('expr', help='Expression to evaluate', nargs='?', default=None)
+
+    args = parser.parse_args()
+
+    common.quiet = args.quiet
+
+    output = None
+    input_is_binary = False
+    if os.path.exists(args.input):
+        inputData = open(args.input, "rb").read()
+        input_is_binary = inputData[0:2] == partition.Entry.MAGIC_BYTES
+        if input_is_binary:
+            config = Config.from_binary(inputData)
+        else:
+            raise InputError("File '%s' not recognised as partition table" % args.input)
+    else:
+        config = Config.from_name(args.input)
+        partitions = config.partitions
+
+    # Define local so it's available for eval()
+    if args.part is not None:
+        part = partitions.find_by_name(args.part)
+        if part is None:
+            return
+
+    if args.command == 'validate':
+        # Validate resulting hardware configuration against schema
+        try:
+            from jsonschema import Draft7Validator
+            from jsonschema.exceptions import ValidationError
+        except ImportError:
+            critical("hwconfig: `jsonschema` is not installed. Please run `make python-requirements`")
+            sys.exit(1)
+        inst = json.loads(config.to_json())
+        schema = json.load(open(args.expr))
+        v = Draft7Validator(schema)
+        errors = sorted(v.iter_errors(inst), key=lambda e: e.path)
+        if errors != []:
+            for e in errors:
+                critical("%s @ %s" % (e.message, e.path))
+            sys.exit(3)
+    elif args.command == 'flashcheck':
+        # Expect list of chunks, such as "0x100000=/out/Esp8266/debug/firmware/spiff_rom.bin 0x200000=custom.bin"
+        list = args.expr.split()
+        if len(list) == 0:
+            raise InputError("No chunks to flash!")
+        for e in list:
+            addr, filename = e.split('=')
+            addr = int(addr, 0)
+            part = config.partitions.find_by_address(addr)
+            if part is None:
+                raise InputError("No partition contains address 0x%08x" % addr)
+            if part.address != addr:
+                raise InputError("Address 0x%08x is within partition '%s', not at start (0x%08x)" % (addr, part.name, part.address))
+            filesize = os.path.getsize(filename)
+            if filesize > part.size:
+                raise InputError("File '%s' is 0x%08x bytes, too big for partition '%s' (0x%08x bytes)" % (os.path.basename(filename), filesize, part.name, part.size))
+    elif args.command == 'partgen':
+        # Generate partition table binary
+        if not args.no_verify:
+            status("Verifying partition table...")
+            config.verify(args.secure)
+        output = config.partitions.to_binary(config.devices)
+    elif args.command == 'expr':
+        # Evaluate expression against configuration data
+        output = str(eval(args.expr)).encode()
+    else:
+        raise InputError('Unknown command: %s' % args.command)
+
+    if output is not None:
+        openOutput(args.output).write(output)
+
+
+if __name__ == '__main__':
+    try:
+        main()
+    except InputError as e:
+        print(e, file=sys.stderr)
+        sys.exit(2)
diff --git a/Sming/Components/Storage/Tools/hwconfig/partition.py b/Sming/Components/Storage/Tools/hwconfig/partition.py
new file mode 100644
index 0000000000..018167d60a
--- /dev/null
+++ b/Sming/Components/Storage/Tools/hwconfig/partition.py
@@ -0,0 +1,541 @@
+#!/usr/bin/env python3
+#
+# From Espressif gen_esp32part.py
+#
+# Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http:#www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import struct, hashlib, storage, binascii
+from common import *
+
+MAX_PARTITION_LENGTH = 0xC00  # 3K for partition data (96 entries) leaves 1K in a 4K sector for signature
+MD5_PARTITION_BEGIN = b"\xEB\xEB" + b"\xFF" * 14  # The first 2 bytes are like magic numbers for MD5 sum
+PARTITION_TABLE_SIZE = 0x1000  # Size of partition table
+PARTITION_ENTRY_SIZE = 32
+
+MIN_PARTITION_SUBTYPE_APP_OTA = 0x10
+NUM_PARTITION_SUBTYPE_APP_OTA = 16
+
+__version__ = '1.2'
+
+APP_TYPE = 0x00
+DATA_TYPE = 0x01
+STORAGE_TYPE = 0x02 # Reference to storage device
+USER_TYPE = 0x40 # First user-defined type
+
+# Default is 4
+ALIGNMENT = {
+    "Esp32": {
+        APP_TYPE: 0x10000,
+    },
+    "Esp8266": {
+        APP_TYPE: 0x1000,
+    },
+    "Host": {
+        APP_TYPE: 0x1000,
+    }
+}
+
+TYPES = {
+    "app": APP_TYPE,
+    "data": DATA_TYPE,
+    "storage": STORAGE_TYPE,
+    "user": USER_TYPE,
+}
+
+# Keep this map in sync with esp_partition_subtype_t enum in esp_partition.h
+SUBTYPES = {
+    APP_TYPE: {
+        "factory": 0x00,
+        "ota_0": 0x10,
+        "ota_1": 0x11,
+        "ota_2": 0x12,
+        "ota_3": 0x13,
+        "ota_4": 0x14,
+        "ota_5": 0x15,
+        "ota_6": 0x16,
+        "ota_7": 0x17,
+        "ota_8": 0x18,
+        "ota_9": 0x19,
+        "ota_10": 0x1a,
+        "ota_11": 0x1b,
+        "ota_12": 0x1c,
+        "ota_13": 0x1d,
+        "ota_14": 0x1e,
+        "ota_15": 0x1f,
+        "test": 0x20,
+    },
+    DATA_TYPE: {
+        "ota": 0x00,
+        "phy": 0x01,
+        "nvs": 0x02,
+        "coredump": 0x03,
+        "nvs_keys": 0x04,
+        "efuse": 0x05,
+        "sysparam": 0x40,
+        "esphttpd": 0x80,
+        "fat": 0x81,
+        "spiffs": 0x82,
+    },
+    STORAGE_TYPE: storage.TYPES
+}
+
+
+def parse_type(value):
+    if isinstance(value, str):
+        if value == "":
+            raise InputError("Field 'type' can't be left empty.")
+        return parse_int(value, TYPES)
+    return value
+
+
+def parse_subtype(ptype, value):
+    if isinstance(value, str):
+        if value == "":
+            return 0  # default
+        return parse_int(value, SUBTYPES.get(ptype, {}))
+    return value
+
+
+class Table(list):
+
+    def __init__(self):
+        super(Table, self).__init__(self)
+
+    def parse_dict(self, data, devices):
+        partnames = []
+        for name, entry in data.items():
+            if name in partnames:
+                raise InputError("Duplicate partition '%s'" % name)
+            if contains_whitespace(name):
+                raise InputError("Partition names may not contain spaces '%s'" % name)
+            partnames += name
+            part = self.find_by_name(name)
+            if part is None:
+                part = Entry(devices[0], name)
+                self.append(part)
+            part.parse_dict(entry, devices)
+        self.sort()
+
+    def sort(self):
+        super(Table, self).sort(key=lambda p: p.device.name + p.address_str())
+
+    def dict(self):
+        res = {}
+        for entry in self:
+            res[entry.name] = entry.dict()
+        return res
+
+    def to_json(self):
+        return to_json(self.dict());
+
+    def to_csv(self):
+        res =  "Device            Start       End         Size        Type      SubType   Name              Filename\n"
+        res += "----------------  ----------  ----------  ----------  --------  --------  ----------------  ------------\n"
+        for p in self:
+            res += "%-16s  %10s  %10s  %10s  %-8s  %-8s  %-16s  %s\n" \
+                % (p.device.name, p.address_str(), p.end_str(), p.size_str(), p.type_str(), p.subtype_str(), p.name, p.filename)
+        return res
+
+    def offset_str(self):
+        return addr_format(self.offset)
+
+    def buildVars(self):
+        dict = {}
+        dict['PARTITION_NAMES'] = " ".join(p.name for p in self)
+        for p in self:
+            dict.update(p.buildVars())
+        return dict
+
+    def __getitem__(self, item):
+        """Allow partition table access by name or index
+        """
+        if isinstance(item, str):
+            p = self.find_by_name(item)
+            if p is None:
+                raise ValueError("No partition entry named '%s'" % item)
+            return p
+        return super(Table, self).__getitem__(item)
+
+    def find_by_type(self, ptype, subtype):
+        """Return a partition by type & subtype, returns None if not found
+        """
+        # convert ptype & subtypes names (if supplied this way) to integer values
+        try:
+            ptype = TYPES[ptype]
+        except KeyError:
+            try:
+                ptype = int(ptype, 0)
+            except TypeError:
+                pass
+        try:
+            subtype = SUBTYPES[int(ptype)][subtype]
+        except KeyError:
+            try:
+                subtype = int(subtype, 0)
+            except TypeError:
+                pass
+
+        for p in self:
+            if p.type == ptype and p.subtype == subtype:
+                yield p
+        return
+
+    def find_by_name(self, name):
+        for p in self:
+            if p.name == name:
+                return p
+        return None
+
+    def find_by_address(self, addr):
+        for p in self:
+            if p.contains(addr):
+                return p
+        return None
+
+    def verify(self, arch, secure):
+        """Verify partition layout
+        """
+        # verify each partition individually
+        for p in self:
+            p.verify(arch, secure)
+
+        # check on duplicate name
+        names = [p.name for p in self]
+        duplicates = set(n for n in names if names.count(n) > 1)
+
+        # print sorted duplicate partitions by name
+        if len(duplicates) != 0:
+            print("A list of partitions that have the same name:")
+            for p in sorted(self, key=lambda x:x.name):
+                if len(duplicates.intersection([p.name])) != 0:
+                    print("%s" % (p.to_csv()))
+            raise InputError("Partition names must be unique")
+
+        # check for overlaps
+        minPartitionAddress = self.offset + PARTITION_TABLE_SIZE
+        dev = ''
+        last = None
+        for p in self:
+            if p.device != dev:
+                last = None
+                dev = p.device
+            if dev == self[0].device and p.address < minPartitionAddress:
+                raise InputError("Partition '%s' @ %s-%s must be located after @ %s" \
+                                 % (p.name, p.address_str(), p.end_str(), addr_format(minPartitionAddress)))
+            if last is not None and p.address <= last.end():
+                raise InputError("Partition '%s' @ %s-%s overlaps '%s' @ %s-%s" \
+                                 % (p.name, p.address_str(), p.end_str(), \
+                                    last.name, last.address_str(), last.end_str()))
+            last = p
+
+    def parse_binary(self, b, devices):
+        """Construct partition table object from binary image
+        """
+        dev = None
+        md5 = hashlib.md5()
+        for o in range(0, len(b), PARTITION_ENTRY_SIZE):
+            data = b[o:o + PARTITION_ENTRY_SIZE]
+            if len(data) != PARTITION_ENTRY_SIZE:
+                raise InputError("Partition table length must be a multiple of %d bytes" % PARTITION_ENTRY_SIZE)
+            if data == b'\xFF' * PARTITION_ENTRY_SIZE:
+                return # got end marker
+
+            if data[:2] == MD5_PARTITION_BEGIN[:2]:  # check only the magic number part
+                if data[16:] == md5.digest():
+                    md5.update(data)
+                    continue  # the next iteration will check for the end marker
+                else:
+                    raise InputError("MD5 checksums don't match! (computed: 0x%s, parsed: 0x%s)" % (md5.hexdigest(), binascii.hexlify(data[16:])))
+
+            md5.update(data)
+
+            if data[:2] == b"\xff\xff": # Pseudo-end marker to keep esp32 bootloader happy
+                continue
+
+            e = Entry.from_binary(data)
+            if e.type == STORAGE_TYPE:
+                dev = storage.Device(e.name, e.subtype, e.size)
+                devices.append(dev)
+            else:
+                e.device = dev
+                self.append(e)
+        raise InputError("Partition table is missing an end-of-table marker")
+
+    def to_binary(self, devices):
+        """Create binary image of partition table
+        """
+        dev_count = 0
+        dev = None
+        result = b""
+        for e in self:
+            if e.device != dev:
+                if dev_count == 1:
+                    result += MD5_PARTITION_BEGIN + hashlib.md5(result).digest()
+                    # esp32 bootloader will see this as end of partition table 
+                    result += struct.pack(Entry.STRUCT_FORMAT,
+                                b"\xff\xff",
+                                0xff, 0xff,
+                                0, 0,
+                                b"SMING EXTENSIONS",
+                                0)
+                dev = e.device
+                s = Entry(dev, dev.name, 0, dev.size, STORAGE_TYPE, dev.type)
+                result += s.to_binary()
+                dev_count += 1
+            result += e.to_binary()
+
+        result += MD5_PARTITION_BEGIN + hashlib.md5(result).digest()
+
+        if len(result) >= MAX_PARTITION_LENGTH:
+            raise InputError("Binary partition table length (%d) longer than max" % len(result))
+        result += b"\xFF" * (MAX_PARTITION_LENGTH - len(result))  # pad the sector, for signing
+        return result
+
+
+class Entry(object):
+    MAGIC_BYTES = b"\xAA\x50"
+
+    # dictionary maps flag name (as used in CSV flags list, property name)
+    # to bit set in flags words in binary format
+    FLAGS = {
+        "encrypted": 0,
+        "readonly": 31,
+    }
+
+    def __init__(self, device=None, name="", address=None, size=None, ptype=None, subtype=None):
+        self.device = device
+        self.name = name
+        self.address = address
+        self.size = size
+        self.type = parse_type(ptype)
+        self.subtype = parse_subtype(self.type, subtype)
+        self.readonly = False
+        self.encrypted = False
+        self.filename = ''
+        self.build = None
+
+
+    def parse_dict(self, data, devices):
+        """Construct a partition object from JSON definition
+        """
+        try:
+            v = data.get('type')
+            if not v is None:
+                self.type = parse_type(v)
+            v = data.get('subtype')
+            if not v is None:
+                self.subtype = parse_subtype(self.type, v)
+
+            for k, v in data.items():
+                if k == 'device':
+                    self.device = devices.find_by_name(v)
+                elif k == 'address':
+                    self.address = parse_int(v)
+                elif k == 'size':
+                    self.size = parse_int(v)
+                elif k == 'filename':
+                    self.filename = v
+                elif k == 'build':
+                    if self.build is None:
+                        self.build = v
+                    else:
+                        self.build.update(v)
+                elif k != 'type' and k != 'subtype':
+                    setattr(self, k, v)
+
+            if self.type is None or self.subtype is None:
+                raise InputError("type/subtype missing")
+            if self.address is None or self.size is None:
+                raise InputError("address/size missing")
+            if self.end() >= self.device.size:
+                raise InputError("Partition '%s' %s-%s too big for %s size %s" \
+                                 % (self.name, self.address_str(), self.end_str(), self.device.name, self.device.size_str()))
+        except InputError as e:
+            raise InputError("Error in partition entry '%s': %s" % (self.name, e))
+
+
+    def dict(self):
+        res = {}
+        for k, v in self.__dict__.items():
+            if k == 'device':
+                res[k] = v.name
+            elif k == 'address':
+                res[k] = self.address_str()
+            elif k == 'size':
+                res[k] = self.size_str()
+            elif k == 'type':
+                res[k] = stringnum(self.type_str())
+            elif k == 'subtype':
+                res[k] = stringnum(self.subtype_str())
+            elif v is not None and k != 'name':
+                res[k] = v
+        return res
+
+    def buildVars(self):
+        res = {}
+
+        dict = self.dict()
+        dict['size_bytes'] = "0x%x" % self.size
+        dict.pop('build', None)
+        for k, v in dict.items():
+            k = "PARTITION_%s_%s" % (self.name, k.upper())
+            res[k] = int(v) if type(v) is bool else v
+
+        return res
+
+    def to_json(self):
+        return to_json(self.dict());
+
+    def end(self):
+        return self.address + self.size - 1
+
+    def end_str(self):
+        return addr_format(self.end())
+
+    def address_str(self):
+        return addr_format(self.address)
+
+    def size_str(self):
+        return size_format(self.size)
+
+    def contains(self, addr):
+        return addr >= self.address and addr <= self.end()
+
+    def type_str(self):
+        return "" if self.type == 0xff else lookup_keyword(self.type, TYPES)
+
+    def type_is(self, t):
+        return self.type_str() == t if isinstance(t, str) else self.type == t
+
+    def subtype_str(self):
+        return "" if self.subtype == 0xff else lookup_keyword(self.subtype, SUBTYPES.get(self.type, {}))
+
+    def subtype_is(self, subtype):
+        return self.subtype_str() == subtype if isinstance(subtype, str) else self.subtype == subtype
+
+    def __eq__(self, other):
+        if isinstance(other, str):
+            return self.name == other
+        else:
+            return self.name == other.name and self.type == other.type \
+                and self.subtype == other.subtype and self.address == other.address \
+                and self.size == other.size
+
+    def __repr__(self):
+
+        def maybe_hex(x):
+            return "0x%x" % x if x is not None else "None"
+
+        return "Entry('%s', 0x%x, 0x%x, %s, %s)" % (self.name, self.type, self.subtype or 0,
+                                                                  maybe_hex(self.address), maybe_hex(self.size))
+
+    def __str__(self):
+        return "Part '%s' %s/%s @ 0x%x size 0x%x" % (self.name, self.type_str(), self.subtype_str(), self.address or -1, self.size or -1)
+
+    def alignment(self, arch):
+        return ALIGNMENT[arch].get(self.type, 4)
+
+    def verify(self, arch, secure):
+        if self.type is None:
+            raise ValidationError(self, "Type field is not set")
+        if self.subtype is None:
+            raise ValidationError(self, "Subtype field is not set")
+        if self.address is None:
+            raise ValidationError(self, "Address field is not set")
+        align = self.alignment(arch)
+        if self.address % align:
+            raise ValidationError(self, "Offset 0x%x is not aligned to 0x%x" % (self.address, align))
+        if self.size % align and secure:
+            raise ValidationError(self, "Size 0x%x is not aligned to 0x%x" % (self.size, align))
+        if self.size is None:
+            raise ValidationError(self, "Size field is not set")
+
+        if self.name in TYPES and TYPES.get(self.name, "") != self.type:
+            critical("WARNING: Partition has name '%s' which is a partition type, but does not match this partition's "
+                     "type (0x%x). Mistake in partition table?" % (self.name, self.type))
+        all_subtype_names = []
+        for names in (t.keys() for t in SUBTYPES.values()):
+            all_subtype_names += names
+        if self.name in all_subtype_names and SUBTYPES.get(self.type, {}).get(self.name, "") != self.subtype:
+            critical("WARNING: Partition has name '%s' which is a partition subtype, but this partition has "
+                     "non-matching type 0x%x and subtype 0x%x. Mistake in partition table?" % (self.name, self.type, self.subtype))
+
+    STRUCT_FORMAT = b"<2sBBLL16sL"
+
+    @classmethod
+    def from_binary(cls, b):
+        if len(b) != PARTITION_ENTRY_SIZE:
+            raise InputError("Partition entry size incorrect. Expected %d bytes, got %d." % (PARTITION_ENTRY_SIZE, len(b)))
+        res = cls()
+        (magic, res.type, res.subtype, res.address,
+         res.size, res.name, flags) = struct.unpack(cls.STRUCT_FORMAT, b)
+        if b"\x00" in res.name:  # strip null byte padding from name string
+            res.name = res.name[:res.name.index(b"\x00")]
+        res.name = res.name.decode()
+        if magic != cls.MAGIC_BYTES:
+            raise InputError("Invalid magic bytes (%r) for partition definition" % magic)
+        for flag, bit in cls.FLAGS.items():
+            if flags & (1 << bit):
+                setattr(res, flag, True)
+                flags &= ~(1 << bit)
+        if flags != 0:
+            critical("WARNING: Partition definition had unknown flag(s) 0x%08x. Newer binary format?" % flags)
+        return res
+
+    def to_binary(self):
+        flags = 0
+        for key in self.FLAGS:
+            if getattr(self, key):
+                flags |= (1 << self.FLAGS[key])
+        return struct.pack(self.STRUCT_FORMAT,
+                           self.MAGIC_BYTES,
+                           self.type, self.subtype,
+                           self.address, self.size,
+                           self.name.encode(),
+                           flags)
+
+
+class Map(Table):
+    """Contiguous map of flash memory
+    """
+    def __init__(self, table, devices):
+        device = devices[0]
+
+        def add(name, address, size):
+            entry = Entry(device, name, address, size, 0xff, 0xff)
+            self.append(entry)
+            return entry
+
+        def add_unused(address, last_end):
+            return add('(unused)', last_end + 1, address - last_end - 1)
+
+        if table.offset == 0:
+            last = None
+        else:
+            add("Boot Sector", 0, table.offset)
+            last = add("Partition Table", table.offset, PARTITION_TABLE_SIZE)
+
+        for p in table:
+            if last is not None:
+                if p.device != last.device:
+                    add_unused(last.device.size, last.end())
+                    device = p.device
+                elif p.address > last.end() + 1:
+                    add_unused(p.address, last.end())
+            self.append(p)
+            last = p
+
+        if last.end() + 1 < device.size:
+            add_unused(device.size, last.end())
diff --git a/Sming/Components/Storage/Tools/hwconfig/storage.py b/Sming/Components/Storage/Tools/hwconfig/storage.py
new file mode 100644
index 0000000000..719f8393dc
--- /dev/null
+++ b/Sming/Components/Storage/Tools/hwconfig/storage.py
@@ -0,0 +1,116 @@
+#
+# Storage devices
+#
+
+from common import *
+
+TYPES = {
+    "unknown": 0x00,
+    "flash": 0x01,
+    "spiram": 0x02,
+    "sdcard": 0x03,
+    "disk": 0x04,
+    "file": 0x05,
+}
+
+
+def parse_type(value):
+    if value == "":
+        raise InputError("Field 'type' can't be left empty.")
+    return parse_int(value, TYPES)
+
+
+class List(list):
+    def parse_dict(self, data):
+        for name, v in data.items():
+            if contains_whitespace(name):
+                raise InputError("Device names may not contain spaces '%s'" % name)
+            dev = self.find_by_name(name)
+            if dev is None:
+                dev = Device(name)
+                self.append(dev)
+            dev.parse_dict(v)
+
+    def dict(self):
+        res = {}
+        for dev in self:
+            res[dev.name] = dev.dict()
+        return res
+
+    def to_json(self):
+        return to_json(self.dict())
+
+    def buildVars(self):
+        dict = {}
+        dict['STORAGE_DEVICE_NAMES'] = " ".join(p.name for p in self)
+        for p in self:
+            dict.update(p.buildVars())
+        return dict
+
+    def __getitem__(self, item):
+        if isinstance(item, str):
+            d = self.find_by_name(item)
+            if d is None:
+                raise ValueError("No device named '%s'" % item)
+            return d
+        return super(List, self).__getitem__(item)
+
+    def find_by_name(self, name):
+        for d in self:
+            if d.name == name:
+                return d
+        return None
+
+
+class Device(object):
+    def __init__(self, name, stype = 0, size = 0):
+        self.name = name
+        self.type = parse_type(stype)
+        self.size = parse_int(size)
+
+    def parse_dict(self, data):
+        for k, v in data.items():
+            if k == 'type':
+                self.type = parse_int(v, TYPES)
+            elif k == 'size':
+                self.size = parse_int(v)
+            elif k == 'mode':
+                self.mode = v
+            elif k == 'speed':
+                self.speed = v
+            else:
+                raise InputError("Unknown storage field '%s'" % k)
+
+    def dict(self):
+        res = {}
+
+        # Some fields are optional
+        def tryAdd(k):
+            if hasattr(self, k):
+                res[k] = getattr(self, k)
+
+        res['type'] = self.type_str()
+        res['size'] = self.size_str()
+        tryAdd('mode')
+        tryAdd('speed')
+        return res
+
+    def to_json(self):
+        return to_json(self.dict())
+
+    def buildVars(self):
+        res = {}
+
+        dict = self.dict()
+        dict['size_bytes'] = "0x%x" % self.size
+        for k, v in dict.items():
+            k = "STORAGE_DEVICE_%s_%s" % (self.name, k.upper())
+            res[k] = v
+
+        return res
+
+    def type_str(self):
+        return "" if self.type == 0 else lookup_keyword(self.type, TYPES)
+
+    def size_str(self):
+        return size_format(self.size)
diff --git a/Sming/Components/esptool/blank.bin b/Sming/Components/Storage/blank.bin
similarity index 100%
rename from Sming/Components/esptool/blank.bin
rename to Sming/Components/Storage/blank.bin
diff --git a/Sming/Components/Storage/component.mk b/Sming/Components/Storage/component.mk
new file mode 100644
index 0000000000..af0307ec78
--- /dev/null
+++ b/Sming/Components/Storage/component.mk
@@ -0,0 +1,186 @@
+COMPONENT_INCDIRS	:= src/include
+COMPONENT_SRCDIRS	:= src
+COMPONENT_DOXYGEN_INPUT := src/include
+
+CONFIG_VARS			+= HWCONFIG
+ifndef HWCONFIG
+override HWCONFIG	:= standard
+$(info Using configuration '$(HWCONFIG)')
+endif
+
+# Directories to search for hardware config
+HWCONFIG_DIRS		:= $(PROJECT_DIR) $(COMPONENT_SEARCH_DIRS) $(ARCH_BASE) $(SMING_HOME)
+
+# List of all hardware configurations
+ALL_HWCONFIG_PATHS	:= $(foreach d,$(HWCONFIG_DIRS),$(wildcard $d/*.hw))
+ALL_HWCONFIG		:= $(sort $(notdir $(ALL_HWCONFIG_PATHS)))
+ALL_HWCONFIG		:= $(ALL_HWCONFIG:.hw=)
+
+# Path to selected hardware config file
+HWCONFIG_PATH		:= $(firstword $(foreach d,$(HWCONFIG_DIRS),$(wildcard $d/$(HWCONFIG).hw)))
+
+ifeq (,$(wildcard $(HWCONFIG_PATH)))
+ifeq (,$(MAKE_CLEAN))
+$(info $(HWCONFIG_DIRS))
+$(eval $(call PrintVariable,ALL_HWCONFIG,Available configurations))
+$(error Hardware configuration '$(HWCONFIG)' not found)
+endif
+endif
+
+PARTITION_PATH		:= $(COMPONENT_PATH)
+PARTITION_TOOLS		:= $(PARTITION_PATH)/Tools
+HWCONFIG_TOOL := \
+	HWCONFIG_DIRS="$(HWCONFIG_DIRS)" \
+	BUILD_BASE=$(BUILD_BASE) \
+	$(PYTHON) $(PARTITION_TOOLS)/hwconfig/hwconfig.py
+
+ifeq (,$(MAKE_DOCS)$(MAKE_CLEAN))
+
+# Generate build variables from hardware configuration
+HWCONFIG_MK := $(PROJECT_DIR)/$(OUT_BASE)/hwconfig.mk
+$(shell $(HWCONFIG_TOOL) --quiet expr $(HWCONFIG) $(HWCONFIG_MK) "config.buildVars()")
+include $(HWCONFIG_MK)
+ifeq ($(SMING_ARCH_HW),)
+$(error Hardware configuration error)
+else ifneq ($(SMING_ARCH),$(SMING_ARCH_HW))
+$(error Hardware configuration is for arch $(SMING_ARCH_HW), does not match SMING_ARCH ($(SMING_ARCH)))
+endif
+COMPONENT_CXXFLAGS := -DPARTITION_TABLE_OFFSET=$(PARTITION_TABLE_OFFSET)
+
+# Function to evaluate expression against config
+HWEXPR := $(HWCONFIG_TOOL) $(if $(PART),--part "$(PART)") expr $(HWCONFIG) -
+
+define HwExpr
+$(shell $(HWEXPR) "$1")
+endef
+
+
+##@Configuration
+
+.PHONY: map
+map: $(HWCONFIG_PATH) ##Show partition map
+	@echo "Partition map:"
+	$(Q) $(HWEXPR) "config.map().to_csv()"
+	@echo
+
+.PHONY: hwexpr
+hwexpr: $(HWCONFIG_PATH) ##Evaluate expression against hardware configuration (use EXPR= and optionally PART=)
+	$(Q) $(HWEXPR) "$(EXPR)"
+
+.PHONY: hwconfig
+hwconfig: $(HWCONFIG_PATH) ##Show current hardware configuration
+	@echo
+	$(Q) $(HWEXPR) "config.to_json()"
+	@echo
+ifneq ($(V),)
+	@echo "$(HWCONFIG): $(foreach c,$(HWCONFIG_DEPENDS),\n  $c)"
+endif
+
+.PHONY: hwconfig-list
+hwconfig-list: ##List available hardware configurations
+	@echo "Available configurations: $(foreach c,$(ALL_HWCONFIG),\n $(if $(subst $c,,$(HWCONFIG)), ,*) $(shell printf "%-25s" "$c") $(filter %/$c.hw,$(ALL_HWCONFIG_PATHS)))"
+	@echo
+
+.PHONY: hwconfig-validate
+hwconfig-validate: $(HWCONFIG_PATH) ##Validate current hardware configuration
+	@echo "Validating hardware config '$(HWCONFIG)'"
+	$(Q) $(HWCONFIG_TOOL) validate $(HWCONFIG) - $(PARTITION_PATH)/schema.json
+
+
+##@Building
+
+# The partition table
+PARTITIONS_BIN := $(FW_BASE)/partitions.bin
+CUSTOM_TARGETS += $(PARTITIONS_BIN)
+
+$(PARTITIONS_BIN): $(HWCONFIG_DEPENDS)
+	$(Q) $(MAKE) --no-print-directory hwconfig-validate
+	$(Q) $(HWCONFIG_TOOL) partgen $(HWCONFIG) $@
+
+
+# Create build target for a partition
+# $1 -> Partition name
+define PartitionTarget
+PTARG := $(shell $(HWCONFIG_TOOL) --part $1 expr $(HWCONFIG) - part.filename)
+$$(PTARG):
+	$$(Q) $$(MAKE) --no-print-directory $$(shell $$(HWCONFIG_TOOL) --part $1 expr $$(HWCONFIG) - "part.build['target']") PART=$1
+CUSTOM_TARGETS += $$(PTARG)
+endef
+
+# Create build targets for all partitions with 'build' property
+DEBUG_VARS += PARTITIONS_WITH_TARGETS
+PARTITIONS_WITH_TARGETS := $(call HwExpr,(' '.join([part.name for part in filter(lambda part: part.build is not None, config.partitions)])))
+
+# Must be invoked from project.mk after all Components have been processed
+# This allows partition definitions to include variables which may not yet be defined
+define PartitionCreateTargets
+$(foreach p,$(PARTITIONS_WITH_TARGETS),$(eval $(call PartitionTarget,$p)))
+endef
+
+
+##@Flashing
+
+# Get chunks for a list of partitions, ignore any without filenames
+# $1 -> List of partition names
+define PartChunks
+$(foreach p,$1,$(if $(PARTITION_$p_FILENAME),$(PARTITION_$p_ADDRESS)=$(PARTITION_$p_FILENAME)))
+endef
+
+# Get regions for list of partitions
+# $1 -> List of partition names
+define PartRegions
+$(foreach p,$1,$(PARTITION_$p_ADDRESS),$(PARTITION_$p_SIZE_BYTES))
+endef
+
+# One flash sector of 0xFF
+BLANK_BIN := $(PARTITION_PATH)/blank.bin
+
+# Just the application chunks
+SPIFLASH_APP_PARTITION_NAMES := $(foreach p,$(SPIFLASH_PARTITION_NAMES),$(if $(filter app,$(PARTITION_$p_TYPE)),$p))
+FLASH_APP_CHUNKS = $(call PartChunks,$(SPIFLASH_APP_PARTITION_NAMES))
+# Partition map chunk
+FLASH_MAP_CHUNK := $(PARTITION_TABLE_OFFSET)=$(PARTITIONS_BIN)
+# All partitions with image files
+FLASH_PARTITION_CHUNKS = $(call PartChunks,$(SPIFLASH_PARTITION_NAMES))
+
+# User-selected partition(s)
+FLASH_PART_CHUNKS = $(call PartChunks,$(PART))
+FLASH_PART_REGION = $(call PartRegions,$(PART))
+
+# Where to store read partition map file
+READMAP_BIN := $(OUT_BASE)/partition-table.read.bin
+PARTITION_TABLE_REGION = $(PARTITION_TABLE_OFFSET),$(PARTITION_TABLE_LENGTH)
+
+.PHONY: readmap
+readmap:##Read partition map from device
+	$(Q) $(call ReadFlash,$(PARTITION_TABLE_REGION),$(READMAP_BIN))
+	@echo
+	@echo "Partition map read from device:"
+	$(Q) $(HWCONFIG_TOOL) expr $(READMAP_BIN) - "config.map().to_csv()"
+	@echo
+
+# Run sanity checks against a list of partitions before flashing commences
+# $1 -> List of partition names
+define CheckPartitionChunks
+$(HWCONFIG_TOOL) flashcheck $(HWCONFIG) - "$1"
+endef
+
+.PHONY: flashpart
+flashpart: all kill_term ##Flash a specific partition, set PART=name
+	$(Q) $(call CheckPartitionChunks,$(FLASH_PART_CHUNKS))
+	$(call WriteFlash,$(FLASH_PART_CHUNKS))
+
+.PHONY: erasepart
+erasepart: kill_term ##Erase a specific partition, set PART=name
+	$(call EraseFlashRegion,$(FLASH_PART_REGION))
+
+.PHONY: readpart
+readpart: kill_term ##Read partition from device, set PART=name
+	$(call ReadFlash,$(FLASH_PART_REGION),$(OUT_BASE)/$(PART).read.bin)
+
+.PHONY: flashmap
+flashmap: $(PARTITIONS_BIN) kill_term ##Write partition table to device
+	$(call WriteFlash,$(FLASH_MAP_CHUNK))
+
+
+endif # MAKE_DOCS
diff --git a/Sming/Components/Storage/notes.rst b/Sming/Components/Storage/notes.rst
new file mode 100644
index 0000000000..3b4765aa06
--- /dev/null
+++ b/Sming/Components/Storage/notes.rst
@@ -0,0 +1,69 @@
+Storage Partition notes
+=======================
+
+External devices
+----------------
+
+Support for 'external' storage devices is implemented by marking groups of entries
+with a ``storage`` type partition entry. This is intended to support designs where the
+memory devices are fixed (such as additional SPI RAM or flash chips) rather than
+removable (such as SD cards). When these devices are registered with the Storage subsystem,
+the primary partition table is scanned for related entries.
+
+Devices may contain their own partition table, but such tables are not loaded automatically.
+This is done by calling :cpp:func:`Storage::Device::loadPartitions`.
+The application must also consider how the partition table will be initialised on external
+devices as this is not handled by the build system.
+
+ 
+
+But it also has some disadvantages:
+
+-  Adding/removing storage devices dynamically does not fit well.
+   For example, when an SD Card is inserted the partition layout must be established
+   dynamically.
+
+The main purpose of the partition table is to manage the system's fixed storage.
+Mostly that will just be the main flash device, but could also be 'external' devices
+such as SPI RAM or flash.
+
+Devices can be dynamically registered/un-registered to the partition table: existing Partition objects remain valid but calls will fail.
+
+Dynamic partitions have additional issues.
+
+Partition identification
+------------------------
+
+Two devices may have identical partition names so these would need
+to be qualified, e.g. ``spiFlash/spiffs0``. Without qualification the first matching
+name would be used.
+
+Alternatively, each :cpp:class:`Storage::Device` object could manage its own partitions,
+rather than having them in a single table. The existing layout scheme is fine, we can
+just extend it so that devices can support their own partitions.
+
+Device serial numbers should be exposed so that devices can be uniquely identified
+by applications.
+
+Device partitions
+-----------------
+
+A global :cpp:class:`Storage::DeviceManager` object replaces ``partitionTable``.
+
+Storage each device manages its own partitions, therefore spiFlash loads its own partition table.
+
+
+
+Partitions in devices ?
+-----------------------
+
+JSON may be more logically arranged so that partitions are defined within each device.
+
+This implies that partition_table_offset is also defined within the device,
+so adding this entry to external devices allows definition of a partition table there also.
+The application now only has to handle how to write any supplementary tables to external devices.
+
+Problem: Way too complicated.
+
+So, if we want external partition tables how to do that?
+Leave for another time.
\ No newline at end of file
diff --git a/Sming/Components/Storage/requirements.txt b/Sming/Components/Storage/requirements.txt
new file mode 100644
index 0000000000..d89304b1a8
--- /dev/null
+++ b/Sming/Components/Storage/requirements.txt
@@ -0,0 +1 @@
+jsonschema
diff --git a/Sming/Components/Storage/schema.json b/Sming/Components/Storage/schema.json
new file mode 100644
index 0000000000..df887e75e2
--- /dev/null
+++ b/Sming/Components/Storage/schema.json
@@ -0,0 +1,178 @@
+{
+	"$schema": "http://json-schema.org/draft-07/schema#",
+	"$ref": "#/definitions/Config",
+	"definitions": {
+		"Config": {
+			"title": "Hardware Configuration",
+			"description": "Defines memory devices and partitions for a specific hardware implementation",
+			"type": "object",
+			"additionalProperties": false,
+			"properties": {
+				"name": {
+					"type": "string"
+				},
+				"base_config": {
+					"type": "string",
+					"title": "Base configuration",
+					"description": "Inherit a previously-defined configuration"
+				},
+				"comment": {
+					"type": "string"
+				},
+				"arch": {
+					"type": "string",
+					"title": "Target architecture",
+					"description": "Defined *only* in the base 'standard' spec"
+				},
+				"partition_table_offset": {
+					"type": "string",
+					"description": "Location of partition table in spiFlash"
+				},
+				"devices": {
+					"$ref": "#/definitions/Devices"
+				},
+				"partitions": {
+					"$ref": "#/definitions/Partitions"
+				}
+			},
+			"required": [
+				"name",
+				"arch",
+				"partition_table_offset",
+				"devices",
+				"partitions"
+			]
+		},
+		"Devices": {
+			"title": "Devices",
+			"type": "object",
+			"additionalProperties": false,
+			"properties": {
+				"spiFlash": {
+					"$ref": "#/definitions/Device",
+					"description": "Main flash memory device"
+				}
+			},
+			"patternProperties": {
+				"^[A-Za-z_][A-Za-z0-9_]*$": {
+					"type": "object",
+					"$ref": "#/definitions/Device"
+				}
+			},
+			"required": [
+				"spiFlash"
+			]
+		},
+		"Device": {
+			"title": "Storage device definition",
+			"type": "object",
+			"additionalProperties": false,
+			"properties": {
+				"size": {
+					"type": "string"
+				},
+				"type": {
+					"type": "string"
+				},
+				"mode": {
+					"type": "string",
+					"enum": [
+						"qio",
+						"qout",
+						"dio",
+						"dout"
+					]
+				},
+				"speed": {
+					"type": "integer"
+				}
+			},
+			"required": [
+				"size",
+				"type"
+			]
+		},
+		"Partitions": {
+			"title": "Partitions",
+			"type": "object",
+			"additionalProperties": false,
+			"patternProperties": {
+				"^[A-Za-z_][A-Za-z0-9_]*$": {
+					"type": "object",
+					"$ref": "#/definitions/Partition"
+				}
+			}
+		},
+		"Partition": {
+			"title": "Partition definition",
+			"type": "object",
+			"additionalProperties": false,
+			"properties": {
+				"device": {
+					"type": "string",
+					"description": "ID of device this partition relates to"
+				},
+				"address": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"size": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"type": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"subtype": {
+					"type": [
+						"string",
+						"integer"
+					]
+				},
+				"readonly": {
+					"type": "boolean"
+				},
+				"encrypted": {
+					"type": "boolean"
+				},
+				"filename": {
+					"type": "string",
+					"description": "Location of file to write to this partition"
+				},
+				"build": {
+					"type": "object",
+					"$ref": "#/definitions/Build",
+					"description": "If present, used to build 'filename'"
+				}
+			},
+			"required": [
+				"address",
+				"size",
+				"type",
+				"subtype"
+			]
+		},
+		"Build": {
+			"title": "Build specification",
+			"description": "Additional properties as required by build target",
+			"type": "object",
+			"additionalProperties": true,
+			"properties": {
+				"target": {
+					"type": "string",
+					"description": "Makefile target for this build"
+				}
+			},
+			"required": [
+				"target"
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/Sming/Components/Storage/src/CustomDevice.cpp b/Sming/Components/Storage/src/CustomDevice.cpp
new file mode 100644
index 0000000000..a960528961
--- /dev/null
+++ b/Sming/Components/Storage/src/CustomDevice.cpp
@@ -0,0 +1,42 @@
+/*
+ * CustomDevice.cpp
+ */
+
+#include "include/Storage/CustomDevice.h"
+#include <debug_progmem.h>
+
+namespace Storage
+{
+namespace
+{
+static constexpr size_t maxPartitions{16}; ///< Hard limit on partition table size
+
+class Partitions : public PartitionTable
+{
+public:
+	Partition add(const Partition::Info& info)
+	{
+		if(!mEntries) {
+			mEntries.reset(new Partition::Info[maxPartitions]);
+		} else
+			assert(mCount < maxPartitions);
+
+		auto i = mCount++;
+		mEntries.get()[i] = info;
+		return operator[](i);
+	}
+};
+
+} // namespace
+
+Partition CustomDevice::createPartition(const Partition::Info& info)
+{
+	if(mPartitions.count() >= maxPartitions) {
+		debug_e("Partition table is full for '%s'", getName().c_str());
+		return Partition{};
+	}
+
+	return reinterpret_cast<Partitions&>(mPartitions).add(info);
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/Device.cpp b/Sming/Components/Storage/src/Device.cpp
new file mode 100644
index 0000000000..6f2c6ec428
--- /dev/null
+++ b/Sming/Components/Storage/src/Device.cpp
@@ -0,0 +1,112 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Device.h - external storage device API
+ *
+ ****/
+
+#include "include/Storage.h"
+#include "include/Storage/Device.h"
+#include "include/Storage/partition_info.h"
+#include <FlashString/Vector.hpp>
+#include <debug_progmem.h>
+
+namespace
+{
+#define XX(type, value, desc) DEFINE_FSTR_LOCAL(typestr_##type, #type)
+STORAGE_TYPE_MAP(XX)
+#undef XX
+
+#define XX(type, value, desc) &typestr_##type,
+DEFINE_FSTR_VECTOR_LOCAL(typeStrings, FlashString, STORAGE_TYPE_MAP(XX))
+#undef XX
+
+#define XX(type, value, desc) DEFINE_FSTR_LOCAL(long_typestr_##type, desc)
+STORAGE_TYPE_MAP(XX)
+#undef XX
+
+#define XX(type, value, desc) &long_typestr_##type,
+DEFINE_FSTR_VECTOR_LOCAL(longTypeStrings, FlashString, STORAGE_TYPE_MAP(XX))
+#undef XX
+
+} // namespace
+
+String toString(Storage::Device::Type type)
+{
+	return typeStrings[unsigned(type)];
+}
+
+String toLongString(Storage::Device::Type type)
+{
+	return longTypeStrings[unsigned(type)];
+}
+
+namespace Storage
+{
+Device::~Device()
+{
+	unRegisterDevice(this);
+}
+
+bool Device::loadPartitions(Device& source, uint32_t tableOffset)
+{
+	constexpr size_t maxEntries = ESP_PARTITION_TABLE_MAX_LEN / sizeof(esp_partition_info_t);
+	esp_partition_info_t buffer[maxEntries];
+	if(!source.read(tableOffset, buffer, sizeof(buffer))) {
+		debug_e("[Partition] Failed to read partition table at offset 0x%08x", tableOffset);
+		return false;
+	}
+
+	if(buffer[0].type != Partition::Type::storage) {
+		debug_e("[Partition] Bad partition table for device '%s' @ 0x%08x", getName().c_str(), tableOffset);
+		return false;
+	}
+
+	String devname = getName();
+	for(unsigned i = 0; i < maxEntries; ++i) {
+		auto entry = &buffer[i];
+		if(entry->magic != ESP_PARTITION_MAGIC) {
+			continue;
+		}
+		if(entry->type != Partition::Type::storage) {
+			continue;
+		}
+
+		auto len = devname.length();
+		if(len > Partition::nameSize) {
+			continue;
+		}
+		if(strncmp(entry->name, devname.c_str(), len) != 0) {
+			continue;
+		}
+
+		if(entry->subtype != uint8_t(getType())) {
+			debug_w("[Device] '%s' type mismatch, '%s' in partition table but device reports '%s'", getName().c_str(),
+					toString(Device::Type(entry->subtype)).c_str(), toString(getType()).c_str());
+		}
+		if(entry->size != getSize()) {
+			debug_w("[Device] '%s' size mismatch, 0x%08x in partition table but device reports 0x%08x",
+					getName().c_str(), entry->size, getSize());
+		}
+
+		// Skip the storage entry, not required
+		++entry;
+		++i;
+		unsigned count{0};
+		while(i < maxEntries && buffer[i].magic == ESP_PARTITION_MAGIC) {
+			++i;
+			++count;
+		}
+
+		mPartitions.load(entry, count);
+		return true;
+	}
+
+	// No partitions found
+	return false;
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/Iterator.cpp b/Sming/Components/Storage/src/Iterator.cpp
new file mode 100644
index 0000000000..a082b4778d
--- /dev/null
+++ b/Sming/Components/Storage/src/Iterator.cpp
@@ -0,0 +1,68 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Iterator.cpp
+ *
+ ****/
+
+#include "include/Storage/Iterator.h"
+#include "include/Storage/SpiFlash.h"
+#include <debug_progmem.h>
+
+namespace Storage
+{
+Iterator::Iterator(Device& device, uint8_t partitionIndex)
+	: mSearch{&device, Partition::Type::any, Partition::SubType::any}, mDevice(&device), mPos(partitionIndex)
+
+{
+	if(partitionIndex >= device.partitions().count()) {
+		mDevice = nullptr;
+		mPos = afterEnd;
+	}
+}
+
+Iterator::Iterator(Partition::Type type, uint8_t subtype) : mSearch{nullptr, type, subtype}
+{
+	mDevice = spiFlash;
+	next();
+}
+
+bool Iterator::next()
+{
+	while(mDevice != nullptr) {
+		while(uint8_t(++mPos) < mDevice->partitions().count()) {
+			auto entry = mDevice->partitions()[mPos];
+
+			if(mSearch.type != Partition::Type::any && mSearch.type != entry.type()) {
+				continue;
+			}
+
+			if(mSearch.subType != Partition::SubType::any && mSearch.subType != entry.subType()) {
+				continue;
+			}
+
+			return true;
+		}
+
+		mPos = afterEnd;
+		if(mSearch.device != nullptr) {
+			mDevice = nullptr;
+			break;
+		}
+
+		mDevice = mDevice->getNext();
+		mPos = beforeStart;
+	}
+
+	return false;
+}
+
+Partition Iterator::operator*() const
+{
+	return mDevice ? mDevice->partitions()[mPos] : Partition{};
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/ObjectList.cpp b/Sming/Components/Storage/src/ObjectList.cpp
new file mode 100644
index 0000000000..dae8a07716
--- /dev/null
+++ b/Sming/Components/Storage/src/ObjectList.cpp
@@ -0,0 +1,65 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * ObjectList.cpp
+ *
+ ****/
+
+#include "include/Storage/ObjectList.h"
+
+namespace Storage
+{
+bool ObjectList::add(Object* object)
+{
+	if(object == nullptr) {
+		return false;
+	}
+
+	Object* prev = nullptr;
+	auto it = mHead;
+	while(it != nullptr) {
+		if(it == object) {
+			// Already in list
+			return true;
+		}
+		prev = it;
+		it = it->mNext;
+	}
+
+	if(prev == nullptr) {
+		mHead = object;
+	} else {
+		prev->mNext = object;
+	}
+	object->mNext = it;
+	return true;
+}
+
+bool ObjectList::remove(Object* object)
+{
+	if(object == nullptr) {
+		return false;
+	}
+
+	if(mHead == object) {
+		mHead = object->mNext;
+		return true;
+	}
+
+	auto it = mHead;
+	while(it->mNext != nullptr) {
+		if(it->mNext == object) {
+			it->mNext = object->mNext;
+			object->mNext = nullptr;
+			return true;
+		}
+		it = it->mNext;
+	}
+
+	return false;
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/Partition.cpp b/Sming/Components/Storage/src/Partition.cpp
new file mode 100644
index 0000000000..d66c128fbb
--- /dev/null
+++ b/Sming/Components/Storage/src/Partition.cpp
@@ -0,0 +1,251 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Partition.cpp - Partition support for all architectures
+ *
+ ****/
+
+#include "include/Storage/Partition.h"
+#include "include/Storage/Device.h"
+#include <FlashString/Map.hpp>
+#include <debug_progmem.h>
+
+using namespace Storage;
+
+namespace
+{
+/* APP type strings */
+
+#define XX(subtype, value, desc) DEFINE_FSTR_LOCAL(app_subTypeStr_##subtype, #subtype)
+PARTITION_APP_SUBTYPE_MAP(XX)
+#undef XX
+
+#define XX(subtype, value, desc) {Partition::SubType::App::subtype, &app_subTypeStr_##subtype},
+DEFINE_FSTR_MAP_LOCAL(appSubTypeStrings, Partition::SubType::App, FlashString, PARTITION_APP_SUBTYPE_MAP(XX))
+#undef XX
+
+#define XX(subtype, value, desc) DEFINE_FSTR_LOCAL(app_subTypeStr_long_##subtype, desc)
+PARTITION_APP_SUBTYPE_MAP(XX)
+#undef XX
+
+#define XX(subtype, value, desc) {Partition::SubType::App::subtype, &app_subTypeStr_long_##subtype},
+DEFINE_FSTR_MAP_LOCAL(longAppSubTypeStrings, Partition::SubType::App, FlashString, PARTITION_APP_SUBTYPE_MAP(XX))
+#undef XX
+
+/* DATA subtype strings */
+
+#define XX(subtype, value, desc) DEFINE_FSTR_LOCAL(data_subTypeStr_##subtype, #subtype)
+PARTITION_DATA_SUBTYPE_MAP(XX)
+#undef XX
+
+#define XX(subtype, value, desc) {Partition::SubType::Data::subtype, &data_subTypeStr_##subtype},
+DEFINE_FSTR_MAP_LOCAL(dataSubTypeStrings, Partition::SubType::Data, FlashString, PARTITION_DATA_SUBTYPE_MAP(XX))
+#undef XX
+
+#define XX(subtype, value, desc) DEFINE_FSTR_LOCAL(data_subTypeStr_long_##subtype, desc)
+PARTITION_DATA_SUBTYPE_MAP(XX)
+#undef XX
+
+#define XX(subtype, value, desc) {Partition::SubType::Data::subtype, &data_subTypeStr_long_##subtype},
+DEFINE_FSTR_MAP_LOCAL(longDataSubTypeStrings, Partition::SubType::Data, FlashString, PARTITION_DATA_SUBTYPE_MAP(XX))
+#undef XX
+
+} // namespace
+
+String toString(Partition::Type type, uint8_t subType)
+{
+	String s;
+	switch(type) {
+	case Partition::Type::app:
+		s = F("app/");
+		if(auto v = appSubTypeStrings[Partition::SubType::App(subType)]) {
+			s += String(v);
+		} else {
+			s += subType;
+		}
+		break;
+	case Partition::Type::data:
+		s = F("data/");
+		if(auto v = dataSubTypeStrings[Partition::SubType::Data(subType)]) {
+			s += String(v);
+		} else {
+			s += subType;
+		}
+		break;
+
+	case Partition::Type::storage:
+		s = F("storage/");
+		if(auto v = toString(Device::Type(subType))) {
+			s += v;
+		} else {
+			s += subType;
+		}
+		break;
+
+	default:
+		s = unsigned(type);
+		s += '.';
+		s += subType;
+	}
+	return s;
+}
+
+String toLongString(Partition::Type type, uint8_t subType)
+{
+	switch(type) {
+	case Partition::Type::app:
+		if(auto v = longAppSubTypeStrings[Partition::SubType::App(subType)]) {
+			return F("App: ") + String(v);
+		}
+		break;
+	case Partition::Type::data:
+		if(auto v = longDataSubTypeStrings[Partition::SubType::Data(subType)]) {
+			return F("Data: ") + String(v);
+		}
+		break;
+
+	case Partition::Type::storage:
+		if(auto s = toLongString(Device::Type(subType))) {
+			return F("Storage: ") + s;
+		}
+		break;
+
+	default:;
+		// Unknown
+	}
+
+	return toString(type, subType);
+}
+
+namespace Storage
+{
+String Partition::typeString() const
+{
+	return toString(type(), subType());
+}
+
+String Partition::longTypeString() const
+{
+	return toLongString(type(), subType());
+}
+
+bool Partition::verify(Partition::Type type, uint8_t subtype) const
+{
+	if(mPart == nullptr) {
+		debug_e("[Partition] invalid");
+		return false;
+	}
+
+	if(type != mPart->type) {
+		debug_e("[Partition] type mismatch, expected %u got %u", unsigned(type), unsigned(mPart->type));
+		return false;
+	}
+
+	if(mPart->subtype != subtype) {
+		debug_e("[Partition] subtype mismatch, expected %u got %u", subtype, mPart->subtype);
+		return false;
+	}
+
+	return true;
+}
+
+bool Partition::getDeviceAddress(uint32_t& address, size_t size) const
+{
+	if(mDevice == nullptr || mPart == nullptr) {
+		debug_e("[Partition] Invalid");
+		return false;
+	}
+
+	if(address >= mPart->size || (address + size - 1) >= mPart->size) {
+		debug_e("[Partition] Invalid range, address: 0x%08x, size: 0x%08x", address, size);
+		return false;
+	}
+
+	// Storage partitions refer directly to the underlying device
+	if(type() != Partition::Type::storage) {
+		address += mPart->offset;
+	}
+
+	return true;
+}
+
+String Partition::getDeviceName() const
+{
+	return mDevice ? mDevice->getName() : nullptr;
+}
+
+size_t Partition::getBlockSize() const
+{
+	return mDevice ? mDevice->getBlockSize() : 0;
+}
+
+bool Partition::allowRead()
+{
+	if(mDevice == nullptr || mPart == nullptr) {
+		debug_e("[Partition] Invalid");
+		return false;
+	}
+
+	return true;
+}
+
+bool Partition::allowWrite()
+{
+	if(!allowRead()) {
+		return false;
+	}
+
+	if(mPart->flags[Flag::readOnly]) {
+		debug_e("[Partition] %s is read-only", mPart ? mPart->name.c_str() : "?");
+		return false;
+	}
+
+	return true;
+}
+
+bool Partition::read(size_t offset, void* dst, size_t size)
+{
+	if(!allowRead()) {
+		return false;
+	}
+
+	uint32_t addr = offset;
+	if(!getDeviceAddress(addr, size)) {
+		return false;
+	}
+
+	return mDevice ? mDevice->read(addr, dst, size) : false;
+}
+
+bool Partition::write(size_t offset, const void* src, size_t size)
+{
+	if(!allowWrite()) {
+		return false;
+	}
+
+	uint32_t addr = offset;
+	if(!getDeviceAddress(addr, size)) {
+		return false;
+	}
+
+	return mDevice ? mDevice->write(addr, src, size) : false;
+}
+
+bool Partition::erase_range(size_t offset, size_t size)
+{
+	if(!allowWrite()) {
+		return false;
+	}
+
+	uint32_t addr = offset;
+	if(!getDeviceAddress(addr, size)) {
+		return false;
+	}
+
+	return mDevice ? mDevice->erase_range(addr, size) : false;
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/PartitionStream.cpp b/Sming/Components/Storage/src/PartitionStream.cpp
new file mode 100644
index 0000000000..86ad9b037c
--- /dev/null
+++ b/Sming/Components/Storage/src/PartitionStream.cpp
@@ -0,0 +1,61 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * PartitionStream.cpp
+ *
+ ****/
+
+#include "include/Storage/PartitionStream.h"
+
+namespace Storage
+{
+uint16_t PartitionStream::readMemoryBlock(char* data, int bufSize)
+{
+	int len = std::min(bufSize, available());
+	return partition.read(startOffset + readPos, data, len) ? len : 0;
+}
+
+int PartitionStream::seekFrom(int offset, SeekOrigin origin)
+{
+	size_t newPos;
+	switch(origin) {
+	case SeekOrigin::Start:
+		newPos = 0;
+		break;
+	case SeekOrigin::Current:
+		newPos = readPos + offset;
+		break;
+	case SeekOrigin::End:
+		newPos = size + offset;
+		break;
+	default:
+		return -1;
+	}
+
+	if(newPos > size) {
+		return -1;
+	}
+
+	readPos = newPos;
+	return readPos;
+}
+
+size_t PartitionStream::write(const uint8_t* data, size_t length)
+{
+	auto len = std::min(size - writePos, length);
+	if(len != 0) {
+		if(!partition.write(startOffset + writePos, data, len)) {
+			len = 0;
+		} else {
+			writePos += len;
+		}
+	}
+
+	// Return amount actually written
+	return len;
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/PartitionTable.cpp b/Sming/Components/Storage/src/PartitionTable.cpp
new file mode 100644
index 0000000000..793cd061bf
--- /dev/null
+++ b/Sming/Components/Storage/src/PartitionTable.cpp
@@ -0,0 +1,37 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * PartitionTable.cpp
+ *
+ ****/
+
+#include "include/Storage/PartitionTable.h"
+#include "include/Storage/partition_info.h"
+#include <debug_progmem.h>
+
+namespace Storage
+{
+void PartitionTable::load(const esp_partition_info_t* entry, unsigned count)
+{
+	if(count == 0) {
+		mEntries.reset();
+		mCount = count;
+		return;
+	}
+
+	mCount = count;
+	mEntries.reset(new Partition::Info[count]);
+	for(unsigned i = 0; i < count; ++i) {
+		auto& e = entry[i];
+		// name may not be zero-terminated
+		char name[Partition::nameSize + 1];
+		memcpy(name, e.name, Partition::nameSize);
+		name[Partition::nameSize] = '\0';
+		mEntries.get()[i] = Partition::Info{name, e.type, e.subtype, e.offset, e.size, e.flags};
+	}
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/ProgMem.cpp b/Sming/Components/Storage/src/ProgMem.cpp
new file mode 100644
index 0000000000..8d95f594cc
--- /dev/null
+++ b/Sming/Components/Storage/src/ProgMem.cpp
@@ -0,0 +1,35 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * ProgMem.cpp
+ *
+ ****/
+
+#include "include/Storage/ProgMem.h"
+#include <esp_spi_flash.h>
+
+namespace Storage
+{
+ProgMem progMem;
+
+bool ProgMem::read(uint32_t address, void* dst, size_t size)
+{
+	size_t readCount = flashmem_read(dst, address, size);
+	return readCount == size;
+}
+
+Partition ProgMem::createPartition(const String& name, const void* flashPtr, size_t size, Partition::Type type,
+								   uint8_t subtype)
+{
+	auto addr = flashmem_get_address(flashPtr);
+	if(addr == 0) {
+		return Partition{};
+	}
+
+	return createPartition(name, type, subtype, addr, size, Partition::Flag::readOnly);
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/SpiFlash.cpp b/Sming/Components/Storage/src/SpiFlash.cpp
new file mode 100644
index 0000000000..a308d65c49
--- /dev/null
+++ b/Sming/Components/Storage/src/SpiFlash.cpp
@@ -0,0 +1,66 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * SpiFlash.cpp
+ *
+ ****/
+
+#include "include/Storage/SpiFlash.h"
+#include "include/Storage/partition_info.h"
+#include <esp_spi_flash.h>
+
+namespace Storage
+{
+DEFINE_FSTR(FS_SPIFLASH, "spiFlash")
+SpiFlash* spiFlash;
+
+String SpiFlash::getName() const
+{
+	return FS_SPIFLASH;
+}
+
+size_t SpiFlash::getBlockSize() const
+{
+	return SPI_FLASH_SEC_SIZE;
+}
+
+size_t SpiFlash::getSize() const
+{
+	return flashmem_get_size_bytes();
+}
+
+bool SpiFlash::read(uint32_t address, void* dst, size_t size)
+{
+	size_t readCount = flashmem_read(dst, address, size);
+	return readCount == size;
+}
+
+bool SpiFlash::write(uint32_t address, const void* src, size_t size)
+{
+	size_t writeCount = flashmem_write(src, address, size);
+	return writeCount == size;
+}
+
+bool SpiFlash::erase_range(uint32_t address, size_t size)
+{
+	if(address % SPI_FLASH_SEC_SIZE != 0 || size % SPI_FLASH_SEC_SIZE != 0) {
+		debug_e("[Partition] erase address/size misaligned: 0x%08x / 0x%08x", address, size);
+		return false;
+	}
+
+	auto sec = address / SPI_FLASH_SEC_SIZE;
+	auto end = (address + size) / SPI_FLASH_SEC_SIZE;
+	while(sec < end) {
+		if(!flashmem_erase_sector(sec)) {
+			return false;
+		}
+		++sec;
+	}
+
+	return true;
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/Storage.cpp b/Sming/Components/Storage/src/Storage.cpp
new file mode 100644
index 0000000000..98b6c8ed18
--- /dev/null
+++ b/Sming/Components/Storage/src/Storage.cpp
@@ -0,0 +1,75 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * DeviceManager.cpp
+ *
+ ****/
+
+#include "include/Storage.h"
+#include "include/Storage/SpiFlash.h"
+#include <debug_progmem.h>
+
+namespace Storage
+{
+void initialize()
+{
+	if(spiFlash == nullptr) {
+		spiFlash = new SpiFlash;
+		registerDevice(spiFlash);
+		spiFlash->loadPartitions(PARTITION_TABLE_OFFSET);
+	}
+}
+
+const Device::List getDevices()
+{
+	return Device::List(spiFlash);
+}
+
+bool registerDevice(Device* device)
+{
+	if(device == nullptr) {
+		return false;
+	}
+	auto devname = device->getName();
+
+	Device::List devices(spiFlash);
+	auto it = std::find(devices.begin(), devices.end(), devname);
+	if(!it) {
+		devices.add(device);
+		device->loadPartitions(*spiFlash, PARTITION_TABLE_OFFSET);
+		debug_i("[Storage] Device '%s' registered", devname.c_str());
+	} else if(*it != *device) {
+		debug_e("[Storage] Another device is already registered with name '%s'", devname.c_str());
+		return false;
+	}
+
+	return true;
+}
+
+bool unRegisterDevice(Device* device)
+{
+	return Device::List(spiFlash).remove(device);
+}
+
+Device* findDevice(const String& name)
+{
+	Device::List devices(spiFlash);
+	return std::find(devices.begin(), devices.end(), name);
+}
+
+Partition findPartition(const String& name)
+{
+	for(auto& dev : getDevices()) {
+		auto part = dev.partitions().find(name);
+		if(part) {
+			return part;
+		}
+	}
+
+	return Partition{};
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/SysMem.cpp b/Sming/Components/Storage/src/SysMem.cpp
new file mode 100644
index 0000000000..5281259f62
--- /dev/null
+++ b/Sming/Components/Storage/src/SysMem.cpp
@@ -0,0 +1,25 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * SysMem.cpp
+ *
+ ****/
+
+#include "include/Storage/SysMem.h"
+#include <esp_spi_flash.h>
+
+namespace Storage
+{
+SysMem sysMem;
+
+Partition SysMem::createPartition(const String& name, const FSTR::ObjectBase& fstr, Partition::Type type,
+								  uint8_t subtype)
+{
+	return createPartition(name, type, subtype, reinterpret_cast<uint32_t>(fstr.data()), fstr.size(),
+						   Partition::Flag::readOnly);
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage.h b/Sming/Components/Storage/src/include/Storage.h
new file mode 100644
index 0000000000..81977f4d85
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage.h
@@ -0,0 +1,62 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Storage.h
+ *
+ ****/
+#pragma once
+
+#include "Storage/Device.h"
+
+namespace Storage
+{
+/**
+ * @brief Called early in the startup phase
+ */
+void initialize();
+
+/**
+ * @brief Get read-only reference to device list
+ */
+const Device::List getDevices();
+
+/**
+ * @brief Register a storage device
+ * @retval bool true on success, false if another device already registered with same name
+ */
+bool registerDevice(Device* device);
+
+/**
+ * @brief Unregister a storage device
+ *
+ * Use extreme care: behaviour is unpredictable if partitions are in use
+ */
+bool unRegisterDevice(Device* device);
+
+/**
+ * @brief Find a registered device
+ */
+Device* findDevice(const String& name);
+
+/**
+ * @brief Find the first partition matching the given name
+ */
+Partition findPartition(const String& name);
+
+/**
+ * @brief Find partitions of the given type
+ */
+inline Iterator findPartition(Partition::Type type = Partition::Type::any, uint8_t subType = Partition::SubType::any)
+{
+	return Iterator(type, subType);
+}
+
+template <typename T> Iterator findPartition(T subType)
+{
+	return Iterator(Partition::Type(T::partitionType), uint8_t(subType));
+}
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/CustomDevice.h b/Sming/Components/Storage/src/include/Storage/CustomDevice.h
new file mode 100644
index 0000000000..82222f2667
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/CustomDevice.h
@@ -0,0 +1,35 @@
+/*
+ * CustomDevice.h
+ */
+
+#pragma once
+
+#include "Device.h"
+
+namespace Storage
+{
+/**
+ * @brief Class to support dynamic partitions
+ *
+ * Call `createPartition` to add partitions up to a maximum of 16 entries.
+ */
+class CustomDevice : public Device
+{
+public:
+	Partition createPartition(const Partition::Info& info);
+
+	Partition createPartition(const String& name, Partition::Type type, uint8_t subtype, uint32_t offset, size_t size,
+							  Partition::Flags flags = 0)
+	{
+		return createPartition(Partition::Info{name, type, subtype, offset, size, flags});
+	}
+
+	template <typename SubType>
+	Partition createPartition(const String& name, SubType subtype, uint32_t offset, size_t size,
+							  Partition::Flags flags = 0)
+	{
+		return createPartition(name, Partition::Type(SubType::partitionType), uint8_t(subtype), offset, size, flags);
+	}
+};
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/Device.h b/Sming/Components/Storage/src/include/Storage/Device.h
new file mode 100644
index 0000000000..cf54588b19
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/Device.h
@@ -0,0 +1,140 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Device.h - external storage device API
+ *
+ ****/
+#pragma once
+
+#include <WString.h>
+#include "ObjectList.h"
+#include "PartitionTable.h"
+
+#define STORAGE_TYPE_MAP(XX)                                                                                           \
+	XX(unknown, 0x00, "Other storage device")                                                                          \
+	XX(flash, 0x01, "SPI flash")                                                                                       \
+	XX(spiram, 0x02, "SPI RAM")                                                                                        \
+	XX(sdcard, 0x03, "SD Card")                                                                                        \
+	XX(disk, 0x04, "Physical disk")                                                                                    \
+	XX(file, 0x05, "Backing file on separate filesystem")                                                              \
+	XX(sysmem, 0x06, "System Memory")
+
+namespace Storage
+{
+class SpiFlash;
+
+/**
+ * @brief Represents a storage device (e.g. flash memory)
+ */
+class Device : public ObjectTemplate<Device>
+{
+public:
+	using List = ObjectListTemplate<Device>;
+	using OwnedList = OwnedObjectListTemplate<Device>;
+
+	/**
+	 * @brief Storage type
+	 */
+	enum class Type : uint8_t {
+#define XX(type, value, desc) type = value,
+		STORAGE_TYPE_MAP(XX)
+#undef XX
+	};
+
+	Device() : mPartitions(*this)
+	{
+	}
+
+	~Device();
+
+	bool operator==(const String& name) const
+	{
+		return getName() == name;
+	}
+
+	PartitionTable& partitions()
+	{
+		return mPartitions;
+	}
+
+	const PartitionTable& partitions() const
+	{
+		return mPartitions;
+	}
+
+	/**
+	 * @brief Load partition table entries
+	 * @tableOffset Location of partition table to read
+	 * @retval bool true on success, false on failure
+	 */
+	bool loadPartitions(uint32_t tableOffset)
+	{
+		return loadPartitions(*this, tableOffset);
+	}
+
+	/**
+	 * @brief Load partition table entries from another table
+	 * @param source Device to load entries from
+	 * @tableOffset Location of partition table to read
+	 * @retval bool true on success, false on failure
+	 */
+	bool loadPartitions(Device& source, uint32_t tableOffset);
+
+	/**
+	 * @brief Obtain unique device name
+	 */
+	virtual String getName() const = 0;
+
+	/**
+	 * @brief Obtain smallest allocation unit for erase operations
+	 */
+	virtual size_t getBlockSize() const = 0;
+
+	/**
+	 * @brief Obtain addressable size of this device
+	 * @retval size_t Must be at least as large as the value declared in the partition table
+	 */
+	virtual size_t getSize() const = 0;
+
+	/**
+	 * @brief Obtain device type
+	 */
+	virtual Type getType() const = 0;
+
+	/**
+	 * @brief Read data from the storage device
+	 * @param address Where to start reading
+	 * @param dst Buffer to store data
+	 * @param size Size of data to be read, in bytes.
+	 * @retval bool true on success, false on error
+	 */
+	virtual bool read(uint32_t address, void* dst, size_t size) = 0;
+
+	/**
+	 * @brief Write data to the storage device
+	 * @param address Where to start writing
+	 * @param src Data to write
+	 * @param size Size of data to be written, in bytes.
+	 * @retval bool true on success, false on error
+	 */
+	virtual bool write(uint32_t address, const void* src, size_t size) = 0;
+
+	/**
+	 * @brief Erase a region of storage in preparation for writing
+	 * @param address Where to start erasing
+	 * @param size Size of region to erase, in bytes
+	 * @retval bool true on success, false on error
+	 */
+	virtual bool erase_range(uint32_t address, size_t size) = 0;
+
+protected:
+	PartitionTable mPartitions;
+};
+
+} // namespace Storage
+
+String toString(Storage::Device::Type type);
+String toLongString(Storage::Device::Type type);
diff --git a/Sming/Components/Storage/src/include/Storage/Iterator.h b/Sming/Components/Storage/src/include/Storage/Iterator.h
new file mode 100644
index 0000000000..dcd3b7ca88
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/Iterator.h
@@ -0,0 +1,78 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Iterator.h
+ *
+ ****/
+#pragma once
+
+#include "Partition.h"
+
+namespace Storage
+{
+class Device;
+
+class Iterator : public std::iterator<std::forward_iterator_tag, Partition>
+{
+public:
+	Iterator(Device& device, uint8_t partitionIndex);
+
+	Iterator(Device& device, Partition::Type type, uint8_t subtype) : mSearch{&device, type, subtype}
+	{
+		mDevice = &device;
+		next();
+	}
+
+	Iterator(Partition::Type type, uint8_t subtype);
+
+	explicit operator bool() const
+	{
+		return (mDevice != nullptr) && (mPos > beforeStart) && (mPos < afterEnd);
+	}
+
+	Iterator operator++(int)
+	{
+		auto result = *this;
+		next();
+		return result;
+	}
+
+	Iterator& operator++()
+	{
+		next();
+		return *this;
+	}
+
+	bool operator==(const Iterator& other) const
+	{
+		return (mDevice == other.mDevice) && (mPos == other.mPos);
+	}
+
+	bool operator!=(const Iterator& other) const
+	{
+		return !operator==(other);
+	}
+
+	Partition operator*() const;
+
+private:
+	static constexpr int8_t beforeStart{-1};
+	static constexpr int8_t afterEnd{0x7f};
+
+	bool seek(uint8_t pos);
+	bool next();
+
+	struct Search {
+		Device* device;
+		Partition::Type type;
+		uint8_t subType;
+	};
+	Search mSearch{};
+	Device* mDevice{nullptr};
+	int8_t mPos{beforeStart};
+};
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/Object.h b/Sming/Components/Storage/src/include/Storage/Object.h
new file mode 100644
index 0000000000..0d6914f643
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/Object.h
@@ -0,0 +1,144 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Object.h - Base Storage object definition
+ *
+ ****/
+#pragma once
+
+#include <iterator>
+#include <algorithm>
+
+namespace Storage
+{
+class ObjectList;
+
+class Object
+{
+public:
+	virtual ~Object()
+	{
+	}
+
+	virtual Object* next() const
+	{
+		return mNext;
+	}
+
+	Object* getNext() const
+	{
+		return mNext;
+	}
+
+	bool operator==(const Object& other) const
+	{
+		return this == &other;
+	}
+
+	bool operator!=(const Object& other) const
+	{
+		return this != &other;
+	}
+
+private:
+	friend class ObjectList;
+	Object* mNext{nullptr};
+};
+
+/**
+ * @brief Base class template for linked items with type casting
+ */
+template <typename ObjectType> class ObjectTemplate : public Object
+{
+public:
+	template <typename T, typename TPtr, typename TRef>
+	class IteratorTemplate : public std::iterator<std::forward_iterator_tag, T>
+	{
+	public:
+		IteratorTemplate(TPtr x) : mObject(x)
+		{
+		}
+
+		IteratorTemplate(TRef& x) : mObject(&x)
+		{
+		}
+
+		IteratorTemplate(const IteratorTemplate& other) : mObject(other.mObject)
+		{
+		}
+
+		IteratorTemplate& operator++()
+		{
+			mObject = mObject->getNext();
+			return *this;
+		}
+
+		IteratorTemplate operator++(int)
+		{
+			Iterator tmp(*this);
+			operator++();
+			return tmp;
+		}
+
+		bool operator==(const IteratorTemplate& rhs) const
+		{
+			return mObject == rhs.mObject;
+		}
+
+		bool operator!=(const IteratorTemplate& rhs) const
+		{
+			return mObject != rhs.mObject;
+		}
+
+		TRef operator*()
+		{
+			return *mObject;
+		}
+
+		TPtr operator->()
+		{
+			return mObject;
+		}
+
+		operator TPtr()
+		{
+			return mObject;
+		}
+
+	private:
+		TPtr mObject;
+	};
+
+	using Iterator = IteratorTemplate<ObjectType, ObjectType*, ObjectType&>;
+	using ConstIterator = IteratorTemplate<const ObjectType, const ObjectType*, const ObjectType&>;
+
+	ObjectType* getNext() const
+	{
+		return reinterpret_cast<ObjectType*>(this->next());
+	}
+
+	Iterator begin() const
+	{
+		return Iterator(this);
+	}
+
+	Iterator end() const
+	{
+		return Iterator(nullptr);
+	}
+
+	Iterator cbegin() const
+	{
+		return ConstIterator(this);
+	}
+
+	Iterator cend() const
+	{
+		return ConstIterator(nullptr);
+	}
+};
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/ObjectList.h b/Sming/Components/Storage/src/include/Storage/ObjectList.h
new file mode 100644
index 0000000000..da015dd0d8
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/ObjectList.h
@@ -0,0 +1,137 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Object.h - Base Storage object definition
+ *
+ ****/
+#pragma once
+
+#include "Object.h"
+#include <vector>
+
+namespace Storage
+{
+/**
+ * @brief Singly-linked list of objects
+ * @note We don't own the items, just keep references to them
+ */
+class ObjectList
+{
+public:
+	ObjectList()
+	{
+	}
+
+	ObjectList(Object* object) : mHead(object)
+	{
+	}
+
+	bool add(Object* object);
+
+	bool add(const Object* object)
+	{
+		return add(const_cast<Object*>(object));
+	}
+
+	bool remove(Object* object);
+
+	void clear()
+	{
+		mHead = nullptr;
+	}
+
+	Object* head()
+	{
+		return mHead;
+	}
+
+	const Object* head() const
+	{
+		return mHead;
+	}
+
+	bool isEmpty() const
+	{
+		return mHead == nullptr;
+	}
+
+protected:
+	Object* mHead{nullptr};
+};
+
+template <typename ObjectType> class ObjectListTemplate : public ObjectList
+{
+public:
+	ObjectListTemplate() = default;
+
+	ObjectListTemplate(ObjectType* object) : ObjectList(object)
+	{
+	}
+
+	ObjectType* head()
+	{
+		return reinterpret_cast<ObjectType*>(mHead);
+	}
+
+	const ObjectType* head() const
+	{
+		return reinterpret_cast<const ObjectType*>(mHead);
+	}
+
+	typename ObjectType::Iterator begin()
+	{
+		return head();
+	}
+
+	typename ObjectType::Iterator end()
+	{
+		return nullptr;
+	}
+
+	typename ObjectType::ConstIterator begin() const
+	{
+		return head();
+	}
+
+	typename ObjectType::ConstIterator end() const
+	{
+		return nullptr;
+	}
+
+	size_t count() const
+	{
+		return std::count(begin(), end(), true);
+	}
+
+	bool contains(const ObjectType& object) const
+	{
+		return std::find(begin(), end(), object);
+	}
+};
+
+/**
+ * @brief Class template for singly-linked list of objects
+ * @note We own the objects so are responsible for destroying them when removed
+ */
+template <typename ObjectType> class OwnedObjectListTemplate : public ObjectListTemplate<ObjectType>
+{
+public:
+	bool remove(ObjectType* object)
+	{
+		bool res = ObjectList::remove(object);
+		delete object;
+		return res;
+	}
+
+	void clear()
+	{
+		while(remove(this->head())) {
+			//
+		}
+	}
+};
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/Partition.h b/Sming/Components/Storage/src/include/Storage/Partition.h
new file mode 100644
index 0000000000..5428e1e2a7
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/Partition.h
@@ -0,0 +1,376 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Partition.h - C++ wrapper for universal partition table support
+ *
+ * Original license for IDF code:
+ *
+ *	Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *	 http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ *
+ ****/
+#pragma once
+
+#include <Data/BitSet.h>
+#include <Data/CString.h>
+#include <memory>
+#include <cassert>
+
+#define PARTITION_APP_SUBTYPE_MAP(XX)                                                                                  \
+	XX(factory, 0x00, "Factory application")                                                                           \
+	XX(ota0, 0x10, "OTA #0")                                                                                           \
+	XX(ota1, 0x11, "OTA #1")                                                                                           \
+	XX(ota2, 0x12, "OTA #2")                                                                                           \
+	XX(ota3, 0x13, "OTA #3")                                                                                           \
+	XX(ota4, 0x14, "OTA #4")                                                                                           \
+	XX(ota5, 0x15, "OTA #5")                                                                                           \
+	XX(ota6, 0x16, "OTA #6")                                                                                           \
+	XX(ota7, 0x17, "OTA #7")                                                                                           \
+	XX(ota8, 0x18, "OTA #8")                                                                                           \
+	XX(ota9, 0x19, "OTA #9")                                                                                           \
+	XX(ota10, 0x1a, "OTA #10")                                                                                         \
+	XX(ota11, 0x1b, "OTA #11")                                                                                         \
+	XX(ota12, 0x1c, "OTA #12")                                                                                         \
+	XX(ota13, 0x1d, "OTA #13")                                                                                         \
+	XX(ota14, 0x1e, "OTA #14")                                                                                         \
+	XX(ota15, 0x1f, "OTA #15")                                                                                         \
+	XX(test, 0x20, "Test application")
+
+#define PARTITION_DATA_SUBTYPE_MAP(XX)                                                                                 \
+	XX(ota, 0x00, "OTA selection")                                                                                     \
+	XX(phy, 0x01, "PHY init data")                                                                                     \
+	XX(nvs, 0x02, "NVS")                                                                                               \
+	XX(coreDump, 0x03, "Core Dump data")                                                                               \
+	XX(nvsKeys, 0x04, "NVS key information")                                                                           \
+	XX(eFuseEm, 0x05, "eFuse emulation")                                                                               \
+	XX(sysParam, 0x40, "System Parameters")                                                                            \
+	XX(espHttpd, 0x80, "ESPHTTPD")                                                                                     \
+	XX(fat, 0x81, "FAT")                                                                                               \
+	XX(spiffs, 0x82, "SPIFFS")
+
+namespace Storage
+{
+class Device;
+class PartitionTable;
+struct esp_partition_info_t;
+
+/**
+ * @brief Represents a flash partition
+ */
+class Partition
+{
+public:
+	enum class Type : uint8_t {
+		app = 0x00,
+		data = 0x01,
+		storage = 0x02,
+		userMin = 0x40,
+		userMax = 0xFE,
+		invalid = 0xff,
+		any = 0xff,
+	};
+
+	struct SubType {
+		static constexpr uint8_t any{0xff};
+		static constexpr uint8_t invalid{0xff};
+
+		/**
+		 * @brief Application partition type
+		 */
+		enum class App : uint8_t {
+			partitionType = uint8_t(Type::app),
+#define XX(type, value, desc) type = value,
+			PARTITION_APP_SUBTYPE_MAP(XX)
+#undef XX
+				ota_min = ota0,
+			ota_max = ota15,
+			any = 0xff
+		};
+
+		/**
+		 * @brief Data partition type
+		 */
+		enum class Data : uint8_t {
+			partitionType = uint8_t(Type::data),
+#define XX(subtype, value, desc) subtype = value,
+			PARTITION_DATA_SUBTYPE_MAP(XX)
+#undef XX
+				any = 0xff
+		};
+	};
+
+	enum class Flag {
+		encrypted = 0,
+		readOnly = 31, ///< Write/erase prohibited
+	};
+
+	static constexpr size_t nameSize{16};
+	using Name = char[nameSize];
+	using Flags = BitSet<uint32_t, Flag>;
+
+	/**
+	 * @brief Partition information
+	 */
+	struct Info {
+		CString name;
+		uint32_t offset{0};
+		uint32_t size{0};
+		Type type{Type::invalid};
+		uint8_t subtype{SubType::invalid};
+		Flags flags;
+
+		Info()
+		{
+		}
+
+		Info(const String& name, Type type, uint8_t subtype, uint32_t offset, uint32_t size, Flags flags)
+			: name(name), offset(offset), size(size), type(type), subtype(subtype), flags(flags)
+		{
+		}
+	};
+
+	Partition()
+	{
+	}
+
+	Partition(const Partition& other) : mDevice(other.mDevice), mPart(other.mPart)
+	{
+	}
+
+	Partition(Device& device, const Info& info) : mDevice(&device), mPart(&info)
+	{
+	}
+
+	/**
+	 * @name Confirm partition is of the expected type
+	 * @param type Expected partition type
+	 * @param subtype Expected partition sub-type
+	 * @retval bool true if type is OK, false if not.
+	 * Logs debug messages on failure.
+	 * @{
+	 */
+	bool verify(Type type, uint8_t subtype) const;
+
+	bool verify(uint8_t type, uint8_t subtype) const
+	{
+		return verify(Type(type), subtype);
+	}
+
+	template <typename T> bool verify(T subType) const
+	{
+		return verify(Type(T::partitionType), uint8_t(subType));
+	}
+
+	/** @} */
+
+	/**
+	 * @brief Convenience function to get SubType value for the i-th OTA partition
+	 */
+	static inline SubType::App apptypeOta(uint8_t i)
+	{
+		auto subtype = SubType::App(uint8_t(SubType::App::ota_min) + i);
+		assert(subtype >= SubType::App::ota_min && subtype <= SubType::App::ota_max);
+		return subtype;
+	}
+
+	explicit operator bool() const
+	{
+		return mDevice != nullptr && mPart != nullptr;
+	}
+
+	/**
+	 * @brief Read data from the partition
+	 * @param offset Where to start reading, relative to start of partition
+	 * @param dst Buffer to store data
+	 * @param size Size of data to be read, in bytes.
+	 * @retval bool true on success, false on error
+	 */
+	bool read(size_t offset, void* dst, size_t size);
+
+	template <typename T> typename std::enable_if<std::is_pod<T>::value, bool>::type read(size_t offset, T& value)
+	{
+		return read(offset, &value, sizeof(value));
+	}
+
+	/**
+	 * @brief Write data to the partition
+	 * @param offset Where to start writing, relative to start of partition
+	 * @param src Data to write
+	 * @param size Size of data to be written, in bytes.
+	 * @retval bool true on success, false on error
+	 * @note Flash region must be erased first
+	 */
+	bool write(size_t offset, const void* src, size_t size);
+
+	/**
+	 * @brief Erase part of the partition
+	 * @param offset Where to start erasing, relative to start of partition
+	 * @param size Size of region to erase, in bytes
+	 * @retval bool true on success, false on error
+	 * @note Both offset and size must be aligned to flash sector size (4Kbytes)
+	 */
+	bool erase_range(size_t offset, size_t size);
+
+	/**
+	 * @brief Obtain partition type
+	 */
+	Partition::Type type() const
+	{
+		return mPart ? Partition::Type(mPart->type) : Type::invalid;
+	}
+
+	/**
+	 * @brief Obtain partition sub-type
+	 */
+	uint8_t subType() const
+	{
+		return mPart ? mPart->subtype : SubType::invalid;
+	}
+
+	/**
+	 * @brief Obtain partition starting address
+	 * @param uint32_t Device address
+	 */
+	uint32_t address() const
+	{
+		return (mPart && mPart->type != Partition::Type::storage) ? mPart->offset : 0;
+	}
+
+	/**
+	 * @brief Obtain address of last byte in this this partition
+	 * @param uint32_t Device address
+	 */
+	uint32_t lastAddress() const
+	{
+		return mPart ? (mPart->offset + mPart->size - 1) : 0;
+	}
+
+	/**
+	 * @brief Obtain partition size
+	 * @retval uint32_t Size in bytes
+	 */
+	uint32_t size() const
+	{
+		return mPart ? mPart->size : 0;
+	}
+
+	/**
+	 * @brief Get partition name
+	 */
+	String name() const
+	{
+		return mPart ? mPart->name.c_str() : nullptr;
+	}
+
+	/**
+	 * @brief Get partition flags
+	 */
+	Flags flags() const
+	{
+		return mPart ? mPart->flags : 0;
+	}
+
+	/**
+	 * @brief Check state of partition `encrypted` flag
+	 */
+	bool isEncrypted() const
+	{
+		return flags()[Flag::encrypted];
+	}
+
+	/**
+	 * @brief Check state of partition `readOnly` flag
+	 */
+	bool isReadOnly() const
+	{
+		return mPart ? mPart->flags[Flag::readOnly] : true;
+	}
+
+	/**
+	 * @name Get partition type expressed as a string
+	 * @{
+	 */
+	String typeString() const;
+	String longTypeString() const;
+	/** @} */
+
+	/**
+	 * @brief Get corresponding storage device address for a given partition offset
+	 * @param address IN: Zero-based offset within partition, OUT: Device address
+	 * @param size Size of data to be accessed
+	 * @retval bool true on success, false on failure
+	 * Fails if the given offset/size combination is out of range, or the partition is undefined.
+	 */
+	bool getDeviceAddress(uint32_t& address, size_t size) const;
+
+	/**
+	 * @brief Get name of storage device for this partition
+	 * @retval String
+	 */
+	String getDeviceName() const;
+
+	/**
+	 * @brief Get storage device containing this partition
+	 * @retval Device* null if device isn't registered
+	 */
+	Device* getDevice() const
+	{
+		return mDevice;
+	}
+
+	/**
+	 * @brief Determine if given address contained within this partition
+	 */
+	bool contains(uint32_t addr) const
+	{
+		return mPart ? (addr >= mPart->offset && addr <= lastAddress()) : false;
+	}
+
+	bool operator==(const Partition& other) const
+	{
+		return this == &other;
+	}
+
+	bool operator==(const char* name) const
+	{
+		return mPart ? mPart->name.equals(name) : false;
+	}
+
+	bool operator==(const String& name) const
+	{
+		return mPart ? mPart->name.equals(name) : false;
+	}
+
+	/**
+	 * @brief Obtain smallest allocation unit for erase operations
+	 */
+	size_t getBlockSize() const;
+
+protected:
+	Device* mDevice{nullptr};
+	const Info* mPart{nullptr};
+
+private:
+	bool allowRead();
+	bool allowWrite();
+};
+
+} // namespace Storage
+
+String toString(Storage::Partition::Type type, uint8_t subType);
+String toLongString(Storage::Partition::Type type, uint8_t subType);
diff --git a/Sming/Components/Storage/src/include/Storage/PartitionStream.h b/Sming/Components/Storage/src/include/Storage/PartitionStream.h
new file mode 100644
index 0000000000..93debaeaff
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/PartitionStream.h
@@ -0,0 +1,61 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * PartitionStream.h
+ *
+ ****/
+
+#pragma once
+
+#include <Data/Stream/ReadWriteStream.h>
+#include "Partition.h"
+
+namespace Storage
+{
+/**
+ * @brief Stream operating directory on a Storage partition
+ *
+ * To support write operations, the target region must be erased first.
+ *
+ * @ingroup stream
+ */
+class PartitionStream : public ReadWriteStream
+{
+public:
+	PartitionStream(Partition partition, uint32_t offset, size_t size)
+		: partition(partition), startOffset(offset), size(size)
+	{
+	}
+
+	PartitionStream(Partition partition) : partition(partition), startOffset(0), size(partition.size())
+	{
+	}
+
+	int available() override
+	{
+		return size - readPos;
+	}
+
+	uint16_t readMemoryBlock(char* data, int bufSize) override;
+
+	int seekFrom(int offset, SeekOrigin origin) override;
+
+	size_t write(const uint8_t* buffer, size_t size) override;
+
+	bool isFinished() override
+	{
+		return available() <= 0;
+	}
+
+private:
+	Partition partition;
+	uint32_t startOffset;
+	size_t size;
+	uint32_t writePos{0};
+	uint32_t readPos{0};
+};
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/PartitionTable.h b/Sming/Components/Storage/src/include/Storage/PartitionTable.h
new file mode 100644
index 0000000000..1dd4ee7b16
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/PartitionTable.h
@@ -0,0 +1,92 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * PartitionTable.h
+ *
+ ****/
+#pragma once
+
+#include "Partition.h"
+#include "Iterator.h"
+
+namespace Storage
+{
+// Used Partition table entries cached in RAM, initialised on first request
+class PartitionTable
+{
+public:
+	PartitionTable(Device& device) : mDevice(device)
+	{
+	}
+
+	/**
+	 * @name Partition search
+	 * @{
+	 *
+	 * @brief Find partitions based on one or more parameters
+	 * @param type Partition type
+	 * @param subtype Partition sub-type
+	 * @retval Iterator Forward-iterator for matching partitions
+	 */
+	Iterator find(Partition::Type type = Partition::Type::any, uint8_t subType = Partition::SubType::any) const
+	{
+		return Iterator(mDevice, type, subType);
+	}
+
+	template <typename T> Iterator find(T subType) const
+	{
+		return find(Partition::Type(T::partitionType), uint8_t(subType));
+	}
+
+	/** @} */
+
+	/**
+	 * @brief Find partition by name
+	 * @param Name to search for, case-sensitive
+	 * @retval Partition
+	 *
+	 * Names are unique so at most only one match
+	 */
+	Partition find(const String& name) const
+	{
+		return *std::find(begin(), end(), name);
+	}
+
+	Iterator begin() const
+	{
+		return Iterator(mDevice, 0);
+	}
+
+	Iterator end() const
+	{
+		return Iterator(mDevice, mCount);
+	}
+
+	uint8_t count() const
+	{
+		return mCount;
+	}
+
+	Device& device() const
+	{
+		return mDevice;
+	}
+
+	Partition operator[](unsigned index) const
+	{
+		return (index < mCount) ? Partition(mDevice, mEntries.get()[index]) : Partition();
+	}
+
+protected:
+	friend Device;
+	void load(const esp_partition_info_t* entry, unsigned count);
+
+	Device& mDevice;
+	std::unique_ptr<Partition::Info[]> mEntries;
+	uint8_t mCount{0};
+};
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/ProgMem.h b/Sming/Components/Storage/src/include/Storage/ProgMem.h
new file mode 100644
index 0000000000..d8758244d0
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/ProgMem.h
@@ -0,0 +1,89 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * ProgMem.h
+ *
+ ****/
+#pragma once
+
+#include "CustomDevice.h"
+
+namespace Storage
+{
+/**
+ * @brief Storage device to access PROGMEM using flash API
+ */
+class ProgMem : public CustomDevice
+{
+public:
+	String getName() const override
+	{
+		return F("ProgMem");
+	}
+
+	size_t getBlockSize() const override
+	{
+		return sizeof(uint32_t);
+	}
+
+	size_t getSize() const override
+	{
+		return 0x80000000;
+	}
+
+	Type getType() const override
+	{
+		return Type::flash;
+	}
+
+	bool read(uint32_t address, void* dst, size_t size) override;
+
+	bool write(uint32_t address, const void* src, size_t size) override
+	{
+		return false;
+	}
+
+	bool erase_range(uint32_t address, size_t size) override
+	{
+		return false;
+	}
+
+	using CustomDevice::createPartition;
+
+	/**
+	 * @brief Create partition for PROGMEM data access
+	 * @param name Name for partition
+	 * @param flashPtr PROGMEM pointer
+	 * @param size Size of PROGMEM data
+	 * @param type Partition type
+	 * @param subtype Partition sub-type
+	 * @retval Partition Invalid if data is not progmem
+	 */
+	Partition createPartition(const String& name, const void* flashPtr, size_t size, Partition::Type type,
+							  uint8_t subtype);
+
+	template <typename T> Partition createPartition(const String& name, const void* flashPtr, size_t size, T subType)
+	{
+		return createPartition(name, flashPtr, size, Partition::Type(T::partitionType), uint8_t(subType));
+	}
+
+	/**
+	 * @brief Create partition for FlashString data access
+	 */
+	Partition createPartition(const String& name, const FSTR::ObjectBase& fstr, Partition::Type type, uint8_t subtype)
+	{
+		return createPartition(name, fstr.data(), fstr.size(), type, subtype);
+	}
+
+	template <typename T> Partition createPartition(const String& name, const FSTR::ObjectBase& fstr, T subType)
+	{
+		return createPartition(name, fstr, Partition::Type(T::partitionType), uint8_t(subType));
+	}
+};
+
+extern ProgMem progMem;
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/SpiFlash.h b/Sming/Components/Storage/src/include/Storage/SpiFlash.h
new file mode 100644
index 0000000000..a5f0319362
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/SpiFlash.h
@@ -0,0 +1,38 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * SpiFlash.h
+ *
+ ****/
+#pragma once
+
+#include "Device.h"
+
+namespace Storage
+{
+extern SpiFlash* spiFlash;
+
+/**
+ * @brief Main flash storage device
+ */
+class SpiFlash : public Device
+{
+public:
+	String getName() const override;
+	size_t getBlockSize() const override;
+	size_t getSize() const override;
+
+	Type getType() const override
+	{
+		return Type::flash;
+	}
+
+	bool read(uint32_t address, void* dst, size_t size) override;
+	bool write(uint32_t address, const void* src, size_t size) override;
+	bool erase_range(uint32_t address, size_t size) override;
+};
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/StreamDevice.h b/Sming/Components/Storage/src/include/Storage/StreamDevice.h
new file mode 100644
index 0000000000..18ca2d64cf
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/StreamDevice.h
@@ -0,0 +1,67 @@
+/*
+ * StreamDevice.h
+ */
+
+#include "CustomDevice.h"
+#include <Data/Stream/DataSourceStream.h>
+
+namespace Storage
+{
+/**
+ * @brief Read-only partition on a stream object
+ * @note Writes not possible as streams always append data, cannot do random writes
+ */
+class StreamDevice : public CustomDevice
+{
+public:
+	StreamDevice(IDataSourceStream* stream, size_t size) : CustomDevice(nameOf(stream), size), mStream(stream)
+	{
+	}
+
+	StreamDevice(IDataSourceStream* stream) : StreamDevice(stream, size_t(stream->available()))
+	{
+	}
+
+	static String nameOf(IDataSourceStream* stream)
+	{
+		String s;
+		if(stream != nullptr) {
+			s = stream->getName();
+		}
+		if(!s) {
+			s = F("stream_") + String(uint32_t(stream), HEX);
+		}
+		return s;
+	}
+
+	Type getType() const override
+	{
+		return Type::stream;
+	}
+
+	bool read(uint32_t address, void* buffer, size_t len) override
+	{
+		if(mStream == nullptr) {
+			return false;
+		}
+		if(mStream->seekFrom(address, SeekOrigin::Start) != int(address)) {
+			return false;
+		}
+		return mStream->readBytes(static_cast<char*>(buffer), len) == len;
+	}
+
+	bool write(uint32_t address, const void* data, size_t len) override
+	{
+		return false;
+	}
+
+	bool erase_range(uint32_t address, size_t len) override
+	{
+		return false;
+	}
+
+private:
+	std::unique_ptr<IDataSourceStream> mStream;
+};
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/SysMem.h b/Sming/Components/Storage/src/include/Storage/SysMem.h
new file mode 100644
index 0000000000..9f49a3fa3e
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/SysMem.h
@@ -0,0 +1,88 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * SysMem.h
+ *
+ ****/
+
+#pragma once
+
+#include "CustomDevice.h"
+
+namespace Storage
+{
+/**
+ * @brief Storage device to access system memory, e.g. RAM
+ */
+class SysMem : public CustomDevice
+{
+public:
+	String getName() const override
+	{
+		return F("SysMem");
+	}
+
+	size_t getBlockSize() const override
+	{
+		return sizeof(uint32_t);
+	}
+
+	size_t getSize() const override
+	{
+		return 0x80000000;
+	}
+
+	Type getType() const override
+	{
+		return Type::sysmem;
+	}
+
+	bool read(uint32_t address, void* buffer, size_t len) override
+	{
+		if(isFlashPtr(reinterpret_cast<const void*>(address))) {
+			memcpy_P(buffer, reinterpret_cast<const void*>(address), len);
+		} else {
+			memcpy(buffer, reinterpret_cast<const void*>(address), len);
+		}
+		return true;
+	}
+
+	bool write(uint32_t address, const void* data, size_t len) override
+	{
+		if(isFlashPtr(reinterpret_cast<const void*>(address))) {
+			return false;
+		}
+
+		memcpy(reinterpret_cast<void*>(address), data, len);
+		return true;
+	}
+
+	bool erase_range(uint32_t address, size_t len) override
+	{
+		if(isFlashPtr(reinterpret_cast<const void*>(address))) {
+			return false;
+		}
+
+		memset(&address, 0xFF, len);
+		return true;
+	}
+
+	using CustomDevice::createPartition;
+
+	/**
+	 * @brief Create partition for FlashString data access
+	 */
+	Partition createPartition(const String& name, const FSTR::ObjectBase& fstr, Partition::Type type, uint8_t subtype);
+
+	template <typename T> Partition createPartition(const String& name, const FSTR::ObjectBase& fstr, T subType)
+	{
+		return createPartition(name, fstr, Partition::Type(T::partitionType), uint8_t(subType));
+	}
+};
+
+extern SysMem sysMem;
+
+} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/partition_info.h b/Sming/Components/Storage/src/include/Storage/partition_info.h
new file mode 100644
index 0000000000..a4b54c7f62
--- /dev/null
+++ b/Sming/Components/Storage/src/include/Storage/partition_info.h
@@ -0,0 +1,32 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * partition_info.h
+ *
+ ****/
+
+#include "Partition.h"
+
+namespace Storage
+{
+/**
+ * @brief Internal structure describing the binary layout of a partition table entry.
+ */
+struct esp_partition_info_t {
+	uint16_t magic;					 ///< Fixed value to identify valid entry, appears as 0xFFFF at end of table
+	Partition::Type type;			 ///< Main type of partition
+	uint8_t subtype;				 ///< Sub-type for partition (interpretation dependent upon type)
+	uint32_t offset;				 ///< Start offset
+	uint32_t size;					 ///< Size of partition in bytes
+	Storage::Partition::Name name;   ///< Unique identifer for entry
+	Storage::Partition::Flags flags; ///< Various option flags
+};
+
+constexpr uint16_t ESP_PARTITION_MAGIC{0x50AA};		 ///< Identifies a valid partition
+constexpr uint16_t ESP_PARTITION_MAGIC_MD5{0xEBEB};  ///< Identifies an MD5 hash block
+constexpr size_t ESP_PARTITION_TABLE_MAX_LEN{0xC00}; // Maximum length of partition table data
+
+} // namespace Storage
diff --git a/Sming/Components/esptool/README.rst b/Sming/Components/esptool/README.rst
index df11b055fa..43acb7c806 100644
--- a/Sming/Components/esptool/README.rst
+++ b/Sming/Components/esptool/README.rst
@@ -8,18 +8,26 @@ Options
 
 .. envvar:: SPI_SPEED
 
+   [read-only]  Set by :ref:`hardware_config`.
+
    Clock speed for flash memory (20, 26, 40 or 80). Default is 40.
 
 
 .. envvar:: SPI_MODE
 
-   Flash memory operating mode (quot, dio, dout, qio). Default is qio.
+   [read-only]  Set by :ref:`hardware_config`.
 
+   Flash memory operating mode (quot, dio, dout, qio). Default is qio.
 
 .. envvar:: SPI_SIZE
 
+   [read-only]  Set by :ref:`hardware_config`.
+
    Size of flash memory chip (256KB, 512KB, 1MB, 2MB, 4MB). Default is 512K bytes.
 
+   The default hardware profile ``standard`` sets this to 1MB.
+   You can set ``HWCONFIG=standard-4m`` to increase it or create a custom :ref:`hardware_config` for your project.
+
 
 .. envvar:: ESPTOOL
 
diff --git a/Sming/Components/esptool/component.mk b/Sming/Components/esptool/component.mk
index c2f8d6d22c..2a4cf0bbc0 100644
--- a/Sming/Components/esptool/component.mk
+++ b/Sming/Components/esptool/component.mk
@@ -1,44 +1,11 @@
 COMPONENT_LIBNAME :=
 
-CONFIG_VARS				+= SPI_SPEED SPI_MODE SPI_SIZE
+DEBUG_VARS				+= SPI_SPEED SPI_MODE SPI_SIZE
+SPI_SPEED				= $(STORAGE_DEVICE_spiFlash_SPEED)
+SPI_MODE				= $(STORAGE_DEVICE_spiFlash_MODE)
+SPI_SIZE				= $(STORAGE_DEVICE_spiFlash_SIZE)
 
-# SPI_SPEED = 40, 26, 20, 80
-SPI_SPEED				?= 40
-# SPI_MODE: qio, qout, dio, dout
-SPI_MODE				?= dio
-# SPI_SIZE: 512K, 256K, 1M, 2M, 4M
-SPI_SIZE				?= 1M
-
-ifeq ($(SPI_SPEED), 26)
-	flashimageoptions	:= -ff 26m
-else ifeq ($(SPI_SPEED), 20)
-	flashimageoptions	:= -ff 20m
-else ifeq ($(SPI_SPEED), 80)
-	flashimageoptions	:= -ff 80m
-else
-	flashimageoptions	:= -ff 40m
-endif
-
-ifeq ($(SPI_MODE), qout)
-	flashimageoptions	+= -fm qout
-else ifeq ($(SPI_MODE), dio)
-	flashimageoptions	+= -fm dio
-else ifeq ($(SPI_MODE), dout)
-	flashimageoptions	+= -fm dout
-else
-	flashimageoptions	+= -fm qio
-endif
-
-# Calculate parameters from SPI_SIZE value (esptool will check validity)
-ifeq ($(SPI_SIZE),detect)
-flashimageoptions	+= -fs detect
-else
-flashimageoptions	+= -fs $(SPI_SIZE)B
-endif
-FLASH_SIZE			:= $(subst M,*1024K,$(SPI_SIZE))
-FLASH_SIZE			:= $(subst K,*1024,$(FLASH_SIZE))
-FlashOffset			= $$(($(FLASH_SIZE)-$1))
-BLANK_BIN			:= $(COMPONENT_PATH)/blank.bin
+flashimageoptions		+= -fs $(SPI_SIZE)B -ff $(SPI_SPEED)m -fm $(SPI_MODE)
 
 # Default COM port and speed used for flashing
 CACHE_VARS				+= COM_PORT_ESPTOOL COM_SPEED_ESPTOOL
@@ -74,6 +41,8 @@ else
 ESPTOOL_EXECUTE = $(ESPTOOL_CMDLINE) $1
 endif
 
+comma := ,
+
 # Write file contents to Flash
 # $1 -> List of `Offset=File` chunks
 define WriteFlash
@@ -83,6 +52,21 @@ define WriteFlash
 	)
 endef
 
+# Read flash memory into file
+# $1 -> `Offset,Size` chunk
+# $2 -> Output filename
+define ReadFlash
+	$(info ReadFlash $1,$2)
+	$(call ESPTOOL_EXECUTE,read_flash $(subst $(comma), ,$1) $2)
+endef
+
+# Erase a region of Flash
+# $1 -> Offset,Size
+define EraseFlashRegion
+	$(info EraseFlashRegion $1)
+	$(call ESPTOOL_EXECUTE,erase_region $(subst $(comma), ,$1))
+endef
+
 # Erase flash memory contents
 define EraseFlash
 	$(call ESPTOOL_EXECUTE,erase_flash)
diff --git a/Sming/Components/rboot/.patches/rboot.patch b/Sming/Components/rboot/.patches/rboot.patch
index ee164e45ac..b8cd1ce078 100644
--- a/Sming/Components/rboot/.patches/rboot.patch
+++ b/Sming/Components/rboot/.patches/rboot.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 0b43474..5176f8f 100644
+index 638a8f7..5176f8f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -58,6 +58,19 @@ endif
@@ -22,17 +22,7 @@ index 0b43474..5176f8f 100644
  ifneq ($(RBOOT_EXTRA_INCDIR),)
  	CFLAGS += $(addprefix -I,$(RBOOT_EXTRA_INCDIR))
  endif
-@@ -75,6 +88,10 @@ else ifeq ($(SPI_SIZE), 2Mb)
- 	E2_OPTS += -2048b
- else ifeq ($(SPI_SIZE), 4M)
- 	E2_OPTS += -4096
-+else ifeq ($(SPI_SIZE), 8M)
-+	E2_OPTS += -8192
-+else ifeq ($(SPI_SIZE), 16M)
-+	E2_OPTS += -16384
- endif
- ifeq ($(SPI_MODE), qio)
- 	E2_OPTS += -qio
+
 diff --git a/rboot.c b/rboot.c
 index d622f97..5e254fa 100644
 --- a/rboot.c
@@ -309,7 +299,7 @@ index d622f97..5e254fa 100644
  	ets_memcpy((void*)_text_addr, _text_data, _text_len);
  	// return address to load from
 diff --git a/appcode/rboot-api.c b/appcode/rboot-api.c
-index eb4d028..490a763 100644
+index eb4d028..bf276a7 100644
 --- a/appcode/rboot-api.c
 +++ b/appcode/rboot-api.c
 @@ -9,7 +9,7 @@
@@ -356,6 +346,15 @@ index eb4d028..490a763 100644
  	return true;
  }
  
+@@ -103,7 +103,7 @@ bool ICACHE_FLASH_ATTR rboot_write_end(rboot_write_status *status) {
+ 
+ // function to do the actual writing to flash
+ // call repeatedly with more data (max len per write is the flash sector size (4k))
+-bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, uint8_t *data, uint16_t len) {
++bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, const uint8_t *data, uint16_t len) {
+ 	
+ 	bool ret = false;
+ 	uint8_t *buffer;
 @@ -114,7 +114,7 @@ bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, uint8_t *da
  	}
  	
@@ -387,3 +386,17 @@ index eb4d028..490a763 100644
  	return ret;
  }
  
+diff --git a/appcode/rboot-api.h b/appcode/rboot-api.h
+index a98c209..ec4f0e5 100644
+--- a/appcode/rboot-api.h
++++ b/appcode/rboot-api.h
+@@ -93,7 +93,7 @@ bool ICACHE_FLASH_ATTR rboot_write_end(rboot_write_status *status);
+  *  of OTA data is received over the network.
+  *  @note   Call rboot_write_init before calling this function to get the rboot_write_status structure
+ */
+-bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, uint8_t *data, uint16_t len);
++bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, const uint8_t *data, uint16_t len);
+ 
+ #ifdef BOOT_RTC_ENABLED
+ /** @brief  Get rBoot status/control data from RTC data area
+
diff --git a/Sming/Components/rboot/README.rst b/Sming/Components/rboot/README.rst
index df119b1787..50cd239c2a 100644
--- a/Sming/Components/rboot/README.rst
+++ b/Sming/Components/rboot/README.rst
@@ -7,7 +7,12 @@ Introduction
 rBoot is a second-stage bootloader that allows booting application images from several 
 pre-configured flash memory addresses, called "slots". Sming supports up to three slots.
 
-Sming uses rBoot exclusively because of its flexibility, reliability and ease of use. 
+.. note::
+
+   With Sming 4.3 partitions are used to manage flash storage.
+   A "slot" refers to a specific application partition, namely ``rom0``, ``rom1`` or ``rom2``.
+
+   The location or size of these partitions is determined by the :ref:`hardware_config`.
 
 .. attention::
 
@@ -19,38 +24,40 @@ Sming uses rBoot exclusively because of its flexibility, reliability and ease of
 Slot 0
 ------
 
-This is the default slot which is always used.
+This is the default slot (``rom0``, the primary application partition) which is always used.
 
 .. envvar:: RBOOT_ROM0_ADDR
 
-   default: 0x2000.
+   [read-only]
 
-   This is the start address for slot 0. The default is sector 3, immediately after rBoot and its configuration data.
+   This is the start address for slot 0.
 
-   Except for the use case described in `Slot2`_ below, you should not need to set this value.
+   Except for the use case described in `Slot2`_ below, you should not need to change this.
 
 Slot 1
 ------
 
 .. envvar:: RBOOT_ROM1_ADDR
 
-   default: disabled
+   [read-only] default: disabled
 
-   The start address of slot 1. If you don't need it, leave unconfigured (empty).
+   The start address of slot 1.
 
 If your application includes any kind of Over-the-Air (OTA) firmware
 update functionality, you will need a second memory slot to store the received
 update image while the update routines execute from the first slot.
 
+.. note::
+
+   The ``spiffs-two-roms`` configuration can be used for this purpose.
+
 Upon successful completion of the update, the second slot is activated, such that on next reset
 rBoot boots into the uploaded application. While now running from slot 1, the next
 update will be stored to slot 0 again, i.e. the roles of slot 0 and slot 1 are
 flipped with every update.
 
-For devices with more than 1MB of flash memory, it is advisable to choose an address with the same 
-offset within its 1MB block as :envvar:`RBOOT_ROM0_ADDR`, e.g. 0x102000 for the default 
-slot 0 address (0x2000). This way, the same application image can be used for both 
-slots. See :ref:`single_vs_dual` for further details.
+For devices with more than 1MB of flash memory, it is advisable to choose an address
+for ``rom1`` with the same offset within its 1MB block as ``rom0``.
 
 .. _Slot2:
 
@@ -69,23 +76,61 @@ To enable slot 2, set these values:
 
 .. envvar:: RBOOT_ROM2_ADDR
 
-   Address for slot 2
+   [read-only]
+
+   Address for slot 2. You must create a custom :ref:`hardware_config` for your project
+   with a definition for ``rom2``.
+
+   .. code-block:: json
+
+      {
+         ...
+         "partitions": {
+            "rom2": {
+               "address": "0x100000",
+               "size": "512K",
+               "type": "app",
+               "subtype": "ota_1"
+            }
+         }
+      }
+
+.. note::
+
+   At present, this will only configure rBoot.
+   Sming will not create an application image for slot 2.
+
+   You can, however, use a second Sming  project to build a recovery application image as follows:
+
+   -  Create a new Sming project for your recovery application. This will be a simple
+      single-slot project. Create a new :ref:`hardware_config` and configure the
+      ``rom0`` start address and size to the same as the ``rom2`` partition of the main project.
+
+   option (a)
+
+   -  Build and flash the recovery project as usual by typing ``make flash``. This will 
+      install the recovery ROM (into slot 2 of the main project) and a temporary 
+      bootloader, which will be overwritten in the next step.
+
+   -  Go back to your main project. Build and flash it with ``make flash``. This will 
+      install the main application (into slot 0) and the final bootloader. You are 
+      now all set for booting into the recovery image if the need arises.
+
+   option (b)
+
+   -  Run a normal ``make`` for your recovery project
+   
+   -  Locate the firmware image file, typically ``out/Esp8266/release/firmware/rom0.bin``
+      (adjust accordingly if using a debug build).
+      Copy this image file as ``rom2.bin`` into your main project directory.
 
-Note that this will only configure rBoot.
-Sming will  not create an application image for slot 2.
-You can, however, use a second Sming  project to build a recovery application image as follows:
+   -  Add an additional property to the ``rom2`` partition entry in your main project:
 
-1. Create a new Sming project for your recovery application. This will be a simple
-   single-slot project. Set :envvar:`RBOOT_ROM0_ADDR` of the recovery project to the value 
-   of :envvar:`RBOOT_ROM2_ADDR` of the main project.
+      .. code-block:: json
 
-2. Build and flash the recovery project as usual by typing ``make flash``. This will 
-   install the recovery ROM (into slot 2 of the main project) and a temporary 
-   bootloader, which will be overwritten in the next step.
+         "filename": "rom2.bin"
 
-3. Go back to your main project. Build and flash it with ``make flash``. This will 
-   install the main application (into slot 0) and the final bootloader. You are 
-   now all set for booting into the recovery image if the need arises.
+      When you run ``make flash`` in this will get written along with the other partitions.
 
 Automatically derived settings
 ------------------------------
@@ -122,8 +167,9 @@ the same address offsets within their 1MB blocks, i.e. ``(RBOOT_ROM0_ADDR & 0xFF
 Consequently, for such configurations, the Sming build system generates only one ROM image.
 
 In all other cases, two distinct application images must be linked with different addresses 
-for the 'irom0_0_seg' memory region. The Sming build system takes care of all the details, 
-including linker script generation.
+for the 'irom0_0_seg' memory region.
+You should use the ``two-rom-mode`` :ref:`hardware_config` for this.
+The Sming build system will handle everything else, including linker script generation.
 
 .. envvar:: RBOOT_TWO_ROMS
 
diff --git a/Sming/Components/rboot/appcode/rboot-overrides.c b/Sming/Components/rboot/appcode/rboot-overrides.c
deleted file mode 100644
index 04132ad0cf..0000000000
--- a/Sming/Components/rboot/appcode/rboot-overrides.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/****
- * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
- * Created 2015 by Skurydin Alexey
- * http://github.com/SmingHub/Sming
- * All files of the Sming Core are provided under the LGPL v3 license.
- *
- * rboot-overrides.c
- *
- ****/
-
-#include "spiffs_sming.h"
-#include <esp_spi_flash.h>
-
-/*
- * rBoot uses different spiffs organization and we need to override this method
- * during application compile time  in order to make automatic
- * mounting with `spiffs_mount()` work as expected.
- */
-spiffs_config spiffs_get_storage_config()
-{
-  spiffs_config cfg = {0};
-  u32_t max_allowed_sector, requested_sector;
-
-#ifdef RBOOT_SPIFFS_0
-  cfg.phys_addr = RBOOT_SPIFFS_0;
-#elif RBOOT_SPIFFS_1
-  cfg.phys_addr = RBOOT_SPIFFS_1;
-#else
-#error "Define either RBOOT_SPIFFS_0 or RBOOT_SPIFFS_1"
-#endif
-
-  cfg.phys_addr &= 0xFFFFF000; // get the start address of the sector
-
-  max_allowed_sector = flashmem_get_sector_of_address(INTERNAL_FLASH_SIZE - 1);
-  requested_sector  = flashmem_get_sector_of_address((cfg.phys_addr + SPIFF_SIZE) - 1);
-  if(requested_sector > max_allowed_sector) {
-      debug_w("The requested SPIFFS size is too big.");
-      requested_sector = max_allowed_sector;
-  }
-  // get the max size until the sector end
-  cfg.phys_size = ((requested_sector + 1) * INTERNAL_FLASH_SECTOR_SIZE) - cfg.phys_addr;
-  return cfg;
-}
diff --git a/Sming/Components/rboot/component.mk b/Sming/Components/rboot/component.mk
index 7cd47cbdeb..0d7617b94e 100644
--- a/Sming/Components/rboot/component.mk
+++ b/Sming/Components/rboot/component.mk
@@ -7,8 +7,8 @@ RBOOT_EMULATION			:= 1
 endif
 
 COMPONENT_SUBMODULES	:= rboot
-COMPONENT_INCDIRS	:= rboot appcode rboot/appcode include
-COMPONENT_SRCDIRS       := src
+COMPONENT_INCDIRS		:= rboot rboot/appcode include
+COMPONENT_SRCDIRS       := src src/Arch/$(SMING_ARCH)
 
 RBOOT_DIR				:= $(COMPONENT_PATH)
 
@@ -35,23 +35,22 @@ $(error Cannot enable RBOOT_GPIO_ENABLED and RBOOT_GPIO_SKIP_ENABLED at the same
 endif
 
 ### ROM Addresses ###
-# Make sure that your ROM slots and SPIFFS slot(s) do not overlap!
 
-CONFIG_VARS				+= RBOOT_ROM0_ADDR RBOOT_ROM1_ADDR RBOOT_ROM2_ADDR
+DEBUG_VARS				+= RBOOT_ROM0_ADDR RBOOT_ROM1_ADDR RBOOT_ROM2_ADDR
 
-# Loation of first ROM (default is sector 2 after rboot and rboot config sector)
-RBOOT_ROM0_ADDR			?= 0x002000
+# Location of first ROM
+RBOOT_ROM0_ADDR := $(PARTITION_rom0_ADDRESS)
 
 # The parameter below specifies the location of the second ROM.
 # You need a second slot for any kind of firmware update mechanism.
 # Leave empty if you don't need a second ROM slot.
-RBOOT_ROM1_ADDR			?=
+RBOOT_ROM1_ADDR := $(PARTITION_rom1_ADDRESS)
 
 # The parameter below specifies the location of the GPIO ROM.
 # It is only used when RBOOT_GPIO_ENABLED = 1
 # Note that setting this parameter will only configure rboot.
 # The Sming build system does not create a ROM for this slot.
-RBOOT_ROM2_ADDR			?=
+RBOOT_ROM2_ADDR := $(PARTITION_rom2_ADDRESS)
 
 ifeq ($(RBOOT_GPIO_ENABLED),0)
 ifneq ($(RBOOT_ROM2_ADDR),)
@@ -86,15 +85,6 @@ RBOOT_LD_TEMPLATE		?= $(RBOOT_DIR)/rboot.rom0.ld
 RBOOT_LD_0				:= $(BUILD_BASE)/$(RBOOT_ROM_0).ld
 RBOOT_LD_1				:= $(BUILD_BASE)/$(RBOOT_ROM_1).ld
 
-#
-CONFIG_VARS				+= RBOOT_SPIFFS_0 RBOOT_SPIFFS_1
-RBOOT_SPIFFS_0			?= 0x100000
-RBOOT_SPIFFS_1			?= 0x300000
-APP_CFLAGS				+= -DRBOOT_SPIFFS_0=$(RBOOT_SPIFFS_0)
-APP_CFLAGS				+= -DRBOOT_SPIFFS_1=$(RBOOT_SPIFFS_1)
-
-SPIFF_START_ADDR		?= $(RBOOT_SPIFFS_0)
-
 # filenames and options for generating rBoot rom images with esptool2
 RBOOT_E2_SECTS			?= .text .text1 .data .rodata
 RBOOT_E2_USER_ARGS		?= -quiet -bin -boot2
@@ -103,7 +93,7 @@ RBOOT_ROM_0_BIN			:= $(FW_BASE)/$(RBOOT_ROM_0).bin
 RBOOT_ROM_1_BIN			:= $(FW_BASE)/$(RBOOT_ROM_1).bin
 
 
-COMPONENT_APPCODE		:= appcode rboot/appcode $(if $(RBOOT_EMULATION),host)
+COMPONENT_APPCODE		:= rboot/appcode
 APP_CFLAGS				+= -DRBOOT_INTEGRATION
 
 # these are exported for use by the rBoot Makefile
@@ -133,11 +123,19 @@ ifeq ($(RBOOT_GPIO_SKIP_ENABLED),1)
 	APP_CFLAGS			+= -DBOOT_GPIO_SKIP_ENABLED
 endif
 
-ifndef RBOOT_EMULATION
+COMPONENT_CXXFLAGS += \
+		-DRBOOT_ROM0_ADDR=$(RBOOT_ROM0_ADDR) \
+		-DRBOOT_ROM1_ADDR=$(RBOOT_ROM1_ADDR)
+
+ifdef RBOOT_EMULATION
+FLASH_BOOT_CHUNKS		= 0x00000=$(BLANK_BIN)
+else
+export RBOOT_ROM0_ADDR
+export RBOOT_ROM1_ADDR
 RBOOT_BIN				:= $(FW_BASE)/rboot.bin
 CUSTOM_TARGETS			+= $(RBOOT_BIN)
 $(RBOOT_BIN):
-	$(Q) $(MAKE) -C $(RBOOT_DIR)/rboot
+	$(Q) $(MAKE) -C $(RBOOT_DIR)/rboot $(RBOOT_CFLAGS)
 
 EXTRA_LDFLAGS			:= -u Cache_Read_Enable_New
 
@@ -151,14 +149,9 @@ endef
 LIBMAIN_COMMANDS += $(RBOOT_LIBMAIN_COMMANDS)
 endif
 
-endif # RBOOT_EMULATION
-
 # Define our flash chunks
-FLASH_RBOOT_BOOT_CHUNKS				:= 0x00000=$(RBOOT_BIN)
-FLASH_RBOOT_APP_CHUNKS				:= $(RBOOT_ROM0_ADDR)=$(RBOOT_ROM_0_BIN)
-FLASH_RBOOT_ERASE_CONFIG_CHUNKS		:= 0x01000=$(SDK_BASE)/bin/blank.bin
-
-ifndef RBOOT_EMULATION
+FLASH_BOOT_CHUNKS				:= 0x00000=$(RBOOT_BIN)
+FLASH_RBOOT_ERASE_CONFIG_CHUNKS	:= 0x01000=$(SDK_BASE)/bin/blank.bin
 
 # => Automatic linker script generation from template
 # $1 -> application target
diff --git a/Sming/Components/rboot/include/Network/RbootHttpUpdater.h b/Sming/Components/rboot/include/Network/RbootHttpUpdater.h
index 3a6ac65c46..c7ed16a43c 100644
--- a/Sming/Components/rboot/include/Network/RbootHttpUpdater.h
+++ b/Sming/Components/rboot/include/Network/RbootHttpUpdater.h
@@ -39,7 +39,7 @@ class RbootHttpUpdater : protected HttpClient
 		cleanup();
 	}
 
-	bool addItem(int offset, const String& firmwareFileUrl, size_t maxSize = 0);
+	bool addItem(uint32_t offset, const String& firmwareFileUrl, size_t maxSize = 0);
 	bool addItem(const String& firmwareFileUrl, RbootOutputStream* stream = nullptr);
 
 	void start();
diff --git a/Sming/Components/rboot/appcode/rboot-integration.h b/Sming/Components/rboot/include/rboot-integration.h
similarity index 100%
rename from Sming/Components/rboot/appcode/rboot-integration.h
rename to Sming/Components/rboot/include/rboot-integration.h
diff --git a/Sming/Components/rboot/rboot b/Sming/Components/rboot/rboot
index 24f6021da8..614f33685d 160000
--- a/Sming/Components/rboot/rboot
+++ b/Sming/Components/rboot/rboot
@@ -1 +1 @@
-Subproject commit 24f6021da82b303262a939c955f6a984bce6208f
+Subproject commit 614f33685d0dd990fc4202f2409b0d2365eeaef3
diff --git a/Sming/Components/rboot/host/rboot.cpp b/Sming/Components/rboot/src/Arch/Host/rboot.cpp
similarity index 89%
rename from Sming/Components/rboot/host/rboot.cpp
rename to Sming/Components/rboot/src/Arch/Host/rboot.cpp
index 755d942c8d..96c5719d88 100644
--- a/Sming/Components/rboot/host/rboot.cpp
+++ b/Sming/Components/rboot/src/Arch/Host/rboot.cpp
@@ -40,12 +40,12 @@ void host_init_bootloader()
 		romconf.magic = BOOT_CONFIG_MAGIC;
 		romconf.version = BOOT_CONFIG_VERSION;
 		romconf.count = 2;
-		romconf.roms[0] = SECTOR_SIZE * (BOOT_CONFIG_SECTOR + 1);
+		romconf.roms[0] = RBOOT_ROM0_ADDR;
 #ifdef BOOT_ROM1_ADDR
-		romconf.roms[1] = BOOT_ROM1_ADDR;
+		romconf.roms[1] = RBOOT_ROM1_ADDR;
 #else
 		size_t flashsize = flashmem_get_size_bytes();
-		romconf.roms[1] = (flashsize / 2) + (SECTOR_SIZE * (BOOT_CONFIG_SECTOR + 1));
+		romconf.roms[1] = RBOOT_ROM0_ADDR + (flashsize / 2);
 #endif
 		bool ok = rboot_set_config(&romconf);
 		hostmsg("Write default config: %s", ok ? "OK" : "FAIL");
diff --git a/Sming/Components/rboot/src/RbootHttpUpdater.cpp b/Sming/Components/rboot/src/RbootHttpUpdater.cpp
index 077d9697da..07d28bf31d 100644
--- a/Sming/Components/rboot/src/RbootHttpUpdater.cpp
+++ b/Sming/Components/rboot/src/RbootHttpUpdater.cpp
@@ -15,7 +15,7 @@
 
 #include <Network/RbootHttpUpdater.h>
 
-bool RbootHttpUpdater::addItem(int offset, const String& firmwareFileUrl, size_t maxSize)
+bool RbootHttpUpdater::addItem(uint32_t offset, const String& firmwareFileUrl, size_t maxSize)
 {
 	RbootHttpUpdaterItem add;
 	add.targetOffset = offset;
diff --git a/Sming/Components/rboot/src/RbootOutputStream.cpp b/Sming/Components/rboot/src/RbootOutputStream.cpp
index 5fea78dff2..e7b71e4eb5 100644
--- a/Sming/Components/rboot/src/RbootOutputStream.cpp
+++ b/Sming/Components/rboot/src/RbootOutputStream.cpp
@@ -33,12 +33,12 @@ size_t RbootOutputStream::write(const uint8_t* data, size_t size)
 		initialized = true;
 	}
 
-	if(maxLength && (written + size > maxLength)) {
+	if(maxLength != 0 && (written + size > maxLength)) {
 		debug_e("The ROM size is bigger than the maximum allowed");
 		return 0;
 	}
 
-	if(!rboot_write_flash(&rBootWriteStatus, (uint8_t*)data, size)) {
+	if(!rboot_write_flash(&rBootWriteStatus, data, size)) {
 		debug_e("rboot_write_flash: Failed. Size: %d", size);
 		return 0;
 	}
diff --git a/Sming/Components/spiffs/README.rst b/Sming/Components/spiffs/README.rst
index 7f2792eb57..13e5852abc 100644
--- a/Sming/Components/spiffs/README.rst
+++ b/Sming/Components/spiffs/README.rst
@@ -1,36 +1,47 @@
 SPIFFS for Sming
 ================
 
-This Component provides additional functionality to support SPIFFS running on both Esp8266 and Host architectures.
+This Component provides SPIFFS filesystem support for all architectures.
 
-.. envvar:: DISABLE_SPIFFS
+A single SPIFFS partition is defined using :envvar:`HWCONFIG` ``=spiffs``, which supports these build variables:
 
-   0 (default)
-      Enable filesystem generation
-      
-   1
-      Disable filesystem generation
+   .. envvar:: DISABLE_SPIFFS
 
-   The value is also #defined for application use.
+      [deprecated and removed]
 
-   Note this doesn't actually disable SPIFFS support in the application!
+      This value is no longer supported. Please remove it from your project's component.mk file.
 
 
-.. envvar:: SPIFF_SIZE
+   .. envvar:: SPIFF_SIZE
 
-   Size (in bytes) of the SPIFFS area in Flash memory.
+      [deprecated and removed]
 
+      Size (in bytes) of the SPIFFS area in Flash memory. To change this, edit the :ref:`hardware_config`.
 
-.. envvar:: SPIFF_FILES
+   .. envvar:: SPIFF_FILES
 
-   default: ``files``
+   .. envvar:: SPIFF_FILES
 
-   The SPIFFS image is built using files from this directory.
+      default: ``files``
 
+      The SPIFFS image is built using files from this directory, which must exist or the build will fail.
 
-.. envvar:: SPIFF_BIN
+      If you set this to an empty value, then an empty filesystem will be created.
+
+
+   .. envvar:: SPIFF_BIN
+
+      Filename to use for the generated SPIFFS filesystem image. The default is ``spiff_rom``.
+
+
+   .. envvar:: SPIFF_BIN_OUT
+
+      [read-only] Shows the full path to the generated image file.
+
+
+For more control over the SPIFFS partition you can create your own partition definition in a
+custom :ref:`hardware_config`.
 
-   Path to the generated SPIFFS filesystem image.
 
 
 .. envvar:: SPIFF_FILEDESC_COUNT
diff --git a/Sming/Components/spiffs/blankfs.bin b/Sming/Components/spiffs/blankfs.bin
deleted file mode 100644
index 171fa2bbce..0000000000
--- a/Sming/Components/spiffs/blankfs.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ No newline at end of file
diff --git a/Sming/Components/spiffs/component.mk b/Sming/Components/spiffs/component.mk
index e9019a6382..f82bfa9608 100644
--- a/Sming/Components/spiffs/component.mk
+++ b/Sming/Components/spiffs/component.mk
@@ -14,31 +14,14 @@ $(COMPONENT_RULE)$(SPIFFY):
 
 ## Application
 
-# This controls filesystem generation, it doesn't actually disable SPIFFS support in the application
-CONFIG_VARS			+= DISABLE_SPIFFS
-DISABLE_SPIFFS		?= 0
-APP_CFLAGS			+= -DDISABLE_SPIFFS=$(DISABLE_SPIFFS)
+ifdef DISABLE_SPIFFS
+$(error DISABLE_SPIFFS is no longer supported; please remove this option from your component.mk file)
+endif
 
 CACHE_VARS			+= SPIFF_FILES SPIFF_BIN
 SPIFF_FILES			?= files
 SPIFF_BIN			?= spiff_rom
 SPIFF_BIN_OUT		:= $(FW_BASE)/$(SPIFF_BIN).bin
-CUSTOM_TARGETS		+= $(SPIFF_BIN_OUT)
-
-CONFIG_VARS	+= SPIFF_SIZE
-ifeq ($(SPI_SIZE), 256K)
-	SPIFF_SIZE			?= 131072  #128K
-else ifeq ($(SPI_SIZE), 1M)
-	SPIFF_SIZE			?= 524288  #512K
-else ifeq ($(SPI_SIZE), 2M)
-	SPIFF_SIZE			?= 524288  #512K
-else ifeq ($(SPI_SIZE), 4M)
-	SPIFF_SIZE			?= 524288  #512K
-else
-	SPIFF_SIZE			?= 196608  #192K
-endif
-APP_CFLAGS				+= -DSPIFF_SIZE=$(SPIFF_SIZE)
-
 
 COMPONENT_RELINK_VARS	+= SPIFF_FILEDESC_COUNT
 SPIFF_FILEDESC_COUNT	?= 7
@@ -46,57 +29,20 @@ COMPONENT_CFLAGS		+= -DSPIFF_FILEDESC_COUNT=$(SPIFF_FILEDESC_COUNT)
 
 COMPONENT_CFLAGS		+= -Wno-tautological-compare
 
-
-ifeq ($(SMING_ARCH),Esp32)
-SPIFF_START_ADDR		?= 0x200000
-APP_CFLAGS				+= -DSPIFF_SIZE=$(SPIFF_SIZE) -DSPIFF_START_ADDR=$(SPIFF_START_ADDR)
-endif
-
 ##@Building
 
 .PHONY: spiffs-image-update
 spiffs-image-update: spiffs-image-clean $(SPIFF_BIN_OUT) ##Rebuild the SPIFFS filesystem image
 
-##@Cleaning
-
-.PHONY: spiffs-image-clean
-spiffs-image-clean: ##Remove SPIFFS image file
-	$(info Cleaning $(SPIFF_BIN_OUT))
-	$(Q) rm -f $(SPIFF_BIN_OUT)
-
-# Generating spiffs_bin
-$(SPIFF_BIN_OUT): $(SPIFFY)
-ifeq ($(DISABLE_SPIFFS), 1)
-	$(info (!) Spiffs support disabled. Remove 'DISABLE_SPIFFS' make argument to enable spiffs.)
-else
-	$(Q) mkdir -p $(dir $(SPIFF_BIN_OUT))
-	$(info Checking for spiffs files)
-	$(Q)	if [ -d "$(SPIFF_FILES)" ]; then \
-				echo "$(SPIFF_FILES) directory exists. Creating $(SPIFF_BIN_OUT)"; \
-				$(SPIFFY) $(SPIFF_SIZE) $(SPIFF_FILES) $(SPIFF_BIN_OUT); \
-			else \
-				echo "No files found in ./$(SPIFF_FILES)."; \
-				echo "Creating empty $(SPIFF_BIN_OUT)"; \
-				$(SPIFFY) $(SPIFF_SIZE) dummy.dir $(SPIFF_BIN_OUT); \
-			fi
+# Target invoked via partition table
+ifneq (,$(filter spiffsgen,$(MAKECMDGOALS)))
+PART_TARGET := $(PARTITION_$(PART)_FILENAME)
+$(eval PART_FILES := $(call HwExpr,part.build['files']))
+SPIFFY_ARGS := $(PARTITION_$(PART)_SIZE_BYTES) "$(or $(PART_FILES),dummy.dir)"
+.PHONY: spiffsgen
+spiffsgen: $(SPIFFY)
+ifneq (,$(PART_TARGET))
+	$(Q) mkdir -p $(dir $(PART_TARGET))
+	$(Q) $(SPIFFY) $(SPIFFY_ARGS) $(PART_TARGET)
 endif
-
-##@Flashing
-
-BLANKFS_BIN := $(COMPONENT_PATH)/blankfs.bin
-
-# If enabled, add the SPIFFS image to the chunks to write
-ifeq ($(DISABLE_SPIFFS), 1)
-FLASH_SPIFFS_CHUNKS	:=
-else
-FLASH_SPIFFS_CHUNKS	:= $(SPIFF_START_ADDR)=$(SPIFF_BIN_OUT)
-FLASH_INIT_CHUNKS	+= $(SPIFF_START_ADDR)=$(BLANKFS_BIN)
-endif
-
-.PHONY: flashfs
-flashfs: $(SPIFF_BIN_OUT) ##Write just the SPIFFS filesystem image
-ifeq ($(DISABLE_SPIFFS), 1)
-	$(info SPIFFS image creation disabled!)
-else
-	$(call WriteFlash,$(FLASH_SPIFFS_CHUNKS))
 endif
diff --git a/Sming/Components/spiffs/spiffs_config.h b/Sming/Components/spiffs/spiffs_config.h
index fe7c0b6dd7..1cd0560bcc 100644
--- a/Sming/Components/spiffs/spiffs_config.h
+++ b/Sming/Components/spiffs/spiffs_config.h
@@ -181,9 +181,7 @@
 #endif
 
 // Enable this if you want the HAL callbacks to be called with the spiffs struct
-#ifndef SPIFFS_HAL_CALLBACK_EXTRA
-#define SPIFFS_HAL_CALLBACK_EXTRA         0
-#endif
+#define SPIFFS_HAL_CALLBACK_EXTRA         1
 
 // Enable this if you want to add an integer offset to all file handles
 // (spiffs_file). This is useful if running multiple instances of spiffs on
diff --git a/Sming/Components/spiffs/spiffs_sming.cpp b/Sming/Components/spiffs/spiffs_sming.cpp
index 0168d93b2b..b138e3517e 100644
--- a/Sming/Components/spiffs/spiffs_sming.cpp
+++ b/Sming/Components/spiffs/spiffs_sming.cpp
@@ -10,10 +10,13 @@
 
 #include "spiffs_sming.h"
 #include <esp_spi_flash.h>
+#include <Storage.h>
 extern "C" {
 #include "spiffs/src/spiffs_nucleus.h"
 }
 
+#define LOG_PAGE_SIZE 256
+
 spiffs _filesystemStorageHandle;
 
 #ifndef SPIFF_FILEDESC_COUNT
@@ -26,32 +29,51 @@ uint16_t spiffs_work_buf[LOG_PAGE_SIZE];
 spiffs_fd spiffs_fds[SPIFF_FILEDESC_COUNT];
 uint32_t spiffs_cache_buf[LOG_PAGE_SIZE + 32];
 
-s32_t api_spiffs_read(u32_t addr, u32_t size, u8_t* dst)
+#define GET_DEVICE()                                                                                                   \
+	if(fs == nullptr || fs->user_data == nullptr) {                                                                    \
+		debug_e("[SPIFFS] NO DEVICE");                                                                                 \
+		return 0;                                                                                                      \
+	}                                                                                                                  \
+	auto device = static_cast<Storage::Device*>(fs->user_data);
+
+s32_t api_spiffs_read(struct spiffs_t* fs, u32_t addr, u32_t size, u8_t* dst)
 {
-	return (flashmem_read(dst, addr, size) == size) ? SPIFFS_OK : SPIFFS_ERR_INTERNAL;
+	GET_DEVICE();
+	return device->read(addr, dst, size) ? SPIFFS_OK : SPIFFS_ERR_INTERNAL;
 }
 
-s32_t api_spiffs_write(u32_t addr, u32_t size, u8_t* src)
+s32_t api_spiffs_write(struct spiffs_t* fs, u32_t addr, u32_t size, u8_t* src)
 {
 	//debugf("api_spiffs_write");
-	return (flashmem_write(src, addr, size) == size) ? SPIFFS_OK : SPIFFS_ERR_INTERNAL;
+	GET_DEVICE();
+	return device->write(addr, src, size) ? SPIFFS_OK : SPIFFS_ERR_INTERNAL;
 }
 
-s32_t api_spiffs_erase(u32_t addr, u32_t size)
+s32_t api_spiffs_erase(struct spiffs_t* fs, u32_t addr, u32_t size)
 {
-	debugf("api_spiffs_erase");
-	uint32_t sect_first = flashmem_get_sector_of_address(addr);
-	uint32_t sect_last = sect_first;
-	while(sect_first <= sect_last) {
-		if(!flashmem_erase_sector(sect_first++)) {
-			return SPIFFS_ERR_INTERNAL;
-		}
-	}
-	return SPIFFS_OK;
+	debugf("api_spiffs_erase(0x%08x, 0x%08x)", addr, size);
+	GET_DEVICE();
+	return device->erase_range(addr, size) ? SPIFFS_OK : SPIFFS_ERR_INTERNAL;
 }
 
-bool tryMount(const spiffs_config& cfg)
+spiffs_config initConfig(Storage::Partition& partition)
 {
+	_filesystemStorageHandle.user_data = partition.getDevice();
+	return spiffs_config{
+		.hal_read_f = api_spiffs_read,
+		.hal_write_f = api_spiffs_write,
+		.hal_erase_f = api_spiffs_erase,
+		.phys_size = partition.size(),
+		.phys_addr = partition.address(),
+		.phys_erase_block = INTERNAL_FLASH_SECTOR_SIZE,
+		.log_block_size = INTERNAL_FLASH_SECTOR_SIZE * 2,
+		.log_page_size = LOG_PAGE_SIZE,
+	};
+}
+
+bool tryMount(Storage::Partition& partition)
+{
+	auto cfg = initConfig(partition);
 	int res = SPIFFS_mount(&_filesystemStorageHandle, const_cast<spiffs_config*>(&cfg),
 						   reinterpret_cast<uint8_t*>(spiffs_work_buf), reinterpret_cast<uint8_t*>(spiffs_fds),
 						   sizeof(spiffs_fds), spiffs_cache_buf, sizeof(spiffs_cache_buf), nullptr);
@@ -60,10 +82,10 @@ bool tryMount(const spiffs_config& cfg)
 	return res >= 0;
 }
 
-bool spiffs_format_internal(const spiffs_config& cfg)
+bool spiffs_format_internal(Storage::Partition& partition)
 {
 	spiffs_unmount();
-	if(tryMount(cfg)) {
+	if(tryMount(partition)) {
 		spiffs_unmount();
 	}
 
@@ -71,22 +93,23 @@ bool spiffs_format_internal(const spiffs_config& cfg)
 	return res >= 0;
 }
 
-bool spiffs_mount_internal(const spiffs_config& cfg)
+bool spiffs_mount_internal(Storage::Partition& partition)
 {
+	auto cfg = initConfig(partition);
 	debugf("fs.start: size:%u Kb, offset:0x%X\n", cfg.phys_size / 1024U, cfg.phys_addr);
 
 	// Simple check of the erase count to see if flash looks like it's already been formatted
-	spiffs_obj_id dat;
-	flashmem_read(&dat, cfg.phys_addr + cfg.log_page_size - sizeof(spiffs_obj_id), sizeof(spiffs_obj_id));
+	spiffs_obj_id dat{UINT16_MAX};
+	partition.read(cfg.log_page_size - sizeof(spiffs_obj_id), &dat, sizeof(dat));
 	//debugf("%X", dat);
-	bool isFormatted = (dat != spiffs_obj_id(UINT32_MAX));
+	bool isFormatted = (dat != UINT16_MAX);
 
 	if(!isFormatted) {
 		debugf("First init file system");
-		spiffs_format_internal(cfg);
+		spiffs_format_internal(partition);
 	}
 
-	if(!tryMount(cfg)) {
+	if(!tryMount(partition)) {
 		return false;
 	}
 
@@ -102,42 +125,30 @@ bool spiffs_mount_internal(const spiffs_config& cfg)
 	return true;
 }
 
-bool initConfig(spiffs_config& cfg, uint32_t phys_addr, uint32_t phys_size)
+Storage::Partition findDefaultPartition()
 {
-	if(phys_addr == 0) {
-		SYSTEM_ERROR("SPIFFS: Start address invalid");
-		return false;
+	auto it = Storage::findPartition(Storage::Partition::SubType::Data::spiffs);
+	if(!it) {
+		debug_e("No SPIFFS partition found");
 	}
-
-	cfg = spiffs_config{
-		.hal_read_f = api_spiffs_read,
-		.hal_write_f = api_spiffs_write,
-		.hal_erase_f = api_spiffs_erase,
-		.phys_size = phys_size,
-		.phys_addr = phys_addr,
-		.phys_erase_block = INTERNAL_FLASH_SECTOR_SIZE,
-		.log_block_size = INTERNAL_FLASH_SECTOR_SIZE * 2,
-		.log_page_size = LOG_PAGE_SIZE,
-	};
-
-	return true;
+	return *it;
 }
 
 } // namespace
 
 bool spiffs_mount()
 {
-	spiffs_config cfg = spiffs_get_storage_config();
-	return spiffs_mount_manual(cfg.phys_addr, cfg.phys_size);
+	auto part = findDefaultPartition();
+	return part ? spiffs_mount_internal(part) : false;
 }
 
-bool spiffs_mount_manual(uint32_t phys_addr, uint32_t phys_size)
+bool spiffs_mount(Storage::Partition partition)
 {
-	spiffs_config cfg;
-	if(!initConfig(cfg, phys_addr, phys_size)) {
+	if(!partition.verify(Storage::Partition::SubType::Data::spiffs)) {
 		return false;
 	}
-	return spiffs_mount_internal(cfg);
+
+	return spiffs_mount_internal(partition);
 }
 
 void spiffs_unmount()
@@ -147,16 +158,21 @@ void spiffs_unmount()
 
 bool spiffs_format()
 {
-	auto cfg = spiffs_get_storage_config();
-	return spiffs_format_manual(cfg.phys_addr, cfg.phys_size);
+	auto part = findDefaultPartition();
+	if(!part) {
+		return false;
+	}
+
+	spiffs_format_internal(part);
+	return spiffs_mount_internal(part);
 }
 
-bool spiffs_format_manual(uint32_t phys_addr, uint32_t phys_size)
+bool spiffs_format(Storage::Partition& partition)
 {
-	spiffs_config cfg;
-	if(!initConfig(cfg, phys_addr, phys_size)) {
+	if(!partition.verify(Storage::Partition::SubType::Data::spiffs)) {
 		return false;
 	}
-	spiffs_format_internal(cfg);
-	return spiffs_mount_internal(cfg);
+
+	spiffs_format_internal(partition);
+	return spiffs_mount_internal(partition);
 }
diff --git a/Sming/Components/spiffs/spiffs_sming.h b/Sming/Components/spiffs/spiffs_sming.h
index c8619f9d81..3b969a7d91 100644
--- a/Sming/Components/spiffs/spiffs_sming.h
+++ b/Sming/Components/spiffs/spiffs_sming.h
@@ -9,14 +9,8 @@
  ****/
 #pragma once
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
 #include "spiffs.h"
-#include <stdbool.h>
-
-#define LOG_PAGE_SIZE 256
+#include <Storage/Partition.h>
 
 /**
  * @brief Mount the SPIFFS volume using default configuration
@@ -27,46 +21,31 @@ extern "C" {
 bool spiffs_mount();
 
 /**
- * @brief Mount a SPIFFS volume using custom location and size
- * @param phys_addr The flash memory address (offset) for the volume
- * @param phys_size The volume size, in bytes
- * @retval bool true on success, false on failure
- * @note If the given flash memory range appears to be empty then it is
- * formatted, erasing any existing content.
+ * @brief Mount SPIFFS volume from a specific partition
  */
-bool spiffs_mount_manual(uint32_t phys_addr, uint32_t phys_size);
+bool spiffs_mount(Storage::Partition partition);
 
 /**
- * @brief Unmount a previously mounted volume
+ * @brief unmount SPIFFS filesystem
+ * @deprecated use fileFreeFileSystem() instead
+ * @note this will do nothing if the active filesystem is not SPIFFS
  */
 void spiffs_unmount();
 
-/**
- * @brief Format and mount a SPIFFS volume using default configuration
- * @retval bool true on success
+/** @brief Format and mount a SPIFFS filesystem
+ *  @deprecated use fileSystemFormat() instead
+ *  @note this will fail if the active filesystem is not SPIFFS
  */
 bool spiffs_format();
 
 /**
- * @brief Format and mount a SPIFFS volume using custom location and size
- * @param phys_addr The flash memory address (offset) for the volume
- * @param phys_size The volume size, in bytes
+ * @brief Format and mount a SPIFFS volume using given partition
+ * @param partition
  * @retval bool true on success
  */
-bool spiffs_format_manual(uint32_t phys_addr, uint32_t phys_size);
-
-/**
- * @brief Obtain the default SPIFFS configuration information
- * @retval spiffs_config
- * @note Only `phys_addr` and `phys_size` are used, all other parameters are overridden.
- */
-spiffs_config spiffs_get_storage_config();
+bool spiffs_format(Storage::Partition& partition);
 
 /**
  * @brief Global SPIFFS instance used by FileSystem API
  */
 extern spiffs _filesystemStorageHandle;
-
-#if defined(__cplusplus)
-}
-#endif
diff --git a/Sming/Components/spiffs/spiffy/spiffy.c b/Sming/Components/spiffs/spiffy/spiffy.c
index 485e4a87c5..6dab9cedac 100644
--- a/Sming/Components/spiffs/spiffy/spiffy.c
+++ b/Sming/Components/spiffs/spiffy/spiffy.c
@@ -33,7 +33,7 @@ void hexdump_mem(u8_t *b, u32_t len) {
 	if ((i % 16) != 0) S_DBG("\n");
 }
 
-static s32_t my_spiffs_read(u32_t addr, u32_t size, u8_t *dst) {
+static s32_t my_spiffs_read(struct spiffs_t* fs, u32_t addr, u32_t size, u8_t *dst) {
 
 	int res;
 
@@ -53,7 +53,7 @@ static s32_t my_spiffs_read(u32_t addr, u32_t size, u8_t *dst) {
 	return SPIFFS_OK;
 }
 
-static s32_t my_spiffs_write(u32_t addr, u32_t size, u8_t *src) {
+static s32_t my_spiffs_write(struct spiffs_t* fs, u32_t addr, u32_t size, u8_t *src) {
 
 	int ret = SPIFFS_OK;
 	u8_t *buff = 0;
@@ -63,7 +63,7 @@ static s32_t my_spiffs_write(u32_t addr, u32_t size, u8_t *src) {
 		printf("Unable to malloc %d bytes.\n", size);
 		ret = SPIFFS_ERR_INTERNAL;
 	} else {
-		ret = my_spiffs_read(addr, size, buff);
+		ret = my_spiffs_read(fs, addr, size, buff);
 		if (ret == SPIFFS_OK) {
 			int i;
 			for(i = 0; i < size; i++) buff[i] &= src[i];
@@ -87,7 +87,7 @@ static s32_t my_spiffs_write(u32_t addr, u32_t size, u8_t *src) {
 	return ret;
 }
 
-static s32_t my_spiffs_erase(u32_t addr, u32_t size) {
+static s32_t my_spiffs_erase(struct spiffs_t* fs, u32_t addr, u32_t size) {
 
 	int i;
 
diff --git a/Sming/Core/Data/CString.h b/Sming/Core/Data/CString.h
index 9dea4b4d9b..4335b95bc7 100644
--- a/Sming/Core/Data/CString.h
+++ b/Sming/Core/Data/CString.h
@@ -13,6 +13,7 @@
 #pragma once
 
 #include <WString.h>
+#include <stringutil.h>
 #include <memory>
 
 /**
@@ -27,13 +28,21 @@ class CString : public std::unique_ptr<char[]>
 public:
 	CString() = default;
 
-	CString(const CString& src) = default;
+	CString(const CString& src)
+	{
+		assign(src.get());
+	}
 
 	CString(const String& src)
 	{
 		assign(src);
 	}
 
+	CString(const char* src)
+	{
+		assign(src);
+	}
+
 	void assign(const String& src)
 	{
 		if(src) {
@@ -59,6 +68,12 @@ class CString : public std::unique_ptr<char[]>
 		}
 	}
 
+	CString& operator=(const CString& src)
+	{
+		assign(src.get());
+		return *this;
+	}
+
 	CString& operator=(const String& src)
 	{
 		assign(src);
@@ -81,14 +96,55 @@ class CString : public std::unique_ptr<char[]>
 		return get() ?: "";
 	}
 
-	bool operator==(const CString& other) const
+	bool equals(const CString& other) const
 	{
 		return strcmp(c_str(), other.c_str()) == 0;
 	}
 
+	bool equals(const String& other) const
+	{
+		return other.equals(c_str());
+	}
+
+	bool equals(const char* other) const
+	{
+		if(other == nullptr) {
+			return length() == 0;
+		}
+		return strcmp(c_str(), other) == 0;
+	}
+
+	bool equalsIgnoreCase(const CString& other) const
+	{
+		return strcasecmp(c_str(), other.c_str()) == 0;
+	}
+
+	bool equalsIgnoreCase(const String& other) const
+	{
+		return other.equalsIgnoreCase(c_str());
+	}
+
+	bool equalsIgnoreCase(const char* other) const
+	{
+		if(other == nullptr) {
+			return length() == 0;
+		}
+		return strcasecmp(c_str(), other) == 0;
+	}
+
+	bool operator==(const CString& other) const
+	{
+		return equals(other);
+	}
+
 	bool operator==(const String& other) const
 	{
-		return strcmp(c_str(), other.c_str()) == 0;
+		return equals(other);
+	}
+
+	bool operator==(const char* other) const
+	{
+		return equals(other);
 	}
 
 	size_t length() const
diff --git a/Sming/Core/SmingCore.h b/Sming/Core/SmingCore.h
index 402665df6c..7420d1ce26 100644
--- a/Sming/Core/SmingCore.h
+++ b/Sming/Core/SmingCore.h
@@ -57,3 +57,5 @@
 #include "DateTime.h"
 
 #include "fatfs/ff.h"
+
+#include <Storage.h>
diff --git a/Sming/Libraries/.patches/Arduino_TensorFlowLite/README.rst b/Sming/Libraries/.patches/Arduino_TensorFlowLite/README.rst
deleted file mode 100644
index 514a20a70a..0000000000
--- a/Sming/Libraries/.patches/Arduino_TensorFlowLite/README.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Arduino TensorFlow Lite
-=======================
-
-This library runs TensorFlow machine learning models on microcontrollers, allowing you to build AI/ML applications powered by deep learning and neural networks.
-
-With the included examples, you can recognize speech, detect people using a camera, and recognise "magic wand" gestures using an accelerometer.
-
-The examples work best with the Arduino Nano 33 BLE Sense board, which has a microphone and accelerometer.
diff --git a/Sming/Libraries/ArduCAM/ArduCAMStream.cpp b/Sming/Libraries/ArduCAM/ArduCAMStream.cpp
index 91564aa79c..11a491cc14 100644
--- a/Sming/Libraries/ArduCAM/ArduCAMStream.cpp
+++ b/Sming/Libraries/ArduCAM/ArduCAMStream.cpp
@@ -15,7 +15,7 @@
 
 #define BMPIMAGEOFFSET 66
 
-const char bmp_header[BMPIMAGEOFFSET] =
+const uint8_t bmp_header[BMPIMAGEOFFSET] =
 {
   0x42, 0x4D, 0x36, 0x58, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x28, 0x00,
   0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x03, 0x00,
diff --git a/Sming/Libraries/Arduino_TensorFlowLite b/Sming/Libraries/Arduino_TensorFlowLite
index 521b889982..9f00dd38f4 160000
--- a/Sming/Libraries/Arduino_TensorFlowLite
+++ b/Sming/Libraries/Arduino_TensorFlowLite
@@ -1 +1 @@
-Subproject commit 521b8899822ccce6188d7fe1fb246c06aec9ef17
+Subproject commit 9f00dd38f4329b8e884c417aa1bcfbfb15f47913
diff --git a/Sming/Libraries/CS5460/samples/generic/component.mk b/Sming/Libraries/CS5460/samples/generic/component.mk
index 51f1520d50..391ca50c73 100644
--- a/Sming/Libraries/CS5460/samples/generic/component.mk
+++ b/Sming/Libraries/CS5460/samples/generic/component.mk
@@ -1,2 +1 @@
 ARDUINO_LIBRARIES := CS5460 
-DISABLE_SPIFFS = 1
diff --git a/Sming/Libraries/DIAL b/Sming/Libraries/DIAL
index 712c3d4087..4d54bde7a1 160000
--- a/Sming/Libraries/DIAL
+++ b/Sming/Libraries/DIAL
@@ -1 +1 @@
-Subproject commit 712c3d4087fca7c90336b559edf912e2bcf9b846
+Subproject commit 4d54bde7a1620b85bf53fcb5670f2321ee562835
diff --git a/Sming/Libraries/HueEmulator b/Sming/Libraries/HueEmulator
index 20553f6e9e..79d7e79754 160000
--- a/Sming/Libraries/HueEmulator
+++ b/Sming/Libraries/HueEmulator
@@ -1 +1 @@
-Subproject commit 20553f6e9e223588595e626fc7aa060847df57eb
+Subproject commit 79d7e797540519a4fcd9e73a6ca7c6e04715794e
diff --git a/Sming/Libraries/ModbusMaster/samples/generic/component.mk b/Sming/Libraries/ModbusMaster/samples/generic/component.mk
index 6b0689bce9..2797abfd8b 100644
--- a/Sming/Libraries/ModbusMaster/samples/generic/component.mk
+++ b/Sming/Libraries/ModbusMaster/samples/generic/component.mk
@@ -1,2 +1 @@
 ARDUINO_LIBRARIES := ModbusMaster
-DISABLE_SPIFFS = 1
diff --git a/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.cpp b/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.cpp
index ca549eac12..c1ac6be9e4 100644
--- a/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.cpp
+++ b/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.cpp
@@ -184,7 +184,7 @@ size_t BasicStream::write(const uint8_t* data, size_t size)
 			break;
 
 		case State::WriteRom: {
-			bool ok = rboot_write_flash(&rbootWriteStatus, const_cast<uint8_t*>(data), std::min(remainingBytes, size));
+			bool ok = rboot_write_flash(&rbootWriteStatus, data, std::min(remainingBytes, size));
 			if(ok) {
 				if(consume(data, size)) {
 					ok = slot.updated = rboot_write_end(&rbootWriteStatus);
diff --git a/Sming/Libraries/RapidXML b/Sming/Libraries/RapidXML
index 0b56a775b7..cab0af2fda 160000
--- a/Sming/Libraries/RapidXML
+++ b/Sming/Libraries/RapidXML
@@ -1 +1 @@
-Subproject commit 0b56a775b7b3603631734506be4984f094df3685
+Subproject commit cab0af2fda5d52a365502750db6e6bd01f585053
diff --git a/Sming/Libraries/RingTone b/Sming/Libraries/RingTone
index 65ebef1efe..a62f39ea08 160000
--- a/Sming/Libraries/RingTone
+++ b/Sming/Libraries/RingTone
@@ -1 +1 @@
-Subproject commit 65ebef1efe71f56ee8d01f158420d4ca07a91fe6
+Subproject commit a62f39ea08867b26c7ace53aedb43769f02cc74f
diff --git a/Sming/Libraries/SmingTest b/Sming/Libraries/SmingTest
index b52ffcd329..36913db2ce 160000
--- a/Sming/Libraries/SmingTest
+++ b/Sming/Libraries/SmingTest
@@ -1 +1 @@
-Subproject commit b52ffcd3297490a39135d50824374d073c4e384b
+Subproject commit 36913db2ce3a5be82abb90d2140988307adfc38d
diff --git a/Sming/Libraries/TFT_S1D13781 b/Sming/Libraries/TFT_S1D13781
index e83437794c..4940599366 160000
--- a/Sming/Libraries/TFT_S1D13781
+++ b/Sming/Libraries/TFT_S1D13781
@@ -1 +1 @@
-Subproject commit e83437794c493cb4bb1c486aa5181a227ed2408b
+Subproject commit 49405993668fc4dfbd51109e836f3eaa7b0b838f
diff --git a/Sming/Libraries/UPnP b/Sming/Libraries/UPnP
index 0dc7d07fe8..e04f503c15 160000
--- a/Sming/Libraries/UPnP
+++ b/Sming/Libraries/UPnP
@@ -1 +1 @@
-Subproject commit 0dc7d07fe8436c96f8c0072acea4d4eca0074139
+Subproject commit e04f503c151f9cd67d7ee06f156ede583b5f06e5
diff --git a/Sming/Libraries/modbusino/samples/generic/component.mk b/Sming/Libraries/modbusino/samples/generic/component.mk
index 4163e3ffed..068e9f51a6 100644
--- a/Sming/Libraries/modbusino/samples/generic/component.mk
+++ b/Sming/Libraries/modbusino/samples/generic/component.mk
@@ -1,5 +1,4 @@
 ARDUINO_LIBRARIES := modbusino
-DISABLE_SPIFFS = 1
 
 CONFIG_VARS += MB_SLAVE_ADDR
 MB_SLAVE_ADDR ?= 1
diff --git a/Sming/Makefile b/Sming/Makefile
index ee0c49f580..4ad8476a79 100644
--- a/Sming/Makefile
+++ b/Sming/Makefile
@@ -22,7 +22,7 @@ all:
 ##@Cleaning
 
 .PHONY: dist-clean
-dist-clean: submodules-clean samples-clean docs-clean ##Clean everything for all arch/build types
+dist-clean: submodules-clean samples-clean docs-clean tests-clean ##Clean everything for all arch/build types
 	-$(Q) rm -rf out
 
 .PHONY: clean
@@ -103,8 +103,8 @@ docs: submodules ##Build the Sming documentation
 
 # For integration testing both samples and tests are moved outside of the repo.
 SMING_PROJECTS_DIR	?= $(abspath $(SMING_HOME)/..)
-SAMPLES_DIR			:= $(call FixPath,$(SMING_PROJECTS_DIR)/samples)
-TESTS_DIR			:= $(call FixPath,$(SMING_PROJECTS_DIR)/tests)
+SMING_PROJECTS_DIR	:= $(call FixPath, $(SMING_PROJECTS_DIR))
+SAMPLES_DIR			:= $(SMING_PROJECTS_DIR)/samples
 
 SAMPLE_NAMES		= $(shell ls -1 $(SAMPLES_DIR))
 
@@ -112,17 +112,41 @@ SAMPLE_NAMES		= $(shell ls -1 $(SAMPLES_DIR))
 samples: | $(SAMPLE_NAMES) ##Build all sample applications
 
 $(SAMPLE_NAMES):
-	$(Q) $(MAKE) --no-print-directory -C $(SAMPLES_DIR)/$@
+	$(Q) $(MAKE) --no-print-directory -C $(SAMPLES_DIR)/$@ PIP_ARGS=-q python-requirements all
+
+# Build component samples
+.PHONY: component-samples
+component-samples: submodules ##Build all samples contained in components
+	$(Q) $(MAKE) --no-print-directory build-component-samples
+
+# Marks sample as build complete for faster re-testing
+BUILT_SUFFIX := /out/.built
+COMPONENT_SAMPLE_TARGETS = $(addsuffix $(BUILT_SUFFIX),$(wildcard $(foreach c,$(COMPONENT_SEARCH_DIRS),$c/*/samples/*)))
+
+.PHONY: build-component-samples
+build-component-samples: $(COMPONENT_SAMPLE_TARGETS)
+
+$(COMPONENT_SAMPLE_TARGETS):
+	$(Q) $(MAKE) --no-print-directory -C $(@:$(BUILT_SUFFIX)=) PIP_ARGS=-q python-requirements all
+	$(Q) touch $@
 
 
-TESTS_COMPLETED = $(addsuffix /.complete,$(call ListSubDirs,$(TESTS_DIR)))
 PHONY: tests
-tests: $(TESTS_COMPLETED) ##Build and run all test applications
+tests: submodules ##Build and run all tests
+	$(Q) $(MAKE) --no-print-directory build-and-run-tests
+
+COMPLETED_SUFFIX := /.complete
+COMPONENT_TESTS = $(call dirx,$(wildcard $(foreach c,$(COMPONENT_SEARCH_DIRS),$c/*/test/component.mk)))
+TESTS_COMPLETED = $(addsuffix $(COMPLETED_SUFFIX),$(wildcard $(SMING_PROJECTS_DIR)/tests/* $(COMPONENT_TESTS)))
+
+PHONY: build-and-run-tests
+build-and-run-tests: $(TESTS_COMPLETED) ##Build and run all test applications
 
 $(TESTS_COMPLETED):
 	$(Q) $(MAKE) -C $(@D) execute
 	$(Q) touch $@
 
+
 ##@Cleaning
 
 .PHONY: samples-clean
@@ -130,15 +154,20 @@ samples-clean: ##Clean all sample applications (all arch/build types)
 	@echo Cleaning all samples...
 	-$(Q) cd $(SAMPLES_DIR) && rm -rf $(addsuffix /out,$(SAMPLE_NAMES))
 
+.PHONY: component-samples-clean
+component-samples-clean: ##Clean all component samples
+	@echo Cleaning all component samples...
+	-$(Q) rm -rf $(dir $(COMPONENT_SAMPLE_TARGETS))
+
 CLEAN_TESTS := $(TESTS_COMPLETED:complete=clean)
 .PHONY: tests-clean
-tests-clean: $(CLEAN_TESTS) ##Clean all test applications (all arch/build types)
+tests-clean: $(wildcard $(CLEAN_TESTS)) ##Clean all test applications (all arch/build types)
 	-$(Q) rm -f $(TESTS_COMPLETED)
 
 .PHONY: $(CLEAN_TESTS)
 $(CLEAN_TESTS):
 	@echo Cleaning '$(@D)'
-	$(Q) $(MAKE) -C $(@D) clean
+	-$(Q) $(MAKE) -C $(@D) clean
 
 
 ##@Tools
diff --git a/Sming/build.mk b/Sming/build.mk
index 98f2889422..d252d0f730 100644
--- a/Sming/build.mk
+++ b/Sming/build.mk
@@ -280,20 +280,22 @@ endef
 
 # Display variable and list values, e.g. $(call PrintVariable,LIBS)
 # $1 -> Name of variable containing values
+# $2 -> (optional) tag to use instead of variable name
 define PrintVariable
-	$(info $1)
+	$(info $(if $2,$2,$1):)
 	$(foreach item,$($1),$(info - $(item)))
 endef
 
 define PrintVariableSorted
-	$(info $1)
+	$(info $(if $2,$2,$1):)
 	$(foreach item,$(sort $($1)),$(info - $(value item)))
 endef
 
 # Display list of variable references with their values e.g. $(call PrintVariableRefs,DEBUG_VARS)
 # $1 -> Name of variable containing list of variable names
+# $2 -> (optional) tag to use instead of variable name
 define PrintVariableRefs
-	$(info $1)
+	$(info $(if $2,$2,$1):)
 	$(foreach item,$(sort $($1)),$(info - $(item) = $(value $(item))) )
 endef
 
diff --git a/Sming/building.rst b/Sming/building.rst
index 4904002d34..e5c6513b50 100644
--- a/Sming/building.rst
+++ b/Sming/building.rst
@@ -127,6 +127,13 @@ To switch to a different build architecture, for example:
 
 To inspect the current build configuration, type ``make list-config``.
 
+Hardware configuration
+~~~~~~~~~~~~~~~~~~~~~~
+
+The appropriate hardware configuration should be selected in the
+project's component.mk file. Use one of the standard configurations
+or create your own. See :ref:`hardware-config`.
+
 Configuration variables
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -140,7 +147,7 @@ sessions, and will override any values set in your project’s
 
 -  Type ``make SPIFF_BIN=test-rom`` to build the project and (if
    enabled) create a SPIFFS image file called ``test-rom.bin``
--  Type ``make flash COM_PORT=COM4 SPI_MODE=dio SPI_SIZE=4M`` to flash
+-  Type ``make flash COM_PORT=COM4`` to flash
    the project and ``test-rom`` SPIFFS image using the provided flash
    memory settings
 -  Next time you type ``make flash``, the same settings will be used, no
diff --git a/Sming/component-wrapper.mk b/Sming/component-wrapper.mk
index 81af7e389e..ae7d2c4cfd 100644
--- a/Sming/component-wrapper.mk
+++ b/Sming/component-wrapper.mk
@@ -15,6 +15,7 @@ all:
 	$(error Internal makefile) 
 
 include $(SMING_HOME)/build.mk
+include $(PROJECT_DIR)/$(OUT_BASE)/hwconfig.mk
 
 # Makefile runs in the build directory
 COMPONENT_BUILD_DIR := $(CURDIR)
diff --git a/Sming/component.mk b/Sming/component.mk
index 62a9f18a22..9685debd3a 100644
--- a/Sming/component.mk
+++ b/Sming/component.mk
@@ -13,6 +13,7 @@ COMPONENT_INCDIRS := \
 	.
 
 COMPONENT_DEPENDS := \
+	Storage \
 	sming-arch \
 	FlashString \
 	spiffs \
@@ -147,8 +148,26 @@ GLOBAL_CFLAGS		+= -DSTRING_OBJECT_SIZE=$(STRING_OBJECT_SIZE)
 ##@Flashing
 
 .PHONY: flashinit
-flashinit: $(ESPTOOL) $(FLASH_INIT_DATA) | $(FW_BASE) ##Erase your device's flash memory and reset system configuration area to defaults
+flashinit: $(ESPTOOL) $(FLASH_INIT_DATA) | $(FW_BASE) ##Erase your device's flash memory
 	$(info Flash init data default and blank data)
-	$(info DISABLE_SPIFFS = $(DISABLE_SPIFFS))
 	$(Q) $(EraseFlash)
 	$(call WriteFlash,$(FLASH_INIT_CHUNKS))
+
+.PHONY: flashboot
+flashboot: $(FLASH_BOOT_LOADER) kill_term ##Write just the Bootloader
+	$(call WriteFlash,$(FLASH_BOOT_CHUNKS))
+
+.PHONY: flashapp
+flashapp: all kill_term ##Write just the application image(s)
+	$(Q) $(call CheckPartitionChunks,$(FLASH_APP_CHUNKS))
+	$(call WriteFlash,$(FLASH_APP_CHUNKS))
+
+.PHONY: flash
+flash: all kill_term ##Write the boot loader and all defined partition images
+	$(Q) $(call CheckPartitionChunks,$(FLASH_PARTITION_CHUNKS))
+	$(call WriteFlash,$(FLASH_BOOT_CHUNKS) $(FLASH_MAP_CHUNK) $(FLASH_PARTITION_CHUNKS))
+ifeq ($(ENABLE_GDB), 1)
+	$(GDB_CMDLINE)
+else ifneq ($(SMING_ARCH),Host)
+	$(TERMINAL)
+endif
diff --git a/Sming/project.mk b/Sming/project.mk
index ec9440cbc1..91b7db27df 100644
--- a/Sming/project.mk
+++ b/Sming/project.mk
@@ -55,6 +55,7 @@ CACHE_VARS		:=
 # Use PROJECT_DIR to identify the project source directory, from where this makefile must be included
 DEBUG_VARS			+= PROJECT_DIR
 PROJECT_DIR			:= $(CURDIR)
+export PROJECT_DIR
 
 ifeq ($(MAKELEVEL),0)
 $(info )
@@ -318,6 +319,8 @@ CMP_App_VARS			:= $(CONFIG_VARS)
 CMP_App_ALL_VARS		:= $(CONFIG_VARS)
 $(foreach c,$(COMPONENTS),$(eval $(call ParseComponentLibs,$c)))
 
+$(PartitionCreateTargets)
+
 export COMPONENTS_EXTRA_INCDIR
 export APPCODE
 export APP_CFLAGS
diff --git a/Sming/spiffs.hw b/Sming/spiffs.hw
new file mode 100644
index 0000000000..f3c0ee4e93
--- /dev/null
+++ b/Sming/spiffs.hw
@@ -0,0 +1,17 @@
+{
+	"name": "Single SPIFFS partition",
+	"base_config": "standard-4m",
+	"partitions": {
+		"spiffs0": {
+			"address": "0x200000",
+			"size": "512K",
+			"type": "data",
+			"subtype": "spiffs",
+			"filename": "$(SPIFF_BIN_OUT)",
+			"build": {
+				"target": "spiffsgen",
+				"files": "$(SPIFF_FILES)"
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Sming/standard-4m.hw b/Sming/standard-4m.hw
new file mode 100644
index 0000000000..c259654b19
--- /dev/null
+++ b/Sming/standard-4m.hw
@@ -0,0 +1,9 @@
+{
+	"name": "Standard config with 4M flash",
+	"base_config": "standard",
+	"devices": {
+		"spiFlash": {
+			"size": "4M"
+		}
+	}
+}
diff --git a/Tools/requirements.txt b/Tools/requirements.txt
new file mode 100644
index 0000000000..ee96c8f8e1
--- /dev/null
+++ b/Tools/requirements.txt
@@ -0,0 +1,2 @@
+pyserial
+jsonschema
diff --git a/docs/Makefile b/docs/Makefile
index 6fe6b5c76a..e8cf78e6f5 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -9,6 +9,7 @@ AWK ?= POSIXLY_CORRECT= awk
 
 SMINGDIR := ..
 override SMING_HOME := $(SMINGDIR)/Sming
+override SMING_ARCH := Host
 
 # You can set these variables from the command line, and also from the environment for the first two.
 SPHINXOPTS		?=
@@ -16,6 +17,7 @@ SPHINXBUILD		?= sphinx-build
 SOURCEDIR		= source
 BUILDDIR		= build
 
+ARCH_BASE		:= $(SMING_HOME)/Arch/$(SMING_ARCH)
 BUILD_TYPE		:= release
 OUT_BASE		:= out/$(SMING_ARCH)/$(BUILD_TYPE)
 BUILD_BASE		= $(OUT_BASE)/build
@@ -115,7 +117,7 @@ DOXYGEN_PREDEFINED := \
 	ICACHE_FLASH_ATTR= \
 	__forceinline= \
 	SMING_DEPRECATED= \
-	SMING_ARCH=Host \
+	SMING_ARCH=$(SMING_ARCH) \
 	ARCH_HOST=1
 
 
diff --git a/docs/source/arch/esp8266/getting-started/config.rst b/docs/source/arch/esp8266/getting-started/config.rst
index 920e5125d2..1798cd59d6 100644
--- a/docs/source/arch/esp8266/getting-started/config.rst
+++ b/docs/source/arch/esp8266/getting-started/config.rst
@@ -3,26 +3,16 @@ Configuring your Esp8266 device
 
 .. highlight:: bash
 
-You may need to configure your project to support the specific device being programmed.
+You may need to configure your project to support the specific device being programmed:
 
-.. note::
-
-   Arduino has a system which allows these values to be set based on a *board*
-   selection. At present Sming does not have such a system so this must be done
-   manually.
-
-Here are a few important ones:
- 
-* :envvar:`SPI_MODE` Change this if your device fails to program or run
-* :envvar:`SPI_SIZE` If using a device with reduced memory you may need to change this value. Note also that samples using :component:`spiffs` may not work.
 * :envvar:`COM_PORT` If you haven't set this already, it will need to match the port you're using to talk to the Esp8266.
 * :envvar:`COM_SPEED_ESPTOOL` The default value should work fine but you can usually set a much faster speed.
 
 You can set these initially on the command line, like this::
 
-   make SMING_ARCH=Esp8266 SPI_MODE=dio SPI_SIZE=4M COM_SPEED_ESPTOOL=921600
+   make SMING_ARCH=Esp8266 COM_PORT=/dev/ttyUSB3 COM_SPEED_ESPTOOL=921600
 
-Once you're happy with the settings, you can add them to your ``project.mk`` file.
+For Windows expect to use COM2, COM3, etc.
 
 You can list the current set of configuration variables like this::
 
@@ -32,14 +22,17 @@ If you want to reset back to default values, do this::
 
    make config-clean
 
-.. note::
+Other hardware-specific settings are stored in the hardware configuration file.
+You can examine the current configuration like this::
+
+   make hwconfig
+
+The standard config should work with all ESP8266 variants.
+If you want to use SPIFFS then you should add this line to your component.mk file::
 
-   When :envvar:`SPI_MODE` or :envvar:`SPI_SIZE` are changed, you must update the on-flash configuration
-   data by running::
-   
-      make flashinit
+   HWCONFIG = spiffs
 
-   You should do this before uploading your program code.
+This expects your device to have at least 4MBytes of flash.
 
 * See :doc:`/_inc/Sming/building` for further details about configuring your project.
 * See :doc:`/features` for configuring Sming options.
diff --git a/docs/source/information/flash.rst b/docs/source/information/flash.rst
index a5a92348d7..90eb70b700 100644
--- a/docs/source/information/flash.rst
+++ b/docs/source/information/flash.rst
@@ -9,33 +9,50 @@ Introduction
 ESP8266 flash memory sizes vary from 512Kbytes on the ESP-01 up to 4Mbytes on the ESP12F.
 Up to 16MBytes are supported for custom designs.
 
-You can find general details for the memory layout in the `ESP8266 Wiki <https://github.com/esp8266/esp8266-wiki/wiki/Memory-Map>`__.
+Sming version 4.3 introduced partition tables to support multiple architectures,
+different hardware variants and custom flash layouts without restriction.
 
-This is the layout for Sming with a 4MByte flash device:
+See :ref:`hardware-config` for details.
 
-=======  ===============   ====   =========================  ===================================================                                
-Address  Config variable   Size   Source filename            Description            
-(hex)    (if any)          (KB)   (if applicable)            
-=======  ===============   ====   =========================  ===================================================            
-000000                     1      rboot.bin                  Boot loader            
-001000                     4                                 rBoot configuration            
-002000   ROM_0_ADDR               rom0.bin                   First ROM image            
-100000   RBOOT_SPIFFS_0
-202000   ROM_1_ADDR               rom1.bin                   Second ROM image            
-300000   RBOOT_SPIFFS_1
-3FB000                     4      blank.bin                  RF Calibration data (Initialised to FFh)
-3FC000                     4      esp_init_data_default.bin  PHY configuration data            
-3FD000                     12     blank.bin                  System parameter area
-=======  ===============   ====   =========================  ===================================================            
+A typical layout for a 4MByte device might look like this:
 
+   =======  ===============   ====   =========================  ===================================================                                
+   Address  Config variable   Size   Source filename            Description            
+   (hex)    (if any)          (KB)   (if applicable)            
+   =======  ===============   ====   =========================  ===================================================            
+   000000                     1      rboot.bin                  Boot loader            
+   001000                     4                                 rBoot configuration
+   002000                     4                                 Partition table
+   003000                     4      esp_init_data_default.bin  PHY configuration data
+   004000                     12     blank.bin                  System parameter area
+   006000                     4      blank.bin                  RF Calibration data (Initialised to FFh)
+   006000                     4                                 Reserved
+   008000   ROM_0_ADDR               rom0.bin                   First ROM image            
+   100000   RBOOT_SPIFFS_0
+   208000   ROM_1_ADDR               rom1.bin                   Second ROM image            
+   300000   RBOOT_SPIFFS_1
+   =======  ===============   ====   =========================  ===================================================            
+   
 
-Partition Tables
-----------------
+.. note::
 
-{ todo }
+   This was the previous layout for a 4MByte flash device:
 
-Whilst SDK version 3 requires a partition table, previous versions do not but this can be added so that we
-can use it as a common reference for all the above locations.
+   =======  ===============   ====   =========================  ===================================================                                
+   Address  Config variable   Size   Source filename            Description            
+   (hex)    (if any)          (KB)   (if applicable)            
+   =======  ===============   ====   =========================  ===================================================            
+   000000                     1      rboot.bin                  Boot loader            
+   001000                     4                                 rBoot configuration            
+   002000   ROM_0_ADDR               rom0.bin                   First ROM image            
+   100000   RBOOT_SPIFFS_0
+   202000   ROM_1_ADDR               rom1.bin                   Second ROM image            
+   300000   RBOOT_SPIFFS_1
+   3FB000                     4      blank.bin                  RF Calibration data (Initialised to FFh)
+   3FC000                     4      esp_init_data_default.bin  PHY configuration data            
+   3FD000                     12     blank.bin                  System parameter area
+   =======  ===============   ====   =========================  ===================================================            
+   
 
 
 Speed and caching
diff --git a/docs/source/information/rboot-ota.rst b/docs/source/information/rboot-ota.rst
index a2953df1f8..5f22026f90 100644
--- a/docs/source/information/rboot-ota.rst
+++ b/docs/source/information/rboot-ota.rst
@@ -44,13 +44,16 @@ Configuring for two ROM mode
 ============================
 
 If you have a 1MB flash, you will need to have two 512KB ROM slots, both
-in the same 1MB block of flash. Set the following options in your project's
-``component.mk`` file:
+in the same 1MB block of flash. You can accommodate this by setting the
+appropriate hardware configuration in your project's component.mk file::
 
 .. code-block:: make
 
-   RBOOT_ROM1_ADDR = 0x80000
-   SPI_SIZE        = 1M
+   HWCONFIG = two-rom-mode
+
+See ``Sming/Arch/Esp8266/two-rom-mode.hw`` for details.
+You can copy this and customise it in your project.
+
 
 SPIFFS
 ======
@@ -60,9 +63,10 @@ To use SPIFFS think about where you want your SPIFFS to sit on the flash.
 If you have a 4MB flash the default position is for the first ROM
 to be placed in the first 1MB block and the second ROM to be placed in
 the third 1MB block of flash. This leaves a whole 1MB spare after each
-ROM in which you can put your SPIFFS.
+ROM in which you can put your SPIFFS. This is the behaviour when you
+set ``HWCONFIG = spiffs`` in your project's component.mk file.
 
-If you have to a smaller flash the SPIFFS will have to share the 1MB block with the ROM.
+If you have a smaller flash the SPIFFS will have to share the 1MB block with the ROM.
 For example, the first part of each 1MB block may contain the ROM, and the second part
 the SPIFFS (but does *not* have to be split equally in half). So for the 4MB example
 you could put the SPIFFS for your first ROM at flash address at 0x100000
@@ -74,9 +78,14 @@ To mount your SPIFFS at boot time add the following code to init:
 .. code-block:: c++
 
    int slot = rboot_get_current_rom();
-   uint32_t address = (slot == 0) ? RBOOT_SPIFFS_0 : RBOOT_SPIFFS_1;
-   //debugf("trying to mount SPIFFS at %x, length %d", address, SPIFF_SIZE);
-   spiffs_mount_manual(address, SPIFF_SIZE);
+   // Find the n'th SPIFFS partition
+   auto part = PartitionTable().find(Partition::SubType::Data::spiffs, slot);
+   if(part) {
+      //debugf("trying to mount SPIFFS at %x, length %d", part.address(), part.size());
+      spiffs_mount(part);
+   } else {
+      debug_e("SPIFFS partition missing for slot #%u", slot);
+   }
 
 Over-the-air (OTA) updates
 ==========================
@@ -98,64 +107,6 @@ products.
  
 A more lightweight solution is provided by :cpp:class:`RbootOutputStream`, which 
 is just a thin wrapper around rBoot's flash API, in combination with :cpp:class:`RbootHttpUpdater`,
-which pulls individual ROM image from an HTTP server. Add the following code:
-
-.. code-block:: c++
-
-   RbootHttpUpdater* otaUpdater = nullptr;
-
-   void OtaUpdate_CallBack(RbootHttpUpdater& client, bool result)
-   {
-       if (result) {
-           // success - switch slot
-           uint8_t slot = rboot_get_current_rom();
-           if (slot == 0) {
-               slot = 1;
-           } else {
-               slot = 0;
-           }
-           // set to boot new ROM and then reboot
-           Serial.printf("Firmware updated, rebooting to ROM %d...\r\n", slot);
-           rboot_set_current_rom(slot);
-           System.restart();
-       } else {
-           // fail
-           Serial.println("Firmware update failed!");
-       }
-   }
-
-   void OtaUpdate()
-   {
-       // need a clean object, otherwise if run before and failed will not run again
-       delete otaUpdater;
-       otaUpdater = new RbootHttpUpdater();
-       
-       // select ROM slot to flash
-       rboot_config bootconf = rboot_get_config();
-       uint8_t slot = bootconf.current_rom;
-       if (slot == 0) {
-           slot = 1;
-       } else {
-           slot = 0;
-       }
-
-   #ifndef RBOOT_TWO_ROMS
-       // flash ROM to position indicated in the rBoot config ROM table
-       otaUpdater->addItem(bootconf.roms[slot], ROM_0_URL);
-   #else
-       // flash appropriate ROM
-       otaUpdater->addItem(bootconf.roms[slot], (slot == 0) ? ROM_0_URL : ROM_1_URL);
-   #endif
-
-       // use user supplied values (defaults for 4MB flash in makefile)
-       otaUpdater->addItem((slot == 0) ? RBOOT_SPIFFS_0 : RBOOT_SPIFFS_1, SPIFFS_URL);
-
-       // set a callback
-       otaUpdater->setCallback(OtaUpdate_CallBack);
-
-       // start update
-       otaUpdater->start();
-   }
+which pulls individual ROM image from an HTTP server.
 
-You will need to define ``ROM_0_URL``, ``ROM_1_URL`` and ``SPIFFS_URL``
-with http urls for the files to download.
+For details, refer to the `OtaUpdate()` function in the :sample:`Basic_rBoot` sample.
diff --git a/docs/source/troubleshooting/random-restart.rst b/docs/source/troubleshooting/random-restart.rst
index 818dfe9d9c..3076a189fe 100644
--- a/docs/source/troubleshooting/random-restart.rst
+++ b/docs/source/troubleshooting/random-restart.rst
@@ -1,9 +1,7 @@
 Random Restarts
 ===============
 
-First try setting the baud rate to ``74880``. Example for Linux:
-
-::
+First try setting the baud rate to ``74880``. Example for Linux::
 
    python -m serial.tools.miniterm /dev/ttyUSB0 74880
 
@@ -15,25 +13,16 @@ device.
 
 To achieve this do the following:
 
-1) Set the SPI_SIZE of your flash memory. Example: If you have device
-   with 4 megabytes make sure that the following is set:
-
-::
-
-   export SPI_SIZE=4M
-
-2) Run ``flashinit``.
+1) Check the :ref:`hardware-config` especially ``flash_size`` setting.
 
-Run the following commands.
+2) Run ``flashinit``::
 
-::
+      cd $SMING_HOME/../samples/Basic_Blink
+      make flashinit
 
-   cd $SMING_HOME/../samples/Basic_Blink
-   make flashinit
+   This resets the flash memory to a default state, erasing any existing
+   application, configuration or data stored there.
 
-``flashinit`` is erasing the current flash memory and populating some
-areas on it with the bytes that your SDK / BootROM is expecting to be
-present.
+3) Re-program your device::
 
-This command needs to be executed only when you change SDKs or memory
-layouts.
+   make flash
diff --git a/docs/source/upgrading/4.2-4.3.rst b/docs/source/upgrading/4.2-4.3.rst
new file mode 100644
index 0000000000..9d52386086
--- /dev/null
+++ b/docs/source/upgrading/4.2-4.3.rst
@@ -0,0 +1,98 @@
+*****************
+From v4.2 to v4.3
+*****************
+
+.. highlight:: c++
+
+
+Storage Management
+------------------
+
+The layout of flash memory has been revised and is now managed via partition table.
+Hardware configuration is stored in a JSON file (with .hw extension).
+
+If your project has minimal customisation then you may only need to change
+the :envvar:`HWCONFIG` setting.
+
+You can find full details in the :component:`Storage` library.
+See also background on :doc:`/information/flash`.
+
+New and updated build targets
+    hwconfig
+        Displays the current configuration in JSON format
+    hwconfig-list
+        Show available hardware configs
+    map
+        Display the current flash memory map
+    readmap
+        Read partition table from device and display the map
+    readpart
+        Read contents of partition into a file, e.g. ``make readpart PART=spiffs0``
+        will create ``out/Esp8266/debug/spiffs0.read.bin``
+    flash
+        Flash partition table and all partitions. Previously it was necessary to run
+        ``make flashinit`` to write system parameter information. Failure to do this
+        was a common problem and should now be a thing of the past.
+    flashinit
+        This now just erases the flash memory, and is no longer a pre-requisite for ``make flash``.
+
+        The ESP8266 system parameter information has been moved into registered
+        partitions (phy_init and sys_param) near the beginning of flash memory.
+        It now gets written when running ``make flash``.
+
+        Previously, this information was kept right at the end of the flash memory,
+        so the location would vary depending on the setting of ``SPI_SIZE``.
+        This was a frequent cause of problems as the system would fail to start if this
+        was set incorrectly.
+    flashmap
+        Flash just the partition map
+    flashpart
+        Flash a single partition, e.g. ``make flashpart PART=spiffs0``
+    erasepart
+        Erase a partition, e.g. ``make erasepart PART=spiffs0``
+
+Configuration variables
+    A number of configuration variables have been removed or made read-only, as these are now
+    generated from the :ref:`hardware_config`.
+
+    :envvar:`SPI_MODE`, :envvar:`SPI_SIZE`, :envvar:`SPI_SPEED`
+        The variables are still used internally but are read-only; they cannot be set at the command line.
+        Values are read from the hardware configuration under ``/devices/spiFlash``.
+
+    :envvar:`RBOOT_ROM0_ADDR`, :envvar:`RBOOT_ROM1_ADDR`, :envvar:`RBOOT_ROM2_ADDR`
+        Used by :component:`rboot`, and are now read-only.
+        Values are read from the ``address`` property of ``rom0-2`` in the hardware configuration.
+
+    :envvar:`RBOOT_SPIFFS_0`, :envvar:`RBOOT_SPIFFS_1`
+        Removed.
+
+    :envvar:`SPIFF_SIZE`
+        Removed. Attempting to set this automatically within a hardware configuration is
+        liable to cause more problems than it solves, so updating the hardware config is
+        the now only way to change this setting.
+
+    :envvar:`SPIFF_FILES`
+        [deprecated]
+
+        You can still use this to specify the source location for the primary
+        SPIFFS partition (spiffs0). The preferred method is to set the ``files``
+        property in a partition ``build`` key.
+
+        The default SPIFFS partition settings can be overridden in a custom profile.
+        For example:
+
+        .. code-block:: json
+
+            {
+                ...
+                "base_config": "spiffs",
+                "partitions": {
+                    "spiffs0": {
+                        "size": "128K",
+                        "build": {
+                            "files": "some/other/folder"
+                        }
+                    }
+                }
+            }
+
diff --git a/docs/source/upgrading/index.rst b/docs/source/upgrading/index.rst
index 9afa71358d..4b024707b8 100644
--- a/docs/source/upgrading/index.rst
+++ b/docs/source/upgrading/index.rst
@@ -7,6 +7,7 @@ For newer versions we have dedicated pages.
 .. toctree::
    :maxdepth: 1
 
+   4.2-4.3
    4.1-4.2
    4.0-4.1
    3.8-4.0
diff --git a/samples/Accelerometer_MMA7455/component.mk b/samples/Accelerometer_MMA7455/component.mk
index ce1725567a..2d423a2a56 100644
--- a/samples/Accelerometer_MMA7455/component.mk
+++ b/samples/Accelerometer_MMA7455/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := MMA_7455
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Arducam/component.mk b/samples/Arducam/component.mk
index 3d7a1074ba..961e2d7ea9 100644
--- a/samples/Arducam/component.mk
+++ b/samples/Arducam/component.mk
@@ -1,3 +1,3 @@
 ARDUINO_LIBRARIES := ArduCAM
-
+HWCONFIG = spiffs
 SPIFF_FILES = web/build
diff --git a/samples/Basic_APA102/component.mk b/samples/Basic_APA102/component.mk
index 75ebf23720..3c540d9c36 100644
--- a/samples/Basic_APA102/component.mk
+++ b/samples/Basic_APA102/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := APA102
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Basic_AWS/component.mk b/samples/Basic_AWS/component.mk
index bcb042181f..6e25c28d7d 100644
--- a/samples/Basic_AWS/component.mk
+++ b/samples/Basic_AWS/component.mk
@@ -1,4 +1,3 @@
-DISABLE_SPIFFS := 1
 ENABLE_SSL := 1
 MQTT_NO_COMPAT := 1
 ENABLE_CUSTOM_HEAP := 1
diff --git a/samples/Basic_Audio/component.mk b/samples/Basic_Audio/component.mk
index 44197b4522..3da06ba826 100644
--- a/samples/Basic_Audio/component.mk
+++ b/samples/Basic_Audio/component.mk
@@ -1,5 +1,3 @@
-DISABLE_SPIFFS=1
-
 # Required if compiling with ENABLE_GDB=1, you must connect debug terminal to alternative serial pins
 GDB_UART_SWAP=1
 
diff --git a/samples/Basic_Blink/component.mk b/samples/Basic_Blink/component.mk
index ec6697542e..fcff50daf3 100644
--- a/samples/Basic_Blink/component.mk
+++ b/samples/Basic_Blink/component.mk
@@ -29,11 +29,11 @@
 # COMPONENT_CFLAGS :=
 # COMPONENT_CXXFLAGS :=
 
-## Configure flash parameters (for ESP12-E and other new boards):
-# SPI_MODE := dio
+## Configure hardware
+# Default is 'standard' (no spiffs), can also provide your own
+#HWCONFIG := spiffs
 
-## SPIFFS options
-DISABLE_SPIFFS := 1
+## Select source of content for default `spiffs` partition when built
 # SPIFF_FILES = files
 
 ## Refer to Basic_rBoot sample for options relating to rBoot
diff --git a/samples/Basic_Capsense/component.mk b/samples/Basic_Capsense/component.mk
index 4652678d1e..7b80efa885 100644
--- a/samples/Basic_Capsense/component.mk
+++ b/samples/Basic_Capsense/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := CapacitiveSensor
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Basic_DateTime/component.mk b/samples/Basic_DateTime/component.mk
index 7df8c5b1c2..3596ab71d1 100644
--- a/samples/Basic_DateTime/component.mk
+++ b/samples/Basic_DateTime/component.mk
@@ -1,4 +1,2 @@
-DISABLE_SPIFFS = 1
-
 # Emulate UART 0
 ENABLE_HOST_UARTID := 0
diff --git a/samples/Basic_Delegates/component.mk b/samples/Basic_Delegates/component.mk
index 2e02dba4b6..7e4d03795a 100644
--- a/samples/Basic_Delegates/component.mk
+++ b/samples/Basic_Delegates/component.mk
@@ -1,2 +1 @@
-DISABLE_SPIFFS = 1
 DEBUG_VERBOSE_LEVEL = 3
diff --git a/samples/Basic_HwPWM/component.mk b/samples/Basic_HwPWM/component.mk
index 5794c096f3..81bf5015ae 100644
--- a/samples/Basic_HwPWM/component.mk
+++ b/samples/Basic_HwPWM/component.mk
@@ -1,4 +1,2 @@
-DISABLE_SPIFFS = 1
-
 # Uncomment the line below if you want to use Espressif's PWM library.
 #ENABLE_CUSTOM_PWM=0
diff --git a/samples/Basic_Interrupts/component.mk b/samples/Basic_Interrupts/component.mk
deleted file mode 100644
index 973dfe71cf..0000000000
--- a/samples/Basic_Interrupts/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-DISABLE_SPIFFS = 1
diff --git a/samples/Basic_NFC/component.mk b/samples/Basic_NFC/component.mk
index 6de711f481..61d0cfc5e2 100644
--- a/samples/Basic_NFC/component.mk
+++ b/samples/Basic_NFC/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := MFRC522
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Basic_Neopixel/component.mk b/samples/Basic_Neopixel/component.mk
index 7728b3185e..379801d9b5 100644
--- a/samples/Basic_Neopixel/component.mk
+++ b/samples/Basic_Neopixel/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := Adafruit_NeoPixel
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Basic_ProgMem/component.mk b/samples/Basic_ProgMem/component.mk
deleted file mode 100644
index 973dfe71cf..0000000000
--- a/samples/Basic_ProgMem/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-DISABLE_SPIFFS = 1
diff --git a/samples/Basic_ScannerI2C/component.mk b/samples/Basic_ScannerI2C/component.mk
index 973dfe71cf..e69de29bb2 100644
--- a/samples/Basic_ScannerI2C/component.mk
+++ b/samples/Basic_ScannerI2C/component.mk
@@ -1 +0,0 @@
-DISABLE_SPIFFS = 1
diff --git a/samples/Basic_Serial/component.mk b/samples/Basic_Serial/component.mk
index ecfe972d0a..96def499d3 100644
--- a/samples/Basic_Serial/component.mk
+++ b/samples/Basic_Serial/component.mk
@@ -1,4 +1,4 @@
-SPIFF_SIZE      ?= 65536
+HWCONFIG := spiffs
 
 CUSTOM_TARGETS	+= files/README.md
 
@@ -10,3 +10,4 @@ files/README.md: $(SMING_HOME)/../README.md
 	
 # Emulate both serial ports
 ENABLE_HOST_UARTID := 0 1
+HOST_NETWORK_OPTIONS := --pause
diff --git a/samples/Basic_Servo/component.mk b/samples/Basic_Servo/component.mk
index 08990693e8..b3fea3a944 100644
--- a/samples/Basic_Servo/component.mk
+++ b/samples/Basic_Servo/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := Servo
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Basic_SmartConfig/component.mk b/samples/Basic_SmartConfig/component.mk
index 30a787416e..c24c9ac9d9 100644
--- a/samples/Basic_SmartConfig/component.mk
+++ b/samples/Basic_SmartConfig/component.mk
@@ -1,2 +1 @@
-DISABLE_SPIFFS = 1
 ENABLE_SMART_CONFIG = 1
diff --git a/samples/Basic_Ssl/component.mk b/samples/Basic_Ssl/component.mk
index ad42913baa..b994d8280f 100644
--- a/samples/Basic_Ssl/component.mk
+++ b/samples/Basic_Ssl/component.mk
@@ -1,12 +1,7 @@
-DISABLE_SPIFFS = 1
-
 #
 ifeq ($(ENABLE_MALLOC_COUNT),1)
 COMPONENT_DEPENDS	+= malloc_count
 COMPONENT_CXXFLAGS	+= -DENABLE_MALLOC_COUNT=1
 endif
 
-## size of the flash chip
-SPI_SIZE  ?= 4M
-
 ENABLE_SSL = 1
diff --git a/samples/Basic_Storage/.cproject b/samples/Basic_Storage/.cproject
new file mode 100644
index 0000000000..1c32c9a8a2
--- /dev/null
+++ b/samples/Basic_Storage/.cproject
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" moduleId="org.eclipse.cdt.core.settings" name="Sming">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" name="Sming" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463" name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1164554300" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
+							<option id="cdt.managedbuild.option.gnu.cross.prefix.521205673" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
+							<option id="cdt.managedbuild.option.gnu.cross.path.393887888" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.712123812" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
+							<builder id="cdt.managedbuild.builder.gnu.cross.2110485170" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.357494572" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.313321806" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.611746109" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.65193859" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1795850540" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.364843833" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.525412186" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.assembler.587940548" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.1067006329" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.651581712" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
+				<externalSettings containerId="Sming;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+			</storageModule>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="Basic_ProgMem.null.1347473968" name="Basic_ProgMem"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Sming">
+			<resource resourceType="PROJECT" workspacePath="/Basic_ProgMem"/>
+		</configuration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+		<buildTargets>
+			<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>all</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>clean</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flash</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashonefile" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashonefile</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashinit" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashinit</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashboot" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashboot</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="rebuild" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>rebuild</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+		</buildTargets>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2032390008;cdt.managedbuild.tool.gnu.c.compiler.input.1700912488">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903;cdt.managedbuild.tool.gnu.c.compiler.input.313321806">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015;cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.454898447;cdt.managedbuild.tool.gnu.cpp.compiler.input.501261625">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+</cproject>
diff --git a/samples/Basic_Storage/.project b/samples/Basic_Storage/.project
new file mode 100644
index 0000000000..96b9a5cf41
--- /dev/null
+++ b/samples/Basic_Storage/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Basic_Storage</name>
+	<comment></comment>
+	<projects>
+		<project>Sming</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/samples/Basic_Storage/Makefile b/samples/Basic_Storage/Makefile
new file mode 100644
index 0000000000..ff51b6c3a7
--- /dev/null
+++ b/samples/Basic_Storage/Makefile
@@ -0,0 +1,9 @@
+#####################################################################
+#### Please don't change this file. Use component.mk instead ####
+#####################################################################
+
+ifndef SMING_HOME
+$(error SMING_HOME is not set: please configure it as an environment variable)
+endif
+
+include $(SMING_HOME)/project.mk
diff --git a/samples/Basic_Storage/README.rst b/samples/Basic_Storage/README.rst
new file mode 100644
index 0000000000..873299a0fd
--- /dev/null
+++ b/samples/Basic_Storage/README.rst
@@ -0,0 +1,7 @@
+Basic Storage
+=============
+
+This sample application demonstrates various ways to manage and access flash memory
+using the :component:`Storage` system.
+
+It also shows how to create and partition custom storage devices.
diff --git a/samples/Basic_Storage/app/application.cpp b/samples/Basic_Storage/app/application.cpp
new file mode 100644
index 0000000000..97c40d6eb4
--- /dev/null
+++ b/samples/Basic_Storage/app/application.cpp
@@ -0,0 +1,99 @@
+#include <SmingCore.h>
+#include <Storage/SysMem.h>
+#include <Storage/ProgMem.h>
+#include <Platform/Timers.h>
+
+IMPORT_FSTR(FS_app, PROJECT_DIR "/app/application.cpp")
+
+void listSpiffsPartitions()
+{
+	Serial.println(_F("** Enumerate registered SPIFFS partitions"));
+	for(auto it = Storage::findPartition(Storage::Partition::SubType::Data::spiffs); it; ++it) {
+		Serial.print(F(">> Mounting '"));
+		Serial.print((*it).name());
+		Serial.println("' ...");
+		bool ok = spiffs_mount(*it);
+		Serial.println(ok ? "OK, listing files:" : "Mount failed!");
+		if(ok) {
+			auto list = fileList();
+			for(auto& f : fileList()) {
+				Serial.print("  ");
+				Serial.println(f);
+			}
+			Serial.print(list.count());
+			Serial.println(F(" files found"));
+			Serial.println();
+		}
+	}
+}
+
+void printPart(Storage::Partition part)
+{
+	size_t bufSize = std::min(4096U, part.size());
+	char buf[bufSize];
+	OneShotFastUs timer;
+	if(!part.read(0, buf, bufSize)) {
+		debug_e("Error reading from partition '%s'", part.name().c_str());
+	} else {
+		auto elapsed = timer.elapsedTime();
+		String s = part.getDeviceName();
+		s += '/';
+		s += part.name();
+		m_printHex(s.c_str(), buf, std::min(128U, bufSize));
+		m_printf(_F("Elapsed: %s\r\n"), elapsed.toString().c_str());
+		if(elapsed != 0) {
+			m_printf(_F("Speed:   %u KB/s\r\n\r\n"), 1000 * bufSize / elapsed);
+		}
+	}
+	Serial.println();
+}
+
+void printPart(const String& partitionName)
+{
+	auto part = Storage::findPartition(partitionName);
+	if(!part) {
+		debug_e("Partition '%s' not found", partitionName.c_str());
+	} else {
+		printPart(part);
+	}
+}
+
+void init()
+{
+	Serial.begin(SERIAL_BAUD_RATE);
+	Serial.systemDebugOutput(true);
+
+	listSpiffsPartitions();
+
+	printPart(F("user0"));
+
+	auto part = Storage::findPartition(F("user1"));
+	printPart(part);
+	Serial.println(_F("Writing some stuff to partition..."));
+	String s = F("Some test stuff to write...");
+	part.write(32, s.c_str(), s.length() + 1);
+	uint8_t buf[32];
+	os_get_random(buf, sizeof buf);
+	part.write(64, buf, sizeof buf);
+	printPart(part);
+
+	Serial.println(_F("** Reading tests, repeat 3 times to show effect of caching (if any)"));
+
+	Serial.println(_F("** Reading SysMem device (flash)"));
+	part = Storage::sysMem.createPartition(F("fs_app"), FS_app, Storage::Partition::Type::data, 100);
+	printPart(part);
+	printPart(part);
+	printPart(part);
+
+	Serial.println(_F("** Reading SysMem device (RAM)"));
+	part = Storage::sysMem.createPartition(F("fs_app"), FS_app, Storage::Partition::Type::data, 100);
+	printPart(part);
+	printPart(part);
+	printPart(part);
+
+	Serial.println(_F("** Reading ProgMem device"));
+	part = Storage::progMem.createPartition(F("fs_app"), FS_app, Storage::Partition::Type::data, 100);
+	printPart(part);
+	printPart(part);
+	printPart(part);
+}
diff --git a/samples/Basic_Storage/basic_storage.hw b/samples/Basic_Storage/basic_storage.hw
new file mode 100644
index 0000000000..c878ea9713
--- /dev/null
+++ b/samples/Basic_Storage/basic_storage.hw
@@ -0,0 +1,53 @@
+{
+	"name": "Basic Storage sample",
+	"base_config": "spiffs",
+	"devices": {
+		"spiFlash": {
+			"mode": "qio",
+			"speed": 80
+		}
+	},
+	"partitions": {
+		"user0": {
+			"address": "0x1F0000",
+			"size": "16K",
+			"type": "user",
+			"subtype": 0,
+			"filename": "user0.bin"
+		},
+		"user1": {
+			"address": "0x1F4000",
+			"size": "16K",
+			"type": "user",
+			"subtype": 1
+		},
+		"spiffs0": {
+			"address": "0x200000",
+			"build": {
+				"files": "files/spiffs0"
+			}
+		},
+		"spiffs1": {
+			"address": "0x280000",
+			"size": "256K",
+			"type": "data",
+			"subtype": "spiffs",
+			"filename": "$(FW_BASE)/spiffs1_rom.bin",
+			"build": {
+				"target": "spiffsgen",
+				"files": "files/spiffs1"
+			}
+		},
+		"spiffs2": {
+			"address": "0x2C0000",
+			"size": "256K",
+			"type": "data",
+			"subtype": "spiffs",
+			"filename": "$(FW_BASE)/spiffs2_rom.bin",
+			"build": {
+				"target": "spiffsgen",
+				"files": "files/spiffs2"
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/Basic_Storage/component.mk b/samples/Basic_Storage/component.mk
new file mode 100644
index 0000000000..9bb23018f7
--- /dev/null
+++ b/samples/Basic_Storage/component.mk
@@ -0,0 +1,4 @@
+# Use our custom hardware configuration
+HWCONFIG := basic_storage
+
+HOST_NETWORK_OPTIONS := --nonet
diff --git a/samples/Basic_Storage/files/spiffs0/file for spiffs0.txt b/samples/Basic_Storage/files/spiffs0/file for spiffs0.txt
new file mode 100644
index 0000000000..1de357938e
--- /dev/null
+++ b/samples/Basic_Storage/files/spiffs0/file for spiffs0.txt	
@@ -0,0 +1,7 @@
+Basic Storage
+=============
+
+This sample application demonstrates various ways to manage and access flash memory
+using the :cpp:namespace:`Storage` API.
+
+It also shows how to create and partition custom storage devices.
diff --git a/samples/Basic_Storage/files/spiffs1/file for spiffs1.txt b/samples/Basic_Storage/files/spiffs1/file for spiffs1.txt
new file mode 100644
index 0000000000..1de357938e
--- /dev/null
+++ b/samples/Basic_Storage/files/spiffs1/file for spiffs1.txt	
@@ -0,0 +1,7 @@
+Basic Storage
+=============
+
+This sample application demonstrates various ways to manage and access flash memory
+using the :cpp:namespace:`Storage` API.
+
+It also shows how to create and partition custom storage devices.
diff --git a/samples/Basic_Storage/files/spiffs2/file for spiffs2.txt b/samples/Basic_Storage/files/spiffs2/file for spiffs2.txt
new file mode 100644
index 0000000000..1de357938e
--- /dev/null
+++ b/samples/Basic_Storage/files/spiffs2/file for spiffs2.txt	
@@ -0,0 +1,7 @@
+Basic Storage
+=============
+
+This sample application demonstrates various ways to manage and access flash memory
+using the :cpp:namespace:`Storage` API.
+
+It also shows how to create and partition custom storage devices.
diff --git a/samples/Basic_Storage/user0.bin b/samples/Basic_Storage/user0.bin
new file mode 100644
index 0000000000..2a8925f954
--- /dev/null
+++ b/samples/Basic_Storage/user0.bin
@@ -0,0 +1 @@
+This is some us
\ No newline at end of file
diff --git a/samples/Basic_Tasks/component.mk b/samples/Basic_Tasks/component.mk
index 6599e8dede..ba03b6dbd5 100644
--- a/samples/Basic_Tasks/component.mk
+++ b/samples/Basic_Tasks/component.mk
@@ -1,4 +1,3 @@
-DISABLE_SPIFFS := 1
 ARDUINO_LIBRARIES := ArduinoFFT SignalGenerator
 ENABLE_TASK_COUNT := 1
 
diff --git a/samples/Basic_Utility/component.mk b/samples/Basic_Utility/component.mk
index 2c74f83110..bde909c92d 100644
--- a/samples/Basic_Utility/component.mk
+++ b/samples/Basic_Utility/component.mk
@@ -5,8 +5,5 @@ APP_NAME := utility
 # We don't need heap monitoring for utility applications
 ENABLE_MALLOC_COUNT := 0
 
-# Don't attempt to build any filesystem images
-DISABLE_SPIFFS := 1
-
 #
 HOST_NETWORK_OPTIONS := --nonet
diff --git a/samples/Basic_WebSkeletonApp/README.rst b/samples/Basic_WebSkeletonApp/README.rst
index f6cc42df8b..f46ed941c7 100644
--- a/samples/Basic_WebSkeletonApp/README.rst
+++ b/samples/Basic_WebSkeletonApp/README.rst
@@ -34,6 +34,6 @@ To test this out, build the application without a filesystem image:
 
 .. code-block:: bash
 
-   make DISABLE_SPIFFS=1
+   make HWCONFIG=standard ENABLE_FLASHSTRING_MAP=1
 
 See *webserver.cpp* for the details.
diff --git a/samples/Basic_WebSkeletonApp/app/application.cpp b/samples/Basic_WebSkeletonApp/app/application.cpp
index 173a10f07f..187bd579bf 100644
--- a/samples/Basic_WebSkeletonApp/app/application.cpp
+++ b/samples/Basic_WebSkeletonApp/app/application.cpp
@@ -38,7 +38,9 @@ void init()
 	Serial.systemDebugOutput(true);
 	Serial.commandProcessing(false);
 
+#ifndef ENABLE_FLASHSTRING_MAP
 	spiffs_mount(); // Mount file system, in order to work with files
+#endif
 
 	//SET higher CPU freq & disable wifi sleep
 	//	system_update_cpu_freq(SYS_CPU_160MHZ);
diff --git a/samples/Basic_WebSkeletonApp/app/webserver.cpp b/samples/Basic_WebSkeletonApp/app/webserver.cpp
index 358dfb9884..5e19982205 100644
--- a/samples/Basic_WebSkeletonApp/app/webserver.cpp
+++ b/samples/Basic_WebSkeletonApp/app/webserver.cpp
@@ -9,7 +9,7 @@ namespace
 bool serverStarted = false;
 HttpServer server;
 
-#if DISABLE_SPIFFS
+#ifdef ENABLE_FLASHSTRING_MAP
 
 // If a filesystem image hasn't been provided, serve the files using a FlashString map
 #define FILE_LIST(XX)                                                                                                  \
diff --git a/samples/Basic_WebSkeletonApp/component.mk b/samples/Basic_WebSkeletonApp/component.mk
index 590d42b363..de15dbd41b 100644
--- a/samples/Basic_WebSkeletonApp/component.mk
+++ b/samples/Basic_WebSkeletonApp/component.mk
@@ -1,5 +1,9 @@
 ARDUINO_LIBRARIES := ArduinoJson6
+HWCONFIG := spiffs
 
-SPIFF_SIZE		?= 196608
-
-DISABLE_SPIFFS	?= 0
+# Use to store files in a FlashString map object instead of SPIFFS
+CONFIG_VARS += ENABLE_FLASHSTRING_MAP
+ENABLE_FLASHSTRING_MAP ?= 0
+ifeq ($(ENABLE_FLASHSTRING_MAP),1)
+COMPONENT_CXXFLAGS += -DENABLE_FLASHSTRING_MAP=1
+endif
diff --git a/samples/Basic_WebSkeletonApp_LTS/component.mk b/samples/Basic_WebSkeletonApp_LTS/component.mk
index e00a805aa3..8621049159 100644
--- a/samples/Basic_WebSkeletonApp_LTS/component.mk
+++ b/samples/Basic_WebSkeletonApp_LTS/component.mk
@@ -26,7 +26,8 @@
 # Com port speed
 # COM_SPEED	= 115200
 
-SPIFF_SIZE     = 196608
+#
+HWCONFIG = spiffs
 
 #
 ARDUINO_LIBRARIES := OneWire ArduinoJson5
diff --git a/samples/Basic_WiFi/component.mk b/samples/Basic_WiFi/component.mk
deleted file mode 100644
index 973dfe71cf..0000000000
--- a/samples/Basic_WiFi/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-DISABLE_SPIFFS = 1
diff --git a/samples/Basic_rBoot/README.rst b/samples/Basic_rBoot/README.rst
index 68307498a1..2fdcbf7e2d 100644
--- a/samples/Basic_rBoot/README.rst
+++ b/samples/Basic_rBoot/README.rst
@@ -44,12 +44,20 @@ Technical Notes
 
 ``spiffs_mount_manual(address, length)`` must be called from init.
 
+.. note::
+
+   This method is now deprecated. Please configure partitions appropriately,
+   use PartitionTable methods to locate the desired partition, then mount it::
+
+      auto part = PartitionTable().find('spiffs0');
+      spiffs_mount(part);
+
+   See :ref:`hardware-config` for further details.
+
 Important compiler flags used:
 
 -  BOOT_BIG_FLASH - when using big flash mode, ensures flash mapping code is built in to the rom.
 -  RBOOT_INTEGRATION - ensures Sming specific options are pulled in to the rBoot source at compile time.
--  SPIFF_SIZE=value - passed through to code for mounting the filesystem.
-   Also used in the Makefile to create the SPIFFS.
 
 Flash layout considerations
 ---------------------------
@@ -58,12 +66,10 @@ If you want to use, for example, two 512k roms in the first 1MB block of
 flash (old style) then Sming will automatically create two separately linked 
 roms. If you are flashing a single rom to multiple 1MB flash blocks, all using
 the same offset inside their 1MB blocks, only a single rom is created.
-See the rBoot readme for further details.
+See :component:`rboot` for further details.
 
 -  If using a very small flash (e.g. 512k) there may be no room for a
-   spiffs fileystem, disable it with *DISABLE_SPIFFS = 1*
--  If you are using spiffs set *RBOOT_SPIFFS_0* & *RBOOT_SPIFFS_1* to
-   indicate where the filesystems are located on the flash.
+   spiffs fileystem, so use *HWCONFIG = standard*
 -  After building copy all the rom*.bin files to the root of your web
    server.
 
diff --git a/samples/Basic_rBoot/app/application.cpp b/samples/Basic_rBoot/app/application.cpp
index 945dc409fa..19d0a683c9 100644
--- a/samples/Basic_rBoot/app/application.cpp
+++ b/samples/Basic_rBoot/app/application.cpp
@@ -1,5 +1,4 @@
 #include <SmingCore.h>
-#include <esp_spi_flash.h>
 #include <Network/RbootHttpUpdater.h>
 
 // download urls, set appropriately
@@ -13,19 +12,32 @@
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
-RbootHttpUpdater* otaUpdater = 0;
+RbootHttpUpdater* otaUpdater;
+Storage::Partition spiffsPartition;
 
-void OtaUpdate_CallBack(RbootHttpUpdater& client, bool result)
+Storage::Partition findSpiffsPartition(uint8_t slot)
+{
+	String name = F("spiffs");
+	name += slot;
+	auto part = Storage::findPartition(name);
+	if(!part) {
+		debug_w("Partition '%s' not found", name.c_str());
+	}
+	return part;
+}
+
+void otaUpdateCallBack(RbootHttpUpdater& client, bool result)
 {
 	Serial.println("In callback...");
 	if(result == true) {
 		// success
 		uint8 slot;
 		slot = rboot_get_current_rom();
-		if(slot == 0)
+		if(slot == 0) {
 			slot = 1;
-		else
+		} else {
 			slot = 0;
+		}
 		// set to boot new rom and then reboot
 		Serial.printf("Firmware updated, rebooting to rom %d...\r\n", slot);
 		rboot_set_current_rom(slot);
@@ -44,43 +56,38 @@ void OtaUpdate()
 	Serial.println("Updating...");
 
 	// need a clean object, otherwise if run before and failed will not run again
-	if(otaUpdater)
+	if(otaUpdater) {
 		delete otaUpdater;
+	}
 	otaUpdater = new RbootHttpUpdater();
 
 	// select rom slot to flash
 	bootconf = rboot_get_config();
 	slot = bootconf.current_rom;
-	if(slot == 0)
+	if(slot == 0) {
 		slot = 1;
-	else
+	} else {
 		slot = 0;
+	}
 
 #ifndef RBOOT_TWO_ROMS
 	// flash rom to position indicated in the rBoot config rom table
 	otaUpdater->addItem(bootconf.roms[slot], ROM_0_URL);
 #else
-	// flash appropriate rom
-	if(slot == 0) {
-		otaUpdater->addItem(bootconf.roms[slot], ROM_0_URL);
-	} else {
-		otaUpdater->addItem(bootconf.roms[slot], ROM_1_URL);
-	}
+	// flash appropriate ROM
+	otaUpdater->addItem(bootconf.roms[slot], (slot == 0) ? ROM_0_URL : ROM_1_URL);
 #endif
 
-#if !DISABLE_SPIFFS
-	// use user supplied values (defaults for 4mb flash in makefile)
-	if(slot == 0) {
-		otaUpdater->addItem(RBOOT_SPIFFS_0, SPIFFS_URL);
-	} else {
-		otaUpdater->addItem(RBOOT_SPIFFS_1, SPIFFS_URL);
+	auto part = findSpiffsPartition(slot);
+	if(part) {
+		// use user supplied values (defaults for 4mb flash in hardware config)
+		otaUpdater->addItem(part.address(), SPIFFS_URL, part.size());
 	}
-#endif
 
 	// request switch and reboot on success
 	//otaUpdater->switchToRom(slot);
 	// and/or set a callback (called on failure or success without switching requested)
-	otaUpdater->setCallback(OtaUpdate_CallBack);
+	otaUpdater->setCallback(otaUpdateCallBack);
 
 	// start update
 	otaUpdater->start();
@@ -90,10 +97,11 @@ void Switch()
 {
 	uint8 before, after;
 	before = rboot_get_current_rom();
-	if(before == 0)
+	if(before == 0) {
 		after = 1;
-	else
+	} else {
 		after = 0;
+	}
 	Serial.printf("Swapping from rom %d to rom %d.\r\n", before, after);
 	rboot_set_current_rom(after);
 	Serial.println("Restarting...\r\n");
@@ -173,10 +181,10 @@ void serialCallBack(Stream& stream, char arrivedChar, unsigned short availableCh
 			Serial.println("  switch - switch to the other rom and reboot");
 			Serial.println("  ota - perform ota update, switch rom and reboot");
 			Serial.println("  info - show esp8266 info");
-#if !DISABLE_SPIFFS
-			Serial.println("  ls - list files in spiffs");
-			Serial.println("  cat - show first file in spiffs");
-#endif
+			if(spiffsPartition) {
+				Serial.println("  ls - list files in spiffs");
+				Serial.println("  cat - show first file in spiffs");
+			}
 			Serial.println();
 		} else {
 			Serial.println("unknown command");
@@ -190,28 +198,14 @@ void init()
 	Serial.systemDebugOutput(true); // Debug output to serial
 
 	// mount spiffs
-	int slot = rboot_get_current_rom();
-#if !DISABLE_SPIFFS
-	if(slot == 0) {
-#ifdef RBOOT_SPIFFS_0
-		debugf("trying to mount spiffs at 0x%08x, length %d", RBOOT_SPIFFS_0, SPIFF_SIZE);
-		spiffs_mount_manual(RBOOT_SPIFFS_0, SPIFF_SIZE);
-#else
-		debugf("trying to mount spiffs at 0x%08x, length %d", 0x100000, SPIFF_SIZE);
-		spiffs_mount_manual(0x100000, SPIFF_SIZE);
-#endif
-	} else {
-#ifdef RBOOT_SPIFFS_1
-		debugf("trying to mount spiffs at 0x%08x, length %d", RBOOT_SPIFFS_1, SPIFF_SIZE);
-		spiffs_mount_manual(RBOOT_SPIFFS_1, SPIFF_SIZE);
-#else
-		debugf("trying to mount spiffs at 0x%08x, length %d", 0x300000, SPIFF_SIZE);
-		spiffs_mount_manual(0x300000, SPIFF_SIZE);
-#endif
+	auto slot = rboot_get_current_rom();
+	spiffsPartition = findSpiffsPartition(slot);
+	if(spiffsPartition) {
+		debugf("trying to mount '%s' at 0x%08x, length %d", spiffsPartition.name().c_str(), spiffsPartition.address(),
+			   spiffsPartition.size());
+		spiffs_mount(spiffsPartition);
 	}
-#else
-	debugf("spiffs disabled");
-#endif
+
 	WifiAccessPoint.enable(false);
 
 	Serial.printf("\r\nCurrently running rom %d.\r\n", slot);
diff --git a/samples/Basic_rBoot/basic_rboot.hw b/samples/Basic_rBoot/basic_rboot.hw
new file mode 100644
index 0000000000..64465e1b3a
--- /dev/null
+++ b/samples/Basic_rBoot/basic_rboot.hw
@@ -0,0 +1,19 @@
+{
+	"name": "Two ROM slots, two SPIFFS",
+	"base_config": "spiffs",
+	"partitions": {
+		"rom1": {
+			"address": "0x108000",
+			"size": "992K",
+			"type": "app",
+			"subtype": "ota_0",
+			"filename": "$(RBOOT_ROM_1_BIN)"
+		},
+		"spiffs1": {
+			"address": "0x300000",
+			"size": "512K",
+			"type": "data",
+			"subtype": "spiffs"
+		}
+	}
+}
diff --git a/samples/Basic_rBoot/component.mk b/samples/Basic_rBoot/component.mk
index 1574232c70..d77a3c8c2f 100644
--- a/samples/Basic_rBoot/component.mk
+++ b/samples/Basic_rBoot/component.mk
@@ -1,31 +1,13 @@
 #### overridable rBoot options ####
 
 ## use rboot build mode
-RBOOT_ENABLED		?= 1
-
-## size of the flash chip
-SPI_SIZE			?= 4M
-
-## address of ROM slots 0 & 1
-#RBOOT_ROM0_ADDR 	?= 0x002000
-RBOOT_ROM1_ADDR 	?= 0x102000
-
-## output file for first rom (.bin will be appended)
-#RBOOT_ROM_0 		?= rom0
-
-## these next options only needed when using two rom mode
-#RBOOT_ROM_1		?= rom1
-
-## size of the spiffs to create
-SPIFF_SIZE			?= 65536
-
-## option to completely disable spiffs
-#DISABLE_SPIFFS		?= 1
-
-## flash offsets for spiffs, set if using two rom mode or not on a 4mb flash
-## (spiffs location defaults to the mb after the rom slot on 4mb flash)
-#RBOOT_SPIFFS_0		?= 0x100000
-#RBOOT_SPIFFS_1		?= 0x300000
+RBOOT_ENABLED := 1
 
+## Use standard hardware config with two ROM slots and two SPIFFS partitions
+ifeq ($(SMING_ARCH),Esp8266)
+HWCONFIG := basic_rboot
+else
+HWCONFIG := spiffs
 # Emulate UART 0
 ENABLE_HOST_UARTID := 0
+endif
diff --git a/samples/CanBus/component.mk b/samples/CanBus/component.mk
index 5db38ef1f8..668373c3fc 100644
--- a/samples/CanBus/component.mk
+++ b/samples/CanBus/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := MCP_CAN_lib 
-
-DISABLE_SPIFFS = 1
diff --git a/samples/CommandProcessing_Debug/component.mk b/samples/CommandProcessing_Debug/component.mk
index 973dfe71cf..298d44e80b 100644
--- a/samples/CommandProcessing_Debug/component.mk
+++ b/samples/CommandProcessing_Debug/component.mk
@@ -1 +1 @@
-DISABLE_SPIFFS = 1
+HWCONFIG := spiffs
diff --git a/samples/Compass_HMC5883L/component.mk b/samples/Compass_HMC5883L/component.mk
index 763fcb3a77..bfebb2a7dc 100644
--- a/samples/Compass_HMC5883L/component.mk
+++ b/samples/Compass_HMC5883L/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := HMC5883L
-
-DISABLE_SPIFFS = 1
diff --git a/samples/DFPlayerMini/component.mk b/samples/DFPlayerMini/component.mk
index ccda75fa45..fe1938596e 100644
--- a/samples/DFPlayerMini/component.mk
+++ b/samples/DFPlayerMini/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := DFRobotDFPlayerMini
-
-DISABLE_SPIFFS = 1
diff --git a/samples/DS3232RTC_NTP_Setter/component.mk b/samples/DS3232RTC_NTP_Setter/component.mk
index 4534b60e67..9f593e41f9 100644
--- a/samples/DS3232RTC_NTP_Setter/component.mk
+++ b/samples/DS3232RTC_NTP_Setter/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := DS3232RTC
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Display_TM1637/component.mk b/samples/Display_TM1637/component.mk
index 1f36cbd482..76b8ba3655 100644
--- a/samples/Display_TM1637/component.mk
+++ b/samples/Display_TM1637/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := TM1637
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Distance_Vl53l0x/component.mk b/samples/Distance_Vl53l0x/component.mk
index d61fceb68e..a944fc3b10 100644
--- a/samples/Distance_Vl53l0x/component.mk
+++ b/samples/Distance_Vl53l0x/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := Adafruit_VL53L0X 
-
-DISABLE_SPIFFS = 1
diff --git a/samples/DnsCaptivePortal/component.mk b/samples/DnsCaptivePortal/component.mk
deleted file mode 100644
index 973dfe71cf..0000000000
--- a/samples/DnsCaptivePortal/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-DISABLE_SPIFFS = 1
diff --git a/samples/Echo_Ssl/component.mk b/samples/Echo_Ssl/component.mk
index 1e5eedd2a0..ae82bad52a 100644
--- a/samples/Echo_Ssl/component.mk
+++ b/samples/Echo_Ssl/component.mk
@@ -1,6 +1 @@
-DISABLE_SPIFFS = 1
-
-## size of the flash chip
-SPI_SIZE  ?= 4M
-
 ENABLE_SSL = 1
diff --git a/samples/FtpServer_Files/component.mk b/samples/FtpServer_Files/component.mk
new file mode 100644
index 0000000000..ab4cb6eed9
--- /dev/null
+++ b/samples/FtpServer_Files/component.mk
@@ -0,0 +1,2 @@
+HWCONFIG := spiffs
+SPIFF_FILES :=
diff --git a/samples/Gesture_APDS-9960/component.mk b/samples/Gesture_APDS-9960/component.mk
index 29be2f65a4..6dc722623d 100644
--- a/samples/Gesture_APDS-9960/component.mk
+++ b/samples/Gesture_APDS-9960/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := SparkFun_APDS9960
-
-DISABLE_SPIFFS = 1
diff --git a/samples/HttpClient/component.mk b/samples/HttpClient/component.mk
index f3ee8603fd..b5818865f6 100644
--- a/samples/HttpClient/component.mk
+++ b/samples/HttpClient/component.mk
@@ -1,5 +1,4 @@
-## size of the flash chip
-SPI_SIZE  ?= 4M
+HWCONFIG = spiffs
 
 ## Prefer BearSSL as it can handle more gracefully big SSL packets.
 ENABLE_SSL ?= Bearssl
diff --git a/samples/HttpClient_Instapush/component.mk b/samples/HttpClient_Instapush/component.mk
index c304e7f8f4..8786c2333d 100644
--- a/samples/HttpClient_Instapush/component.mk
+++ b/samples/HttpClient_Instapush/component.mk
@@ -1,2 +1,3 @@
-DISABLE_SPIFFS = 1
+HWCONFIG := spiffs
+SPIFF_FILES :=
 ARDUINO_LIBRARIES := ArduinoJson6
diff --git a/samples/HttpClient_ThingSpeak/component.mk b/samples/HttpClient_ThingSpeak/component.mk
index 973dfe71cf..ab4cb6eed9 100644
--- a/samples/HttpClient_ThingSpeak/component.mk
+++ b/samples/HttpClient_ThingSpeak/component.mk
@@ -1 +1,2 @@
-DISABLE_SPIFFS = 1
+HWCONFIG := spiffs
+SPIFF_FILES :=
diff --git a/samples/HttpServer_AJAX/component.mk b/samples/HttpServer_AJAX/component.mk
index 6e7cdbc0c9..50337d80c6 100644
--- a/samples/HttpServer_AJAX/component.mk
+++ b/samples/HttpServer_AJAX/component.mk
@@ -1,2 +1,3 @@
+HWCONFIG := spiffs
 SPIFF_FILES = web/build
 ARDUINO_LIBRARIES := ArduinoJson6
diff --git a/samples/HttpServer_Bootstrap/component.mk b/samples/HttpServer_Bootstrap/component.mk
new file mode 100644
index 0000000000..ab4cb6eed9
--- /dev/null
+++ b/samples/HttpServer_Bootstrap/component.mk
@@ -0,0 +1,2 @@
+HWCONFIG := spiffs
+SPIFF_FILES :=
diff --git a/samples/HttpServer_ConfigNetwork/component.mk b/samples/HttpServer_ConfigNetwork/component.mk
index ef3cde28e8..2574c69f39 100644
--- a/samples/HttpServer_ConfigNetwork/component.mk
+++ b/samples/HttpServer_ConfigNetwork/component.mk
@@ -1,3 +1,4 @@
+HWCONFIG := spiffs
 SPIFF_FILES = web/build
 ARDUINO_LIBRARIES := ArduinoJson6
 
diff --git a/samples/HttpServer_FirmwareUpload/README.rst b/samples/HttpServer_FirmwareUpload/README.rst
index c483906a07..1a6be3e966 100644
--- a/samples/HttpServer_FirmwareUpload/README.rst
+++ b/samples/HttpServer_FirmwareUpload/README.rst
@@ -46,15 +46,7 @@ documentation for further advice on how to use the security features properly.
 Usage instructions
 ------------------
 
-
-1. Configure your flash memory layout:
-
-   -  Set :envvar:`SPI_SIZE` to the flash memory size of your device.
-   -  If necessary, modify :envvar:`RBOOT_ROM0_ADDR`, :envvar:`RBOOT_ROM1_ADDR`, 
-      :envvar:`RBOOT_SPIFFS_0` and :envvar:`SPIFF_SIZE` to fit both ROM slots and
-      the file system into the available flash memory. Make sure that the 
-      flash areas do not overlap with each other or any the reserved regions.
-      Refer to the :component:`rboot` documentation for further details.
+1. Configure your flash memory layout. See :ref:`hardware_config`.
 
 2. Build the example by running::
 
diff --git a/samples/HttpServer_FirmwareUpload/component.mk b/samples/HttpServer_FirmwareUpload/component.mk
index 66466ad9b0..5bba481389 100644
--- a/samples/HttpServer_FirmwareUpload/component.mk
+++ b/samples/HttpServer_FirmwareUpload/component.mk
@@ -1,3 +1,4 @@
+HWCONFIG := spiffs
 SPIFF_FILES = web/
 ARDUINO_LIBRARIES := MultipartParser OtaUpgrade
 
diff --git a/samples/HttpServer_WebSockets/component.mk b/samples/HttpServer_WebSockets/component.mk
new file mode 100644
index 0000000000..298d44e80b
--- /dev/null
+++ b/samples/HttpServer_WebSockets/component.mk
@@ -0,0 +1 @@
+HWCONFIG := spiffs
diff --git a/samples/Humidity_AM2321/component.mk b/samples/Humidity_AM2321/component.mk
index ed804579fb..a1e9eff658 100644
--- a/samples/Humidity_AM2321/component.mk
+++ b/samples/Humidity_AM2321/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := AM2321
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Humidity_DHT22/component.mk b/samples/Humidity_DHT22/component.mk
index da47456b52..6a0e948fe4 100644
--- a/samples/Humidity_DHT22/component.mk
+++ b/samples/Humidity_DHT22/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := DHTesp
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Humidity_SI7021/component.mk b/samples/Humidity_SI7021/component.mk
index e01c1c0c49..d570b9b3f4 100644
--- a/samples/Humidity_SI7021/component.mk
+++ b/samples/Humidity_SI7021/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := SI7021
-
-DISABLE_SPIFFS = 1
diff --git a/samples/IR_lib/component.mk b/samples/IR_lib/component.mk
index 10e306665b..bf1221327c 100644
--- a/samples/IR_lib/component.mk
+++ b/samples/IR_lib/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := IR
-
-DISABLE_SPIFFS = 1
diff --git a/samples/LED_WS2812/component.mk b/samples/LED_WS2812/component.mk
index c3b9fd7313..19ece9de25 100644
--- a/samples/LED_WS2812/component.mk
+++ b/samples/LED_WS2812/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := WS2812
-
-DISABLE_SPIFFS = 1
diff --git a/samples/LED_YeelightBulb/component.mk b/samples/LED_YeelightBulb/component.mk
index 8b99c0071c..68b70f2b6b 100644
--- a/samples/LED_YeelightBulb/component.mk
+++ b/samples/LED_YeelightBulb/component.mk
@@ -1,2 +1 @@
-DISABLE_SPIFFS = 1
 ARDUINO_LIBRARIES := Yeelight
diff --git a/samples/Light_BH1750/component.mk b/samples/Light_BH1750/component.mk
index 0ff62be148..7f0ae9c735 100644
--- a/samples/Light_BH1750/component.mk
+++ b/samples/Light_BH1750/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := BH1750FVI
-
-DISABLE_SPIFFS = 1
diff --git a/samples/LiquidCrystal_44780/component.mk b/samples/LiquidCrystal_44780/component.mk
index 2eaa53c03c..1424c543b2 100644
--- a/samples/LiquidCrystal_44780/component.mk
+++ b/samples/LiquidCrystal_44780/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := LiquidCrystal
-
-DISABLE_SPIFFS = 1
diff --git a/samples/LiveDebug/component.mk b/samples/LiveDebug/component.mk
index f82ee2d9d9..e54600cb3c 100644
--- a/samples/LiveDebug/component.mk
+++ b/samples/LiveDebug/component.mk
@@ -1,5 +1,3 @@
-DISABLE_SPIFFS = 1
-
 ENABLE_GDB = 1
 
 ENABLE_GDB_CONSOLE ?= 1
diff --git a/samples/MeteoControl/component.mk b/samples/MeteoControl/component.mk
index 253cf6cb30..b847e6d1b0 100644
--- a/samples/MeteoControl/component.mk
+++ b/samples/MeteoControl/component.mk
@@ -1,3 +1,4 @@
 ARDUINO_LIBRARIES := LiquidCrystal DHTesp ArduinoJson6
 
+HWCONFIG := spiffs
 SPIFF_FILES = web
diff --git a/samples/MeteoControl_mqtt/component.mk b/samples/MeteoControl_mqtt/component.mk
index bdb4b87fa1..5b00021804 100644
--- a/samples/MeteoControl_mqtt/component.mk
+++ b/samples/MeteoControl_mqtt/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := BMP180 SI7021
-
-DISABLE_SPIFFS = 1
diff --git a/samples/MqttClient_Hello/component.mk b/samples/MqttClient_Hello/component.mk
index 0b3208d9a7..10ef45cc95 100644
--- a/samples/MqttClient_Hello/component.mk
+++ b/samples/MqttClient_Hello/component.mk
@@ -1,8 +1,5 @@
-DISABLE_SPIFFS = 1
+HWCONFIG := standard-4m
 
 ifdef MQTT_URL
 	USER_CFLAGS += -DMQTT_URL=\"$(MQTT_URL)\" 
 endif
-
-## size of the flash chip
-SPI_SIZE  ?= 4M
diff --git a/samples/Nextion_Button/component.mk b/samples/Nextion_Button/component.mk
index c7cc0b302c..538e725470 100644
--- a/samples/Nextion_Button/component.mk
+++ b/samples/Nextion_Button/component.mk
@@ -1,5 +1,3 @@
 ARDUINO_LIBRARIES := ITEADLIB_Arduino_Nextion
 
-DISABLE_SPIFFS = 1
-
 ENABLE_NEXTION = 1
diff --git a/samples/PortExpander_MCP23017/component.mk b/samples/PortExpander_MCP23017/component.mk
index e59988fa90..decdab0b14 100644
--- a/samples/PortExpander_MCP23017/component.mk
+++ b/samples/PortExpander_MCP23017/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := MCP23017
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Pressure_BMP180/component.mk b/samples/Pressure_BMP180/component.mk
index edad90d026..bc6de35d78 100644
--- a/samples/Pressure_BMP180/component.mk
+++ b/samples/Pressure_BMP180/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := BMP180
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Radio_RCSwitch/component.mk b/samples/Radio_RCSwitch/component.mk
index 664aaee609..cd2c1300e9 100644
--- a/samples/Radio_RCSwitch/component.mk
+++ b/samples/Radio_RCSwitch/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := RCSwitch
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Radio_nRF24L01/component.mk b/samples/Radio_nRF24L01/component.mk
index 5b82a43543..9a478c319a 100644
--- a/samples/Radio_nRF24L01/component.mk
+++ b/samples/Radio_nRF24L01/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := RF24
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Radio_si4432/component.mk b/samples/Radio_si4432/component.mk
index 2ad241b2cc..fdf6ee7962 100644
--- a/samples/Radio_si4432/component.mk
+++ b/samples/Radio_si4432/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := si4432
-
-DISABLE_SPIFFS = 1
diff --git a/samples/SDCard/component.mk b/samples/SDCard/component.mk
index 0811609ed1..e93d57393d 100644
--- a/samples/SDCard/component.mk
+++ b/samples/SDCard/component.mk
@@ -1,2 +1 @@
 ARDUINO_LIBRARIES := SDCard
-DISABLE_SPIFFS := 1
diff --git a/samples/ScreenLCD_5110/component.mk b/samples/ScreenLCD_5110/component.mk
index 9e06efca69..2855fb3158 100644
--- a/samples/ScreenLCD_5110/component.mk
+++ b/samples/ScreenLCD_5110/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := Adafruit_PCD8544
-
-DISABLE_SPIFFS = 1
diff --git a/samples/ScreenOLED_SSD1306/component.mk b/samples/ScreenOLED_SSD1306/component.mk
index c30fac01ee..72278b67fd 100644
--- a/samples/ScreenOLED_SSD1306/component.mk
+++ b/samples/ScreenOLED_SSD1306/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := Adafruit_SSD1306
-
-DISABLE_SPIFFS = 1
diff --git a/samples/ScreenTFT_ILI9163C/component.mk b/samples/ScreenTFT_ILI9163C/component.mk
index 9494698445..a6c5efa5b8 100644
--- a/samples/ScreenTFT_ILI9163C/component.mk
+++ b/samples/ScreenTFT_ILI9163C/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := TFT_ILI9163C
-
-DISABLE_SPIFFS = 1
diff --git a/samples/ScreenTFT_ILI9340-ILI9341/component.mk b/samples/ScreenTFT_ILI9340-ILI9341/component.mk
index 77706c8ff2..29bda5a46a 100644
--- a/samples/ScreenTFT_ILI9340-ILI9341/component.mk
+++ b/samples/ScreenTFT_ILI9340-ILI9341/component.mk
@@ -1 +1,2 @@
+HWCONFIG := spiffs
 ARDUINO_LIBRARIES := Adafruit_ILI9341
diff --git a/samples/ScreenTFT_ST7735/component.mk b/samples/ScreenTFT_ST7735/component.mk
index 444739bbdd..cb9740b8f7 100644
--- a/samples/ScreenTFT_ST7735/component.mk
+++ b/samples/ScreenTFT_ST7735/component.mk
@@ -1 +1,2 @@
+HWCONFIG := spiffs
 ARDUINO_LIBRARIES := Adafruit_ST7735
diff --git a/samples/SmtpClient/component.mk b/samples/SmtpClient/component.mk
index 738d384dcc..943f6630c9 100644
--- a/samples/SmtpClient/component.mk
+++ b/samples/SmtpClient/component.mk
@@ -1 +1,2 @@
+HWCONFIG := spiffs
 ENABLE_SSL		?= 1
diff --git a/samples/SystemClock_NTP/component.mk b/samples/SystemClock_NTP/component.mk
index 5e0ebcaf7f..2d668a76f1 100644
--- a/samples/SystemClock_NTP/component.mk
+++ b/samples/SystemClock_NTP/component.mk
@@ -1,5 +1,3 @@
-DISABLE_SPIFFS = 1
-
 ARDUINO_LIBRARIES = \
 	Timezone \
 	SolarCalculator
diff --git a/samples/TcpClient_NarodMon/component.mk b/samples/TcpClient_NarodMon/component.mk
deleted file mode 100644
index 973dfe71cf..0000000000
--- a/samples/TcpClient_NarodMon/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-DISABLE_SPIFFS = 1
diff --git a/samples/Telnet_TCPServer_TCPClient/component.mk b/samples/Telnet_TCPServer_TCPClient/component.mk
deleted file mode 100644
index 973dfe71cf..0000000000
--- a/samples/Telnet_TCPServer_TCPClient/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-DISABLE_SPIFFS = 1
diff --git a/samples/Temperature_DS1820/component.mk b/samples/Temperature_DS1820/component.mk
index 087c1b4647..d5d59373b7 100644
--- a/samples/Temperature_DS1820/component.mk
+++ b/samples/Temperature_DS1820/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := DS18S20
-
-DISABLE_SPIFFS = 1
diff --git a/samples/UdpServer_Echo/component.mk b/samples/UdpServer_Echo/component.mk
deleted file mode 100644
index 973dfe71cf..0000000000
--- a/samples/UdpServer_Echo/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-DISABLE_SPIFFS = 1
diff --git a/samples/UdpServer_mDNS/component.mk b/samples/UdpServer_mDNS/component.mk
index 75719a495d..ed2eaeb314 100644
--- a/samples/UdpServer_mDNS/component.mk
+++ b/samples/UdpServer_mDNS/component.mk
@@ -1,2 +1,3 @@
-DISABLE_SPIFFS = 1
+HWCONFIG := spiffs
+SPIFF_FILES :=
 COMPONENT_DEPENDS += mdns
diff --git a/samples/Ultrasonic_HCSR04/component.mk b/samples/Ultrasonic_HCSR04/component.mk
index c21f2d42fa..793a94abd4 100644
--- a/samples/Ultrasonic_HCSR04/component.mk
+++ b/samples/Ultrasonic_HCSR04/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := Ultrasonic
-
-DISABLE_SPIFFS = 1
diff --git a/samples/Websocket_Client/component.mk b/samples/Websocket_Client/component.mk
index a2dcdb1632..38bc642725 100644
--- a/samples/Websocket_Client/component.mk
+++ b/samples/Websocket_Client/component.mk
@@ -1,7 +1,4 @@
-DISABLE_SPIFFS = 1
+HWCONFIG := standard-4m
 
 # Uncomment the option below if you want SSL support
 #ENABLE_SSL=1
-
-## size of the flash chip
-SPI_SIZE  ?= 4M
diff --git a/samples/Wifi_Sniffer/component.mk b/samples/Wifi_Sniffer/component.mk
deleted file mode 100644
index 973dfe71cf..0000000000
--- a/samples/Wifi_Sniffer/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-DISABLE_SPIFFS = 1
diff --git a/tests/HostTests/component.mk b/tests/HostTests/component.mk
index 136f4813d1..284b9f0aab 100644
--- a/tests/HostTests/component.mk
+++ b/tests/HostTests/component.mk
@@ -1,6 +1,5 @@
-DISABLE_SPIFFS = 1
+HWCONFIG = host-tests
 DEBUG_VERBOSE_LEVEL = 2
-SPI_SIZE = 4M
 
 COMPONENT_INCDIRS := include
 COMPONENT_SRCDIRS := app modules
diff --git a/tests/HostTests/host-tests.hw b/tests/HostTests/host-tests.hw
new file mode 100644
index 0000000000..954c4865ff
--- /dev/null
+++ b/tests/HostTests/host-tests.hw
@@ -0,0 +1,42 @@
+{
+	"name": "Host Tests profile",
+	"base_config": "spiffs",
+	"devices": {
+		"testDevice": {
+			"type": "spiram",
+			"size": "0x40000000"
+		}
+	},
+	"partitions": {
+		"spiffs0": {
+			"size": "0x10000",
+			"filename": ""
+		},
+		"external1": {
+			"device": "testDevice",
+			"address": 0,
+			"size": "4M",
+			"type": "data",
+			"subtype": "spiffs",
+			"filename": "$(FW_BASE)/test-spiffs.bin",
+			"build": {
+				"target": "spiffsgen",
+				"files": "resource"
+			}
+		},
+		"external2": {
+			"device": "testDevice",
+			"address": "0x600000",
+			"size": "240K",
+			"type": "data",
+			"subtype": 37
+		},
+		"external3": {
+			"device": "testDevice",
+			"address": "0x800000",
+			"size": "240M",
+			"type": "data",
+			"subtype": "nvs"
+		}
+	}
+}
\ No newline at end of file
diff --git a/tests/HostTests/include/modules.h b/tests/HostTests/include/modules.h
index ba9bfc2520..97583b28b3 100644
--- a/tests/HostTests/include/modules.h
+++ b/tests/HostTests/include/modules.h
@@ -19,6 +19,7 @@
 	XX(Url)                                                                                                            \
 	XX(ArduinoJson5)                                                                                                   \
 	XX(ArduinoJson6)                                                                                                   \
+	XX(Storage)                                                                                                        \
 	XX(Files)                                                                                                          \
 	XX(SpiFlash)                                                                                                       \
 	XX(Spiffs)                                                                                                         \
diff --git a/tests/HostTests/modules/ArduinoJson6.cpp b/tests/HostTests/modules/ArduinoJson6.cpp
index 8dbc74d63b..9c3690045b 100644
--- a/tests/HostTests/modules/ArduinoJson6.cpp
+++ b/tests/HostTests/modules/ArduinoJson6.cpp
@@ -292,15 +292,17 @@ class JsonTest6 : public TestGroup
 		loadStream(fs);
 	}
 
-	void speedChecks()
+	template <typename T> void check(T func)
 	{
-#define CHECK(func)                                                                                                    \
-	for(unsigned i = 0; i < 4; ++i) {                                                                                  \
-		ElapseTimer timer;                                                                                             \
-		func;                                                                                                          \
-		debug_i("Time: %s", timer.elapsedTime().toString().c_str());                                                   \
+		for(unsigned i = 0; i < 4; ++i) {
+			ElapseTimer timer;
+			func();
+			debug_i("Time: %s", timer.elapsedTime().toString().c_str());
+		}
 	}
 
+	void speedChecks()
+	{
 		PSTR_ARRAY(filename, "test.json");
 		if(!fileExist(filename)) {
 			FileStream fs(filename, eFO_CreateNewAlways | eFO_WriteOnly);
@@ -312,28 +314,28 @@ class JsonTest6 : public TestGroup
 		TEST_CASE("loadBuffer")
 		{
 			LOAD_FSTR(buffer, Resource::test_json);
-			CHECK(loadBuffer(buffer, Resource::test_json.length()));
+			check([&] { loadBuffer(buffer, Resource::test_json.length()); });
 		}
 		TEST_CASE("loadFlashString")
 		{
-			CHECK(loadFlashString());
+			check([&] { loadFlashString(); });
 		}
 		TEST_CASE("loadFlashString via Stream (cached)")
 		{
-			CHECK(loadFlashStringViaStream(false));
+			check([&] { loadFlashStringViaStream(false); });
 		}
 		TEST_CASE("loadFlashString via Stream (un-cached)")
 		{
-			CHECK(loadFlashStringViaStream(true));
+			check([&] { loadFlashStringViaStream(true); });
 		}
 		TEST_CASE("loadFile")
 		{
-			CHECK(loadFile(filename));
+			check([&] { loadFile(filename); });
 		}
 		TEST_CASE("loadStream")
 		{
 			FileStream fs(filename);
-			CHECK(loadStream(fs));
+			check([&]() { loadStream(fs); });
 		}
 	}
 
diff --git a/tests/HostTests/modules/Spiffs.cpp b/tests/HostTests/modules/Spiffs.cpp
index f7bdf9b98a..67e73475ee 100644
--- a/tests/HostTests/modules/Spiffs.cpp
+++ b/tests/HostTests/modules/Spiffs.cpp
@@ -1,5 +1,5 @@
 #include <HostTests.h>
-#include <esp_spi_flash.h>
+#include <Storage.h>
 
 class SpiffsTest : public TestGroup
 {
@@ -32,7 +32,7 @@ class SpiffsTest : public TestGroup
 		DEFINE_FSTR_LOCAL(testFile, "testfile");
 		DEFINE_FSTR_LOCAL(testContent, "Some test content to write to a file");
 
-		auto cfg = spiffs_get_storage_config();
+		auto part = *Storage::findPartition(Storage::Partition::SubType::Data::spiffs);
 
 		// Write to filesystem until sector #0 gets erased
 		unsigned writeCount = 0;
@@ -44,8 +44,8 @@ class SpiffsTest : public TestGroup
 				break;
 			}
 			++writeCount;
-			if(flashmem_read(&word0, cfg.phys_addr, sizeof(word0)) != sizeof(word0)) {
-				debug_e("flashmem_read failed");
+			if(!part.read(0, word0)) {
+				debug_e("part.read() failed");
 				TEST_ASSERT(false);
 				break;
 			}
diff --git a/tests/HostTests/modules/Storage.cpp b/tests/HostTests/modules/Storage.cpp
new file mode 100644
index 0000000000..238af5076b
--- /dev/null
+++ b/tests/HostTests/modules/Storage.cpp
@@ -0,0 +1,110 @@
+#include <HostTests.h>
+#include <Storage.h>
+
+class TestDevice : public Storage::Device
+{
+public:
+	String getName() const override
+	{
+		return F("testDevice");
+	}
+
+	size_t getBlockSize() const override
+	{
+		return sizeof(uint32_t);
+	}
+
+	size_t getSize() const override
+	{
+		return 0x40000000;
+	}
+
+	Type getType() const override
+	{
+		return Type::unknown;
+	}
+
+	bool read(uint32_t address, void* dst, size_t size) override
+	{
+		for(unsigned i = 0; i < size; ++i) {
+			static_cast<uint8_t*>(dst)[i] = address + i;
+		}
+		return true;
+	}
+
+	bool write(uint32_t address, const void* src, size_t size) override
+	{
+		return false;
+	}
+
+	bool erase_range(uint32_t address, size_t size) override
+	{
+		return false;
+	}
+};
+
+class PartitionTest : public TestGroup
+{
+public:
+	PartitionTest() : TestGroup(_F("Partition"))
+	{
+	}
+
+	void execute() override
+	{
+		auto dev = new TestDevice;
+		Storage::registerDevice(dev);
+
+		listPartitions();
+
+		delete dev;
+	}
+
+	void listPartitions()
+	{
+		for(auto it = Storage::findPartition(); it; ++it) {
+			auto part = *it;
+
+			Serial.println();
+			Serial.print(_F("Device '"));
+			Serial.print(part.getDeviceName());
+			Serial.print(_F("', partition '"));
+			Serial.print(part.name());
+			Serial.print(_F("', type "));
+			Serial.print(int(part.type()));
+			Serial.print('/');
+			Serial.print(int(part.subType()));
+			Serial.print(" (");
+			Serial.print(part.longTypeString());
+			Serial.print(_F("), address 0x"));
+			Serial.print(part.address(), HEX);
+			Serial.print(_F(", size 0x"));
+			Serial.print(part.size(), HEX);
+			Serial.println();
+
+			testRead(part, 0xE0, 0x20, true);
+			testRead(part, 10, 20, true);
+			testRead(part, part.size() - 10, 10, true);
+			testRead(part, part.size() - 10, 11, false);
+		}
+	}
+
+	void testRead(Storage::Partition& part, uint32_t address, size_t size, bool shouldSucceed)
+	{
+		auto buf = new uint8_t[size];
+		bool success = part.read(address, buf, size);
+		if(success) {
+			m_printHex("READ", buf, size, address);
+			REQUIRE(shouldSucceed == true);
+		} else {
+			debug_e("read(0x%08x, %u) failed", address, size);
+			REQUIRE(shouldSucceed == false);
+		}
+		delete[] buf;
+	}
+};
+
+void REGISTER_TEST(Storage)
+{
+	registerGroup<PartitionTest>();
+}
diff --git a/tests/SharedComponent/Project/component.mk b/tests/SharedComponent/Project/component.mk
index 9aaec6713e..80934857ab 100644
--- a/tests/SharedComponent/Project/component.mk
+++ b/tests/SharedComponent/Project/component.mk
@@ -1,12 +1,7 @@
 ## Local build configuration
 ## Parameters configured here will override default and ENV values.
 
-## SPIFFS options
-DISABLE_SPIFFS = 1
-# SPIFF_FILES = files
-
 DEBUG_VERBOSE_LEVEL = 3
-SPI_SIZE = 4M
 
 # Tell Sming about any Components we need
 COMPONENT_DEPENDS := shared-test

From d9e8c9c977c39b93f198b59be720275fe8adf0ee Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Tue, 9 Feb 2021 09:35:15 +0000
Subject: [PATCH 12/91] Storage fixes (#2216)

* HOST_PARAMETERS missing from valgrind and gdb cmdline
* RingTone sample requires HWCONFIG=spiffs
* Storage missing nullptr check
* Wrong device name in error message in `Device::loadPartitions`
---
 Sming/Arch/Host/Components/gdbstub/component.mk | 2 +-
 Sming/Arch/Host/app.mk                          | 2 +-
 Sming/Components/Storage/src/Device.cpp         | 2 +-
 Sming/Components/Storage/src/ObjectList.cpp     | 2 +-
 Sming/Libraries/RingTone                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sming/Arch/Host/Components/gdbstub/component.mk b/Sming/Arch/Host/Components/gdbstub/component.mk
index d2f160a6f7..46fd3ee841 100644
--- a/Sming/Arch/Host/Components/gdbstub/component.mk
+++ b/Sming/Arch/Host/Components/gdbstub/component.mk
@@ -3,4 +3,4 @@ DEBUG_VARS	+= GDBSTUB_DIR
 GDBSTUB_DIR := $(COMPONENT_PATH)
 
 CACHE_VARS	+= GDB_CMDLINE
-GDB_CMDLINE = trap '' INT; $(GDB) -x $(GDBSTUB_DIR)/gdbcmds --args $(TARGET_OUT_0) $(CLI_TARGET_OPTIONS) --pause
+GDB_CMDLINE = trap '' INT; $(GDB) -x $(GDBSTUB_DIR)/gdbcmds --args $(TARGET_OUT_0) $(CLI_TARGET_OPTIONS) --pause -- $(HOST_PARAMETERS)
diff --git a/Sming/Arch/Host/app.mk b/Sming/Arch/Host/app.mk
index 9e4f858af4..d5484569cf 100644
--- a/Sming/Arch/Host/app.mk
+++ b/Sming/Arch/Host/app.mk
@@ -29,7 +29,7 @@ $(TARGET_OUT_0): $(COMPONENTS_AR)
 valgrind: all ##Run the application under valgrind to detect memory issues. Requires `valgrind` to be installed on the host system.
 	$(Q) valgrind --track-origins=yes --leak-check=full \
 	$(foreach id,$(ENABLE_HOST_UARTID),echo '$(call RunHostTerminal,$(id))' >> $@;) \
-	$(TARGET_OUT_0) $(CLI_TARGET_OPTIONS)
+	$(TARGET_OUT_0) $(CLI_TARGET_OPTIONS) -- $(HOST_PARAMETERS)
 
 
 RUN_SCRIPT := $(FW_BASE)/run.sh
diff --git a/Sming/Components/Storage/src/Device.cpp b/Sming/Components/Storage/src/Device.cpp
index 6f2c6ec428..127396828a 100644
--- a/Sming/Components/Storage/src/Device.cpp
+++ b/Sming/Components/Storage/src/Device.cpp
@@ -61,7 +61,7 @@ bool Device::loadPartitions(Device& source, uint32_t tableOffset)
 	}
 
 	if(buffer[0].type != Partition::Type::storage) {
-		debug_e("[Partition] Bad partition table for device '%s' @ 0x%08x", getName().c_str(), tableOffset);
+		debug_e("[Partition] Bad partition table for device '%s' @ 0x%08x", source.getName().c_str(), tableOffset);
 		return false;
 	}
 
diff --git a/Sming/Components/Storage/src/ObjectList.cpp b/Sming/Components/Storage/src/ObjectList.cpp
index dae8a07716..4ec5cc3d15 100644
--- a/Sming/Components/Storage/src/ObjectList.cpp
+++ b/Sming/Components/Storage/src/ObjectList.cpp
@@ -40,7 +40,7 @@ bool ObjectList::add(Object* object)
 
 bool ObjectList::remove(Object* object)
 {
-	if(object == nullptr) {
+	if(object == nullptr || mHead == nullptr) {
 		return false;
 	}
 
diff --git a/Sming/Libraries/RingTone b/Sming/Libraries/RingTone
index a62f39ea08..56bdf070f7 160000
--- a/Sming/Libraries/RingTone
+++ b/Sming/Libraries/RingTone
@@ -1 +1 @@
-Subproject commit a62f39ea08867b26c7ace53aedb43769f02cc74f
+Subproject commit 56bdf070f7e4eebebe15646079aa709af10e248c

From 9b5143fbf9c63933398dfbf33860f59f3d639fea Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 10 Feb 2021 15:04:50 +0000
Subject: [PATCH 13/91] Installable File System (#1579)

* Add IFS Component

* Use new style of file open flags

* File/Directory streams and Formatter classes

Core IFS streams allow use with any file system
Add base Formatter class, headers and standard/html/json within Format namespace

* Use Host filesystem instead of raw API

* Implement GdbFileStream using GdbFileSystem

* Basic_IFS sample

* Add upgrade notes

[scan:coverity]
---
 .gitmodules                                   |   4 +
 .../Esp8266/Components/gdbstub/gdbhostio.cpp  |  12 +-
 .../hostlib/include/hostlib/hostlib.h         |   6 +-
 .../Arch/Host/Components/hostlib/options.cpp  |   5 +
 Sming/Arch/Host/Components/hostlib/options.h  |   1 +
 .../Arch/Host/Components/hostlib/startup.cpp  |   3 +-
 .../Host/Components/spi_flash/flashmem.cpp    |  52 +-
 .../Host/Core/Data/Stream/HostFileStream.cpp  | 166 +------
 .../Host/Core/Data/Stream/HostFileStream.h    | 116 +----
 Sming/Arch/Host/Tools/ci/build.run.cmd        |   2 +-
 Sming/Components/IFS                          |   1 +
 .../Storage/Tools/hwconfig/partition.py       |   1 +
 .../Storage/src/include/Storage/Partition.h   |   3 +-
 Sming/Components/spiffs/spiffs_config.h       |   2 +-
 Sming/Components/spiffs/spiffs_sming.cpp      | 157 ++----
 Sming/Components/spiffs/spiffs_sming.h        |   7 +-
 Sming/Core/Data/Stream/Directory.h            |  28 ++
 Sming/Core/Data/Stream/FileStream.cpp         | 155 ------
 Sming/Core/Data/Stream/FileStream.h           | 152 +-----
 Sming/Core/Data/Stream/GdbFileStream.cpp      | 130 -----
 Sming/Core/Data/Stream/GdbFileStream.h        | 120 +----
 Sming/Core/Data/Stream/IFS/Directory.cpp      | 102 ++++
 Sming/Core/Data/Stream/IFS/Directory.h        | 111 +++++
 .../Data/Stream/IFS/DirectoryTemplate.cpp     | 118 +++++
 .../Core/Data/Stream/IFS/DirectoryTemplate.h  |  82 +++
 Sming/Core/Data/Stream/IFS/FileStream.cpp     | 223 +++++++++
 Sming/Core/Data/Stream/IFS/FileStream.h       | 146 ++++++
 Sming/Core/Data/Stream/IFS/FsBase.h           |  72 +++
 .../Data/Stream/IFS/HtmlDirectoryTemplate.cpp |  67 +++
 .../Data/Stream/IFS/HtmlDirectoryTemplate.h   |  36 ++
 .../Data/Stream/IFS/JsonDirectoryTemplate.h   |  33 ++
 Sming/Core/FileSystem.cpp                     | 209 +-------
 Sming/Core/FileSystem.h                       | 468 ++++++++++++++----
 Sming/Core/Network/Ftp/FtpDataRetrieve.h      |   2 +-
 Sming/Core/Network/Ftp/FtpDataStore.h         |   2 +-
 Sming/Core/Network/FtpServer.cpp              |   2 +-
 Sming/Core/Network/Http/HttpResponse.cpp      |  40 +-
 Sming/Core/Network/Http/HttpResponse.h        |   6 +
 Sming/Core/Network/HttpClient.cpp             |   2 +-
 Sming/Libraries/Adafruit_GFX/BMPDraw.h        |   2 +-
 .../ArduinoJson6/include/ArduinoJson.h        |   2 +-
 Sming/component.mk                            |   1 +
 docs/source/upgrading/4.2-4.3.rst             |  24 +
 samples/Basic_IFS/.cproject                   | 154 ++++++
 samples/Basic_IFS/.project                    |  29 ++
 samples/Basic_IFS/Makefile                    |   9 +
 samples/Basic_IFS/README.rst                  |  24 +
 samples/Basic_IFS/app/application.cpp         | 220 ++++++++
 samples/Basic_IFS/basic_ifs.hw                |  21 +
 samples/Basic_IFS/component.mk                |  12 +
 samples/Basic_IFS/files/.auth.json            |  19 +
 samples/Basic_IFS/files/.network.json         |   8 +
 samples/Basic_IFS/files/.time.json            |   4 +
 ...ever want to do this, but hey, why not.txt |   7 +
 .../A Subdirectory/a/b/c/d/e/f/lonely.txt     |   1 +
 .../files/apple-touch-icon-180x180.png        | Bin 0 -> 17250 bytes
 samples/Basic_IFS/files/bootstrap.min.css     |   7 +
 samples/Basic_IFS/files/error.html            |  26 +
 samples/Basic_IFS/files/favicon.ico           | Bin 0 -> 15086 bytes
 samples/Basic_IFS/files/styles.css            | 165 ++++++
 samples/Basic_IFS/fsimage.ini                 |  32 ++
 samples/Basic_IFS/resource/listing.html       |  76 +++
 samples/Basic_IFS/resource/listing.json       |  24 +
 samples/Basic_IFS/resource/listing.txt        |  26 +
 samples/Basic_Serial/app/application.cpp      |   2 +-
 samples/HttpClient/app/application.cpp        |   2 +-
 samples/LiveDebug/app/application.cpp         |  26 +-
 tests/HostTests/modules/ArduinoJson6.cpp      |   2 +-
 tests/HostTests/modules/Files.cpp             |   6 +-
 tests/HostTests/modules/TemplateStream.cpp    |  21 +
 70 files changed, 2499 insertions(+), 1297 deletions(-)
 create mode 160000 Sming/Components/IFS
 create mode 100644 Sming/Core/Data/Stream/Directory.h
 delete mode 100644 Sming/Core/Data/Stream/FileStream.cpp
 delete mode 100644 Sming/Core/Data/Stream/GdbFileStream.cpp
 create mode 100644 Sming/Core/Data/Stream/IFS/Directory.cpp
 create mode 100644 Sming/Core/Data/Stream/IFS/Directory.h
 create mode 100644 Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp
 create mode 100644 Sming/Core/Data/Stream/IFS/DirectoryTemplate.h
 create mode 100644 Sming/Core/Data/Stream/IFS/FileStream.cpp
 create mode 100644 Sming/Core/Data/Stream/IFS/FileStream.h
 create mode 100644 Sming/Core/Data/Stream/IFS/FsBase.h
 create mode 100644 Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp
 create mode 100644 Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.h
 create mode 100644 Sming/Core/Data/Stream/IFS/JsonDirectoryTemplate.h
 create mode 100644 samples/Basic_IFS/.cproject
 create mode 100644 samples/Basic_IFS/.project
 create mode 100644 samples/Basic_IFS/Makefile
 create mode 100644 samples/Basic_IFS/README.rst
 create mode 100644 samples/Basic_IFS/app/application.cpp
 create mode 100644 samples/Basic_IFS/basic_ifs.hw
 create mode 100644 samples/Basic_IFS/component.mk
 create mode 100644 samples/Basic_IFS/files/.auth.json
 create mode 100644 samples/Basic_IFS/files/.network.json
 create mode 100644 samples/Basic_IFS/files/.time.json
 create mode 100644 samples/Basic_IFS/files/A Subdirectory/The name of this file is excessively long. Can't say I'd ever want to do this, but hey, why not.txt
 create mode 100644 samples/Basic_IFS/files/A Subdirectory/a/b/c/d/e/f/lonely.txt
 create mode 100644 samples/Basic_IFS/files/apple-touch-icon-180x180.png
 create mode 100644 samples/Basic_IFS/files/bootstrap.min.css
 create mode 100644 samples/Basic_IFS/files/error.html
 create mode 100644 samples/Basic_IFS/files/favicon.ico
 create mode 100644 samples/Basic_IFS/files/styles.css
 create mode 100644 samples/Basic_IFS/fsimage.ini
 create mode 100644 samples/Basic_IFS/resource/listing.html
 create mode 100644 samples/Basic_IFS/resource/listing.json
 create mode 100644 samples/Basic_IFS/resource/listing.txt

diff --git a/.gitmodules b/.gitmodules
index ad249f7315..9bb87d3574 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,6 +49,10 @@
 	path = Sming/Components/http-parser
 	url = https://github.com/nodejs/http-parser.git
 	ignore = dirty
+[submodule "IFS"]
+	path = Sming/Components/IFS
+	url = https://github.com/mikee47/IFS.git
+	ignore = dirty
 [submodule "libyuarel"]
 	path = Sming/Components/libyuarel
 	url = https://github.com/jacketizer/libyuarel.git
diff --git a/Sming/Arch/Esp8266/Components/gdbstub/gdbhostio.cpp b/Sming/Arch/Esp8266/Components/gdbstub/gdbhostio.cpp
index fc29b4a100..df984d9e4a 100644
--- a/Sming/Arch/Esp8266/Components/gdbstub/gdbhostio.cpp
+++ b/Sming/Arch/Esp8266/Components/gdbstub/gdbhostio.cpp
@@ -57,23 +57,23 @@ void ATTR_GDBEXTERNFN gdbHandleHostIo(char* commandBuffer, unsigned cmdLen)
 		filename[len] = '\0';
 		++data; // skip ,
 		unsigned flags = GdbPacket::readHexValue(data);
-		++data;						   // Skip ,
+		++data;										   // Skip ,
 		unsigned mode = GdbPacket::readHexValue(data); // Skip mode (not used)
 		(void)mode;
 
 		FileOpenFlags openFlags;
 		if((flags & 0xff) == O_RDWR) {
-			openFlags = eFO_ReadWrite;
+			openFlags = File::ReadWrite;
 		} else if((flags & 0xff) == O_WRONLY) {
-			openFlags = eFO_WriteOnly;
+			openFlags = File::WriteOnly;
 		} else {
-			openFlags = eFO_ReadOnly;
+			openFlags = File::ReadOnly;
 		}
 		if(flags & O_CREAT) {
-			openFlags = openFlags | eFO_CreateIfNotExist;
+			openFlags |= File::Create;
 		}
 		if(flags & O_TRUNC) {
-			openFlags = openFlags | eFO_Truncate;
+			openFlags |= File::Truncate;
 		}
 		int fd = fileOpen(filename, openFlags);
 
diff --git a/Sming/Arch/Host/Components/hostlib/include/hostlib/hostlib.h b/Sming/Arch/Host/Components/hostlib/include/hostlib/hostlib.h
index c2e52a10f5..b30b0cec12 100644
--- a/Sming/Arch/Host/Components/hostlib/include/hostlib/hostlib.h
+++ b/Sming/Arch/Host/Components/hostlib/include/hostlib/hostlib.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-// Required for sleep(), ftruncate(), probably others
+// Required for sleep(), probably others
 #undef _POSIX_C_SOURCE
 #define _POSIX_C_SOURCE 200112L
 
@@ -35,10 +35,6 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (int)(sizeof(x) / sizeof((x)[0]))
 #endif
diff --git a/Sming/Arch/Host/Components/hostlib/options.cpp b/Sming/Arch/Host/Components/hostlib/options.cpp
index b46908e07c..bc40b88e12 100644
--- a/Sming/Arch/Host/Components/hostlib/options.cpp
+++ b/Sming/Arch/Host/Components/hostlib/options.cpp
@@ -92,3 +92,8 @@ option_tag_t get_option(int argc, char* argv[], const char*& arg)
 	arg = optarg;
 	return option_tag_t(option_index);
 }
+
+int get_first_non_option()
+{
+	return optind;
+}
diff --git a/Sming/Arch/Host/Components/hostlib/options.h b/Sming/Arch/Host/Components/hostlib/options.h
index 85a31f75b8..f148b70847 100644
--- a/Sming/Arch/Host/Components/hostlib/options.h
+++ b/Sming/Arch/Host/Components/hostlib/options.h
@@ -58,4 +58,5 @@ enum option_tag_t {
 };
 
 option_tag_t get_option(int argc, char* argv[], const char*& arg);
+int get_first_non_option();
 void print_help();
diff --git a/Sming/Arch/Host/Components/hostlib/startup.cpp b/Sming/Arch/Host/Components/hostlib/startup.cpp
index e9f95c91b2..dc918e8fd8 100644
--- a/Sming/Arch/Host/Components/hostlib/startup.cpp
+++ b/Sming/Arch/Host/Components/hostlib/startup.cpp
@@ -201,7 +201,8 @@ int main(int argc, char* argv[])
 		}
 	}
 
-	commandLine.parse(argc - optind, &argv[optind]);
+	auto i = get_first_non_option();
+	commandLine.parse(argc - i, &argv[i]);
 
 	if(!host_flashmem_init(config.flash)) {
 		return 1;
diff --git a/Sming/Arch/Host/Components/spi_flash/flashmem.cpp b/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
index 8489fe1ac5..d1d645c78a 100644
--- a/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
+++ b/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
@@ -21,17 +21,21 @@
 #include "flashmem.h"
 #include <string.h>
 #include <esp_spi_flash.h>
+#include <IFS/Host/FileSystem.h>
 
-static int flashFile = -1;
-static size_t flashFileSize = 0x400000U;
-static char flashFileName[256];
-static const char defaultFlashFileName[] = "flash.bin";
+namespace
+{
+IFS::Host::FileSystem fileSys;
+IFS::File::Handle flashFile{-1};
+size_t flashFileSize{0x400000U};
+char flashFileName[256];
+const char defaultFlashFileName[]{"flash.bin"};
 
 // Top bit of flash address is set to indicate it's actually program memory
-static constexpr uint32_t FLASHMEM_REAL_BIT = 0x80000000U;
-static constexpr uint32_t FLASHMEM_REAL_MASK = ~FLASHMEM_REAL_BIT;
+constexpr uint32_t FLASHMEM_REAL_BIT{0x80000000U};
+constexpr uint32_t FLASHMEM_REAL_MASK{~FLASHMEM_REAL_BIT};
 
-#define SPI_FLASH_SEC_SIZE 4096
+} // namespace
 
 #define CHECK_ALIGNMENT(_x) assert(((uint32_t)(_x)&0x00000003) == 0)
 
@@ -55,26 +59,26 @@ bool host_flashmem_init(FlashmemConfig& config)
 		config.filename = flashFileName;
 	}
 
-	flashFile = open(flashFileName, O_CREAT | O_RDWR | O_BINARY, 0644);
+	flashFile = fileSys.open(flashFileName, IFS::File::Create | IFS::File::ReadWrite);
 	if(flashFile < 0) {
 		hostmsg("Error opening \"%s\"", flashFileName);
 		return false;
 	}
 
-	int res = lseek(flashFile, 0, SEEK_END);
+	int res = fileSys.lseek(flashFile, 0, SeekOrigin::End);
 	if(res < 0) {
-		hostmsg("Error seeking \"%s\"", flashFileName);
-		close(flashFile);
+		hostmsg("Error seeking \"%s\": %s", flashFileName, fileSys.getErrorString(res).c_str());
+		fileSys.close(flashFile);
 		flashFile = -1;
 		return false;
 	}
 
 	if(res == 0) {
 		size_t size = config.createSize ?: flashFileSize;
-		res = lseek(flashFile, size, SEEK_SET);
+		res = fileSys.lseek(flashFile, size, SeekOrigin::Start);
 		if(res != int(size)) {
 			hostmsg("Error seeking beyond end of file \"%s\"", flashFileName);
-		} else if(ftruncate(flashFile, size) < 0) {
+		} else if(fileSys.truncate(flashFile, size) < 0) {
 			hostmsg("Error truncating \"%s\" to %u bytes", flashFileName, size);
 		} else {
 			hostmsg("Created blank \"%s\", %u bytes", flashFileName, size);
@@ -91,7 +95,7 @@ bool host_flashmem_init(FlashmemConfig& config)
 
 void host_flashmem_cleanup()
 {
-	close(flashFile);
+	fileSys.close(flashFile);
 	flashFile = -1;
 	hostmsg("Closed \"%s\"", flashFileName);
 }
@@ -101,8 +105,14 @@ static int readFlashFile(uint32_t offset, void* buffer, size_t count)
 	if(flashFile < 0) {
 		return -1;
 	}
-	int res = lseek(flashFile, offset, SEEK_SET);
-	return (res < 0) ? res : read(flashFile, buffer, count);
+	int res = fileSys.lseek(flashFile, offset, SeekOrigin::Start);
+	if(res >= 0) {
+		res = fileSys.read(flashFile, buffer, count);
+	}
+	if(res < 0) {
+		debug_w("readFlashFile(0x%08x, %u) failed: %s", offset, count, fileSys.getErrorString(res).c_str());
+	}
+	return res;
 }
 
 static int writeFlashFile(uint32_t offset, const void* data, size_t count)
@@ -110,8 +120,14 @@ static int writeFlashFile(uint32_t offset, const void* data, size_t count)
 	if(flashFile < 0) {
 		return -1;
 	}
-	int res = lseek(flashFile, offset, SEEK_SET);
-	return (res < 0) ? res : write(flashFile, data, count);
+	int res = fileSys.lseek(flashFile, offset, SeekOrigin::Start);
+	if(res >= 0) {
+		res = fileSys.write(flashFile, data, count);
+	}
+	if(res < 0) {
+		debug_w("writeFlashFile(0x%08x, %u) failed: %s", offset, count, fileSys.getErrorString(res).c_str());
+	}
+	return res;
 }
 
 SPIFlashInfo flashmem_get_info()
diff --git a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp
index 3f1eb40952..a467733794 100644
--- a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp
+++ b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp
@@ -4,174 +4,18 @@
  * http://github.com/SmingHub/Sming
  * All files of the Sming Core are provided under the LGPL v3 license.
  *
- * HostFileStream.h
+ * HostFileStream.cpp
  *
  ****/
 
-// Required for ftruncate()
-#define _POSIX_C_SOURCE 200112L
-
 #include "HostFileStream.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <BitManipulations.h>
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-#define CHECK(res) check(res, __FUNCTION__)
-
-static int mapFlags(FileOpenFlags flags)
-{
-	int f = 0;
-	if(flags & eFO_Append) {
-		f |= O_APPEND;
-	}
-	if(flags & eFO_CreateIfNotExist) {
-		f |= O_CREAT;
-	}
-	if(flags & eFO_ReadOnly) {
-		f |= O_RDONLY;
-	}
-	if(flags & eFO_Truncate) {
-		f |= O_TRUNC;
-	}
-	if(flags & eFO_WriteOnly) {
-		f |= O_WRONLY;
-	}
-	return f;
-}
-
-bool HostFileStream::check(int res, const char* func)
-{
-	if(res >= 0) {
-		return true;
-	}
-
-	lastError = errno;
-
-	debug_e("check(%s) = %d", func, lastError);
-
-	return false;
-}
-
-bool HostFileStream::open(const String& fileName, FileOpenFlags openFlags)
-{
-	close();
-
-	handle = ::open(fileName.c_str(), O_BINARY | mapFlags(openFlags), 0644);
-	if(!CHECK(handle)) {
-		debug_e("Failed to open '%s'", fileName.c_str());
-		return false;
-	}
-
-	int len = ::lseek(handle, 0, SEEK_END);
-	if(len < 0) {
-		len = 0;
-	} else if(openFlags & eFO_Append) {
-		pos = len;
-	} else {
-		::lseek(handle, 0, SEEK_SET);
-	}
-	size = len;
-
-	debug_i("Opened file '%s', %u bytes", fileName.c_str(), size);
-	filename = fileName;
-	return true;
-}
-
-void HostFileStream::close()
-{
-	if(!isValid()) {
-		return;
-	}
-
-	::close(handle);
-	handle = -1;
-	size = 0;
-	pos = 0;
-	filename = nullptr;
-	lastError = 0;
-}
-
-size_t HostFileStream::write(const uint8_t* buffer, size_t size)
-{
-	if(!isValid()) {
-		return 0;
-	}
-
-	::lseek(handle, 0, SEEK_END);
-
-	int res = ::write(handle, buffer, size);
-	if(!CHECK(res)) {
-		return 0;
-	}
-	pos += res;
-	if(pos > this->size) {
-		this->size = pos;
-	}
-	return res;
-}
-
-uint16_t HostFileStream::readMemoryBlock(char* data, int bufSize)
-{
-	if(!isValid()) {
-		return 0;
-	}
-
-	int res = ::lseek(handle, pos, SEEK_SET);
-	if(!CHECK(res)) {
-		return 0;
-	}
-
-	res = ::read(handle, data, bufSize);
-	if(!CHECK(res)) {
-		return 0;
-	}
-
-	return res;
-}
-
-int HostFileStream::seekFrom(int offset, SeekOrigin origin)
-{
-	if(!isValid()) {
-		return -1;
-	}
-
-	if(origin == SeekOrigin::Current) {
-		origin = SeekOrigin::Start;
-		offset += pos;
-	}
-	int newPos = ::lseek(handle, offset, int(origin));
-	if(!CHECK(newPos)) {
-		return -1;
-	}
-
-	pos = newPos;
-	if(newPos > int(size)) {
-		size = newPos;
-	}
-
-	return true;
-}
+#include <IFS/Host/FileSystem.h>
 
-bool HostFileStream::isFinished()
+namespace
 {
-	return pos == size;
+IFS::Host::FileSystem hostFileSystem;
 }
 
-bool HostFileStream::truncate(size_t newSize)
+HostFileStream::HostFileStream() : IFS::FileStream(&hostFileSystem)
 {
-	if(!isValid()) {
-		return false;
-	}
-	if(::ftruncate(handle, newSize) < 0) {
-		return false;
-	}
-	size = newSize;
-	if(pos > newSize) {
-		pos = newSize;
-	}
-	return true;
 }
diff --git a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.h b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.h
index 8532cc05ed..0332203d5c 100644
--- a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.h
+++ b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.h
@@ -10,127 +10,19 @@
 
 #pragma once
 
-#include <Data/Stream/ReadWriteStream.h>
-#include <FileSystem.h>
+#include <Data/Stream/IFS/FileStream.h>
 
 /**
   * @brief      Host File stream class
   * @ingroup    stream data
-  *
-  *  @{
  */
-
-class HostFileStream : public ReadWriteStream
+class HostFileStream : public IFS::FileStream
 {
 public:
-	HostFileStream()
-	{
-	}
+	HostFileStream();
 
-	/** @brief  Create a file stream
-     *  @param  fileName Name of file to open
-     *  @param	openFlags
-     */
-	HostFileStream(const String& fileName, FileOpenFlags openFlags = eFO_ReadOnly)
+	HostFileStream(const String& fileName, IFS::File::OpenFlags openFlags = IFS::File::ReadOnly) : HostFileStream()
 	{
 		open(fileName, openFlags);
 	}
-
-	~HostFileStream()
-	{
-		close();
-	}
-
-	/** @brief Open a file and attach this stream object to it
-	 *  @param fileName
-	 *  @param openFlags
-	 *  @retval bool true on success, false on error
-	 *  @note call getLastError() to determine cause of failure
-	 */
-	bool open(const String& fileName, FileOpenFlags openFlags = eFO_ReadOnly);
-
-	/** @brief Close file
-	 */
-	void close();
-
-	StreamType getStreamType() const override
-	{
-		return eSST_File;
-	}
-
-	size_t write(const uint8_t* buffer, size_t size) override;
-
-	uint16_t readMemoryBlock(char* data, int bufSize) override;
-
-	int seekFrom(int offset, SeekOrigin origin) override;
-
-	bool isFinished() override;
-
-	String getName() const override
-	{
-		return filename;
-	}
-
-	bool isValid() const override
-	{
-		return handle >= 0;
-	}
-
-	/** @brief  Get the offset of cursor from beginning of data
-     *  @retval size_t Cursor offset
-     */
-	size_t getPos() const
-	{
-		return pos;
-	}
-
-	/** @brief  Get the total file size
-     *  @retval size_t File size
-     */
-	size_t getSize() const
-	{
-		return size;
-	}
-
-	/**	@brief Return the maximum bytes available to read, from current position
-	 * 	@retval int -1 is returned when the size cannot be determined
-	 */
-	int available() override
-	{
-		return size - pos;
-	}
-
-	/** @brief determine if an error occurred during operation
-	 *  @retval int filesystem error code
-	 */
-	int getLastError()
-	{
-		return lastError;
-	}
-
-	/** @brief Reduce the file size
-	 *  @param newSize
-	 *  @retval bool true on success
-	 */
-	bool truncate(size_t newSize);
-
-	/** @brief Truncate file at current position
-	 *  @retval bool true on success
-	 */
-	bool truncate()
-	{
-		return truncate(pos);
-	}
-
-private:
-	bool check(int res, const char* func);
-
-private:
-	int handle = -1;
-	String filename;
-	size_t pos = 0;
-	size_t size = 0;
-	int lastError = 0;
 };
-
-/** @} */
diff --git a/Sming/Arch/Host/Tools/ci/build.run.cmd b/Sming/Arch/Host/Tools/ci/build.run.cmd
index 735cc871f0..55174dc850 100644
--- a/Sming/Arch/Host/Tools/ci/build.run.cmd
+++ b/Sming/Arch/Host/Tools/ci/build.run.cmd
@@ -1,7 +1,7 @@
 REM Host build.run.cmd
 
 REM Build a couple of basic applications
-%MAKE_PARALLEL% Basic_Serial Basic_ProgMem STRICT=1 V=1 || goto :error
+%MAKE_PARALLEL% Basic_Serial Basic_ProgMem Basic_IFS STRICT=1 V=1 || goto :error
 
 REM Run basic tests
 %MAKE_PARALLEL% tests || goto :error
diff --git a/Sming/Components/IFS b/Sming/Components/IFS
new file mode 160000
index 0000000000..ac268fb17a
--- /dev/null
+++ b/Sming/Components/IFS
@@ -0,0 +1 @@
+Subproject commit ac268fb17a562a6b94fb16df64d43639a3e5aefe
diff --git a/Sming/Components/Storage/Tools/hwconfig/partition.py b/Sming/Components/Storage/Tools/hwconfig/partition.py
index 018167d60a..fcd6d67d5b 100644
--- a/Sming/Components/Storage/Tools/hwconfig/partition.py
+++ b/Sming/Components/Storage/Tools/hwconfig/partition.py
@@ -87,6 +87,7 @@
         "esphttpd": 0x80,
         "fat": 0x81,
         "spiffs": 0x82,
+        "fwfs": 0xf1,
     },
     STORAGE_TYPE: storage.TYPES
 }
diff --git a/Sming/Components/Storage/src/include/Storage/Partition.h b/Sming/Components/Storage/src/include/Storage/Partition.h
index 5428e1e2a7..6affd80cba 100644
--- a/Sming/Components/Storage/src/include/Storage/Partition.h
+++ b/Sming/Components/Storage/src/include/Storage/Partition.h
@@ -61,7 +61,8 @@
 	XX(sysParam, 0x40, "System Parameters")                                                                            \
 	XX(espHttpd, 0x80, "ESPHTTPD")                                                                                     \
 	XX(fat, 0x81, "FAT")                                                                                               \
-	XX(spiffs, 0x82, "SPIFFS")
+	XX(spiffs, 0x82, "SPIFFS")                                                                                         \
+	XX(fwfs, 0xF1, "FWFS")
 
 namespace Storage
 {
diff --git a/Sming/Components/spiffs/spiffs_config.h b/Sming/Components/spiffs/spiffs_config.h
index 1cd0560bcc..502ecc0e64 100644
--- a/Sming/Components/spiffs/spiffs_config.h
+++ b/Sming/Components/spiffs/spiffs_config.h
@@ -117,7 +117,7 @@
 // logical_page_size - (SPIFFS_OBJ_NAME_LEN + sizeof(spiffs_page_header) +
 // spiffs_object_ix_header fields + at least some LUT entries)
 #ifndef SPIFFS_OBJ_META_LEN
-#define SPIFFS_OBJ_META_LEN             (0)
+#define SPIFFS_OBJ_META_LEN             (16)
 #endif
 
 // Size of buffer allocated on stack used when copying data.
diff --git a/Sming/Components/spiffs/spiffs_sming.cpp b/Sming/Components/spiffs/spiffs_sming.cpp
index b138e3517e..10e99448ed 100644
--- a/Sming/Components/spiffs/spiffs_sming.cpp
+++ b/Sming/Components/spiffs/spiffs_sming.cpp
@@ -9,122 +9,12 @@
  ****/
 
 #include "spiffs_sming.h"
-#include <esp_spi_flash.h>
+#include <IFS/SPIFFS/FileSystem.h>
+#include <FileSystem.h>
 #include <Storage.h>
-extern "C" {
-#include "spiffs/src/spiffs_nucleus.h"
-}
-
-#define LOG_PAGE_SIZE 256
-
-spiffs _filesystemStorageHandle;
-
-#ifndef SPIFF_FILEDESC_COUNT
-#define SPIFF_FILEDESC_COUNT 7
-#endif
 
 namespace
 {
-uint16_t spiffs_work_buf[LOG_PAGE_SIZE];
-spiffs_fd spiffs_fds[SPIFF_FILEDESC_COUNT];
-uint32_t spiffs_cache_buf[LOG_PAGE_SIZE + 32];
-
-#define GET_DEVICE()                                                                                                   \
-	if(fs == nullptr || fs->user_data == nullptr) {                                                                    \
-		debug_e("[SPIFFS] NO DEVICE");                                                                                 \
-		return 0;                                                                                                      \
-	}                                                                                                                  \
-	auto device = static_cast<Storage::Device*>(fs->user_data);
-
-s32_t api_spiffs_read(struct spiffs_t* fs, u32_t addr, u32_t size, u8_t* dst)
-{
-	GET_DEVICE();
-	return device->read(addr, dst, size) ? SPIFFS_OK : SPIFFS_ERR_INTERNAL;
-}
-
-s32_t api_spiffs_write(struct spiffs_t* fs, u32_t addr, u32_t size, u8_t* src)
-{
-	//debugf("api_spiffs_write");
-	GET_DEVICE();
-	return device->write(addr, src, size) ? SPIFFS_OK : SPIFFS_ERR_INTERNAL;
-}
-
-s32_t api_spiffs_erase(struct spiffs_t* fs, u32_t addr, u32_t size)
-{
-	debugf("api_spiffs_erase(0x%08x, 0x%08x)", addr, size);
-	GET_DEVICE();
-	return device->erase_range(addr, size) ? SPIFFS_OK : SPIFFS_ERR_INTERNAL;
-}
-
-spiffs_config initConfig(Storage::Partition& partition)
-{
-	_filesystemStorageHandle.user_data = partition.getDevice();
-	return spiffs_config{
-		.hal_read_f = api_spiffs_read,
-		.hal_write_f = api_spiffs_write,
-		.hal_erase_f = api_spiffs_erase,
-		.phys_size = partition.size(),
-		.phys_addr = partition.address(),
-		.phys_erase_block = INTERNAL_FLASH_SECTOR_SIZE,
-		.log_block_size = INTERNAL_FLASH_SECTOR_SIZE * 2,
-		.log_page_size = LOG_PAGE_SIZE,
-	};
-}
-
-bool tryMount(Storage::Partition& partition)
-{
-	auto cfg = initConfig(partition);
-	int res = SPIFFS_mount(&_filesystemStorageHandle, const_cast<spiffs_config*>(&cfg),
-						   reinterpret_cast<uint8_t*>(spiffs_work_buf), reinterpret_cast<uint8_t*>(spiffs_fds),
-						   sizeof(spiffs_fds), spiffs_cache_buf, sizeof(spiffs_cache_buf), nullptr);
-	debugf("mount res: %d", res);
-
-	return res >= 0;
-}
-
-bool spiffs_format_internal(Storage::Partition& partition)
-{
-	spiffs_unmount();
-	if(tryMount(partition)) {
-		spiffs_unmount();
-	}
-
-	int res = SPIFFS_format(&_filesystemStorageHandle);
-	return res >= 0;
-}
-
-bool spiffs_mount_internal(Storage::Partition& partition)
-{
-	auto cfg = initConfig(partition);
-	debugf("fs.start: size:%u Kb, offset:0x%X\n", cfg.phys_size / 1024U, cfg.phys_addr);
-
-	// Simple check of the erase count to see if flash looks like it's already been formatted
-	spiffs_obj_id dat{UINT16_MAX};
-	partition.read(cfg.log_page_size - sizeof(spiffs_obj_id), &dat, sizeof(dat));
-	//debugf("%X", dat);
-	bool isFormatted = (dat != UINT16_MAX);
-
-	if(!isFormatted) {
-		debugf("First init file system");
-		spiffs_format_internal(partition);
-	}
-
-	if(!tryMount(partition)) {
-		return false;
-	}
-
-	if(!isFormatted) {
-		spiffs_file fd = SPIFFS_open(&_filesystemStorageHandle, _F("initialize_fs_header.dat"),
-									 SPIFFS_CREAT | SPIFFS_TRUNC | SPIFFS_RDWR, 0);
-		uint8_t c{1};
-		SPIFFS_write(&_filesystemStorageHandle, fd, &c, 1);
-		SPIFFS_fremove(&_filesystemStorageHandle, fd);
-		SPIFFS_close(&_filesystemStorageHandle, fd);
-	}
-
-	return true;
-}
-
 Storage::Partition findDefaultPartition()
 {
 	auto it = Storage::findPartition(Storage::Partition::SubType::Data::spiffs);
@@ -136,43 +26,52 @@ Storage::Partition findDefaultPartition()
 
 } // namespace
 
-bool spiffs_mount()
-{
-	auto part = findDefaultPartition();
-	return part ? spiffs_mount_internal(part) : false;
-}
-
 bool spiffs_mount(Storage::Partition partition)
 {
-	if(!partition.verify(Storage::Partition::SubType::Data::spiffs)) {
+	auto fs = new IFS::SPIFFS::FileSystem(partition);
+	int err = fs->mount();
+	if(err < 0) {
+		debug_e("SPIFFS mount failed: %s", fs->getErrorString(err).c_str());
+		delete fs;
 		return false;
 	}
 
-	return spiffs_mount_internal(partition);
+	fileSetFileSystem(fs);
+	return true;
+}
+
+bool spiffs_mount()
+{
+	auto part = findDefaultPartition();
+	return part ? spiffs_mount(part) : false;
 }
 
 void spiffs_unmount()
 {
-	SPIFFS_unmount(&_filesystemStorageHandle);
+	if(fileSystemType() == IFS::IFileSystem::Type::SPIFFS) {
+		fileFreeFileSystem();
+	}
 }
 
 bool spiffs_format()
 {
-	auto part = findDefaultPartition();
-	if(!part) {
+	if(fileSystemType() != IFS::IFileSystem::Type::SPIFFS) {
 		return false;
 	}
-
-	spiffs_format_internal(part);
-	return spiffs_mount_internal(part);
+	return fileSystemFormat() == FS_OK;
 }
 
 bool spiffs_format(Storage::Partition& partition)
 {
-	if(!partition.verify(Storage::Partition::SubType::Data::spiffs)) {
+	spiffs_unmount();
+	auto fs = new IFS::SPIFFS::FileSystem(partition);
+	int err = fs->format();
+	if(err < 0) {
+		debug_e("SPIFFS format failed: %s", fs->getErrorString(err).c_str());
+		delete fs;
 		return false;
 	}
 
-	spiffs_format_internal(partition);
-	return spiffs_mount_internal(partition);
+	fileSetFileSystem(fs);
+	return true;
 }
diff --git a/Sming/Components/spiffs/spiffs_sming.h b/Sming/Components/spiffs/spiffs_sming.h
index 3b969a7d91..566bd91287 100644
--- a/Sming/Components/spiffs/spiffs_sming.h
+++ b/Sming/Components/spiffs/spiffs_sming.h
@@ -9,7 +9,7 @@
  ****/
 #pragma once
 
-#include "spiffs.h"
+#include <spiffs.h>
 #include <Storage/Partition.h>
 
 /**
@@ -44,8 +44,3 @@ bool spiffs_format();
  * @retval bool true on success
  */
 bool spiffs_format(Storage::Partition& partition);
-
-/**
- * @brief Global SPIFFS instance used by FileSystem API
- */
-extern spiffs _filesystemStorageHandle;
diff --git a/Sming/Core/Data/Stream/Directory.h b/Sming/Core/Data/Stream/Directory.h
new file mode 100644
index 0000000000..e1c203d876
--- /dev/null
+++ b/Sming/Core/Data/Stream/Directory.h
@@ -0,0 +1,28 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/anakod/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Directory.h
+ *
+ * @author mikee47 <mike@sillyhouse.net> May 2019
+ *
+ ****/
+
+#pragma once
+
+#include "IFS/Directory.h"
+#include <FileSystem.h>
+
+/**
+  * @brief      Directory stream class
+  * @ingroup    stream data
+ */
+class Directory : public IFS::Directory
+{
+public:
+	Directory() : IFS::Directory(::getFileSystem())
+	{
+	}
+};
diff --git a/Sming/Core/Data/Stream/FileStream.cpp b/Sming/Core/Data/Stream/FileStream.cpp
deleted file mode 100644
index 8837e4bb6a..0000000000
--- a/Sming/Core/Data/Stream/FileStream.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/****
- * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
- * Created 2015 by Skurydin Alexey
- * http://github.com/SmingHub/Sming
- * All files of the Sming Core are provided under the LGPL v3 license.
- *
- * FileStream.cpp
- *
- ****/
-
-#include "FileStream.h"
-
-/* FileStream */
-
-void FileStream::attach(file_t file, size_t size)
-{
-	close();
-	if(file >= 0) {
-		handle = file;
-		this->size = size;
-		fileSeek(handle, 0, SeekOrigin::Start);
-		pos = 0;
-		debug_d("attached file: '%s' (%u bytes) #0x%08X", fileName().c_str(), size, this);
-	}
-}
-
-bool FileStream::open(const String& fileName, FileOpenFlags openFlags)
-{
-	lastError = SPIFFS_OK;
-
-	file_t file = fileOpen(fileName, openFlags);
-	if(!check(file)) {
-		debug_w("File wasn't found: %s", fileName.c_str());
-		return false;
-	}
-
-	// Get size
-	int size = fileSeek(file, 0, SeekOrigin::End);
-	if(check(size)) {
-		attach(file, size);
-		return true;
-	}
-
-	fileClose(file);
-	return false;
-}
-
-void FileStream::close()
-{
-	if(handle >= 0) {
-		fileClose(handle);
-		handle = -1;
-	}
-	size = 0;
-	pos = 0;
-	lastError = SPIFFS_OK;
-}
-
-size_t FileStream::readBytes(char* buffer, size_t length)
-{
-	if(buffer == nullptr || length == 0 || pos >= size) {
-		return 0;
-	}
-
-	int available = fileRead(handle, buffer, std::min(size - pos, length));
-	if(!check(available)) {
-		return 0;
-	}
-
-	pos += size_t(available);
-
-	return available;
-}
-
-uint16_t FileStream::readMemoryBlock(char* data, int bufSize)
-{
-	assert(bufSize >= 0);
-	size_t startPos = pos;
-	size_t count = readBytes(data, bufSize);
-
-	// Move cursor back to start position
-	(void)fileSeek(handle, startPos, SeekOrigin::Start);
-
-	return count;
-}
-
-size_t FileStream::write(const uint8_t* buffer, size_t size)
-{
-	if(!fileExist()) {
-		return 0;
-	}
-
-	if(pos != this->size) {
-		int writePos = fileSeek(handle, 0, SeekOrigin::End);
-		if(!check(writePos)) {
-			return 0;
-		}
-
-		pos = size_t(writePos);
-	}
-
-	int written = fileWrite(handle, buffer, size);
-	if(check(written)) {
-		pos += size_t(written);
-		this->size = pos;
-	}
-
-	return written > 0 ? written : 0;
-}
-
-int FileStream::seekFrom(int offset, SeekOrigin origin)
-{
-	// Cannot rely on return value from fileSeek - failure does not mean position hasn't changed
-	fileSeek(handle, offset, origin);
-	int newpos = fileTell(handle);
-	if(check(newpos)) {
-		pos = size_t(newpos);
-		if(pos > size) {
-			size = pos;
-		}
-	}
-	return newpos;
-}
-
-String FileStream::fileName() const
-{
-	spiffs_stat stat;
-	fileStats(handle, &stat);
-	return String(reinterpret_cast<const char*>(stat.name));
-}
-
-String FileStream::id() const
-{
-	spiffs_stat stat;
-	fileStats(handle, &stat);
-
-#define ETAG_SIZE 16
-	char buf[ETAG_SIZE];
-	m_snprintf(buf, ETAG_SIZE, _F("00f-%x-%x0-%x"), stat.obj_id, stat.size,
-			   strlen(reinterpret_cast<const char*>(stat.name)));
-
-	return String(buf);
-}
-
-bool FileStream::truncate(size_t newSize)
-{
-	bool res = check(fileTruncate(handle, newSize));
-	if(res) {
-		size = newSize;
-		if(pos > size) {
-			pos = size;
-		}
-	}
-	return res;
-}
diff --git a/Sming/Core/Data/Stream/FileStream.h b/Sming/Core/Data/Stream/FileStream.h
index d5b0b01037..d391a2aa42 100644
--- a/Sming/Core/Data/Stream/FileStream.h
+++ b/Sming/Core/Data/Stream/FileStream.h
@@ -10,17 +10,17 @@
 
 #pragma once
 
-#include "ReadWriteStream.h"
-#include "FileSystem.h"
+#include "IFS/FileStream.h"
+#include <FileSystem.h>
 
 /**
  * @brief    File stream class
  * @ingroup  stream data
  */
-class FileStream : public ReadWriteStream
+class FileStream : public IFS::FileStream
 {
 public:
-	FileStream()
+	FileStream() : IFS::FileStream(::getFileSystem())
 	{
 	}
 
@@ -28,155 +28,21 @@ class FileStream : public ReadWriteStream
      *  @param  fileName Name of file to open
      *  @param	openFlags
      */
-	FileStream(const String& fileName, FileOpenFlags openFlags = eFO_ReadOnly)
+	FileStream(const String& fileName, FileOpenFlags openFlags = File::ReadOnly) : FileStream()
 	{
 		open(fileName, openFlags);
 	}
 
-	~FileStream()
+	FileStream(const FileStat& stat, FileOpenFlags openFlags = File::ReadOnly) : FileStream()
 	{
-		close();
+		open(stat, openFlags);
 	}
 
-	/** @brief Attach this stream object to an open file handle
-	 *  @param file
-	 *  @param size
-	 */
-	void attach(file_t file, size_t size);
+	using IFS::FileStream::attach;
 
 	/** @deprecated Use `open()` instead */
-	bool attach(const String& fileName, FileOpenFlags openFlags = eFO_ReadOnly) SMING_DEPRECATED
+	bool attach(const String& fileName, FileOpenFlags openFlags = File::ReadOnly) SMING_DEPRECATED
 	{
 		return open(fileName, openFlags);
 	}
-
-	/** @brief Open a file and attach this stream object to it
-	 *  @param fileName
-	 *  @param openFlags
-	 *  @retval bool true on success, false on error
-	 *  @note call getLastError() to determine cause of failure
-	 */
-	bool open(const String& fileName, FileOpenFlags openFlags = eFO_ReadOnly);
-
-	/** @brief Close file
-	 */
-	void close();
-
-	StreamType getStreamType() const override
-	{
-		return eSST_File;
-	}
-
-	size_t write(const uint8_t* buffer, size_t size) override;
-
-	int read() override
-	{
-		char c;
-		return readBytes(&c, 1) ? static_cast<unsigned char>(c) : -1;
-	}
-
-	size_t readBytes(char* buffer, size_t length) override;
-
-	uint16_t readMemoryBlock(char* data, int bufSize) override;
-
-	int seekFrom(int offset, SeekOrigin origin) override;
-
-	bool isFinished() override
-	{
-		return fileIsEOF(handle);
-	}
-
-	/** @brief Filename of file stream is attached to
-	 *  @retval String invalid if stream isn't open
-	 */
-	String fileName() const;
-
-	/** @brief Determine if file exists
-	 *  @retval bool true if stream contains valid file
-	 */
-	bool fileExist() const
-	{
-		return handle >= 0;
-	}
-
-	String getName() const override
-	{
-		return fileName();
-	}
-
-	bool isValid() const override
-	{
-		return fileExist();
-	}
-
-	/** @brief  Get the offset of cursor from beginning of data
-     *  @retval size_t Cursor offset
-     */
-	size_t getPos() const
-	{
-		return pos;
-	}
-
-	/** @brief  Get the total file size
-     *  @retval size_t File size
-     */
-	size_t getSize() const
-	{
-		return size;
-	}
-
-	/**	@brief Return the maximum bytes available to read, from current position
-	 * 	@retval int -1 is returned when the size cannot be determined
-	 */
-	int available() override
-	{
-		return size - pos;
-	}
-
-	String id() const override;
-
-	/** @brief determine if an error occurred during operation
-	 *  @retval int filesystem error code
-	 */
-	int getLastError()
-	{
-		return lastError;
-	}
-
-	/** @brief Reduce the file size
-	 *  @param newSize
-	 *  @retval bool true on success
-	 */
-	bool truncate(size_t newSize);
-
-	/** @brief Truncate file at current position
-	 *  @retval bool true on success
-	 */
-	bool truncate()
-	{
-		return truncate(pos);
-	}
-
-private:
-	/** @brief Check file operation result and note error code
-	 *  @param res result of fileXXX() operation to check
-	 *  @retval bool true if operation was successful, false if error occurred
-	 */
-	bool check(int res)
-	{
-		if(res >= 0) {
-			return true;
-		}
-
-		if(lastError >= 0) {
-			lastError = res;
-		}
-		return false;
-	}
-
-private:
-	file_t handle = -1;
-	size_t pos = 0;
-	size_t size = 0;
-	int lastError = SPIFFS_OK;
 };
diff --git a/Sming/Core/Data/Stream/GdbFileStream.cpp b/Sming/Core/Data/Stream/GdbFileStream.cpp
deleted file mode 100644
index ae7d03c967..0000000000
--- a/Sming/Core/Data/Stream/GdbFileStream.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/****
- * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
- * Created 2015 by Skurydin Alexey
- * http://github.com/SmingHub/Sming
- * All files of the Sming Core are provided under the LGPL v3 license.
- *
- * GdbFileStream.cpp
- *
- ****/
-
-#include "GdbFileStream.h"
-#include <gdb/gdb_syscall.h>
-
-bool GdbFileStream::open(const String& fileName, FileOpenFlags openFlags)
-{
-	lastError = 0;
-
-	int flags = 0;
-	if((openFlags & eFO_ReadWrite) == eFO_ReadWrite) {
-		flags = O_RDWR;
-	} else if(openFlags & eFO_WriteOnly) {
-		flags = O_WRONLY;
-	} else {
-		flags = O_RDONLY;
-	}
-	if(openFlags & eFO_CreateIfNotExist) {
-		flags |= O_CREAT;
-	}
-	if(openFlags & eFO_Truncate) {
-		flags |= O_TRUNC;
-	}
-
-	int fd = gdb_syscall_open(fileName.c_str(), flags, S_IRWXU);
-	if(!check(fd)) {
-		debug_w("File wasn't found: %s", fileName.c_str());
-		return false;
-	}
-
-	// Get size
-	int size = gdb_syscall_lseek(fd, 0, SEEK_END);
-	if(check(size)) {
-		close();
-		if(fd >= 0) {
-			handle = fd;
-			this->size = size;
-			gdb_syscall_lseek(fd, 0, SEEK_SET);
-			pos = 0;
-			debug_d("opened file: '%s' (%u bytes) #0x%08X", fileName.c_str(), size, this);
-		}
-		return true;
-	}
-
-	gdb_syscall_close(fd);
-	return false;
-}
-
-void GdbFileStream::close()
-{
-	if(handle >= 0) {
-		gdb_syscall_close(handle);
-		handle = -1;
-	}
-	size = 0;
-	pos = 0;
-	lastError = 0;
-}
-
-uint16_t GdbFileStream::readMemoryBlock(char* data, int bufSize)
-{
-	if(data == nullptr || bufSize <= 0 || pos >= size) {
-		return 0;
-	}
-
-	int available = gdb_syscall_read(handle, data, std::min(size - pos, size_t(bufSize)));
-	(void)check(available);
-
-	// Don't move cursor now (waiting seek)
-	(void)gdb_syscall_lseek(handle, pos, SEEK_SET);
-
-	return available > 0 ? available : 0;
-}
-
-size_t GdbFileStream::write(const uint8_t* buffer, size_t size)
-{
-	if(!fileExist()) {
-		return 0;
-	}
-
-	int writePos = gdb_syscall_lseek(handle, 0, SEEK_END);
-	if(!check(writePos)) {
-		return 0;
-	}
-
-	pos = size_t(writePos);
-
-	int written = gdb_syscall_write(handle, buffer, size);
-	if(check(written)) {
-		pos += size_t(written);
-		if(pos > this->size) {
-			this->size = pos;
-		}
-	}
-
-	return written;
-}
-
-int GdbFileStream::seekFrom(int offset, SeekOrigin origin)
-{
-	int newpos = gdb_syscall_lseek(handle, offset, int(origin));
-	if(check(newpos)) {
-		pos = size_t(newpos);
-		if(pos > size) {
-			size = pos;
-		}
-	}
-
-	return newpos;
-}
-
-String GdbFileStream::id() const
-{
-	gdb_stat_t stat;
-	gdb_syscall_fstat(handle, &stat);
-
-#define ETAG_SIZE 16
-	char buf[ETAG_SIZE];
-	m_snprintf(buf, ETAG_SIZE, _F("00f-%x-%x0-%x"), stat.st_ino, stat.st_size, fileName.length());
-
-	return String(buf);
-}
diff --git a/Sming/Core/Data/Stream/GdbFileStream.h b/Sming/Core/Data/Stream/GdbFileStream.h
index fbc47e2b3e..e7f564a41b 100644
--- a/Sming/Core/Data/Stream/GdbFileStream.h
+++ b/Sming/Core/Data/Stream/GdbFileStream.h
@@ -10,130 +10,20 @@
 
 #pragma once
 
-#include "ReadWriteStream.h"
-#include "FileSystem.h"
+#include "IFS/FileStream.h"
+#include <IFS/Gdb/FileSystem.h>
 
 /**
   * @brief GDB File stream class to provide access to host files whilst running under debugger
   * @ingroup stream gdb_syscall
  */
-class GdbFileStream : public ReadWriteStream
+class GdbFileStream : public IFS::FileStream
 {
 public:
-	GdbFileStream()
+	GdbFileStream() : IFS::FileStream(&fileSystem)
 	{
 	}
 
-	/** @brief  Create a file stream
-     *  @param  fileName Name of file to open
-     *  @param	openFlags
-     */
-	GdbFileStream(const String& fileName, FileOpenFlags openFlags = eFO_ReadOnly)
-	{
-		open(fileName, openFlags);
-	}
-
-	~GdbFileStream()
-	{
-		close();
-	}
-
-	/** @brief Open a file and attach this stream object to it
-	 *  @param fileName
-	 *  @param openFlags
-	 *  @retval bool true on success, false on error
-	 *  @note call getLastError() to determine cause of failure
-	 */
-	bool open(const String& fileName, FileOpenFlags openFlags = eFO_ReadOnly);
-
-	/** @brief Close file
-	 */
-	void close();
-
-	size_t write(const uint8_t* buffer, size_t size) override;
-
-	uint16_t readMemoryBlock(char* data, int bufSize) override;
-
-	int seekFrom(int offset, SeekOrigin origin) override;
-
-	bool isFinished() override
-	{
-		return pos == size;
-	}
-
-	/** @brief Filename of file stream is attached to
-	 *  @retval String invalid if stream isn't open
-	 */
-	String getFileName() const
-	{
-		return fileName;
-	}
-
-	/** @brief Determine if file exists
-	 *  @retval bool true if stream contains valid file
-	 */
-	bool fileExist() const
-	{
-		return handle >= 0;
-	}
-
-	String getName() const override
-	{
-		return fileName;
-	}
-
-	bool isValid() const override
-	{
-		return fileExist();
-	}
-
-	/** @brief  Get the offset of cursor from beginning of data
-     *  @retval size_t Cursor offset
-     */
-	size_t getPos() const
-	{
-		return pos;
-	}
-
-	/**	@brief Return the total length of the stream
-	 * 	@retval int -1 is returned when the size cannot be determined
-	 */
-	int available() override
-	{
-		return size - pos;
-	}
-
-	String id() const override;
-
-	/** @brief determine if an error occurred during operation
-	 *  @retval int filesystem error code
-	 */
-	int getLastError()
-	{
-		return lastError;
-	}
-
-private:
-	/** @brief Check file operation result and note error code
-	 *  @param res result of fileXXX() operation to check
-	 *  @retval bool true if operation was successful, false if error occurred
-	 */
-	bool check(int res)
-	{
-		if(res >= 0) {
-			return true;
-		}
-
-		if(lastError >= 0) {
-			lastError = res;
-		}
-		return false;
-	}
-
 private:
-	String fileName;
-	int handle = -1;
-	size_t pos = 0;
-	size_t size = 0;
-	int lastError = 0;
+	IFS::Gdb::FileSystem fileSystem;
 };
diff --git a/Sming/Core/Data/Stream/IFS/Directory.cpp b/Sming/Core/Data/Stream/IFS/Directory.cpp
new file mode 100644
index 0000000000..2405e208d7
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/Directory.cpp
@@ -0,0 +1,102 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/anakod/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Directory.cpp
+ *
+ * @author mikee47 <mike@sillyhouse.net> May 2019
+ *
+ ****/
+
+#include "Directory.h"
+
+namespace IFS
+{
+bool Directory::open(const String& dirName)
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return false;
+	}
+
+	DirHandle dir;
+	int err = fs->opendir(dirName, dir);
+	if(!check(err)) {
+		debug_w("Directory '%s' open error: %s", dirName.c_str(), fs->getErrorString(err).c_str());
+		return false;
+	}
+
+	close();
+	name = dirName ?: "";
+	this->dir = dir;
+
+	return true;
+}
+
+void Directory::close()
+{
+	if(dir != nullptr) {
+		auto fs = getFileSystem();
+		assert(fs != nullptr);
+		fs->closedir(dir);
+		dir = nullptr;
+	}
+	lastError = FS_OK;
+}
+
+bool Directory::rewind()
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return false;
+	}
+
+	int err = fs->rewinddir(dir);
+	return err == FS_OK;
+}
+
+String Directory::getPath() const
+{
+	String path('/');
+	path += name;
+	if(name.length() != 0 && name[name.length() - 1] != '/') {
+		path += '/';
+	}
+	return path;
+}
+
+String Directory::getParent() const
+{
+	if(name.length() == 0 || name == "/") {
+		return nullptr;
+	}
+	String path('/');
+	int i = name.lastIndexOf('/');
+	if(i >= 0) {
+		path.concat(name.c_str(), i);
+	}
+	return path;
+}
+
+bool Directory::next()
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return false;
+	}
+
+	int err = fs->readdir(dir, dirStat);
+	if(check(err)) {
+		totalSize += dirStat.size;
+		++currentIndex;
+		return true;
+	}
+
+	debug_w("Directory '%s' read error: %s", name.c_str(), getErrorString(err).c_str());
+
+	return false;
+}
+
+} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/Directory.h b/Sming/Core/Data/Stream/IFS/Directory.h
new file mode 100644
index 0000000000..5b1af25adf
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/Directory.h
@@ -0,0 +1,111 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/anakod/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Directory.h
+ *
+ * @author mikee47 <mike@sillyhouse.net> May 2019
+ *
+ ****/
+
+#pragma once
+
+#include "FsBase.h"
+
+namespace IFS
+{
+/**
+  * @brief Wrapper class for enumerating a directory
+ */
+class Directory : public FsBase
+{
+public:
+	using FsBase::FsBase;
+
+	~Directory()
+	{
+		close();
+	}
+
+	/**
+	 * @brief Open a directory and attach this stream object to it
+	 * @param dirName
+	 * @retval bool true on success, false on error
+	 * @note call getLastError() to determine cause of failure
+	 */
+	bool open(const String& dirName);
+
+	/**
+	 * @brief Close directory
+	 */
+	void close();
+
+	/**
+	 * @brief Rewind directory stream to start so it can be re-enumerated
+	 * @retval bool true on success, false on error
+	 * @note call getLastError() to determine cause of failure
+	 */
+	bool rewind();
+
+	/**
+	 * @brief Name of directory stream is attached to
+	 * @retval String invalid if stream isn't open
+	 */
+	const String& getDirName() const
+	{
+		return name;
+	}
+
+	/**
+	 * @brief Determine if directory exists
+	 * @retval bool true if stream is attached to a directory
+	 */
+	bool dirExist() const
+	{
+		return dir != nullptr;
+	}
+
+	/**
+	 * @brief Get path with leading separator /path/to/dir
+	 */
+	String getPath() const;
+
+	/**
+	 * @brief Get parent directory
+	 * @retval String invalid if there is no parent directory
+	 */
+	String getParent() const;
+
+	int index() const
+	{
+		return currentIndex;
+	}
+
+	bool isValid() const
+	{
+		return currentIndex >= 0;
+	}
+
+	size_t size() const
+	{
+		return totalSize;
+	}
+
+	const FileStat& stat() const
+	{
+		return dirStat;
+	}
+
+	bool next();
+
+private:
+	String name;
+	DirHandle dir{};
+	FileNameStat dirStat;
+	int currentIndex{-1};
+	size_t totalSize{0};
+};
+
+} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp
new file mode 100644
index 0000000000..460aa885a5
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp
@@ -0,0 +1,118 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/anakod/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * DirectoryStream.cpp
+ *
+ * @author mikee47 <mike@sillyhouse.net> May 2019
+ *
+ ****/
+
+#include "DirectoryTemplate.h"
+#include <DateTime.h>
+#include <FlashString/Vector.hpp>
+
+namespace IFS
+{
+namespace
+{
+#define XX(name, comment) DEFINE_FSTR_LOCAL(fieldstr_##name, #name)
+DIRSTREAM_FIELD_MAP(XX)
+#undef XX
+
+#define XX(name, comment) &fieldstr_##name,
+DEFINE_FSTR_VECTOR(fieldStrings, FSTR::String, DIRSTREAM_FIELD_MAP(XX))
+#undef XX
+
+} // namespace
+
+String DirectoryTemplate::getValue(const char* name)
+{
+	String value = SectionTemplate::getValue(name);
+	if(value) {
+		return value;
+	}
+
+	int i = fieldStrings.indexOf(name);
+	auto field = Field(i + 1);
+
+	auto& d = dir();
+	auto& s = d.stat();
+
+	bool statValid = d.isValid();
+
+	switch(field) {
+	case Field::unknown:
+		break;
+
+	case Field::file_id:
+		return statValid ? String(s.id) : nullptr;
+
+	case Field::name:
+		if(statValid) {
+			value.setString(s.name.buffer, s.name.length);
+			formatter().escape(value);
+			return value;
+		} else {
+			return nullptr;
+		}
+
+	case Field::modified:
+		return statValid ? DateTime(s.mtime).toISO8601() : nullptr;
+
+	case Field::size:
+		return statValid ? String(s.size) : nullptr;
+
+	case Field::original_size:
+		return statValid ? String(s.originalSize) : nullptr;
+
+	case Field::attr:
+		return statValid ? IFS::File::getAttributeString(s.attr) : nullptr;
+
+	case Field::attr_long:
+		return statValid ? toString(s.attr) : nullptr;
+
+	case Field::compression:
+		if(!statValid) {
+			return nullptr;
+		} else if(!s.attr[File::Attribute::Compressed]) {
+			return "";
+		} else {
+			return toString(s.compression);
+		}
+
+	case Field::access:
+		return statValid ? IFS::File::getAclString(s.acl) : nullptr;
+
+	case Field::access_long:
+		return statValid ? toString(s.acl) : nullptr;
+
+	case Field::index:
+		return String(d.index());
+
+	case Field::total_size:
+		return String(d.size());
+
+	case Field::path:
+		return d.getPath();
+
+	case Field::parent: {
+		value = d.getParent();
+		if(value.length() != 0) {
+			formatter().escape(value);
+		} else {
+			value = "";
+		}
+		return value;
+	}
+
+	case Field::last_error:
+		return d.getLastErrorString();
+	}
+
+	return nullptr;
+}
+
+} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/DirectoryTemplate.h b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.h
new file mode 100644
index 0000000000..4e88dd5d0c
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.h
@@ -0,0 +1,82 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/anakod/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * DirectoryTemplate.h
+ *
+ * @author mikee47 <mike@sillyhouse.net> May 2019
+ *
+ *
+ ****/
+
+#pragma once
+
+#include "../SectionTemplate.h"
+#include "Directory.h"
+
+#define DIRSTREAM_FIELD_MAP(XX)                                                                                        \
+	XX(file_id, "File identifier")                                                                                     \
+	XX(name, "Filename")                                                                                               \
+	XX(modified, "Date/time of file modification")                                                                     \
+	XX(size, "File size in bytes")                                                                                     \
+	XX(original_size, "Original size of compressed file")                                                              \
+	XX(attr, "File attributes (brief)")                                                                                \
+	XX(attr_long, "File attributes")                                                                                   \
+	XX(compression, "Compression type")                                                                                \
+	XX(access, "File access information (brief)")                                                                      \
+	XX(access_long, "File access information")                                                                         \
+	XX(index, "Zero-based index of current file")                                                                      \
+	XX(total_size, "Total size of files processed (in bytes)")                                                         \
+	XX(path, "Path to containing directory")                                                                           \
+	XX(parent, "Path to parent directory (if any)")                                                                    \
+	XX(last_error, "Last error message")
+
+namespace IFS
+{
+/**
+  * @brief      Directory stream class
+  * @ingroup    stream data
+ */
+class DirectoryTemplate : public SectionTemplate
+{
+public:
+	enum class Field {
+		unknown = 0,
+#define XX(name, comment) name,
+		DIRSTREAM_FIELD_MAP(XX)
+#undef XX
+	};
+
+	DirectoryTemplate(IDataSourceStream* source, Directory* dir) : SectionTemplate(source), directory(dir)
+	{
+	}
+
+	~DirectoryTemplate()
+	{
+		delete directory;
+	}
+
+	Directory& dir()
+	{
+		return *directory;
+	}
+
+	bool nextRecord() override
+	{
+		if(sectionIndex() == 1) {
+			return directory->next();
+		}
+
+		return recordIndex() < 0;
+	}
+
+protected:
+	String getValue(const char* name) override;
+
+private:
+	Directory* directory;
+};
+
+} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/FileStream.cpp b/Sming/Core/Data/Stream/IFS/FileStream.cpp
new file mode 100644
index 0000000000..66caa0c383
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/FileStream.cpp
@@ -0,0 +1,223 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * FileStream.cpp
+ *
+ ****/
+
+#include "FileStream.h"
+
+#define ETAG_SIZE 16
+
+namespace IFS
+{
+void FileStream::attach(File::Handle file, size_t size)
+{
+	close();
+	if(file < 0) {
+		return;
+	}
+
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return;
+	}
+	handle = file;
+	this->size = size;
+	fs->lseek(handle, 0, SeekOrigin::Start);
+	pos = 0;
+
+	debug_d("attached file: '%s' (%u bytes) #0x%08X", fileName().c_str(), size, this);
+}
+
+bool FileStream::open(const FileStat& stat, File::OpenFlags openFlags)
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return false;
+	}
+
+	lastError = FS_OK;
+
+	File::Handle file = fs->fopen(stat, openFlags);
+	if(!check(file)) {
+		return false;
+	}
+
+	attach(file, stat.size);
+	return true;
+}
+
+bool FileStream::open(const String& fileName, File::OpenFlags openFlags)
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return false;
+	}
+
+	lastError = FS_OK;
+
+	File::Handle file = fs->open(fileName, openFlags);
+	if(!check(file)) {
+		debug_w("File '%s' open error: %s", fileName.c_str(), fs->getErrorString(file).c_str());
+		return false;
+	}
+
+	// Get size
+	int size = fs->lseek(file, 0, SeekOrigin::End);
+	if(check(size)) {
+		attach(file, size);
+		return true;
+	}
+
+	fs->close(file);
+	return false;
+}
+
+void FileStream::close()
+{
+	if(handle >= 0) {
+		auto fs = getFileSystem();
+		assert(fs != nullptr);
+		fs->close(handle);
+		handle = -1;
+	}
+	size = 0;
+	pos = 0;
+	lastError = FS_OK;
+}
+
+size_t FileStream::readBytes(char* buffer, size_t length)
+{
+	if(buffer == nullptr || length == 0 || pos >= size) {
+		return 0;
+	}
+
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return 0;
+	}
+
+	int available = fs->read(handle, buffer, std::min(size - pos, length));
+	if(!check(available)) {
+		return 0;
+	}
+
+	pos += size_t(available);
+
+	return available;
+}
+
+uint16_t FileStream::readMemoryBlock(char* data, int bufSize)
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return 0;
+	}
+
+	assert(bufSize >= 0);
+	size_t startPos = pos;
+	size_t count = readBytes(data, bufSize);
+
+	// Move cursor back to start position
+	(void)fs->lseek(handle, startPos, SeekOrigin::Start);
+
+	return count;
+}
+
+size_t FileStream::write(const uint8_t* buffer, size_t size)
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return 0;
+	}
+
+	if(pos != this->size) {
+		int writePos = fs->lseek(handle, 0, SeekOrigin::End);
+		if(!check(writePos)) {
+			return 0;
+		}
+
+		pos = size_t(writePos);
+	}
+
+	int written = fs->write(handle, buffer, size);
+	if(check(written)) {
+		pos += size_t(written);
+		this->size = pos;
+	}
+
+	return written > 0 ? written : 0;
+}
+
+int FileStream::seekFrom(int offset, SeekOrigin origin)
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return 0;
+	}
+
+	// Cannot rely on return value from fileSeek - failure does not mean position hasn't changed
+	fs->lseek(handle, offset, origin);
+	int newpos = fs->tell(handle);
+	if(check(newpos)) {
+		pos = size_t(newpos);
+		if(pos > size) {
+			size = pos;
+		}
+	}
+	return newpos;
+}
+
+String FileStream::fileName() const
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return nullptr;
+	}
+
+	FileNameStat stat;
+	int res = fs->fstat(handle, stat);
+	return (res < 0 || stat.name.length == 0) ? nullptr : stat.name.buffer;
+}
+
+String FileStream::id() const
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return 0;
+	}
+
+	FileStat stat;
+	int res = fs->fstat(handle, stat);
+	if(res < 0) {
+		return nullptr;
+	}
+
+	char buf[ETAG_SIZE];
+	m_snprintf(buf, ETAG_SIZE, _F("00f-%x-%x0-%x"), stat.id, stat.size, stat.name.length);
+
+	return String(buf);
+}
+
+bool FileStream::truncate(size_t newSize)
+{
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return 0;
+	}
+
+	bool res = check(fs->truncate(handle, newSize));
+	if(res) {
+		size = newSize;
+		if(pos > size) {
+			pos = size;
+		}
+	}
+	return res;
+}
+
+} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/FileStream.h b/Sming/Core/Data/Stream/IFS/FileStream.h
new file mode 100644
index 0000000000..9fb9491317
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/FileStream.h
@@ -0,0 +1,146 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * FileStream.h
+ *
+ ****/
+
+#pragma once
+
+#include "../ReadWriteStream.h"
+#include "FsBase.h"
+
+namespace IFS
+{
+/**
+ * @brief    File stream class
+ * @ingroup  stream data
+ */
+class FileStream : public FsBase, public ReadWriteStream
+{
+public:
+	using FsBase::FsBase;
+
+	~FileStream()
+	{
+		close();
+	}
+
+	/** @brief Attach this stream object to an open file handle
+	 *  @param file
+	 *  @param size
+	 */
+	void attach(File::Handle file, size_t size);
+
+	bool open(const FileStat& stat, File::OpenFlags openFlags = File::ReadOnly);
+
+	/** @brief Open a file and attach this stream object to it
+	 *  @param fileName
+	 *  @param openFlags
+	 *  @retval bool true on success, false on error
+	 *  @note call getLastError() to determine cause of failure
+	 */
+	bool open(const String& fileName, File::OpenFlags openFlags = File::ReadOnly);
+
+	/** @brief Close file
+	 */
+	void close();
+
+	StreamType getStreamType() const override
+	{
+		return eSST_File;
+	}
+
+	size_t write(const uint8_t* buffer, size_t size) override;
+
+	int read() override
+	{
+		char c;
+		return readBytes(&c, 1) ? static_cast<unsigned char>(c) : -1;
+	}
+
+	size_t readBytes(char* buffer, size_t length) override;
+
+	uint16_t readMemoryBlock(char* data, int bufSize) override;
+
+	int seekFrom(int offset, SeekOrigin origin) override;
+
+	bool isFinished() override
+	{
+		auto fs = getFileSystem();
+		return fs == nullptr || fs->eof(handle) != 0;
+	}
+
+	/** @brief Filename of file stream is attached to
+	 *  @retval String invalid if stream isn't open
+	 */
+	String fileName() const;
+
+	/** @brief Determine if file exists
+	 *  @retval bool true if stream contains valid file
+	 */
+	bool fileExist() const
+	{
+		return handle >= 0;
+	}
+
+	String getName() const override
+	{
+		return fileName();
+	}
+
+	bool isValid() const override
+	{
+		return fileExist();
+	}
+
+	/** @brief  Get the offset of cursor from beginning of data
+     *  @retval size_t Cursor offset
+     */
+	size_t getPos() const
+	{
+		return pos;
+	}
+
+	/** @brief  Get the total file size
+     *  @retval size_t File size
+     */
+	size_t getSize() const
+	{
+		return size;
+	}
+
+	/**	@brief Return the maximum bytes available to read, from current position
+	 * 	@retval int -1 is returned when the size cannot be determined
+	 */
+	int available() override
+	{
+		return size - pos;
+	}
+
+	String id() const override;
+
+	/** @brief Reduce the file size
+	 *  @param newSize
+	 *  @retval bool true on success
+	 */
+	bool truncate(size_t newSize);
+
+	/** @brief Truncate file at current position
+	 *  @retval bool true on success
+	 */
+	bool truncate()
+	{
+		return truncate(pos);
+	}
+
+private:
+	File::Handle handle{-1};
+	size_t pos{0};
+	size_t size{0};
+};
+
+} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/FsBase.h b/Sming/Core/Data/Stream/IFS/FsBase.h
new file mode 100644
index 0000000000..98d00f4cf0
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/FsBase.h
@@ -0,0 +1,72 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * FsBase.h - common base for file system classes
+ *
+ ****/
+
+#pragma once
+
+#include <IFS/FileSystem.h>
+
+namespace IFS
+{
+class FsBase
+{
+public:
+	FsBase(IFileSystem* filesys) : fileSystem(filesys)
+	{
+	}
+
+	/** @brief determine if an error occurred during operation
+	 *  @retval int filesystem error code
+	 */
+	int getLastError()
+	{
+		return lastError;
+	}
+
+	String getErrorString(int err) const
+	{
+		return fileSystem == nullptr ? Error::toString(err) : fileSystem->getErrorString(err);
+	}
+
+	String getLastErrorString() const
+	{
+		return getErrorString(lastError);
+	}
+
+	IFileSystem* getFileSystem() const
+	{
+		lastError = (fileSystem == nullptr) ? Error::NoFileSystem : FS_OK;
+		return fileSystem;
+	}
+
+protected:
+	/** @brief Check file operation result and note error code
+	 *  @param res result of fileXXX() operation to check
+	 *  @retval bool true if operation was successful, false if error occurred
+	 */
+	bool check(int res)
+	{
+		if(res >= 0) {
+			return true;
+		}
+
+		if(lastError >= 0) {
+			lastError = res;
+		}
+		return false;
+	}
+
+protected:
+	mutable int lastError{FS_OK};
+
+private:
+	IFileSystem* fileSystem;
+};
+
+} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp b/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp
new file mode 100644
index 0000000000..05cdeb47c7
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp
@@ -0,0 +1,67 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * HtmlDirectoryTemplate.h
+ *
+ * @author mikee47 <mike@sillyhouse.net> May 2019
+ *
+ ****/
+
+#include "HtmlDirectoryTemplate.h"
+#include <Network/WebConstants.h>
+#include <Network/WebHelpers/escape.h>
+
+namespace IFS
+{
+String HtmlDirectoryTemplate::getValue(const char* name)
+{
+	String text = DirectoryTemplate::getValue(name);
+	if(text) {
+		return text;
+	}
+
+	if(dir().isValid()) {
+		auto& stat = dir().stat();
+
+		if(FS("icon") == name) {
+			if(stat.attr[File::Attribute::Directory]) {
+				return F("&#128193;");
+			}
+
+			auto mimeType = ContentType::fromFullFileName(stat.name, MIME_UNKNOWN);
+			// https://html-css-js.com/html/character-codes/icons/
+			switch(mimeType) {
+			case MIME_TEXT:
+				return F("&#128196;");
+			case MIME_JS:
+			case MIME_CSS:
+			case MIME_HTML:
+			case MIME_XML:
+			case MIME_JSON:
+				return F("&#128209;");
+
+			case MIME_JPEG:
+			case MIME_GIF:
+			case MIME_PNG:
+			case MIME_SVG:
+			case MIME_ICO:
+				return F("&#127827;");
+
+			case MIME_GZIP:
+			case MIME_ZIP:
+				return F("&#128451;");
+
+			case MIME_UNKNOWN:
+			default:
+				return F("&bull;");
+			}
+		}
+	}
+
+	return nullptr;
+}
+
+} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.h b/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.h
new file mode 100644
index 0000000000..ec60d66ba4
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.h
@@ -0,0 +1,36 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * HtmlDirectoryTemplate.h
+ *
+ * @author mikee47 <mike@sillyhouse.net> May 2019
+ *
+ ****/
+
+#pragma once
+
+#include "../../Format.h"
+#include "DirectoryTemplate.h"
+
+namespace IFS
+{
+/**
+ * @brief Read-only stream access to directory listing with HTML output
+ * @ingroup stream data
+*/
+class HtmlDirectoryTemplate : public DirectoryTemplate
+{
+public:
+	HtmlDirectoryTemplate(IDataSourceStream* source, Directory* dir) : DirectoryTemplate(source, dir)
+	{
+		setFormatter(Format::html);
+	}
+
+protected:
+	String getValue(const char* name) override;
+};
+
+} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/JsonDirectoryTemplate.h b/Sming/Core/Data/Stream/IFS/JsonDirectoryTemplate.h
new file mode 100644
index 0000000000..61ec5bc438
--- /dev/null
+++ b/Sming/Core/Data/Stream/IFS/JsonDirectoryTemplate.h
@@ -0,0 +1,33 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * JsonDirectoryTemplate.h
+ *
+ * @author mikee47 <mike@sillyhouse.net> Nov 2020
+ *
+ ****/
+
+#pragma once
+
+#include "DirectoryTemplate.h"
+#include <Data/Format.h>
+
+namespace IFS
+{
+/**
+ * @brief Read-only stream providing directory listing in JSON format
+*/
+class JsonDirectoryTemplate : public DirectoryTemplate
+{
+public:
+	JsonDirectoryTemplate(IDataSourceStream* source, Directory* dir) : DirectoryTemplate(source, dir)
+	{
+		setDoubleBraces(true);
+		setFormatter(Format::json);
+	}
+};
+
+} // namespace IFS
diff --git a/Sming/Core/FileSystem.cpp b/Sming/Core/FileSystem.cpp
index c7e1f1def1..72aaa01289 100644
--- a/Sming/Core/FileSystem.cpp
+++ b/Sming/Core/FileSystem.cpp
@@ -12,213 +12,40 @@
 #include <WString.h>
 #include <debug_progmem.h>
 
-file_t fileOpen(const String& name, FileOpenFlags flags)
+namespace SmingInternal
 {
-	// Special fix to prevent known spifFS bug: manual delete file
-	if((flags & eFO_CreateNewAlways) == eFO_CreateNewAlways) {
-		if(fileExist(name)) {
-			fileDelete(name);
-		}
-		flags = (FileOpenFlags)((int)flags & ~eFO_Truncate);
-	}
-
-	int res = SPIFFS_open(&_filesystemStorageHandle, name.c_str(), (spiffs_flags)flags, 0);
-	if(res < 0) {
-		debugf("open errno %d\n", SPIFFS_errno(&_filesystemStorageHandle));
-	}
-
-	return res;
-}
-
-void fileClose(file_t file)
-{
-	SPIFFS_close(&_filesystemStorageHandle, file);
-}
-
-int fileWrite(file_t file, const void* data, size_t size)
-{
-	int res = SPIFFS_write(&_filesystemStorageHandle, file, (void*)data, size);
-	if(res < 0) {
-		debugf("write errno %d\n", SPIFFS_errno(&_filesystemStorageHandle));
-	}
-	return res;
-}
-
-int fileRead(file_t file, void* data, size_t size)
-{
-	int res = SPIFFS_read(&_filesystemStorageHandle, file, data, size);
-	if(res < 0) {
-		debugf("read errno %d\n", SPIFFS_errno(&_filesystemStorageHandle));
-	}
-	return res;
-}
-
-int fileSeek(file_t file, int offset, SeekOrigin origin)
-{
-	return SPIFFS_lseek(&_filesystemStorageHandle, file, offset, int(origin));
-}
-
-bool fileIsEOF(file_t file)
-{
-	return SPIFFS_eof(&_filesystemStorageHandle, file) != 0;
-}
-
-int32_t fileTell(file_t file)
-{
-	return SPIFFS_tell(&_filesystemStorageHandle, file);
-}
-
-int fileFlush(file_t file)
-{
-	return SPIFFS_fflush(&_filesystemStorageHandle, file);
-}
-
-int fileStats(const String& name, spiffs_stat* stat)
-{
-	return SPIFFS_stat(&_filesystemStorageHandle, name.c_str(), stat);
-}
-
-int fileStats(file_t file, spiffs_stat* stat)
-{
-	return SPIFFS_fstat(&_filesystemStorageHandle, file, stat);
-}
-
-int fileDelete(const String& name)
-{
-	return SPIFFS_remove(&_filesystemStorageHandle, name.c_str());
-}
-
-int fileDelete(file_t file)
-{
-	return SPIFFS_fremove(&_filesystemStorageHandle, file);
+IFS::IFileSystem* activeFileSystem;
 }
 
-bool fileExist(const String& name)
+void fileSetFileSystem(IFS::IFileSystem* fileSystem)
 {
-	spiffs_stat stat = {0};
-	if(fileStats(name.c_str(), &stat) < 0) {
-		return false;
+	if(SmingInternal::activeFileSystem != fileSystem) {
+		delete SmingInternal::activeFileSystem;
+		SmingInternal::activeFileSystem = fileSystem;
 	}
-	return stat.name[0] != '\0';
-}
-
-int fileLastError(file_t fd)
-{
-	return SPIFFS_errno(&_filesystemStorageHandle);
-}
-
-void fileClearLastError(file_t fd)
-{
-	SPIFFS_clearerr(&_filesystemStorageHandle);
-}
-
-int fileSetContent(const String& fileName, const String& content)
-{
-	return fileSetContent(fileName, content.c_str(), content.length());
-}
-
-int fileSetContent(const String& fileName, const char* content, int length)
-{
-	file_t file = fileOpen(fileName.c_str(), eFO_CreateNewAlways | eFO_WriteOnly);
-	if(file < 0) {
-		return file;
-	}
-	if(length < 0) {
-		length = strlen(content);
-	}
-	int res = fileWrite(file, content, length);
-	fileClose(file);
-	return res;
-}
-
-uint32_t fileGetSize(const String& fileName)
-{
-	file_t file = fileOpen(fileName.c_str(), eFO_ReadOnly);
-	int size = fileSeek(file, 0, SeekOrigin::End);
-	fileClose(file);
-	return (size < 0) ? 0 : size;
-}
-
-int fileRename(const String& oldName, const String& newName)
-{
-	return SPIFFS_rename(&_filesystemStorageHandle, oldName.c_str(), newName.c_str());
 }
 
 Vector<String> fileList()
 {
 	Vector<String> result;
-	spiffs_DIR d;
-	spiffs_dirent info;
 
-	SPIFFS_opendir(&_filesystemStorageHandle, "/", &d);
-	while(true) {
-		if(!SPIFFS_readdir(&d, &info)) {
-			break;
+	DirHandle dir;
+	if(fileOpenDir(nullptr, dir) == FS_OK) {
+		FileNameStat stat;
+		while(fileReadDir(dir, stat) >= 0) {
+			result.add(stat.name.buffer);
 		}
-		result.add(String((char*)info.name));
+		fileCloseDir(dir);
 	}
-	SPIFFS_closedir(&d);
 	return result;
 }
 
-String fileGetContent(const String& fileName)
+IFS::IFileSystem::Type fileSystemType()
 {
-	String res;
-	file_t file = fileOpen(fileName.c_str(), eFO_ReadOnly);
-	int size = fileSeek(file, 0, SeekOrigin::End);
-	if(size == 0) {
-		res = ""; // Valid String, file is empty
-	} else if(size > 0) {
-		fileSeek(file, 0, SeekOrigin::Start);
-		res.setLength(size);
-		if(fileRead(file, res.begin(), res.length()) != size) {
-			res = nullptr; // read failed, invalidate String
-		}
-	}
-	fileClose(file);
-	return res;
-}
-
-size_t fileGetContent(const String& fileName, char* buffer, size_t bufSize)
-{
-	if(buffer == nullptr || bufSize == 0) {
-		return 0;
+	if(SmingInternal::activeFileSystem == nullptr) {
+		return IFS::IFileSystem::Type::Unknown;
 	}
-
-	file_t file = fileOpen(fileName.c_str(), eFO_ReadOnly);
-	int size = fileSeek(file, 0, SeekOrigin::End);
-	if(size <= 0 || bufSize <= size_t(size)) {
-		size = 0;
-	} else {
-		fileSeek(file, 0, SeekOrigin::Start);
-		if(fileRead(file, buffer, size) != size) {
-			size = 0; // Error
-		}
-	}
-	fileClose(file);
-	buffer[size] = '\0';
-	return size;
-}
-
-int fileTruncate(file_t file, size_t newSize)
-{
-	return SPIFFS_ftruncate(&_filesystemStorageHandle, file, newSize);
-}
-
-int fileTruncate(file_t file)
-{
-	int pos = fileTell(file);
-	return (pos < 0) ? pos : fileTruncate(file, pos);
-}
-
-int fileTruncate(const String& fileName, size_t newSize)
-{
-	file_t file = fileOpen(fileName, eFO_WriteOnly);
-	if(file < 0) {
-		return file;
-	}
-
-	int res = fileTruncate(file, newSize);
-	fileClose(file);
-	return res;
+	IFS::IFileSystem::Info info;
+	fileGetSystemInfo(info);
+	return info.type;
 }
diff --git a/Sming/Core/FileSystem.h b/Sming/Core/FileSystem.h
index aece4d25a0..e34e5488a5 100644
--- a/Sming/Core/FileSystem.h
+++ b/Sming/Core/FileSystem.h
@@ -15,46 +15,119 @@
 
 #pragma once
 
+#include <IFS/Helpers.h>
 #include <spiffs_sming.h>
-#include <WVector.h>
-#include <WString.h>
-#include "Data/Stream/SeekOrigin.h"
+#include "WVector.h" ///< @deprecated see fileList()
 
-using file_t = signed short; ///< File handle
-
-/// File open flags
-enum FileOpenFlags {
-	eFO_ReadOnly = SPIFFS_RDONLY,							  ///< Read only file
-	eFO_WriteOnly = SPIFFS_WRONLY,							  ///< Write only file
-	eFO_ReadWrite = eFO_ReadOnly | eFO_WriteOnly,			  ///< Read and write file
-	eFO_CreateIfNotExist = SPIFFS_CREAT,					  ///< Create new file if file does not exist
-	eFO_Append = SPIFFS_APPEND,								  ///< Append to file
-	eFO_Truncate = SPIFFS_TRUNC,							  ///< Truncate file
-	eFO_CreateNewAlways = eFO_CreateIfNotExist | eFO_Truncate ///< Create new file even if file exists
-};
-
-static inline FileOpenFlags operator|(FileOpenFlags lhs, FileOpenFlags rhs)
+namespace File
 {
-	return (FileOpenFlags)((int)lhs | (int)rhs);
+using namespace IFS::File;
 }
 
-/// File seek flags
+using file_t = IFS::File::Handle;
+typedef SeekOrigin SeekOriginFlags; ///< @deprecated Use `SeekOrigin` instead
+using DirHandle = IFS::DirHandle;
+using FileOpenFlag = File::OpenFlag;
+using FileOpenFlags = File::OpenFlags;
+using FileStat = File::Stat;
+using FileNameStat = File::NameStat;
+constexpr int FS_OK = IFS::FS_OK;
+
+// Various file flag combinations
+constexpr FileOpenFlags eFO_ReadOnly SMING_DEPRECATED{File::ReadOnly};   ///< @deprecated use File::ReadOnly
+constexpr FileOpenFlags eFO_WriteOnly SMING_DEPRECATED{File::WriteOnly}; ///< @deprecated use File::WriteOnly
+constexpr FileOpenFlags eFO_ReadWrite{File::ReadWrite};					 ///< @deprecated use File::ReadWrite
+constexpr FileOpenFlags eFO_CreateIfNotExist{File::Create};				 ///< @deprecated use File::Create
+constexpr FileOpenFlags eFO_Append{File::Append};						 ///< @deprecated use File::Append
+constexpr FileOpenFlags eFO_Truncate{File::Truncate};					 ///< @deprecated use File::Truncate
+constexpr FileOpenFlags eFO_CreateNewAlways{File::CreateNewAlways};		 ///< @deprecated use File::CreateNewAlways
+
 constexpr SeekOrigin eSO_FileStart{SeekOrigin::Start};	///< @deprecated use SeekOrigin::Start
 constexpr SeekOrigin eSO_CurrentPos{SeekOrigin::Current}; ///< @deprecated use SeekOrigin::Current
 constexpr SeekOrigin eSO_FileEnd{SeekOrigin::End};		  ///< @deprecated use SeekOrigin::End
 
+namespace SmingInternal
+{
+/** @brief Global file system instance
+ *
+ * Filing system implementations should use helper functions to setup and
+ * initialise a filing system. If successful, call fileSetFileSystem() to make
+ * it active. This ensures that any active filing system is dismounted destroyed
+ * first.
+ *
+ */
+extern IFS::IFileSystem* activeFileSystem;
+
+} // namespace SmingInternal
+
+/*
+ * Boilerplate check for file function wrappers to catch undefined filesystem.
+ */
+#define CHECK_FS(_method)                                                                                              \
+	auto fileSystem = SmingInternal::activeFileSystem;                                                                 \
+	if(fileSystem == nullptr) {                                                                                        \
+		debug_e("ERROR in %s(): No active file system", __FUNCTION__);                                                 \
+		return file_t(IFS::Error::NoFileSystem);                                                                       \
+	}
+
+/**
+ * @brief Get the currently active file system, if any
+ * @retval IFS::IFileSystem*
+ */
+inline IFS::IFileSystem* getFileSystem()
+{
+	if(SmingInternal::activeFileSystem == nullptr) {
+		debug_e("ERROR: No active file system");
+	}
+	return SmingInternal::activeFileSystem;
+}
+
+/** @brief Sets the currently active file system
+ *  @param fileSystem
+ *  @note Any existing filing system is freed first.
+ *  Typically the filing system implementation has helper functions which
+ *  create and initialise the file system to a valid state. The last step
+ *  is to call this function to make it active.
+ *	Call this function with nullptr to inactivate the filing system.
+ */
+void fileSetFileSystem(IFS::IFileSystem* fileSystem);
+
+inline void fileFreeFileSystem()
+{
+	fileSetFileSystem(nullptr);
+}
+
 /** @brief  Open file
  *  @param  name File name
  *  @param  flags Mode to open file
  *  @retval file File ID or negative error code
  */
-file_t fileOpen(const String& name, FileOpenFlags flags);
+inline file_t fileOpen(const char* name, FileOpenFlags flags = File::ReadOnly)
+{
+	CHECK_FS(open)
+	return fileSystem->open(name, flags);
+}
+
+inline file_t fileOpen(const String& name, FileOpenFlags flags = File::ReadOnly)
+{
+	return fileOpen(name.c_str(), flags);
+}
+
+inline file_t fileOpen(const FileStat& stat, FileOpenFlags flags = File::ReadOnly)
+{
+	CHECK_FS(fopen)
+	return fileSystem->fopen(stat, flags);
+}
 
 /** @brief  Clode file
  *  @param  file ID of file to open
  *  @note   File ID is returned from fileOpen function
  */
-void fileClose(file_t file);
+inline int fileClose(file_t file)
+{
+	CHECK_FS(close)
+	return fileSystem->close(file);
+}
 
 /** @brief  Write to file
  *  @param  file File ID
@@ -62,7 +135,20 @@ void fileClose(file_t file);
  *  @param  size Quantity of data elements to write to file
  *  @retval int Quantity of data elements actually written to file or negative error code
  */
-int fileWrite(file_t file, const void* data, size_t size);
+inline int fileWrite(file_t file, const void* data, size_t size)
+{
+	CHECK_FS(write);
+	return fileSystem->write(file, data, size);
+}
+
+/** @brief  Update file modification time
+ *  @param  file File ID
+ *  @retval int Error code
+ */
+inline int fileTouch(file_t file)
+{
+	return fileWrite(file, nullptr, 0);
+}
 
 /** @brief  Read from file
  *  @param  file File ID
@@ -70,110 +156,153 @@ int fileWrite(file_t file, const void* data, size_t size);
  *  @param  size Quantity of data elements to read from file
  *  @retval int Quantity of data elements actually read from file or negative error code
  */
-int fileRead(file_t file, void* data, size_t size);
+inline int fileRead(file_t file, void* data, size_t size)
+{
+	CHECK_FS(read)
+	return fileSystem->read(file, data, size);
+}
 
 /** @brief  Position file cursor
  *  @param  file File ID
  *  @param  offset Quantity of bytes to move cursor
  *  @param  origin Position from where to move cursor
- *  @retval Offset within file or negative error code
+ *  @retval int Offset within file or negative error code
  */
-int fileSeek(file_t file, int offset, SeekOrigin origin);
+inline int fileSeek(file_t file, int offset, SeekOrigin origin)
+{
+	CHECK_FS(seek)
+	return fileSystem->lseek(file, offset, origin);
+}
 
 /** @brief  Check if at end of file
  *  @param  file File ID
- *  @retval bool True if at end of file
+ *  @retval bool true if at end of file
  */
-bool fileIsEOF(file_t file);
+inline bool fileIsEOF(file_t file)
+{
+	auto fileSystem = getFileSystem();
+	return fileSystem ? (fileSystem->eof(file) != 0) : true;
+}
 
 /** @brief  Get position in file
  *  @param  file File ID
- *  @retval int32_t Read / write cursor position
+ *  @retval int32_t Read / write cursor position or error code
  */
-int32_t fileTell(file_t file);
+inline int fileTell(file_t file)
+{
+	CHECK_FS(tell)
+	return fileSystem->tell(file);
+}
 
 /** @brief  Flush pending writes
  *  @param  file File ID
- *  @retval int Size of last file written or negative error number
+ *  @retval int Size of last file written or error code
  */
-int fileFlush(file_t file);
-
-/** @brief  Get last file system error code
- *  @param  fd Not used
- *  @todo   Why does fileLastError have unused fd parameter?
- *  @retval int Error code of last file system operation
- */
-int fileLastError(file_t fd);
+inline int fileFlush(file_t file)
+{
+	CHECK_FS(flush)
+	return fileSystem->flush(file);
+}
 
-/** @brief  Clear last file system error
- *  @param  fd Not used
- *  @todo   Why does fileClearLastError have unused fd parameter?
+/** @brief get the text for a returned error code
+ *  @param err
+ *  @retval String
  */
-void fileClearLastError(file_t fd);
+inline String fileGetErrorString(int err)
+{
+	auto fileSystem = getFileSystem();
+	if(fileSystem == nullptr) {
+		return IFS::Error::toString(err);
+	}
+	return fileSystem->getErrorString(err);
+}
 
 /** @brief  Create or replace file with defined content
  *  @param  fileName Name of file to create or replace
  *  @param  content Pointer to c-string containing content to populate file with
- *  @param  length (optional) number of characters to write
- *  @retval int Positive value (>= 0) represents the numbers of bytes written
- *  			Negative value (< 0) indicates error
+ *  @param  length Number of characters to write
+ *  @retval int Number of bytes transferred or error code
  *  @note   This function creates a new file or replaces an existing file and
  *  		populates the file with the content of a c-string buffer.
-            If you do not specify `length`, remember to terminate your c-string buffer with a NUL ('\0').
  */
-int fileSetContent(const String& fileName, const char* content, int length = -1);
+template <typename TFileName> inline int fileSetContent(const TFileName& fileName, const char* content, size_t length)
+{
+	CHECK_FS(setContent)
+	return fileSystem->setContent(fileName, content, length);
+}
 
-/** @brief  Create or replace file with defined content
- *  @param  fileName Name of file to create or replace
- *  @param  content String containing content to populate file with
- *  @retval int Positive integer represents the numbers of bytes written,
- *  		negative integer represents the error code of last file system operation.
- *  @note   This function creates a new file or replaces an existing file and
-            populates the file with the content of a string.
- */
-int fileSetContent(const String& fileName, const String& content);
+template <typename TFileName, typename TContent> inline int fileSetContent(const TFileName& fileName, TContent content)
+{
+	CHECK_FS(setContent)
+	return fileSystem->setContent(fileName, content);
+}
 
 /** @brief  Get size of file
  *  @param  fileName Name of file
- *  @retval uint32_t Size of file in bytes
- *  @note	Returns 0 if error occurs
+ *  @retval uint32_t Size of file in bytes, 0 on error
  */
-uint32_t fileGetSize(const String& fileName);
+template <typename TFileName> inline uint32_t fileGetSize(const TFileName& fileName)
+{
+	auto fileSystem = getFileSystem();
+	return fileSystem ? fileSystem->getSize(fileName) : 0;
+}
 
 /** @brief Truncate (reduce) the size of an open file
  *  @param file Open file handle, must have Write access
  *  @param newSize
- *  @retval int error code
+ *  @retval int Error code
  *  @note In POSIX `ftruncate()` can also make the file bigger, however SPIFFS can only
  *  reduce the file size and will return an error if newSize > fileSize
  */
-int fileTruncate(file_t file, size_t newSize);
+inline int fileTruncate(file_t file, size_t newSize)
+{
+	CHECK_FS(truncate);
+	return fileSystem->truncate(file, newSize);
+}
 
 /** @brief Truncate an open file at the current cursor position
  *  @param file Open file handle, must have Write access
- *  @retval int error code
+ *  @retval int Error code
  */
-int fileTruncate(file_t file);
+inline int fileTruncate(file_t file)
+{
+	CHECK_FS(truncate);
+	return fileSystem->truncate(file);
+}
 
 /** @brief Truncate (reduce) the size of a file
  *  @param fileName
  *  @param newSize
- *  @retval int error code
+ *  @retval int Error code
  *  @note In POSIX `truncate()` can also make the file bigger, however SPIFFS can only
  *  reduce the file size and will return an error if newSize > fileSize
  */
-int fileTruncate(const String& fileName, size_t newSize);
+template <typename TFileName> int fileTruncate(const TFileName& fileName, size_t newSize)
+{
+	CHECK_FS(truncate);
+	return fileSystem->truncate(fileName, newSize);
+}
 
 /** @brief  Rename file
  *  @param  oldName Original name of file to rename
  *  @param  newName New name for file
- *  @retval int error code
+ *  @retval int Error code
  */
-int fileRename(const String& oldName, const String& newName);
+inline int fileRename(const char* oldName, const char* newName)
+{
+	CHECK_FS(rename)
+	return fileSystem->rename(oldName, newName);
+}
+
+inline int fileRename(const String& oldName, const String& newName)
+{
+	return fileRename(oldName.c_str(), newName.c_str());
+}
 
 /** @brief  Get list of files on file system
  *  @retval Vector<String> Vector of strings.
             Each string element contains the name of a file on the file system
+    @deprecated use fileOpenDir / fileReadDir / fileCloseDir
  */
 Vector<String> fileList();
 
@@ -184,7 +313,11 @@ Vector<String> fileList();
  *  The result will be an invalid String (equates to `false`) if the file could not be read.
  *  If the file exists, but is empty, the result will be an empty string "".
  */
-String fileGetContent(const String& fileName);
+template <typename TFileName> String fileGetContent(const TFileName& fileName)
+{
+	auto fileSystem = getFileSystem();
+	return fileSystem ? fileSystem->getContent(fileName) : nullptr;
+}
 
 /** @brief  Read content of a file
  *  @param  fileName Name of file to read from
@@ -192,46 +325,205 @@ String fileGetContent(const String& fileName);
  *  @param  bufSize Quantity of bytes to read from file
  *  @retval size_t Quantity of bytes read from file or zero on failure
  *  @note   After calling this function the content of the file is placed in to a c-string
-            Ensure there is sufficient space in the buffer for file content
-            plus extra trailing null, i.e. at least bufSize + 1
-    @note   Returns 0 if the file could not be read
+ *  		Ensure there is sufficient space in the buffer for file content
+ *  		plus extra trailing null, i.e. at least bufSize + 1
+ *  		Always check the return value!
+ *  @note   Returns 0 if the file could not be read
  */
-size_t fileGetContent(const String& fileName, char* buffer, size_t bufSize);
+template <typename TFileName> inline size_t fileGetContent(const TFileName& fileName, char* buffer, size_t bufSize)
+{
+	auto fileSystem = getFileSystem();
+	return fileSystem ? fileSystem->getContent(fileName, buffer, bufSize) : 0;
+}
 
-/** brief   Get file statistics
+template <typename TFileName> inline size_t fileGetContent(const TFileName& fileName, char* buffer)
+{
+	auto fileSystem = getFileSystem();
+	return fileSystem ? fileSystem->getContent(fileName, buffer) : 0;
+}
+
+/** @brief   Get file statistics
  *  @param  name File name
  *  @param  stat Pointer to SPIFFS statistic structure to populate
- *  @retval int -1 on error
- *  @note   Pass a pointer to an instantiated fileStats structure
- *  @todo   Document the return value of fileStats
+ *  @retval int Error code
  */
-int fileStats(const String& name, spiffs_stat* stat);
+inline int fileStats(const char* fileName, FileStat& stat)
+{
+	CHECK_FS(stat)
+	return fileSystem->stat(fileName, &stat);
+}
+
+inline int fileStats(const String& fileName, FileStat& stat)
+{
+	return fileStats(fileName.c_str(), stat);
+}
 
 /** brief   Get file statistics
  *  @param  file File ID
  *  @param  stat Pointer to SPIFFS statistic structure to populate
- *  @retval int -1 on error
- *  @note   Pass a pointer to an instantiated fileStats structure
- *  @todo   Document the return value of fileStats
+ *  @retval int Error code
  */
-int fileStats(file_t file, spiffs_stat* stat);
+inline int fileStats(file_t file, FileStat& stat)
+{
+	CHECK_FS(fstat)
+	return fileSystem->fstat(file, &stat);
+}
 
 /** @brief  Delete file
  *  @param  name Name of file to delete
- *  @retval int error code, 0 on success
+ *  @retval int Error code
  */
-int fileDelete(const String& name);
+inline int fileDelete(const char* fileName)
+{
+	CHECK_FS(remove)
+	return fileSystem->remove(fileName);
+}
+
+inline int fileDelete(const String& fileName)
+{
+	return fileDelete(fileName.c_str());
+}
 
 /** @brief  Delete file
- *  @param  file ID of file to delete
- *  @retval int error code, 0 on success
+ *  @param  file handle of file to delete
+ *  @retval int Error code
  */
-int fileDelete(file_t file);
+inline int fileDelete(file_t file)
+{
+	CHECK_FS(fremove)
+	return fileSystem->fremove(file);
+}
 
 /** @brief  Check if a file exists on file system
  *  @param  name Name of file to check for
- *  @retval bool True if file exists
+ *  @retval bool true if file exists
+ */
+inline bool fileExist(const char* fileName)
+{
+	CHECK_FS(stat)
+	return fileSystem->stat(fileName, nullptr) >= 0;
+}
+
+inline bool fileExist(const String& fileName)
+{
+	return fileExist(fileName.c_str());
+}
+
+/** @brief Open a named directory for reading
+ *  @param name Name of directory to open, empty or "/" for root
+ *  @param dir  Directory object
+ *  @retval int Error code
+ *
+ */
+inline int fileOpenDir(const char* dirName, DirHandle& dir)
+{
+	CHECK_FS(opendir)
+	return fileSystem->opendir(dirName, dir);
+}
+
+inline int fileOpenDir(const String& dirName, DirHandle& dir)
+{
+	return fileOpenDir(dirName.c_str(), dir);
+}
+
+inline int fileOpenRootDir(DirHandle& dir)
+{
+	return fileOpenDir(nullptr, dir);
+}
+
+/** @brief Open a sub-directory for reading
+ *  @param stat Details of directory to open, nullptr for root directory
+ *  @param dir  Directory object
+ *  @retrval 0 on success or negative error
  */
-bool fileExist(const String& name);
+inline int fileOpenDir(const FileStat& stat, DirHandle& dir)
+{
+	CHECK_FS(opendir)
+	return fileSystem->fopendir(&stat, dir);
+}
+
+/** @brief close a directory object
+ *  @param dir directory to close
+ *  @retval int Error code
+ */
+inline int fileCloseDir(DirHandle dir)
+{
+	CHECK_FS(closedir)
+	return fileSystem->closedir(dir);
+}
+
+/** @brief Read a directory entry
+ *  @param dir The directory object returned by fileOpenDir()
+ *  @param stat The returned information, owned by DirHandle object
+ */
+inline int fileReadDir(DirHandle dir, FileStat& stat)
+{
+	CHECK_FS(readdir)
+	return fileSystem->readdir(dir, stat);
+}
+
+/** @brief Get basic file system information
+ *  @retval int Error code
+ */
+inline int fileGetSystemInfo(IFS::IFileSystem::Info& info)
+{
+	CHECK_FS(getinfo)
+	return fileSystem->getinfo(info);
+}
+
+/** @brief Get the type of file system currently mounted (if any)
+ *  @retval FileSystemType the file system type
+ */
+IFS::IFileSystem::Type fileSystemType();
+
+/** @brief Format the active file system
+ *  @retval int Error code
+ */
+inline int fileSystemFormat()
+{
+	CHECK_FS(format)
+	return fileSystem->format();
+}
+
+/** @brief Perform a consistency check/repair on the active file system
+ *  @retval int 0 if OK, < 0 unrecoverable errors, > 0 repairs required
+ */
+inline int fileSystemCheck()
+{
+	CHECK_FS(check)
+	return fileSystem->check();
+}
+
+/** @brief  Set access control information
+ *  @param  file File handle
+ *  @param acl
+ *  @retval int Error code
+ */
+inline int fileSetACL(file_t file, const File::ACL& acl)
+{
+	CHECK_FS(setacl)
+	return fileSystem->setacl(file, acl);
+}
+
+/** @brief Set file attributes
+ *  @param file handle to open file, must have write access
+ *  @retval int Error code
+ */
+inline int fileSetAttr(file_t file, File::Attributes attr)
+{
+	CHECK_FS(setattr)
+	return fileSystem->setattr(file, attr);
+}
+
+/** @brief Set access control information for file
+ *  @param file handle to open file, must have write access
+ *  @retval int Error code
+ *  @note any writes to file will reset this to current time
+ */
+inline int fileSetTime(file_t file, time_t mtime)
+{
+	CHECK_FS(settime)
+	return fileSystem->settime(file, mtime);
+}
 
 /** @} */
diff --git a/Sming/Core/Network/Ftp/FtpDataRetrieve.h b/Sming/Core/Network/Ftp/FtpDataRetrieve.h
index 0fecb0821f..70cc360bc3 100644
--- a/Sming/Core/Network/Ftp/FtpDataRetrieve.h
+++ b/Sming/Core/Network/Ftp/FtpDataRetrieve.h
@@ -17,7 +17,7 @@ class FtpDataRetrieve : public FtpDataStream
 {
 public:
 	FtpDataRetrieve(FtpServerConnection& connection, const String& fileName)
-		: FtpDataStream(connection), file(fileOpen(fileName, eFO_ReadOnly))
+		: FtpDataStream(connection), file(fileOpen(fileName, File::ReadOnly))
 	{
 	}
 
diff --git a/Sming/Core/Network/Ftp/FtpDataStore.h b/Sming/Core/Network/Ftp/FtpDataStore.h
index aa33032190..a713b97af0 100644
--- a/Sming/Core/Network/Ftp/FtpDataStore.h
+++ b/Sming/Core/Network/Ftp/FtpDataStore.h
@@ -17,7 +17,7 @@ class FtpDataStore : public FtpDataStream
 {
 public:
 	FtpDataStore(FtpServerConnection& connection, const String& fileName)
-		: FtpDataStream(connection), file(fileOpen(fileName, eFO_WriteOnly | eFO_CreateNewAlways))
+		: FtpDataStream(connection), file(fileOpen(fileName, File::WriteOnly | File::CreateNewAlways))
 	{
 	}
 
diff --git a/Sming/Core/Network/FtpServer.cpp b/Sming/Core/Network/FtpServer.cpp
index b2515665c5..efb0a75918 100644
--- a/Sming/Core/Network/FtpServer.cpp
+++ b/Sming/Core/Network/FtpServer.cpp
@@ -36,7 +36,7 @@ bool FtpServer::checkUser(const String& login, const String& pass)
 bool FtpServer::onCommand(String cmd, String data, FtpServerConnection& connection)
 {
 	if(cmd == _F("FSFORMAT")) {
-		spiffs_format();
+		fileSystemFormat();
 		connection.response(200, F("File system successfully formatted"));
 		return true;
 	}
diff --git a/Sming/Core/Network/Http/HttpResponse.cpp b/Sming/Core/Network/Http/HttpResponse.cpp
index 517d2deee7..6990cd6615 100644
--- a/Sming/Core/Network/Http/HttpResponse.cpp
+++ b/Sming/Core/Network/Http/HttpResponse.cpp
@@ -56,22 +56,40 @@ bool HttpResponse::sendString(String&& text) noexcept
 	return true;
 }
 
+bool HttpResponse::sendFile(const FileStat& stat)
+{
+	auto file = new FileStream(stat);
+	if(stat.compression == File::Compression::GZip) {
+		headers[HTTP_HEADER_CONTENT_ENCODING] = F("gzip");
+	} else if(stat.compression != File::Compression::None) {
+		debug_e("Unsupported compression type: %u", stat.compression);
+	}
+
+	return sendDataStream(file, ContentType::fromFullFileName(stat.name));
+}
+
 bool HttpResponse::sendFile(const String& fileName, bool allowGzipFileCheck)
 {
-	IDataSourceStream* stream = nullptr;
-	String compressed = fileName + ".gz";
-	if(allowGzipFileCheck && fileExist(compressed)) {
-		debug_d("found %s", compressed.c_str());
-		stream = new FileStream(compressed);
-		headers[HTTP_HEADER_CONTENT_ENCODING] = _F("gzip");
-	} else if(fileExist(fileName)) {
-		debug_d("found %s", fileName.c_str());
-		stream = new FileStream(fileName);
+	FileStat stat;
+
+	if(allowGzipFileCheck) {
+		String fnCompressed = fileName + _F(".gz");
+		if(fileStats(fnCompressed, stat) >= 0) {
+			debug_d("found %s", stat.name);
+			stat.compression = File::Compression::GZip;
+			stat.name = IFS::NameBuffer(fnCompressed);
+			return sendFile(stat);
+		}
 	}
 
-	headers[HTTP_HEADER_CONTENT_TYPE] = ContentType::fromFullFileName(fileName);
+	if(fileStats(fileName, stat) >= 0) {
+		debug_d("found %s", fileName.c_str());
+		stat.name = IFS::NameBuffer((char*)fileName.c_str(), fileName.length(), fileName.length());
+		return sendFile(stat);
+	}
 
-	return sendNamedStream(stream);
+	code = HTTP_STATUS_NOT_FOUND;
+	return false;
 }
 
 bool HttpResponse::sendNamedStream(IDataSourceStream* newDataStream)
diff --git a/Sming/Core/Network/Http/HttpResponse.h b/Sming/Core/Network/Http/HttpResponse.h
index 1debc961d0..b852a8233d 100644
--- a/Sming/Core/Network/Http/HttpResponse.h
+++ b/Sming/Core/Network/Http/HttpResponse.h
@@ -94,6 +94,12 @@ class HttpResponse
 		return this;
 	}
 
+	/*
+	 * Send file by stat, indicates whether file is compressed
+	 * A name is required in stat to get the appropriate content type
+	 */
+	bool sendFile(const FileStat& stat);
+
 	/**
 	 * @brief Send file by name
 	 * @param fileName
diff --git a/Sming/Core/Network/HttpClient.cpp b/Sming/Core/Network/HttpClient.cpp
index faff09432a..723788e3fe 100644
--- a/Sming/Core/Network/HttpClient.cpp
+++ b/Sming/Core/Network/HttpClient.cpp
@@ -54,7 +54,7 @@ bool HttpClient::downloadFile(const Url& url, const String& saveFileName, Reques
 	}
 
 	auto fileStream = new FileStream();
-	if(!fileStream->open(file, eFO_CreateNewAlways | eFO_WriteOnly)) {
+	if(!fileStream->open(file, File::CreateNewAlways | File::WriteOnly)) {
 		debug_e("HttpClient failed to open \"%s\"", file.c_str());
 		delete fileStream;
 		return false;
diff --git a/Sming/Libraries/Adafruit_GFX/BMPDraw.h b/Sming/Libraries/Adafruit_GFX/BMPDraw.h
index 5414d03ad0..4ceb3e0401 100644
--- a/Sming/Libraries/Adafruit_GFX/BMPDraw.h
+++ b/Sming/Libraries/Adafruit_GFX/BMPDraw.h
@@ -64,7 +64,7 @@ template <class Adafruit_TFT> bool bmpDraw(Adafruit_TFT& tft, String fileName, u
 
 	uint32_t startTime = millis();
 
-	file_t handle = fileOpen(fileName.c_str(), eFO_ReadOnly);
+	file_t handle = fileOpen(fileName.c_str(), File::ReadOnly);
 	if(handle < 0) {
 		debug_e("File wasn't found: %s", fileName.c_str());
 		return false;
diff --git a/Sming/Libraries/ArduinoJson6/include/ArduinoJson.h b/Sming/Libraries/ArduinoJson6/include/ArduinoJson.h
index 955857231a..567a80a914 100644
--- a/Sming/Libraries/ArduinoJson6/include/ArduinoJson.h
+++ b/Sming/Libraries/ArduinoJson6/include/ArduinoJson.h
@@ -256,7 +256,7 @@ template <typename TSource> String serialize(const TSource& source, Serializatio
 template <typename TSource>
 bool saveToFile(const TSource& source, const String& filename, SerializationFormat format = JSON_FORMAT_DEFAULT)
 {
-	FileStream stream(filename, eFO_WriteOnly | eFO_CreateNewAlways);
+	FileStream stream(filename, File::WriteOnly | File::CreateNewAlways);
 	if(!stream.isValid()) {
 		return false;
 	}
diff --git a/Sming/component.mk b/Sming/component.mk
index 9685debd3a..8f3471a83c 100644
--- a/Sming/component.mk
+++ b/Sming/component.mk
@@ -17,6 +17,7 @@ COMPONENT_DEPENDS := \
 	sming-arch \
 	FlashString \
 	spiffs \
+	IFS \
 	http-parser \
 	libb64 \
 	ws_parser \
diff --git a/docs/source/upgrading/4.2-4.3.rst b/docs/source/upgrading/4.2-4.3.rst
index 9d52386086..63be9b39f8 100644
--- a/docs/source/upgrading/4.2-4.3.rst
+++ b/docs/source/upgrading/4.2-4.3.rst
@@ -96,3 +96,27 @@ Configuration variables
                 }
             }
 
+
+Installable File System (IFS)
+-----------------------------
+
+Sming now supports multiple filesystems via :component:`IFS`.
+
+See :sample:`Basic_IFS` for a demonstration.
+
+:source:`Core/FileSystem.h` has been modified to use IFS but the API remains largely unchanged, although somewhat expanded.
+Functions are now mainly just wrappers around filing system calls.
+
+A single global IFileSystem instance is used.
+
+SPIFFS
+    All access is now managed via the ``IFS::SPIFFS::FileSystem`` implementation.
+
+    Applications should not use SPIFFS functions directly.
+
+    SPIFFS is now built with ``SPIFFS_OBJ_META_LEN=16`` to store extended attribute information,
+    but existing volumes should still be readable.
+
+File open flags
+    e.g. eFO_ReadOnly. These will still work but are now deprecated and should be replaced with their
+    C++ equivalent such as ``File::ReadOnly``.
diff --git a/samples/Basic_IFS/.cproject b/samples/Basic_IFS/.cproject
new file mode 100644
index 0000000000..a217ffc882
--- /dev/null
+++ b/samples/Basic_IFS/.cproject
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" moduleId="org.eclipse.cdt.core.settings" name="Sming">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" name="Sming" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463" name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1164554300" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
+							<option id="cdt.managedbuild.option.gnu.cross.prefix.521205673" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
+							<option id="cdt.managedbuild.option.gnu.cross.path.393887888" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.712123812" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
+							<builder autoBuildTarget="all" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.builder.gnu.cross.2110485170" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.357494572" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.313321806" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.611746109" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.65193859" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1795850540" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.364843833" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.525412186" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.assembler.587940548" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.1067006329" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.651581712" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
+				<externalSettings containerId="SmingFramework;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+				<externalSettings containerId="Sming;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+			</storageModule>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="HttpServer_AJAX.null.1347473968" name="HttpServer_AJAX"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Sming">
+			<resource resourceType="PROJECT" workspacePath="/HttpServer_AJAX"/>
+		</configuration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+		<buildTargets>
+			<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>all</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>clean</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flash</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashonefile" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashonefile</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashinit" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashinit</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashboot" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashboot</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="rebuild" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>rebuild</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+		</buildTargets>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2032390008;cdt.managedbuild.tool.gnu.c.compiler.input.1700912488">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903;cdt.managedbuild.tool.gnu.c.compiler.input.313321806">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015;cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.454898447;cdt.managedbuild.tool.gnu.cpp.compiler.input.501261625">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+</cproject>
diff --git a/samples/Basic_IFS/.project b/samples/Basic_IFS/.project
new file mode 100644
index 0000000000..56fba6c6ed
--- /dev/null
+++ b/samples/Basic_IFS/.project
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Basic_IFS</name>
+	<comment></comment>
+	<projects>
+		<project>SmingFramework</project>
+		<project>Sming</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/samples/Basic_IFS/Makefile b/samples/Basic_IFS/Makefile
new file mode 100644
index 0000000000..ff51b6c3a7
--- /dev/null
+++ b/samples/Basic_IFS/Makefile
@@ -0,0 +1,9 @@
+#####################################################################
+#### Please don't change this file. Use component.mk instead ####
+#####################################################################
+
+ifndef SMING_HOME
+$(error SMING_HOME is not set: please configure it as an environment variable)
+endif
+
+include $(SMING_HOME)/project.mk
diff --git a/samples/Basic_IFS/README.rst b/samples/Basic_IFS/README.rst
new file mode 100644
index 0000000000..70867537f0
--- /dev/null
+++ b/samples/Basic_IFS/README.rst
@@ -0,0 +1,24 @@
+Basic IFS
+=========
+
+.. highlight:: bash
+
+Simple Webserver demonstration using IFS.
+
+View the filesystem using a web browser.
+
+To see the data in a different format, add ``?format=XX``. Current supported formats are ``json``, ``text`` and ``html``.
+
+Building
+--------
+
+By default, data is stored in a read-only FWFS (Firmware Filesytem) partition.
+
+This sample also demonstrates how to store the data in a :cpp:class:`FlashString` object::
+
+    make config-clean
+    make ENABLE_FLASHSTRING_IMAGE=1
+
+Because the data is linked into the program image this is only suitable for small filesystem images.
+This could be used to store default recovery data, especially with OTA updates because each program
+image is self-contained.
diff --git a/samples/Basic_IFS/app/application.cpp b/samples/Basic_IFS/app/application.cpp
new file mode 100644
index 0000000000..5828f96d24
--- /dev/null
+++ b/samples/Basic_IFS/app/application.cpp
@@ -0,0 +1,220 @@
+/*
+ * Webserver demo using IFS
+ *
+ */
+
+#include <SmingCore.h>
+#include <Data/Stream/MemoryDataStream.h>
+#include <Data/Stream/Directory.h>
+#include <Data/Stream/IFS/DirectoryTemplate.h>
+#include <Data/Stream/IFS/HtmlDirectoryTemplate.h>
+#include <Data/Stream/IFS/JsonDirectoryTemplate.h>
+#include <Storage/ProgMem.h>
+
+// If you want, you can define WiFi settings globally in Eclipse Environment Variables
+#ifndef WIFI_SSID
+#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_PWD "PleaseEnterPass"
+#endif
+
+namespace
+{
+#ifdef ENABLE_FLASHSTRING_IMAGE
+IMPORT_FSTR(fwfsImage, PROJECT_DIR "/out/fwfs1.bin")
+#endif
+
+IMPORT_FSTR(listing_html, PROJECT_DIR "/resource/listing.html")
+IMPORT_FSTR(listing_txt, PROJECT_DIR "/resource/listing.txt")
+IMPORT_FSTR(listing_json, PROJECT_DIR "/resource/listing.json")
+
+HttpServer server;
+FtpServer ftp;
+int requestCount;
+
+/*
+ * Handle any custom fields here
+ */
+String getValue(const char* name)
+{
+	if(FS("webpage") == name) {
+		return "https://github.com/SmingHub/Sming";
+	}
+
+	if(FS("request-count") == name) {
+		return String(requestCount); // Doesn't require escaping
+	}
+
+	return nullptr;
+}
+
+void onFile(HttpRequest& request, HttpResponse& response)
+{
+	++requestCount;
+
+	String file = request.uri.getRelativePath();
+
+	FileStat stat;
+	if(fileStats(file, stat) < 0) {
+		response.code = HTTP_STATUS_INTERNAL_SERVER_ERROR;
+		return;
+	}
+
+	if(stat.attr[File::Attribute::Directory]) {
+		auto dir = new Directory;
+		IFS::DirectoryTemplate* tmpl;
+		String fmt = request.uri.Query["format"];
+		if(fmt.equalsIgnoreCase("json")) {
+			auto source = new FlashMemoryStream(listing_json);
+			tmpl = new IFS::JsonDirectoryTemplate(source, dir);
+		} else if(fmt.equalsIgnoreCase("text")) {
+			auto source = new FlashMemoryStream(listing_txt);
+			tmpl = new IFS::DirectoryTemplate(source, dir);
+		} else {
+			auto source = new FlashMemoryStream(listing_html);
+			tmpl = new IFS::HtmlDirectoryTemplate(source, dir);
+		}
+		tmpl->onGetValue(getValue);
+		dir->open(file);
+		tmpl->gotoSection(0);
+		response.sendDataStream(tmpl, tmpl->getMimeType());
+	} else {
+		//	response.setCache(86400, true); // It's important to use cache for better performance.
+		auto stream = new FileStream(stat);
+		if(stat.compression == File::Compression::GZip) {
+			response.headers[HTTP_HEADER_CONTENT_ENCODING] = F("gzip");
+		} else if(stat.compression != File::Compression::None) {
+			debug_e("Unsupported compression type: %u", stat.compression);
+		}
+
+		auto mimeType = ContentType::fromFullFileName(file.c_str(), MIME_TEXT);
+		response.sendDataStream(stream, mimeType);
+	}
+}
+
+void startWebServer()
+{
+	server.listen(80);
+	server.paths.setDefault(onFile);
+
+	Serial.println("\r\n=== WEB SERVER STARTED ===");
+	Serial.println(WifiStation.getIP());
+	Serial.println("==============================\r\n");
+}
+
+void gotIP(IpAddress ip, IpAddress netmask, IpAddress gateway)
+{
+	startWebServer();
+}
+
+bool initFileSystem()
+{
+	fileFreeFileSystem();
+
+#if DEBUG_VERBOSE_LEVEL >= INFO
+	auto freeheap = system_get_free_heap_size();
+#endif
+	debug_i("1: heap = %u", freeheap);
+
+#ifdef ENABLE_FLASHSTRING_IMAGE
+	// Create a partition wrapping some flashstring data
+	auto part = Storage::progMem.createPartition(F("fwfsMem"), fwfsImage, Storage::Partition::SubType::Data::fwfs);
+#else
+	auto part = *Storage::findPartition(Storage::Partition::SubType::Data::fwfs);
+	if(part) {
+		debug_i("Found '%s'", part.name().c_str());
+	} else {
+		debug_e("No FWFS partition found");
+	}
+#endif
+
+	IFS::IFileSystem* fs;
+#ifdef FWFS_HYBRID
+	// Create a read/write filesystem
+	fs = IFS::createHybridFilesystem(part);
+#else
+	// Read-only
+	fs = IFS::createFirmwareFilesystem(part);
+#endif
+	debug_i("2: heap = -%u", freeheap - system_get_free_heap_size());
+
+	if(fs == nullptr) {
+		debug_e("Failed to created filesystem object");
+		return false;
+	}
+
+	int res = fs->mount();
+	debug_i("3: heap = -%u", freeheap - system_get_free_heap_size());
+
+	debug_i("mount() returned %d (%s)", res, fs->getErrorString(res).c_str());
+
+	if(res < 0) {
+		delete fs;
+		return false;
+	}
+
+	fileSetFileSystem(fs);
+
+	debug_i("File system initialised");
+	return true;
+}
+
+void printDirectory(const char* path)
+{
+	auto printStream = [](IDataSourceStream& stream) {
+		// Use an intermediate memory stream so debug information doesn't get mixed into output
+		//		MemoryDataStream mem;
+		//		mem.copyFrom(&stream);
+		//		Serial.copyFrom(&mem);
+		Serial.copyFrom(&stream);
+	};
+
+	{
+		auto dir = new Directory;
+		if(!dir->open(path)) {
+			debug_e("Open '%s' failed: %s", path, dir->getLastErrorString().c_str());
+			delete dir;
+			return;
+		}
+
+		auto source = new FlashMemoryStream(listing_txt);
+		IFS::DirectoryTemplate tmpl(source, dir);
+		printStream(tmpl);
+	}
+
+	{
+		auto dir = new Directory;
+		if(!dir->open(path)) {
+			debug_e("Open '%s' failed: %s", path, dir->getLastErrorString().c_str());
+			delete dir;
+			return;
+		}
+
+		auto source = new FlashMemoryStream(listing_json);
+		IFS::JsonDirectoryTemplate tmpl(source, dir);
+		printStream(tmpl);
+	}
+}
+} // namespace
+
+void init()
+{
+#if DEBUG_BUILD
+	Serial.begin(COM_SPEED_SERIAL);
+
+	Serial.systemDebugOutput(true);
+	debug_i("\n\n********************************************************\n"
+			"Hello\n");
+#endif
+
+	initFileSystem();
+
+	printDirectory(nullptr);
+
+	WifiStation.enable(true);
+	WifiStation.config(WIFI_SSID, WIFI_PWD);
+	WifiAccessPoint.enable(false);
+
+	WifiEvents.onStationGotIP(gotIP);
+
+	//	testDirectoryStreams();
+}
diff --git a/samples/Basic_IFS/basic_ifs.hw b/samples/Basic_IFS/basic_ifs.hw
new file mode 100644
index 0000000000..b001259618
--- /dev/null
+++ b/samples/Basic_IFS/basic_ifs.hw
@@ -0,0 +1,21 @@
+{
+    "name": "Basic IFS sample",
+    "base_config": "spiffs",
+    "partitions": {
+        "spiffs0": {
+            "size": "0x20000",
+            "build": {}
+        },
+        "fwfs1": {
+            "address": "0x280000",
+            "size": "0x60000",
+            "type": "data",
+            "subtype": "fwfs",
+            "filename": "out/fwfs1.bin",
+            "build": {
+                "target": "fwfs-build",
+                "config": "fsimage.ini"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/Basic_IFS/component.mk b/samples/Basic_IFS/component.mk
new file mode 100644
index 0000000000..81f4a0ac1d
--- /dev/null
+++ b/samples/Basic_IFS/component.mk
@@ -0,0 +1,12 @@
+# Empty SPIFFS partition please
+SPIFF_FILES :=
+
+# Use to store filesystem image in a FlashString object instead of partition
+CONFIG_VARS += ENABLE_FLASHSTRING_IMAGE
+ENABLE_FLASHSTRING_IMAGE ?= 0
+ifeq ($(ENABLE_FLASHSTRING_IMAGE),1)
+COMPONENT_CXXFLAGS += -DENABLE_FLASHSTRING_IMAGE=1
+HWCONFIG := spiffs
+else
+HWCONFIG := basic_ifs
+endif
diff --git a/samples/Basic_IFS/files/.auth.json b/samples/Basic_IFS/files/.auth.json
new file mode 100644
index 0000000000..beb9ec86b9
--- /dev/null
+++ b/samples/Basic_IFS/files/.auth.json
@@ -0,0 +1,19 @@
+{
+  "users": [
+    {
+      "name":"",
+      "password":"",
+      "access":"guest"
+    },
+    {
+      "name":"user",
+      "password":"user",
+      "access":"user"
+    },
+    {
+      "name":"admin",
+      "password":"admin",
+      "access":"admin"
+    }
+  ]
+}
diff --git a/samples/Basic_IFS/files/.network.json b/samples/Basic_IFS/files/.network.json
new file mode 100644
index 0000000000..1295805160
--- /dev/null
+++ b/samples/Basic_IFS/files/.network.json
@@ -0,0 +1,8 @@
+{
+  "hostname":"Sming-IFS",
+  "server-port":80,
+  "accesspoint": {
+    "ssid":"Sming IFS",
+    "password":"welcome"
+  }
+}
diff --git a/samples/Basic_IFS/files/.time.json b/samples/Basic_IFS/files/.time.json
new file mode 100644
index 0000000000..08b3032c55
--- /dev/null
+++ b/samples/Basic_IFS/files/.time.json
@@ -0,0 +1,4 @@
+{
+  "latitude":52.01486,
+  "longitude":-0.70126
+}
diff --git a/samples/Basic_IFS/files/A Subdirectory/The name of this file is excessively long. Can't say I'd ever want to do this, but hey, why not.txt b/samples/Basic_IFS/files/A Subdirectory/The name of this file is excessively long. Can't say I'd ever want to do this, but hey, why not.txt
new file mode 100644
index 0000000000..fb0665dc5b
--- /dev/null
+++ b/samples/Basic_IFS/files/A Subdirectory/The name of this file is excessively long. Can't say I'd ever want to do this, but hey, why not.txt	
@@ -0,0 +1,7 @@
+Mary had a little lamb
+It's fleece was very red.
+The reason for this was,
+You see, it had a pickaxe
+Though its head.
+
+Anon.
\ No newline at end of file
diff --git a/samples/Basic_IFS/files/A Subdirectory/a/b/c/d/e/f/lonely.txt b/samples/Basic_IFS/files/A Subdirectory/a/b/c/d/e/f/lonely.txt
new file mode 100644
index 0000000000..a59579b465
--- /dev/null
+++ b/samples/Basic_IFS/files/A Subdirectory/a/b/c/d/e/f/lonely.txt	
@@ -0,0 +1 @@
+I am a lonely file. Where are my fwends?
\ No newline at end of file
diff --git a/samples/Basic_IFS/files/apple-touch-icon-180x180.png b/samples/Basic_IFS/files/apple-touch-icon-180x180.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a9221f4cdd765249bf038f264086db03614c1f9
GIT binary patch
literal 17250
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

literal 0
HcmV?d00001

diff --git a/samples/Basic_IFS/files/bootstrap.min.css b/samples/Basic_IFS/files/bootstrap.min.css
new file mode 100644
index 0000000000..6561b6f4c9
--- /dev/null
+++ b/samples/Basic_IFS/files/bootstrap.min.css
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v4.0.0 (https://getbootstrap.com)
+ * Copyright 2011-2018 The Bootstrap Authors
+ * Copyright 2011-2018 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-family:inherit;font-weight:500;line-height:1.2;color:inherit}.h1,h1{font-size:2.5rem}.h2,h2{font-size:2rem}.h3,h3{font-size:1.75rem}.h4,h4{font-size:1.5rem}.h5,h5{font-size:1.25rem}.h6,h6{font-size:1rem}.lead{font-size:1.25rem;font-weight:300}.display-1{font-size:6rem;font-weight:300;line-height:1.2}.display-2{font-size:5.5rem;font-weight:300;line-height:1.2}.display-3{font-size:4.5rem;font-weight:300;line-height:1.2}.display-4{font-size:3.5rem;font-weight:300;line-height:1.2}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small,small{font-size:80%;font-weight:400}.mark,mark{padding:.2em;background-color:#fcf8e3}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.25rem}.blockquote-footer{display:block;font-size:80%;color:#6c757d}.blockquote-footer::before{content:"\2014 \00A0"}.img-fluid{max-width:100%;height:auto}.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:.25rem;max-width:100%;height:auto}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#6c757d}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}code{font-size:87.5%;color:#e83e8c;word-break:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:#212529}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:576px){.container{max-width:540px}}@media (min-width:768px){.container{max-width:720px}}@media (min-width:992px){.container{max-width:960px}}@media (min-width:1200px){.container{max-width:1140px}}.container-fluid{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}.col,.col-1,.col-10,.col-11,.col-12,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-auto,.col-lg,.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-auto,.col-md,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-auto,.col-sm,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-auto{position:relative;width:100%;min-height:1px;padding-right:15px;padding-left:15px}.col{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-1{-webkit-box-flex:0;-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-2{-webkit-box-flex:0;-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-4{-webkit-box-flex:0;-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-5{-webkit-box-flex:0;-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-7{-webkit-box-flex:0;-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-8{-webkit-box-flex:0;-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-10{-webkit-box-flex:0;-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-11{-webkit-box-flex:0;-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-1{margin-left:8.333333%}.offset-2{margin-left:16.666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.333333%}.offset-5{margin-left:41.666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.333333%}.offset-8{margin-left:66.666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.333333%}.offset-11{margin-left:91.666667%}@media (min-width:576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-sm-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-sm-1{-webkit-box-flex:0;-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-sm-2{-webkit-box-flex:0;-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-sm-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-webkit-box-flex:0;-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-sm-5{-webkit-box-flex:0;-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-sm-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-webkit-box-flex:0;-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-sm-8{-webkit-box-flex:0;-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-sm-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-webkit-box-flex:0;-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-sm-11{-webkit-box-flex:0;-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-sm-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-sm-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-sm-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-sm-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-sm-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-sm-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-sm-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-sm-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-sm-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-sm-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-sm-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-sm-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-sm-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-sm-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-sm-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-sm-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.333333%}.offset-sm-2{margin-left:16.666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.333333%}.offset-sm-5{margin-left:41.666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.333333%}.offset-sm-8{margin-left:66.666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.333333%}.offset-sm-11{margin-left:91.666667%}}@media (min-width:768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-md-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-md-1{-webkit-box-flex:0;-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-md-2{-webkit-box-flex:0;-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-md-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-webkit-box-flex:0;-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-md-5{-webkit-box-flex:0;-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-md-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-webkit-box-flex:0;-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-md-8{-webkit-box-flex:0;-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-md-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-webkit-box-flex:0;-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-md-11{-webkit-box-flex:0;-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-md-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-md-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-md-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-md-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-md-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-md-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-md-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-md-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-md-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-md-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-md-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-md-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-md-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-md-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-md-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-md-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.333333%}.offset-md-2{margin-left:16.666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.333333%}.offset-md-5{margin-left:41.666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.333333%}.offset-md-8{margin-left:66.666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.333333%}.offset-md-11{margin-left:91.666667%}}@media (min-width:992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-lg-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-lg-1{-webkit-box-flex:0;-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-lg-2{-webkit-box-flex:0;-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-lg-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-webkit-box-flex:0;-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-lg-5{-webkit-box-flex:0;-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-lg-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-webkit-box-flex:0;-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-lg-8{-webkit-box-flex:0;-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-lg-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-webkit-box-flex:0;-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-lg-11{-webkit-box-flex:0;-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-lg-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-lg-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-lg-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-lg-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-lg-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-lg-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-lg-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-lg-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-lg-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-lg-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-lg-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-lg-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-lg-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-lg-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-lg-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-lg-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.333333%}.offset-lg-2{margin-left:16.666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.333333%}.offset-lg-5{margin-left:41.666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.333333%}.offset-lg-8{margin-left:66.666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.333333%}.offset-lg-11{margin-left:91.666667%}}@media (min-width:1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;max-width:100%}.col-xl-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:none}.col-xl-1{-webkit-box-flex:0;-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}.col-xl-2{-webkit-box-flex:0;-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}.col-xl-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-webkit-box-flex:0;-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}.col-xl-5{-webkit-box-flex:0;-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}.col-xl-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-webkit-box-flex:0;-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}.col-xl-8{-webkit-box-flex:0;-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}.col-xl-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-webkit-box-flex:0;-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}.col-xl-11{-webkit-box-flex:0;-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}.col-xl-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-xl-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-xl-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-xl-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-xl-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-xl-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-xl-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-xl-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-xl-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-xl-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-xl-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-xl-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-xl-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-xl-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-xl-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-xl-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.333333%}.offset-xl-2{margin-left:16.666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.333333%}.offset-xl-5{margin-left:41.666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.333333%}.offset-xl-8{margin-left:66.666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.333333%}.offset-xl-11{margin-left:91.666667%}}.table{width:100%;max-width:100%;margin-bottom:1rem;background-color:transparent}.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}.table tbody+tbody{border-top:2px solid #dee2e6}.table .table{background-color:#fff}.table-sm td,.table-sm th{padding:.3rem}.table-bordered{border:1px solid #dee2e6}.table-bordered td,.table-bordered th{border:1px solid #dee2e6}.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}.table-hover tbody tr:hover{background-color:rgba(0,0,0,.075)}.table-primary,.table-primary>td,.table-primary>th{background-color:#b8daff}.table-hover .table-primary:hover{background-color:#9fcdff}.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#9fcdff}.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#d6d8db}.table-hover .table-secondary:hover{background-color:#c8cbcf}.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#c8cbcf}.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}.table-hover .table-success:hover{background-color:#b1dfbb}.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}.table-hover .table-info:hover{background-color:#abdde5}.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}.table-hover .table-warning:hover{background-color:#ffe8a1}.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}.table-hover .table-danger:hover{background-color:#f1b0b7}.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}.table-light,.table-light>td,.table-light>th{background-color:#fdfdfe}.table-hover .table-light:hover{background-color:#ececf6}.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#ececf6}.table-dark,.table-dark>td,.table-dark>th{background-color:#c6c8ca}.table-hover .table-dark:hover{background-color:#b9bbbe}.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b9bbbe}.table-active,.table-active>td,.table-active>th{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover{background-color:rgba(0,0,0,.075)}.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}.table .thead-dark th{color:#fff;background-color:#212529;border-color:#32383e}.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}.table-dark{color:#fff;background-color:#212529}.table-dark td,.table-dark th,.table-dark thead th{border-color:#32383e}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:rgba(255,255,255,.05)}.table-dark.table-hover tbody tr:hover{background-color:rgba(255,255,255,.075)}@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-sm>.table-bordered{border:0}}@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-md>.table-bordered{border:0}}@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-lg>.table-bordered{border:0}}@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;padding:.375rem .75rem;font-size:1rem;line-height:1.5;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:focus{color:#495057;background-color:#fff;border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.form-control::-webkit-input-placeholder{color:#6c757d;opacity:1}.form-control::-moz-placeholder{color:#6c757d;opacity:1}.form-control:-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::-ms-input-placeholder{color:#6c757d;opacity:1}.form-control::placeholder{color:#6c757d;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}select.form-control:not([size]):not([multiple]){height:calc(2.25rem + 2px)}select.form-control:focus::-ms-value{color:#495057;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.5}.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.25rem;line-height:1.5}.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.875rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding-top:.375rem;padding-bottom:.375rem;margin-bottom:0;line-height:1.5;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm,.input-group-lg>.form-control-plaintext.form-control,.input-group-lg>.input-group-append>.form-control-plaintext.btn,.input-group-lg>.input-group-append>.form-control-plaintext.input-group-text,.input-group-lg>.input-group-prepend>.form-control-plaintext.btn,.input-group-lg>.input-group-prepend>.form-control-plaintext.input-group-text,.input-group-sm>.form-control-plaintext.form-control,.input-group-sm>.input-group-append>.form-control-plaintext.btn,.input-group-sm>.input-group-append>.form-control-plaintext.input-group-text,.input-group-sm>.input-group-prepend>.form-control-plaintext.btn,.input-group-sm>.input-group-prepend>.form-control-plaintext.input-group-text{padding-right:0;padding-left:0}.form-control-sm,.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.input-group-sm>.input-group-append>select.btn:not([size]):not([multiple]),.input-group-sm>.input-group-append>select.input-group-text:not([size]):not([multiple]),.input-group-sm>.input-group-prepend>select.btn:not([size]):not([multiple]),.input-group-sm>.input-group-prepend>select.input-group-text:not([size]):not([multiple]),.input-group-sm>select.form-control:not([size]):not([multiple]),select.form-control-sm:not([size]):not([multiple]){height:calc(1.8125rem + 2px)}.form-control-lg,.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.input-group-lg>.input-group-append>select.btn:not([size]):not([multiple]),.input-group-lg>.input-group-append>select.input-group-text:not([size]):not([multiple]),.input-group-lg>.input-group-prepend>select.btn:not([size]):not([multiple]),.input-group-lg>.input-group-prepend>select.input-group-text:not([size]):not([multiple]),.input-group-lg>select.form-control:not([size]):not([multiple]),select.form-control-lg:not([size]):not([multiple]){height:calc(2.875rem + 2px)}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:.25rem}.form-row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}.form-check-input:disabled~.form-check-label{color:#6c757d}.form-check-label{margin-bottom:0}.form-check-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#28a745}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.5rem;margin-top:.1rem;font-size:.875rem;line-height:1;color:#fff;background-color:rgba(40,167,69,.8);border-radius:.2rem}.custom-select.is-valid,.form-control.is-valid,.was-validated .custom-select:valid,.was-validated .form-control:valid{border-color:#28a745}.custom-select.is-valid:focus,.form-control.is-valid:focus,.was-validated .custom-select:valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.custom-select.is-valid~.valid-feedback,.custom-select.is-valid~.valid-tooltip,.form-control.is-valid~.valid-feedback,.form-control.is-valid~.valid-tooltip,.was-validated .custom-select:valid~.valid-feedback,.was-validated .custom-select:valid~.valid-tooltip,.was-validated .form-control:valid~.valid-feedback,.was-validated .form-control:valid~.valid-tooltip{display:block}.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}.custom-control-input.is-valid~.custom-control-label::before,.was-validated .custom-control-input:valid~.custom-control-label::before{background-color:#71dd8a}.custom-control-input.is-valid~.valid-feedback,.custom-control-input.is-valid~.valid-tooltip,.was-validated .custom-control-input:valid~.valid-feedback,.was-validated .custom-control-input:valid~.valid-tooltip{display:block}.custom-control-input.is-valid:checked~.custom-control-label::before,.was-validated .custom-control-input:valid:checked~.custom-control-label::before{background-color:#34ce57}.custom-control-input.is-valid:focus~.custom-control-label::before,.was-validated .custom-control-input:valid:focus~.custom-control-label::before{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(40,167,69,.25)}.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}.custom-file-input.is-valid~.custom-file-label::before,.was-validated .custom-file-input:valid~.custom-file-label::before{border-color:inherit}.custom-file-input.is-valid~.valid-feedback,.custom-file-input.is-valid~.valid-tooltip,.was-validated .custom-file-input:valid~.valid-feedback,.was-validated .custom-file-input:valid~.valid-tooltip{display:block}.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:80%;color:#dc3545}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:.5rem;margin-top:.1rem;font-size:.875rem;line-height:1;color:#fff;background-color:rgba(220,53,69,.8);border-radius:.2rem}.custom-select.is-invalid,.form-control.is-invalid,.was-validated .custom-select:invalid,.was-validated .form-control:invalid{border-color:#dc3545}.custom-select.is-invalid:focus,.form-control.is-invalid:focus,.was-validated .custom-select:invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.custom-select.is-invalid~.invalid-feedback,.custom-select.is-invalid~.invalid-tooltip,.form-control.is-invalid~.invalid-feedback,.form-control.is-invalid~.invalid-tooltip,.was-validated .custom-select:invalid~.invalid-feedback,.was-validated .custom-select:invalid~.invalid-tooltip,.was-validated .form-control:invalid~.invalid-feedback,.was-validated .form-control:invalid~.invalid-tooltip{display:block}.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}.custom-control-input.is-invalid~.custom-control-label::before,.was-validated .custom-control-input:invalid~.custom-control-label::before{background-color:#efa2a9}.custom-control-input.is-invalid~.invalid-feedback,.custom-control-input.is-invalid~.invalid-tooltip,.was-validated .custom-control-input:invalid~.invalid-feedback,.was-validated .custom-control-input:invalid~.invalid-tooltip{display:block}.custom-control-input.is-invalid:checked~.custom-control-label::before,.was-validated .custom-control-input:invalid:checked~.custom-control-label::before{background-color:#e4606d}.custom-control-input.is-invalid:focus~.custom-control-label::before,.was-validated .custom-control-input:invalid:focus~.custom-control-label::before{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(220,53,69,.25)}.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}.custom-file-input.is-invalid~.custom-file-label::before,.was-validated .custom-file-input:invalid~.custom-file-label::before{border-color:inherit}.custom-file-input.is-invalid~.invalid-feedback,.custom-file-input.is-invalid~.invalid-tooltip,.was-validated .custom-file-input:invalid~.invalid-feedback,.was-validated .custom-file-input:invalid~.invalid-tooltip{display:block}.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}.form-inline{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.form-inline .form-check{width:100%}@media (min-width:576px){.form-inline label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-bottom:0}.form-inline .form-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:0}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .input-group{width:auto}.form-inline .form-check{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;margin-top:0;margin-right:.25rem;margin-left:0}.form-inline .custom-control{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-weight:400;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;line-height:1.5;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}.btn:focus,.btn:hover{text-decoration:none}.btn.focus,.btn:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.btn.disabled,.btn:disabled{opacity:.65}.btn:not(:disabled):not(.disabled){cursor:pointer}.btn:not(:disabled):not(.disabled).active,.btn:not(:disabled):not(.disabled):active{background-image:none}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:hover{color:#fff;background-color:#0069d9;border-color:#0062cc}.btn-primary.focus,.btn-primary:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#007bff;border-color:#007bff}.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#0062cc;border-color:#005cbf}.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-secondary{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:hover{color:#fff;background-color:#5a6268;border-color:#545b62}.btn-secondary.focus,.btn-secondary:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#545b62;border-color:#4e555b}.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}.btn-success.focus,.btn-success:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}.btn-info.focus,.btn-info:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-warning{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:hover{color:#212529;background-color:#e0a800;border-color:#d39e00}.btn-warning.focus,.btn-warning:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-warning.disabled,.btn-warning:disabled{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#212529;background-color:#d39e00;border-color:#c69500}.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}.btn-danger.focus,.btn-danger:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-light{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:hover{color:#212529;background-color:#e2e6ea;border-color:#dae0e5}.btn-light.focus,.btn-light:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-light.disabled,.btn-light:disabled{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#212529;background-color:#dae0e5;border-color:#d3d9df}.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-dark{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:hover{color:#fff;background-color:#23272b;border-color:#1d2124}.btn-dark.focus,.btn-dark:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#343a40;border-color:#343a40}.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#1d2124;border-color:#171a1d}.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-primary{color:#007bff;background-color:transparent;background-image:none;border-color:#007bff}.btn-outline-primary:hover{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#007bff;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#007bff;border-color:#007bff}.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}.btn-outline-secondary{color:#6c757d;background-color:transparent;background-image:none;border-color:#6c757d}.btn-outline-secondary:hover{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#6c757d;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#6c757d;border-color:#6c757d}.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}.btn-outline-success{color:#28a745;background-color:transparent;background-image:none;border-color:#28a745}.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success.focus,.btn-outline-success:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}.btn-outline-info{color:#17a2b8;background-color:transparent;background-image:none;border-color:#17a2b8}.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info.focus,.btn-outline-info:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}.btn-outline-warning{color:#ffc107;background-color:transparent;background-image:none;border-color:#ffc107}.btn-outline-warning:hover{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning.focus,.btn-outline-warning:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#212529;background-color:#ffc107;border-color:#ffc107}.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}.btn-outline-danger{color:#dc3545;background-color:transparent;background-image:none;border-color:#dc3545}.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger.focus,.btn-outline-danger:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}.btn-outline-light{color:#f8f9fa;background-color:transparent;background-image:none;border-color:#f8f9fa}.btn-outline-light:hover{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light.focus,.btn-outline-light:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f8f9fa;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}.btn-outline-dark{color:#343a40;background-color:transparent;background-image:none;border-color:#343a40}.btn-outline-dark:hover{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark.focus,.btn-outline-dark:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#343a40;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#343a40;border-color:#343a40}.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}.btn-link{font-weight:400;color:#007bff;background-color:transparent}.btn-link:hover{color:#0056b3;text-decoration:underline;background-color:transparent;border-color:transparent}.btn-link.focus,.btn-link:focus{text-decoration:underline;border-color:transparent;box-shadow:none}.btn-link.disabled,.btn-link:disabled{color:#6c757d}.btn-group-lg>.btn,.btn-lg{padding:.5rem 1rem;font-size:1.25rem;line-height:1.5;border-radius:.3rem}.btn-group-sm>.btn,.btn-sm{padding:.25rem .5rem;font-size:.875rem;line-height:1.5;border-radius:.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:.5rem}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;transition:opacity .15s linear}.fade.show{opacity:1}.collapse{display:none}.collapse.show{display:block}tr.collapse.show{display:table-row}tbody.collapse.show{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}.dropdown,.dropup{position:relative}.dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}.dropdown-toggle:empty::after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:1rem;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}.dropup .dropdown-menu{margin-top:0;margin-bottom:.125rem}.dropup .dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}.dropup .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-menu{margin-top:0;margin-left:.125rem}.dropright .dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-bottom:.3em solid transparent;border-left:.3em solid}.dropright .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-toggle::after{vertical-align:0}.dropleft .dropdown-menu{margin-top:0;margin-right:.125rem}.dropleft .dropdown-toggle::after{display:inline-block;width:0;height:0;margin-left:.255em;vertical-align:.255em;content:""}.dropleft .dropdown-toggle::after{display:none}.dropleft .dropdown-toggle::before{display:inline-block;width:0;height:0;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}.dropleft .dropdown-toggle:empty::after{margin-left:0}.dropleft .dropdown-toggle::before{vertical-align:0}.dropdown-divider{height:0;margin:.5rem 0;overflow:hidden;border-top:1px solid #e9ecef}.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:focus,.dropdown-item:hover{color:#16181b;text-decoration:none;background-color:#f8f9fa}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#007bff}.dropdown-item.disabled,.dropdown-item:disabled{color:#6c757d;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.875rem;color:#6c757d;white-space:nowrap}.btn-group,.btn-group-vertical{position:relative;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto}.btn-group-vertical>.btn:hover,.btn-group>.btn:hover{z-index:1}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus{z-index:1}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group,.btn-group-vertical .btn+.btn,.btn-group-vertical .btn+.btn-group,.btn-group-vertical .btn-group+.btn,.btn-group-vertical .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}.dropdown-toggle-split::after{margin-left:0}.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}.btn-group-vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.btn-group-vertical .btn,.btn-group-vertical .btn-group{width:100%}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio],.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;width:100%}.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;width:1%;margin-bottom:0}.input-group>.custom-file:focus,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control{margin-left:-1px}.input-group>.custom-select:not(:last-child),.input-group>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label::before{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label,.input-group>.custom-file:not(:first-child) .custom-file-label::before{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-append,.input-group-prepend{display:-webkit-box;display:-ms-flexbox;display:flex}.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:1rem;font-weight:400;line-height:1.5;color:#495057;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:.25rem}.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.5rem;padding-left:1.5rem}.custom-control-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;z-index:-1;opacity:0}.custom-control-input:checked~.custom-control-label::before{color:#fff;background-color:#007bff}.custom-control-input:focus~.custom-control-label::before{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}.custom-control-input:active~.custom-control-label::before{color:#fff;background-color:#b3d7ff}.custom-control-input:disabled~.custom-control-label{color:#6c757d}.custom-control-input:disabled~.custom-control-label::before{background-color:#e9ecef}.custom-control-label{margin-bottom:0}.custom-control-label::before{position:absolute;top:.25rem;left:0;display:block;width:1rem;height:1rem;pointer-events:none;content:"";-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#dee2e6}.custom-control-label::after{position:absolute;top:.25rem;left:0;display:block;width:1rem;height:1rem;content:"";background-repeat:no-repeat;background-position:center center;background-size:50% 50%}.custom-checkbox .custom-control-label::before{border-radius:.25rem}.custom-checkbox .custom-control-input:checked~.custom-control-label::before{background-color:#007bff}.custom-checkbox .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before{background-color:#007bff}.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E")}.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-radio .custom-control-label::before{border-radius:50%}.custom-radio .custom-control-input:checked~.custom-control-label::before{background-color:#007bff}.custom-radio .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E")}.custom-radio .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}.custom-select{display:inline-block;width:100%;height:calc(2.25rem + 2px);padding:.375rem 1.75rem .375rem .75rem;line-height:1.5;color:#495057;vertical-align:middle;background:#fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center;background-size:8px 10px;border:1px solid #ced4da;border-radius:.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#80bdff;outline:0;box-shadow:inset 0 1px 2px rgba(0,0,0,.075),0 0 5px rgba(128,189,255,.5)}.custom-select:focus::-ms-value{color:#495057;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}.custom-select:disabled{color:#6c757d;background-color:#e9ecef}.custom-select::-ms-expand{opacity:0}.custom-select-sm{height:calc(1.8125rem + 2px);padding-top:.375rem;padding-bottom:.375rem;font-size:75%}.custom-select-lg{height:calc(2.875rem + 2px);padding-top:.375rem;padding-bottom:.375rem;font-size:125%}.custom-file{position:relative;display:inline-block;width:100%;height:calc(2.25rem + 2px);margin-bottom:0}.custom-file-input{position:relative;z-index:2;width:100%;height:calc(2.25rem + 2px);margin:0;opacity:0}.custom-file-input:focus~.custom-file-control{border-color:#80bdff;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.custom-file-input:focus~.custom-file-control::before{border-color:#80bdff}.custom-file-input:lang(en)~.custom-file-label::after{content:"Browse"}.custom-file-label{position:absolute;top:0;right:0;left:0;z-index:1;height:calc(2.25rem + 2px);padding:.375rem .75rem;line-height:1.5;color:#495057;background-color:#fff;border:1px solid #ced4da;border-radius:.25rem}.custom-file-label::after{position:absolute;top:0;right:0;bottom:0;z-index:3;display:block;height:calc(calc(2.25rem + 2px) - 1px * 2);padding:.375rem .75rem;line-height:1.5;color:#495057;content:"Browse";background-color:#e9ecef;border-left:1px solid #ced4da;border-radius:0 .25rem .25rem 0}.nav{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:.5rem 1rem}.nav-link:focus,.nav-link:hover{text-decoration:none}.nav-link.disabled{color:#6c757d}.nav-tabs{border-bottom:1px solid #dee2e6}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{border-color:#e9ecef #e9ecef #dee2e6}.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#fff;border-color:#dee2e6 #dee2e6 #fff}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}.nav-fill .nav-item{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}.nav-justified .nav-item{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:.5rem 1rem}.navbar>.container,.navbar>.container-fluid{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:.3125rem;padding-bottom:.3125rem;margin-right:1rem;font-size:1.25rem;line-height:inherit;white-space:nowrap}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-nav{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.navbar-toggler{padding:.25rem .75rem;font-size:1.25rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}.navbar-toggler:not(:disabled):not(.disabled){cursor:pointer}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat center center;background-size:100% 100%}@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:576px){.navbar-expand-sm{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-sm .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}.navbar-expand-sm .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:768px){.navbar-expand-md{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-md .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}.navbar-expand-md .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:992px){.navbar-expand-lg{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-lg .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}.navbar-expand-lg .dropup .dropdown-menu{top:auto;bottom:100%}}@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{padding-right:0;padding-left:0}}@media (min-width:1200px){.navbar-expand-xl{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-xl .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}.navbar-expand-xl .dropup .dropdown-menu{top:auto;bottom:100%}}.navbar-expand{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .dropdown-menu-right{right:0;left:auto}.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-expand .dropup .dropdown-menu{top:auto;bottom:100%}.navbar-light .navbar-brand{color:rgba(0,0,0,.9)}.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-light .navbar-text{color:rgba(0,0,0,.5)}.navbar-light .navbar-text a{color:rgba(0,0,0,.9)}.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}.navbar-dark .navbar-brand{color:#fff}.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:rgba(255,255,255,.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:rgba(255,255,255,.75)}.navbar-dark .navbar-nav .nav-link.disabled{color:rgba(255,255,255,.25)}.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}.navbar-dark .navbar-toggler{color:rgba(255,255,255,.5);border-color:rgba(255,255,255,.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(255, 255, 255, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E")}.navbar-dark .navbar-text{color:rgba(255,255,255,.5)}.navbar-dark .navbar-text a{color:#fff}.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}.card{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card>hr{margin-right:0;margin-left:0}.card>.list-group:first-child .list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-body{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:1.25rem}.card-title{margin-bottom:.75rem}.card-subtitle{margin-top:-.375rem;margin-bottom:0}.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card-header{padding:.75rem 1.25rem;margin-bottom:0;background-color:rgba(0,0,0,.03);border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:.75rem 1.25rem;background-color:rgba(0,0,0,.03);border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.card-header-tabs{margin-right:-.625rem;margin-bottom:-.75rem;margin-left:-.625rem;border-bottom:0}.card-header-pills{margin-right:-.625rem;margin-left:-.625rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img{width:100%;border-radius:calc(.25rem - 1px)}.card-img-top{width:100%;border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}.card-img-bottom{width:100%;border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}.card-deck{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.card-deck .card{margin-bottom:15px}@media (min-width:576px){.card-deck{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}.card-deck .card{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;margin-right:15px;margin-bottom:0;margin-left:15px}}.card-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.card-group>.card{margin-bottom:15px}@media (min-width:576px){.card-group{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group>.card{-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:first-child{border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:first-child .card-header,.card-group>.card:first-child .card-img-top{border-top-right-radius:0}.card-group>.card:first-child .card-footer,.card-group>.card:first-child .card-img-bottom{border-bottom-right-radius:0}.card-group>.card:last-child{border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:last-child .card-header,.card-group>.card:last-child .card-img-top{border-top-left-radius:0}.card-group>.card:last-child .card-footer,.card-group>.card:last-child .card-img-bottom{border-bottom-left-radius:0}.card-group>.card:only-child{border-radius:.25rem}.card-group>.card:only-child .card-header,.card-group>.card:only-child .card-img-top{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card-group>.card:only-child .card-footer,.card-group>.card:only-child .card-img-bottom{border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.card-group>.card:not(:first-child):not(:last-child):not(:only-child){border-radius:0}.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-footer,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-header,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-bottom,.card-group>.card:not(:first-child):not(:last-child):not(:only-child) .card-img-top{border-radius:0}}.card-columns .card{margin-bottom:.75rem}@media (min-width:576px){.card-columns{-webkit-column-count:3;-moz-column-count:3;column-count:3;-webkit-column-gap:1.25rem;-moz-column-gap:1.25rem;column-gap:1.25rem}.card-columns .card{display:inline-block;width:100%}}.breadcrumb{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}.breadcrumb-item+.breadcrumb-item::before{display:inline-block;padding-right:.5rem;padding-left:.5rem;color:#6c757d;content:"/"}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:underline}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:none}.breadcrumb-item.active{color:#6c757d}.pagination{display:-webkit-box;display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:.25rem}.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#007bff;background-color:#fff;border:1px solid #dee2e6}.page-link:hover{color:#0056b3;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}.page-link:focus{z-index:2;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}.page-link:not(:disabled):not(.disabled){cursor:pointer}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.page-item:last-child .page-link{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}.page-item.active .page-link{z-index:1;color:#fff;background-color:#007bff;border-color:#007bff}.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.25rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:.3rem;border-bottom-left-radius:.3rem}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:.3rem;border-bottom-right-radius:.3rem}.pagination-sm .page-link{padding:.25rem .5rem;font-size:.875rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:.2rem;border-bottom-left-radius:.2rem}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:.2rem;border-bottom-right-radius:.2rem}.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#007bff}.badge-primary[href]:focus,.badge-primary[href]:hover{color:#fff;text-decoration:none;background-color:#0062cc}.badge-secondary{color:#fff;background-color:#6c757d}.badge-secondary[href]:focus,.badge-secondary[href]:hover{color:#fff;text-decoration:none;background-color:#545b62}.badge-success{color:#fff;background-color:#28a745}.badge-success[href]:focus,.badge-success[href]:hover{color:#fff;text-decoration:none;background-color:#1e7e34}.badge-info{color:#fff;background-color:#17a2b8}.badge-info[href]:focus,.badge-info[href]:hover{color:#fff;text-decoration:none;background-color:#117a8b}.badge-warning{color:#212529;background-color:#ffc107}.badge-warning[href]:focus,.badge-warning[href]:hover{color:#212529;text-decoration:none;background-color:#d39e00}.badge-danger{color:#fff;background-color:#dc3545}.badge-danger[href]:focus,.badge-danger[href]:hover{color:#fff;text-decoration:none;background-color:#bd2130}.badge-light{color:#212529;background-color:#f8f9fa}.badge-light[href]:focus,.badge-light[href]:hover{color:#212529;text-decoration:none;background-color:#dae0e5}.badge-dark{color:#fff;background-color:#343a40}.badge-dark[href]:focus,.badge-dark[href]:hover{color:#fff;text-decoration:none;background-color:#1d2124}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:.3rem}@media (min-width:576px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:.25rem}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:4rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:.75rem 1.25rem;color:inherit}.alert-primary{color:#004085;background-color:#cce5ff;border-color:#b8daff}.alert-primary hr{border-top-color:#9fcdff}.alert-primary .alert-link{color:#002752}.alert-secondary{color:#383d41;background-color:#e2e3e5;border-color:#d6d8db}.alert-secondary hr{border-top-color:#c8cbcf}.alert-secondary .alert-link{color:#202326}.alert-success{color:#155724;background-color:#d4edda;border-color:#c3e6cb}.alert-success hr{border-top-color:#b1dfbb}.alert-success .alert-link{color:#0b2e13}.alert-info{color:#0c5460;background-color:#d1ecf1;border-color:#bee5eb}.alert-info hr{border-top-color:#abdde5}.alert-info .alert-link{color:#062c33}.alert-warning{color:#856404;background-color:#fff3cd;border-color:#ffeeba}.alert-warning hr{border-top-color:#ffe8a1}.alert-warning .alert-link{color:#533f03}.alert-danger{color:#721c24;background-color:#f8d7da;border-color:#f5c6cb}.alert-danger hr{border-top-color:#f1b0b7}.alert-danger .alert-link{color:#491217}.alert-light{color:#818182;background-color:#fefefe;border-color:#fdfdfe}.alert-light hr{border-top-color:#ececf6}.alert-light .alert-link{color:#686868}.alert-dark{color:#1b1e21;background-color:#d6d8d9;border-color:#c6c8ca}.alert-dark hr{border-top-color:#b9bbbe}.alert-dark .alert-link{color:#040505}@-webkit-keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}.progress{display:-webkit-box;display:-ms-flexbox;display:flex;height:1rem;overflow:hidden;font-size:.75rem;background-color:#e9ecef;border-radius:.25rem}.progress-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;color:#fff;text-align:center;background-color:#007bff;transition:width .6s ease}.progress-bar-striped{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}.media{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.media-body{-webkit-box-flex:1;-ms-flex:1;flex:1}.list-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0}.list-group-item-action{width:100%;color:#495057;text-align:inherit}.list-group-item-action:focus,.list-group-item-action:hover{color:#495057;text-decoration:none;background-color:#f8f9fa}.list-group-item-action:active{color:#212529;background-color:#e9ecef}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;margin-bottom:-1px;background-color:#fff;border:1px solid rgba(0,0,0,.125)}.list-group-item:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.list-group-item:focus,.list-group-item:hover{z-index:1;text-decoration:none}.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;background-color:#fff}.list-group-item.active{z-index:2;color:#fff;background-color:#007bff;border-color:#007bff}.list-group-flush .list-group-item{border-right:0;border-left:0;border-radius:0}.list-group-flush:first-child .list-group-item:first-child{border-top:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom:0}.list-group-item-primary{color:#004085;background-color:#b8daff}.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#004085;background-color:#9fcdff}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#004085;border-color:#004085}.list-group-item-secondary{color:#383d41;background-color:#d6d8db}.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#383d41;background-color:#c8cbcf}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#383d41;border-color:#383d41}.list-group-item-success{color:#155724;background-color:#c3e6cb}.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#155724;background-color:#b1dfbb}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#155724;border-color:#155724}.list-group-item-info{color:#0c5460;background-color:#bee5eb}.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#0c5460;background-color:#abdde5}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#0c5460;border-color:#0c5460}.list-group-item-warning{color:#856404;background-color:#ffeeba}.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#856404;background-color:#ffe8a1}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#856404;border-color:#856404}.list-group-item-danger{color:#721c24;background-color:#f5c6cb}.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#721c24;background-color:#f1b0b7}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#721c24;border-color:#721c24}.list-group-item-light{color:#818182;background-color:#fdfdfe}.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#818182;background-color:#ececf6}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#818182;border-color:#818182}.list-group-item-dark{color:#1b1e21;background-color:#c6c8ca}.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#1b1e21;background-color:#b9bbbe}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#1b1e21;border-color:#1b1e21}.close{float:right;font-size:1.5rem;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}.close:focus,.close:hover{color:#000;text-decoration:none;opacity:.75}.close:not(:disabled):not(.disabled){cursor:pointer}button.close{padding:0;background-color:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;outline:0}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}.modal.fade .modal-dialog{transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out;-webkit-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.show .modal-dialog{-webkit-transform:translate(0,0);transform:translate(0,0)}.modal-dialog-centered{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;min-height:calc(100% - (.5rem * 2))}.modal-content{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:.5}.modal-header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:1rem;border-bottom:1px solid #e9ecef;border-top-left-radius:.3rem;border-top-right-radius:.3rem}.modal-header .close{padding:1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.5}.modal-body{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}.modal-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;padding:1rem;border-top:1px solid #e9ecef}.modal-footer>:not(:first-child){margin-left:.25rem}.modal-footer>:not(:last-child){margin-right:.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-centered{min-height:calc(100% - (1.75rem * 2))}.modal-sm{max-width:300px}}@media (min-width:992px){.modal-lg{max-width:800px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:.9}.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}.tooltip .arrow::before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}.bs-tooltip-auto[x-placement^=top] .arrow::before,.bs-tooltip-top .arrow::before{top:0;border-width:.4rem .4rem 0;border-top-color:#000}.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=right] .arrow::before,.bs-tooltip-right .arrow::before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#000}.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}.bs-tooltip-auto[x-placement^=bottom] .arrow::before,.bs-tooltip-bottom .arrow::before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#000}.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}.bs-tooltip-auto[x-placement^=left] .arrow::before,.bs-tooltip-left .arrow::before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#000}.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#000;border-radius:.25rem}.popover{position:absolute;top:0;left:0;z-index:1060;display:block;max-width:276px;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:.875rem;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem}.popover .arrow{position:absolute;display:block;width:1rem;height:.5rem;margin:0 .3rem}.popover .arrow::after,.popover .arrow::before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}.bs-popover-auto[x-placement^=top] .arrow,.bs-popover-top .arrow{bottom:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=top] .arrow::after,.bs-popover-auto[x-placement^=top] .arrow::before,.bs-popover-top .arrow::after,.bs-popover-top .arrow::before{border-width:.5rem .5rem 0}.bs-popover-auto[x-placement^=top] .arrow::before,.bs-popover-top .arrow::before{bottom:0;border-top-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=top] .arrow::after,.bs-popover-top .arrow::after{bottom:1px;border-top-color:#fff}.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}.bs-popover-auto[x-placement^=right] .arrow,.bs-popover-right .arrow{left:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=right] .arrow::after,.bs-popover-auto[x-placement^=right] .arrow::before,.bs-popover-right .arrow::after,.bs-popover-right .arrow::before{border-width:.5rem .5rem .5rem 0}.bs-popover-auto[x-placement^=right] .arrow::before,.bs-popover-right .arrow::before{left:0;border-right-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=right] .arrow::after,.bs-popover-right .arrow::after{left:1px;border-right-color:#fff}.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}.bs-popover-auto[x-placement^=bottom] .arrow,.bs-popover-bottom .arrow{top:calc((.5rem + 1px) * -1)}.bs-popover-auto[x-placement^=bottom] .arrow::after,.bs-popover-auto[x-placement^=bottom] .arrow::before,.bs-popover-bottom .arrow::after,.bs-popover-bottom .arrow::before{border-width:0 .5rem .5rem .5rem}.bs-popover-auto[x-placement^=bottom] .arrow::before,.bs-popover-bottom .arrow::before{top:0;border-bottom-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=bottom] .arrow::after,.bs-popover-bottom .arrow::after{top:1px;border-bottom-color:#fff}.bs-popover-auto[x-placement^=bottom] .popover-header::before,.bs-popover-bottom .popover-header::before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}.bs-popover-auto[x-placement^=left] .arrow,.bs-popover-left .arrow{right:calc((.5rem + 1px) * -1);width:.5rem;height:1rem;margin:.3rem 0}.bs-popover-auto[x-placement^=left] .arrow::after,.bs-popover-auto[x-placement^=left] .arrow::before,.bs-popover-left .arrow::after,.bs-popover-left .arrow::before{border-width:.5rem 0 .5rem .5rem}.bs-popover-auto[x-placement^=left] .arrow::before,.bs-popover-left .arrow::before{right:0;border-left-color:rgba(0,0,0,.25)}.bs-popover-auto[x-placement^=left] .arrow::after,.bs-popover-left .arrow::after{right:1px;border-left-color:#fff}.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:1rem;color:inherit;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}.popover-header:empty{display:none}.popover-body{padding:.5rem .75rem;color:#212529}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-item{position:relative;display:none;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;transition:-webkit-transform .6s ease;transition:transform .6s ease;transition:transform .6s ease,-webkit-transform .6s ease;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}.carousel-item-next,.carousel-item-prev{position:absolute;top:0}.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translateX(0);transform:translateX(0)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.carousel-item-next.carousel-item-left,.carousel-item-prev.carousel-item-right{-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.active.carousel-item-right,.carousel-item-next{-webkit-transform:translateX(100%);transform:translateX(100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-right,.carousel-item-next{-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}}.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translateX(-100%);transform:translateX(-100%)}@supports ((-webkit-transform-style:preserve-3d) or (transform-style:preserve-3d)){.active.carousel-item-left,.carousel-item-prev{-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}}.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:.5}.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:transparent no-repeat center center;background-size:100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E")}.carousel-control-next-icon{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E")}.carousel-indicators{position:absolute;right:0;bottom:10px;left:0;z-index:15;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{position:relative;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;background-color:rgba(255,255,255,.5)}.carousel-indicators li::before{position:absolute;top:-10px;left:0;display:inline-block;width:100%;height:10px;content:""}.carousel-indicators li::after{position:absolute;bottom:-10px;left:0;display:inline-block;width:100%;height:10px;content:""}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}.align-baseline{vertical-align:baseline!important}.align-top{vertical-align:top!important}.align-middle{vertical-align:middle!important}.align-bottom{vertical-align:bottom!important}.align-text-bottom{vertical-align:text-bottom!important}.align-text-top{vertical-align:text-top!important}.bg-primary{background-color:#007bff!important}a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#0062cc!important}.bg-secondary{background-color:#6c757d!important}a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#545b62!important}.bg-success{background-color:#28a745!important}a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}.bg-info{background-color:#17a2b8!important}a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}.bg-warning{background-color:#ffc107!important}a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}.bg-danger{background-color:#dc3545!important}a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}.bg-light{background-color:#f8f9fa!important}a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#dae0e5!important}.bg-dark{background-color:#343a40!important}a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#1d2124!important}.bg-white{background-color:#fff!important}.bg-transparent{background-color:transparent!important}.border{border:1px solid #dee2e6!important}.border-top{border-top:1px solid #dee2e6!important}.border-right{border-right:1px solid #dee2e6!important}.border-bottom{border-bottom:1px solid #dee2e6!important}.border-left{border-left:1px solid #dee2e6!important}.border-0{border:0!important}.border-top-0{border-top:0!important}.border-right-0{border-right:0!important}.border-bottom-0{border-bottom:0!important}.border-left-0{border-left:0!important}.border-primary{border-color:#007bff!important}.border-secondary{border-color:#6c757d!important}.border-success{border-color:#28a745!important}.border-info{border-color:#17a2b8!important}.border-warning{border-color:#ffc107!important}.border-danger{border-color:#dc3545!important}.border-light{border-color:#f8f9fa!important}.border-dark{border-color:#343a40!important}.border-white{border-color:#fff!important}.rounded{border-radius:.25rem!important}.rounded-top{border-top-left-radius:.25rem!important;border-top-right-radius:.25rem!important}.rounded-right{border-top-right-radius:.25rem!important;border-bottom-right-radius:.25rem!important}.rounded-bottom{border-bottom-right-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-left{border-top-left-radius:.25rem!important;border-bottom-left-radius:.25rem!important}.rounded-circle{border-radius:50%!important}.rounded-0{border-radius:0!important}.clearfix::after{display:block;clear:both;content:""}.d-none{display:none!important}.d-inline{display:inline!important}.d-inline-block{display:inline-block!important}.d-block{display:block!important}.d-table{display:table!important}.d-table-row{display:table-row!important}.d-table-cell{display:table-cell!important}.d-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}@media (min-width:576px){.d-sm-none{display:none!important}.d-sm-inline{display:inline!important}.d-sm-inline-block{display:inline-block!important}.d-sm-block{display:block!important}.d-sm-table{display:table!important}.d-sm-table-row{display:table-row!important}.d-sm-table-cell{display:table-cell!important}.d-sm-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-sm-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:768px){.d-md-none{display:none!important}.d-md-inline{display:inline!important}.d-md-inline-block{display:inline-block!important}.d-md-block{display:block!important}.d-md-table{display:table!important}.d-md-table-row{display:table-row!important}.d-md-table-cell{display:table-cell!important}.d-md-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-md-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:992px){.d-lg-none{display:none!important}.d-lg-inline{display:inline!important}.d-lg-inline-block{display:inline-block!important}.d-lg-block{display:block!important}.d-lg-table{display:table!important}.d-lg-table-row{display:table-row!important}.d-lg-table-cell{display:table-cell!important}.d-lg-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-lg-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media (min-width:1200px){.d-xl-none{display:none!important}.d-xl-inline{display:inline!important}.d-xl-inline-block{display:inline-block!important}.d-xl-block{display:block!important}.d-xl-table{display:table!important}.d-xl-table-row{display:table-row!important}.d-xl-table-cell{display:table-cell!important}.d-xl-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-xl-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}@media print{.d-print-none{display:none!important}.d-print-inline{display:inline!important}.d-print-inline-block{display:inline-block!important}.d-print-block{display:block!important}.d-print-table{display:table!important}.d-print-table-row{display:table-row!important}.d-print-table-cell{display:table-cell!important}.d-print-flex{display:-webkit-box!important;display:-ms-flexbox!important;display:flex!important}.d-print-inline-flex{display:-webkit-inline-box!important;display:-ms-inline-flexbox!important;display:inline-flex!important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive::before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9::before{padding-top:42.857143%}.embed-responsive-16by9::before{padding-top:56.25%}.embed-responsive-4by3::before{padding-top:75%}.embed-responsive-1by1::before{padding-top:100%}.flex-row{-webkit-box-orient:horizontal!important;-webkit-box-direction:normal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-column{-webkit-box-orient:vertical!important;-webkit-box-direction:normal!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}@media (min-width:576px){.flex-sm-row{-webkit-box-orient:horizontal!important;-webkit-box-direction:normal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-sm-column{-webkit-box-orient:vertical!important;-webkit-box-direction:normal!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-sm-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-sm-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-sm-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-sm-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-sm-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-sm-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-sm-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-sm-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-sm-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-sm-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-sm-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-sm-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-sm-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-sm-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-sm-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-sm-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-sm-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-sm-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-sm-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-sm-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-sm-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-sm-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-sm-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-sm-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-sm-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-sm-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:768px){.flex-md-row{-webkit-box-orient:horizontal!important;-webkit-box-direction:normal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-md-column{-webkit-box-orient:vertical!important;-webkit-box-direction:normal!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-md-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-md-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-md-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-md-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-md-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-md-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-md-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-md-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-md-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-md-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-md-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-md-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-md-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-md-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-md-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-md-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-md-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-md-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-md-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-md-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-md-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-md-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-md-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-md-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-md-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-md-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:992px){.flex-lg-row{-webkit-box-orient:horizontal!important;-webkit-box-direction:normal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-lg-column{-webkit-box-orient:vertical!important;-webkit-box-direction:normal!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-lg-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-lg-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-lg-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-lg-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-lg-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-lg-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-lg-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-lg-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-lg-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-lg-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-lg-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-lg-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-lg-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-lg-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-lg-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-lg-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-lg-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-lg-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-lg-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-lg-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-lg-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-lg-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-lg-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-lg-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-lg-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-lg-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}@media (min-width:1200px){.flex-xl-row{-webkit-box-orient:horizontal!important;-webkit-box-direction:normal!important;-ms-flex-direction:row!important;flex-direction:row!important}.flex-xl-column{-webkit-box-orient:vertical!important;-webkit-box-direction:normal!important;-ms-flex-direction:column!important;flex-direction:column!important}.flex-xl-row-reverse{-webkit-box-orient:horizontal!important;-webkit-box-direction:reverse!important;-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}.flex-xl-column-reverse{-webkit-box-orient:vertical!important;-webkit-box-direction:reverse!important;-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}.flex-xl-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}.flex-xl-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}.justify-content-xl-start{-webkit-box-pack:start!important;-ms-flex-pack:start!important;justify-content:flex-start!important}.justify-content-xl-end{-webkit-box-pack:end!important;-ms-flex-pack:end!important;justify-content:flex-end!important}.justify-content-xl-center{-webkit-box-pack:center!important;-ms-flex-pack:center!important;justify-content:center!important}.justify-content-xl-between{-webkit-box-pack:justify!important;-ms-flex-pack:justify!important;justify-content:space-between!important}.justify-content-xl-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}.align-items-xl-start{-webkit-box-align:start!important;-ms-flex-align:start!important;align-items:flex-start!important}.align-items-xl-end{-webkit-box-align:end!important;-ms-flex-align:end!important;align-items:flex-end!important}.align-items-xl-center{-webkit-box-align:center!important;-ms-flex-align:center!important;align-items:center!important}.align-items-xl-baseline{-webkit-box-align:baseline!important;-ms-flex-align:baseline!important;align-items:baseline!important}.align-items-xl-stretch{-webkit-box-align:stretch!important;-ms-flex-align:stretch!important;align-items:stretch!important}.align-content-xl-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}.align-content-xl-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}.align-content-xl-center{-ms-flex-line-pack:center!important;align-content:center!important}.align-content-xl-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}.align-content-xl-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}.align-content-xl-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}.align-self-xl-auto{-ms-flex-item-align:auto!important;align-self:auto!important}.align-self-xl-start{-ms-flex-item-align:start!important;align-self:flex-start!important}.align-self-xl-end{-ms-flex-item-align:end!important;align-self:flex-end!important}.align-self-xl-center{-ms-flex-item-align:center!important;align-self:center!important}.align-self-xl-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}.align-self-xl-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}}.float-left{float:left!important}.float-right{float:right!important}.float-none{float:none!important}@media (min-width:576px){.float-sm-left{float:left!important}.float-sm-right{float:right!important}.float-sm-none{float:none!important}}@media (min-width:768px){.float-md-left{float:left!important}.float-md-right{float:right!important}.float-md-none{float:none!important}}@media (min-width:992px){.float-lg-left{float:left!important}.float-lg-right{float:right!important}.float-lg-none{float:none!important}}@media (min-width:1200px){.float-xl-left{float:left!important}.float-xl-right{float:right!important}.float-xl-none{float:none!important}}.position-static{position:static!important}.position-relative{position:relative!important}.position-absolute{position:absolute!important}.position-fixed{position:fixed!important}.position-sticky{position:-webkit-sticky!important;position:sticky!important}.fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030}.fixed-bottom{position:fixed;right:0;bottom:0;left:0;z-index:1030}@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;-webkit-clip-path:inset(50%);clip-path:inset(50%);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal;-webkit-clip-path:none;clip-path:none}.w-25{width:25%!important}.w-50{width:50%!important}.w-75{width:75%!important}.w-100{width:100%!important}.h-25{height:25%!important}.h-50{height:50%!important}.h-75{height:75%!important}.h-100{height:100%!important}.mw-100{max-width:100%!important}.mh-100{max-height:100%!important}.m-0{margin:0!important}.mt-0,.my-0{margin-top:0!important}.mr-0,.mx-0{margin-right:0!important}.mb-0,.my-0{margin-bottom:0!important}.ml-0,.mx-0{margin-left:0!important}.m-1{margin:.25rem!important}.mt-1,.my-1{margin-top:.25rem!important}.mr-1,.mx-1{margin-right:.25rem!important}.mb-1,.my-1{margin-bottom:.25rem!important}.ml-1,.mx-1{margin-left:.25rem!important}.m-2{margin:.5rem!important}.mt-2,.my-2{margin-top:.5rem!important}.mr-2,.mx-2{margin-right:.5rem!important}.mb-2,.my-2{margin-bottom:.5rem!important}.ml-2,.mx-2{margin-left:.5rem!important}.m-3{margin:1rem!important}.mt-3,.my-3{margin-top:1rem!important}.mr-3,.mx-3{margin-right:1rem!important}.mb-3,.my-3{margin-bottom:1rem!important}.ml-3,.mx-3{margin-left:1rem!important}.m-4{margin:1.5rem!important}.mt-4,.my-4{margin-top:1.5rem!important}.mr-4,.mx-4{margin-right:1.5rem!important}.mb-4,.my-4{margin-bottom:1.5rem!important}.ml-4,.mx-4{margin-left:1.5rem!important}.m-5{margin:3rem!important}.mt-5,.my-5{margin-top:3rem!important}.mr-5,.mx-5{margin-right:3rem!important}.mb-5,.my-5{margin-bottom:3rem!important}.ml-5,.mx-5{margin-left:3rem!important}.p-0{padding:0!important}.pt-0,.py-0{padding-top:0!important}.pr-0,.px-0{padding-right:0!important}.pb-0,.py-0{padding-bottom:0!important}.pl-0,.px-0{padding-left:0!important}.p-1{padding:.25rem!important}.pt-1,.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.pl-1,.px-1{padding-left:.25rem!important}.p-2{padding:.5rem!important}.pt-2,.py-2{padding-top:.5rem!important}.pr-2,.px-2{padding-right:.5rem!important}.pb-2,.py-2{padding-bottom:.5rem!important}.pl-2,.px-2{padding-left:.5rem!important}.p-3{padding:1rem!important}.pt-3,.py-3{padding-top:1rem!important}.pr-3,.px-3{padding-right:1rem!important}.pb-3,.py-3{padding-bottom:1rem!important}.pl-3,.px-3{padding-left:1rem!important}.p-4{padding:1.5rem!important}.pt-4,.py-4{padding-top:1.5rem!important}.pr-4,.px-4{padding-right:1.5rem!important}.pb-4,.py-4{padding-bottom:1.5rem!important}.pl-4,.px-4{padding-left:1.5rem!important}.p-5{padding:3rem!important}.pt-5,.py-5{padding-top:3rem!important}.pr-5,.px-5{padding-right:3rem!important}.pb-5,.py-5{padding-bottom:3rem!important}.pl-5,.px-5{padding-left:3rem!important}.m-auto{margin:auto!important}.mt-auto,.my-auto{margin-top:auto!important}.mr-auto,.mx-auto{margin-right:auto!important}.mb-auto,.my-auto{margin-bottom:auto!important}.ml-auto,.mx-auto{margin-left:auto!important}@media (min-width:576px){.m-sm-0{margin:0!important}.mt-sm-0,.my-sm-0{margin-top:0!important}.mr-sm-0,.mx-sm-0{margin-right:0!important}.mb-sm-0,.my-sm-0{margin-bottom:0!important}.ml-sm-0,.mx-sm-0{margin-left:0!important}.m-sm-1{margin:.25rem!important}.mt-sm-1,.my-sm-1{margin-top:.25rem!important}.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}.m-sm-2{margin:.5rem!important}.mt-sm-2,.my-sm-2{margin-top:.5rem!important}.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}.m-sm-3{margin:1rem!important}.mt-sm-3,.my-sm-3{margin-top:1rem!important}.mr-sm-3,.mx-sm-3{margin-right:1rem!important}.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}.ml-sm-3,.mx-sm-3{margin-left:1rem!important}.m-sm-4{margin:1.5rem!important}.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}.m-sm-5{margin:3rem!important}.mt-sm-5,.my-sm-5{margin-top:3rem!important}.mr-sm-5,.mx-sm-5{margin-right:3rem!important}.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}.ml-sm-5,.mx-sm-5{margin-left:3rem!important}.p-sm-0{padding:0!important}.pt-sm-0,.py-sm-0{padding-top:0!important}.pr-sm-0,.px-sm-0{padding-right:0!important}.pb-sm-0,.py-sm-0{padding-bottom:0!important}.pl-sm-0,.px-sm-0{padding-left:0!important}.p-sm-1{padding:.25rem!important}.pt-sm-1,.py-sm-1{padding-top:.25rem!important}.pr-sm-1,.px-sm-1{padding-right:.25rem!important}.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}.pl-sm-1,.px-sm-1{padding-left:.25rem!important}.p-sm-2{padding:.5rem!important}.pt-sm-2,.py-sm-2{padding-top:.5rem!important}.pr-sm-2,.px-sm-2{padding-right:.5rem!important}.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}.pl-sm-2,.px-sm-2{padding-left:.5rem!important}.p-sm-3{padding:1rem!important}.pt-sm-3,.py-sm-3{padding-top:1rem!important}.pr-sm-3,.px-sm-3{padding-right:1rem!important}.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}.pl-sm-3,.px-sm-3{padding-left:1rem!important}.p-sm-4{padding:1.5rem!important}.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}.p-sm-5{padding:3rem!important}.pt-sm-5,.py-sm-5{padding-top:3rem!important}.pr-sm-5,.px-sm-5{padding-right:3rem!important}.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}.pl-sm-5,.px-sm-5{padding-left:3rem!important}.m-sm-auto{margin:auto!important}.mt-sm-auto,.my-sm-auto{margin-top:auto!important}.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}}@media (min-width:768px){.m-md-0{margin:0!important}.mt-md-0,.my-md-0{margin-top:0!important}.mr-md-0,.mx-md-0{margin-right:0!important}.mb-md-0,.my-md-0{margin-bottom:0!important}.ml-md-0,.mx-md-0{margin-left:0!important}.m-md-1{margin:.25rem!important}.mt-md-1,.my-md-1{margin-top:.25rem!important}.mr-md-1,.mx-md-1{margin-right:.25rem!important}.mb-md-1,.my-md-1{margin-bottom:.25rem!important}.ml-md-1,.mx-md-1{margin-left:.25rem!important}.m-md-2{margin:.5rem!important}.mt-md-2,.my-md-2{margin-top:.5rem!important}.mr-md-2,.mx-md-2{margin-right:.5rem!important}.mb-md-2,.my-md-2{margin-bottom:.5rem!important}.ml-md-2,.mx-md-2{margin-left:.5rem!important}.m-md-3{margin:1rem!important}.mt-md-3,.my-md-3{margin-top:1rem!important}.mr-md-3,.mx-md-3{margin-right:1rem!important}.mb-md-3,.my-md-3{margin-bottom:1rem!important}.ml-md-3,.mx-md-3{margin-left:1rem!important}.m-md-4{margin:1.5rem!important}.mt-md-4,.my-md-4{margin-top:1.5rem!important}.mr-md-4,.mx-md-4{margin-right:1.5rem!important}.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}.ml-md-4,.mx-md-4{margin-left:1.5rem!important}.m-md-5{margin:3rem!important}.mt-md-5,.my-md-5{margin-top:3rem!important}.mr-md-5,.mx-md-5{margin-right:3rem!important}.mb-md-5,.my-md-5{margin-bottom:3rem!important}.ml-md-5,.mx-md-5{margin-left:3rem!important}.p-md-0{padding:0!important}.pt-md-0,.py-md-0{padding-top:0!important}.pr-md-0,.px-md-0{padding-right:0!important}.pb-md-0,.py-md-0{padding-bottom:0!important}.pl-md-0,.px-md-0{padding-left:0!important}.p-md-1{padding:.25rem!important}.pt-md-1,.py-md-1{padding-top:.25rem!important}.pr-md-1,.px-md-1{padding-right:.25rem!important}.pb-md-1,.py-md-1{padding-bottom:.25rem!important}.pl-md-1,.px-md-1{padding-left:.25rem!important}.p-md-2{padding:.5rem!important}.pt-md-2,.py-md-2{padding-top:.5rem!important}.pr-md-2,.px-md-2{padding-right:.5rem!important}.pb-md-2,.py-md-2{padding-bottom:.5rem!important}.pl-md-2,.px-md-2{padding-left:.5rem!important}.p-md-3{padding:1rem!important}.pt-md-3,.py-md-3{padding-top:1rem!important}.pr-md-3,.px-md-3{padding-right:1rem!important}.pb-md-3,.py-md-3{padding-bottom:1rem!important}.pl-md-3,.px-md-3{padding-left:1rem!important}.p-md-4{padding:1.5rem!important}.pt-md-4,.py-md-4{padding-top:1.5rem!important}.pr-md-4,.px-md-4{padding-right:1.5rem!important}.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}.pl-md-4,.px-md-4{padding-left:1.5rem!important}.p-md-5{padding:3rem!important}.pt-md-5,.py-md-5{padding-top:3rem!important}.pr-md-5,.px-md-5{padding-right:3rem!important}.pb-md-5,.py-md-5{padding-bottom:3rem!important}.pl-md-5,.px-md-5{padding-left:3rem!important}.m-md-auto{margin:auto!important}.mt-md-auto,.my-md-auto{margin-top:auto!important}.mr-md-auto,.mx-md-auto{margin-right:auto!important}.mb-md-auto,.my-md-auto{margin-bottom:auto!important}.ml-md-auto,.mx-md-auto{margin-left:auto!important}}@media (min-width:992px){.m-lg-0{margin:0!important}.mt-lg-0,.my-lg-0{margin-top:0!important}.mr-lg-0,.mx-lg-0{margin-right:0!important}.mb-lg-0,.my-lg-0{margin-bottom:0!important}.ml-lg-0,.mx-lg-0{margin-left:0!important}.m-lg-1{margin:.25rem!important}.mt-lg-1,.my-lg-1{margin-top:.25rem!important}.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}.m-lg-2{margin:.5rem!important}.mt-lg-2,.my-lg-2{margin-top:.5rem!important}.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}.m-lg-3{margin:1rem!important}.mt-lg-3,.my-lg-3{margin-top:1rem!important}.mr-lg-3,.mx-lg-3{margin-right:1rem!important}.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}.ml-lg-3,.mx-lg-3{margin-left:1rem!important}.m-lg-4{margin:1.5rem!important}.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}.m-lg-5{margin:3rem!important}.mt-lg-5,.my-lg-5{margin-top:3rem!important}.mr-lg-5,.mx-lg-5{margin-right:3rem!important}.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}.ml-lg-5,.mx-lg-5{margin-left:3rem!important}.p-lg-0{padding:0!important}.pt-lg-0,.py-lg-0{padding-top:0!important}.pr-lg-0,.px-lg-0{padding-right:0!important}.pb-lg-0,.py-lg-0{padding-bottom:0!important}.pl-lg-0,.px-lg-0{padding-left:0!important}.p-lg-1{padding:.25rem!important}.pt-lg-1,.py-lg-1{padding-top:.25rem!important}.pr-lg-1,.px-lg-1{padding-right:.25rem!important}.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}.pl-lg-1,.px-lg-1{padding-left:.25rem!important}.p-lg-2{padding:.5rem!important}.pt-lg-2,.py-lg-2{padding-top:.5rem!important}.pr-lg-2,.px-lg-2{padding-right:.5rem!important}.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}.pl-lg-2,.px-lg-2{padding-left:.5rem!important}.p-lg-3{padding:1rem!important}.pt-lg-3,.py-lg-3{padding-top:1rem!important}.pr-lg-3,.px-lg-3{padding-right:1rem!important}.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}.pl-lg-3,.px-lg-3{padding-left:1rem!important}.p-lg-4{padding:1.5rem!important}.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}.p-lg-5{padding:3rem!important}.pt-lg-5,.py-lg-5{padding-top:3rem!important}.pr-lg-5,.px-lg-5{padding-right:3rem!important}.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}.pl-lg-5,.px-lg-5{padding-left:3rem!important}.m-lg-auto{margin:auto!important}.mt-lg-auto,.my-lg-auto{margin-top:auto!important}.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}}@media (min-width:1200px){.m-xl-0{margin:0!important}.mt-xl-0,.my-xl-0{margin-top:0!important}.mr-xl-0,.mx-xl-0{margin-right:0!important}.mb-xl-0,.my-xl-0{margin-bottom:0!important}.ml-xl-0,.mx-xl-0{margin-left:0!important}.m-xl-1{margin:.25rem!important}.mt-xl-1,.my-xl-1{margin-top:.25rem!important}.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}.m-xl-2{margin:.5rem!important}.mt-xl-2,.my-xl-2{margin-top:.5rem!important}.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}.m-xl-3{margin:1rem!important}.mt-xl-3,.my-xl-3{margin-top:1rem!important}.mr-xl-3,.mx-xl-3{margin-right:1rem!important}.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}.ml-xl-3,.mx-xl-3{margin-left:1rem!important}.m-xl-4{margin:1.5rem!important}.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}.m-xl-5{margin:3rem!important}.mt-xl-5,.my-xl-5{margin-top:3rem!important}.mr-xl-5,.mx-xl-5{margin-right:3rem!important}.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}.ml-xl-5,.mx-xl-5{margin-left:3rem!important}.p-xl-0{padding:0!important}.pt-xl-0,.py-xl-0{padding-top:0!important}.pr-xl-0,.px-xl-0{padding-right:0!important}.pb-xl-0,.py-xl-0{padding-bottom:0!important}.pl-xl-0,.px-xl-0{padding-left:0!important}.p-xl-1{padding:.25rem!important}.pt-xl-1,.py-xl-1{padding-top:.25rem!important}.pr-xl-1,.px-xl-1{padding-right:.25rem!important}.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}.pl-xl-1,.px-xl-1{padding-left:.25rem!important}.p-xl-2{padding:.5rem!important}.pt-xl-2,.py-xl-2{padding-top:.5rem!important}.pr-xl-2,.px-xl-2{padding-right:.5rem!important}.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}.pl-xl-2,.px-xl-2{padding-left:.5rem!important}.p-xl-3{padding:1rem!important}.pt-xl-3,.py-xl-3{padding-top:1rem!important}.pr-xl-3,.px-xl-3{padding-right:1rem!important}.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}.pl-xl-3,.px-xl-3{padding-left:1rem!important}.p-xl-4{padding:1.5rem!important}.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}.p-xl-5{padding:3rem!important}.pt-xl-5,.py-xl-5{padding-top:3rem!important}.pr-xl-5,.px-xl-5{padding-right:3rem!important}.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}.pl-xl-5,.px-xl-5{padding-left:3rem!important}.m-xl-auto{margin:auto!important}.mt-xl-auto,.my-xl-auto{margin-top:auto!important}.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}}.text-justify{text-align:justify!important}.text-nowrap{white-space:nowrap!important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}@media (min-width:576px){.text-sm-left{text-align:left!important}.text-sm-right{text-align:right!important}.text-sm-center{text-align:center!important}}@media (min-width:768px){.text-md-left{text-align:left!important}.text-md-right{text-align:right!important}.text-md-center{text-align:center!important}}@media (min-width:992px){.text-lg-left{text-align:left!important}.text-lg-right{text-align:right!important}.text-lg-center{text-align:center!important}}@media (min-width:1200px){.text-xl-left{text-align:left!important}.text-xl-right{text-align:right!important}.text-xl-center{text-align:center!important}}.text-lowercase{text-transform:lowercase!important}.text-uppercase{text-transform:uppercase!important}.text-capitalize{text-transform:capitalize!important}.font-weight-light{font-weight:300!important}.font-weight-normal{font-weight:400!important}.font-weight-bold{font-weight:700!important}.font-italic{font-style:italic!important}.text-white{color:#fff!important}.text-primary{color:#007bff!important}a.text-primary:focus,a.text-primary:hover{color:#0062cc!important}.text-secondary{color:#6c757d!important}a.text-secondary:focus,a.text-secondary:hover{color:#545b62!important}.text-success{color:#28a745!important}a.text-success:focus,a.text-success:hover{color:#1e7e34!important}.text-info{color:#17a2b8!important}a.text-info:focus,a.text-info:hover{color:#117a8b!important}.text-warning{color:#ffc107!important}a.text-warning:focus,a.text-warning:hover{color:#d39e00!important}.text-danger{color:#dc3545!important}a.text-danger:focus,a.text-danger:hover{color:#bd2130!important}.text-light{color:#f8f9fa!important}a.text-light:focus,a.text-light:hover{color:#dae0e5!important}.text-dark{color:#343a40!important}a.text-dark:focus,a.text-dark:hover{color:#1d2124!important}.text-muted{color:#6c757d!important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.visible{visibility:visible!important}.invisible{visibility:hidden!important}@media print{*,::after,::before{text-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}abbr[title]::after{content:" (" attr(title) ")"}pre{white-space:pre-wrap!important}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}body{min-width:992px!important}.container{min-width:992px!important}.navbar{display:none}.badge{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}
+/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
diff --git a/samples/Basic_IFS/files/error.html b/samples/Basic_IFS/files/error.html
new file mode 100644
index 0000000000..14c35043cb
--- /dev/null
+++ b/samples/Basic_IFS/files/error.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en-GB">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="icon" href="/favicon.ico" type="image/x-icon">
+<title>Sming IFS demo</title>
+
+<link rel="stylesheet" href="styles.css"/>
+
+</head>
+
+<body>
+ 
+<h2>Sming IFS demo</h2>
+
+<p>Sorry, there's been a problem.</p>
+
+<p>Requested path: {path}</p>
+
+<p>{code}: {text}</p>
+
+<a href="/">Return to home page</a>
+
+</body>
+</html>
diff --git a/samples/Basic_IFS/files/favicon.ico b/samples/Basic_IFS/files/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4ef8ef16286c58dd37617b0d8c71ae4ce91b51dd
GIT binary patch
literal 15086
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

literal 0
HcmV?d00001

diff --git a/samples/Basic_IFS/files/styles.css b/samples/Basic_IFS/files/styles.css
new file mode 100644
index 0000000000..4f03804998
--- /dev/null
+++ b/samples/Basic_IFS/files/styles.css
@@ -0,0 +1,165 @@
+
+/* 
+  Safari (iPhone) will auto-zoom if input elements are less than 16px, and the
+  default for that platform is 11px. That causes the 'Connect' button to disappear
+  from the screen when entering login details.
+  To fix this, change the default text size to the minimum; it also makes things
+  easier to read.
+*/
+body {
+  font-size: 16px;
+}
+
+input, button {
+  font-size: inherit;
+}
+
+select {
+	font-family:"Lucida Console", monospace, serif;
+	width: 100%;
+	display: block;
+}
+
+select option {
+	width:auto;
+}
+
+
+div .menu {
+  display: inline-block;
+  cursor: pointer;
+}
+
+div .bar {
+  width: 25px;
+  height: 5px;
+  background-color: black;
+  margin: 4px 0;
+}
+
+.sidenav {
+  height: 100%;
+  width: 0;
+  position: fixed;
+  z-index: 1;
+  top: 0;
+  left: 0;
+  background-color: rgba(0,0,0,0.85);
+  overflow-x: hidden;
+  transition: 0.1s;
+  padding-top: 60px;
+}
+
+.sidenav a {
+  padding: 8px 8px 8px 32px;
+  text-decoration: none;
+  font-size: 25px;
+  color: #818181;
+  display: block;
+  transition: 0.2s;
+}
+
+.sidenav a:hover {
+  color: #f1f1f1;
+}
+
+.sidenav .closebtn {
+  position: absolute;
+  top: 0;
+  right: 25px;
+  font-size: 36px;
+  margin-left: 50px;
+}
+
+@media screen and (max-height: 450px) {
+  .sidenav {padding-top: 15px;}
+  .sidenav a {font-size: 18px;}
+}
+
+
+
+
+
+
+.accordion {
+  background-color: #eee;
+  color: #444;
+  cursor: pointer;
+  padding: 18px;
+  text-align: left;
+  border: none;
+  width: 100%;
+  outline: none;
+  transition: 0.25s;
+}
+
+/*
+  Add a background color to the button if it is clicked on (add the .active class with JS), and when you move the mouse over it (hover)
+*/
+.active, .accordion:hover {
+  background-color: #ccc;
+}
+
+.accordion:before {
+  content: '\02795'; /* Unicode character for "plus" sign (+) */
+}
+
+.active:before {
+  content: "\2796"; /* Unicode character for "minus" sign (-) */
+}
+
+
+/*
+  Style the accordion panel. Note: hidden by default
+*/
+.panel {
+  display: none;
+  padding: 0 18px;
+  background-color: white;
+  overflow: hidden;
+}
+
+
+.panel button {
+  outline: none;
+  border: none;
+  border-radius: 8px;
+  color: black;
+  background-color: GainsBoro; 
+  padding: 10px 10px;
+  text-align: left;
+  text-decoration: none;
+  display: inline-block;
+  margin: 2px 2px;
+  cursor: pointer;
+}
+
+.panel button.on        { background-color: Red; color: white; }
+.panel button.someon    { background-color: Orange; color: white; }
+.panel button.off       { background-color: DimGray; color: white; }
+.panel button.unk       { background-color: WhiteSmoke; color: DarkGrey; opacity: 0.6; }
+.panel button.pending   { background-color: DarkSeaGreen;   color: white; }
+.panel button.disabled  { background-color: WhiteSmoke; color: black; opacity: 0.6 }
+
+.panel button.accordion { border-radius: 0px; opacity: 0.8; }
+
+
+.content {
+	display: block;
+}
+
+.group {
+  display: none;
+  padding: 6px 12px;
+  border: 1px solid #ccc;
+  border-top: none;
+} 
+
+
+#progress {
+  width: 100%;
+  background-color: lightgrey;
+  text-align: center;
+  color: white;
+}
+
diff --git a/samples/Basic_IFS/fsimage.ini b/samples/Basic_IFS/fsimage.ini
new file mode 100644
index 0000000000..6e23dc647a
--- /dev/null
+++ b/samples/Basic_IFS/fsimage.ini
@@ -0,0 +1,32 @@
+
+# Filesystem builder configuration
+[config]
+
+volumeName = Sming IFS demo volume
+volumeID = 0x12345678
+
+# Where to read files from
+[source]
+/ = files
+readme.md = ${SMING_HOME}/Components/IFS/README.rst
+sming.png = ${SMING_HOME}/../docs/api-logo.png
+Data = ${SMING_HOME}/Core/Data
+framework = ${SMING_HOME}/../docs/source/framework
+Sming = ${SMING_HOME}/Core
+
+# Directories to mount other object stores
+[mountpoints]
+config = 1
+
+# Rules for file metadata. All rules are evaluated in sequence for every file
+# The masks apply to the full target path
+[rules]
+*: read=guest,write=admin
+\.*: read=admin
+*.html: readonly=true
+*.js, *.png, *.ico, *.jpg, *.jpeg, *.html, *.css, *.txt, *.md: compress=gzip
+/layout.json, /full-layout.json: compress=gzip
+/Data/*, /framework/*, /Sming/*: compress=gzip
+/index.html, /index.js, /stswsio.js, /styles.css, *.ico, *.png: read=any
+# This is a template file so firmware needs to read it
+/error.html: compress=none
diff --git a/samples/Basic_IFS/resource/listing.html b/samples/Basic_IFS/resource/listing.html
new file mode 100644
index 0000000000..dba33cb68f
--- /dev/null
+++ b/samples/Basic_IFS/resource/listing.html
@@ -0,0 +1,76 @@
+#
+# HTML template to list directory with links 
+#
+
+# 0: Header
+{SECTION}
+<!DOCTYPE html>
+<html lang="en-GB">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<link rel="stylesheet" href="/bootstrap.min.css">
+<title>Index of '{path}'</title>
+</head>
+<body>
+<h1><a href="/"><img src="/sming.png"></a> Basic IFS demo</h1>
+Request count: {request-count}
+<h2>{path}</h2>
+<table class="table">
+<thead >
+<tr>
+<th></th>
+<th>ID</th>
+<th>Name</th>
+<th>MIME type</th>
+<th>Last modified</th>
+<th>Size</th>
+<th>Original Size</th>
+<th>Attributes</th>
+<th>Compression</th>
+<th>Access R/W</th>
+</tr>
+</thead>
+
+{!ifdef:parent}
+<tr>
+<td colspan="6"><a href="{parent}"><span style='font-size:20px'>&hookleftarrow;</span> {parent}</a></td>
+</tr>
+{!endif}
+
+{/SECTION}
+
+
+# 1: Content
+{SECTION}
+{!iflt:$record:100}
+<tr>
+<td>{$record}</td>
+<td>{file_id}</td>
+<td><a href="{path}{name}"><span style='font-size:20px'>{icon}</span> {name}</a></td>
+<td>{!mime_type:name}</td>
+<td>{modified}</td>
+{!ifin:attr:"D"}<td></td><td></td>
+{!else}
+<td>{size}<br>{!kb:size}&nbsp;KB</td>
+<td>{original_size}<br>{!kb:original_size}&nbsp;KB</td>
+{!endif}
+<td>{!replace:attr_long:", ":"<br>"}</td>
+<td>{compression}</td>
+<td>{access_long}</td>
+</tr>
+{!else}
+Too many records {$record}
+{!endif}
+{/SECTION}
+
+
+# 2: Footer
+{SECTION}
+</table>
+<p>
+{!ifeq:{!count:1}}No files found. Last error: <b>{last_error}</b>
+{!else}{!count:1} files, {total_size} bytes ({!kb:total_size} KB){!endif}
+</body>
+</html>
+{/SECTION}
\ No newline at end of file
diff --git a/samples/Basic_IFS/resource/listing.json b/samples/Basic_IFS/resource/listing.json
new file mode 100644
index 0000000000..5a20750249
--- /dev/null
+++ b/samples/Basic_IFS/resource/listing.json
@@ -0,0 +1,24 @@
+{SECTION}
+{
+	{{!ifdef:parent}}"parent":"{{parent}}",
+	{{!endif}}"files": [
+{/SECTION}
+
+{SECTION}{{!ifgt:$record:0}},
+{{!endif}}		{
+			"record": {{!as_int:$record}},
+			"name": "{{name}}",
+			"modified": "{{modified}}",
+			"size": {{!as_int:size}},
+			"original_size": {{!as_int:original_size}},
+			"attr": "{{attr}}",
+			"access": "{{access}}"
+		}{/SECTION}
+
+{SECTION}
+	],
+	"count": {{!as_int:{!count:1}}},
+	"total_size": {{!as_int:total_size}},
+	"last_error": "{{last_error}}"
+}
+{/SECTION}
diff --git a/samples/Basic_IFS/resource/listing.txt b/samples/Basic_IFS/resource/listing.txt
new file mode 100644
index 0000000000..9737a1fd5c
--- /dev/null
+++ b/samples/Basic_IFS/resource/listing.txt
@@ -0,0 +1,26 @@
+#
+# Sample template to display root directory in a table
+#
+
+{SECTION} 
+Index of '{path}'
+{!ifdef:parent}Parent is '{parent}' (length is {length:parent}){!endif}
+
+{!pad:"#":5} {!pad:"Name":32} {!pad:"Modified":22} {!pad:"Size":10} {!pad:"Size (KB)":10} {!pad:"Orig Size":10} {!pad:"Attributes":10} {!pad:"Access":10}
+{!repeat:"-":5} {!repeat:"-":32} {!repeat:"-":22} {!repeat:"-":10} {!repeat:"-":10} {!repeat:"-":10} {!repeat:"-":10} {!repeat:"-":10}
+{/SECTION}
+
+# Data section follows
+
+{SECTION}{!pad:$record:5} {!pad:name:32} {!pad:modified:22} {!pad:size:10} {!pad:{!kb:size}:10} {!pad:original_size:10} {!pad:attr:10} {!pad:access:10}
+{/SECTION}
+
+{SECTION}{!repeat:"-":10}
+{!count:1} files, {total_size} bytes ({!kb:total_size} KB)
+Last error: {last_error}
+
+LISTING COMPLETE
+
+{/SECTION}
+
+# We're all done.
diff --git a/samples/Basic_Serial/app/application.cpp b/samples/Basic_Serial/app/application.cpp
index 1a7e0ce2a5..02548412d1 100644
--- a/samples/Basic_Serial/app/application.cpp
+++ b/samples/Basic_Serial/app/application.cpp
@@ -222,7 +222,7 @@ void handleCommand(const String& command)
 	if(command.equalsIgnoreCase(_F("cat"))) {
 		String filename = F("README.md");
 		FileStream* fileStream = new FileStream;
-		if(fileStream && fileStream->open(filename, eFO_ReadOnly)) {
+		if(fileStream && fileStream->open(filename, File::ReadOnly)) {
 			Serial.printf(_F("Sending \"%s\" (%u bytes)\r\n"), filename.c_str(), fileStream->available());
 			auto demo = new SerialTransmitDemo(Serial1, fileStream);
 			demo->begin();
diff --git a/samples/HttpClient/app/application.cpp b/samples/HttpClient/app/application.cpp
index 1078d84445..bb54ee542f 100644
--- a/samples/HttpClient/app/application.cpp
+++ b/samples/HttpClient/app/application.cpp
@@ -140,7 +140,7 @@ void connectOk(IpAddress ip, IpAddress mask, IpAddress gateway)
 
 	// Or if you want to directly save the response body to a file then the following can be done
 	//	FileStream* responseBodyFile = new FileStream();
-	//	responseBodyFile->open("file.name", eFO_CreateNewAlways | eFO_WriteOnly);
+	//	responseBodyFile->open("file.name", File::CreateNewAlways | File::WriteOnly);
 	//	putRequest->setResponseStream(responseBodyFile); // << the complete body will be stored on your file system
 	// see the implementation of `bool HttpClient::downloadFile(const String& url, const String& saveFileName, ...` for details.
 
diff --git a/samples/LiveDebug/app/application.cpp b/samples/LiveDebug/app/application.cpp
index a60f0186f6..dbe12d1ed7 100644
--- a/samples/LiveDebug/app/application.cpp
+++ b/samples/LiveDebug/app/application.cpp
@@ -1,6 +1,7 @@
 #include <SmingCore.h>
 #include "HardwareTimer.h"
 #include <gdb/gdb_syscall.h>
+#include <IFS/Gdb/FileSystem.h>
 #include <Data/Stream/GdbFileStream.h>
 #include <Data/Buffer/LineBuffer.h>
 #include <Platform/OsMessageInterceptor.h>
@@ -61,6 +62,9 @@ static OsMessageInterceptor osMessageInterceptor;
 // Supports `consoleOff` command to prevent re-enabling when debugger is attached
 bool consoleOffRequested = false;
 
+//
+IFS::Gdb::FileSystem gdbfs;
+
 // Forward declarations
 bool handleCommand(const String& cmd);
 void readConsole();
@@ -154,15 +158,15 @@ void onDataReceived(Stream& source, char arrivedChar, unsigned short availableCh
  */
 void readFile(const char* filename, bool display)
 {
-	auto start = millis();
-	int fd = gdb_syscall_open(filename, O_RDONLY, 0);
-	Serial.printf(_F("gdb_syscall_open(\"%s\") = %d\r\n"), filename, fd);
-	if(fd > 0) {
+	int file = gdbfs.open(filename, File::ReadOnly);
+	Serial.printf(_F("gdbfs.open(\"%s\") = %d\r\n"), filename, file);
+	if(file >= 0) {
+		OneShotFastMs timer;
 		char buf[256];
-		size_t total = 0;
+		size_t total{0};
 		int len;
 		do {
-			len = gdb_syscall_read(fd, buf, sizeof(buf));
+			len = gdbfs.read(file, buf, sizeof(buf));
 			if(len > 0) {
 				total += size_t(len);
 				if(display) {
@@ -170,11 +174,11 @@ void readFile(const char* filename, bool display)
 				}
 			}
 		} while(len == sizeof(buf));
-		auto elapsed = millis() - start;
-		Serial.printf(_F("\r\ngdb_syscall_read() = %d, total = %u, elapsed = %u ms, av. %u bytes/sec\r\n"), len, total,
-					  elapsed, total == 0 ? 0 : 1000U * total / elapsed);
+		auto elapsed = timer.elapsedTime();
+		Serial.printf(_F("\r\ngdbfs.read() = %d, total = %u, elapsed = %s, av. %u bytes/sec\r\n"), len, total,
+					  elapsed.toString().c_str(), total == 0 ? 0 : 1000U * total / elapsed);
 
-		gdb_syscall_close(fd);
+		gdbfs.close(file);
 	}
 }
 
@@ -649,7 +653,7 @@ extern "C" void gdb_on_attach(bool attached)
 	debug_i("GdbAttach(%d)", attached);
 	if(attached) {
 		// Open a log file on the host to demonstrate use of GdbFileStream
-		logFile.open(F(LOG_FILENAME), eFO_WriteOnly | eFO_CreateIfNotExist);
+		logFile.open(F(LOG_FILENAME), File::WriteOnly | File::Create);
 		debug_i("open log %d", logFile.getLastError());
 		logFile.println();
 
diff --git a/tests/HostTests/modules/ArduinoJson6.cpp b/tests/HostTests/modules/ArduinoJson6.cpp
index 9c3690045b..544d5a83a8 100644
--- a/tests/HostTests/modules/ArduinoJson6.cpp
+++ b/tests/HostTests/modules/ArduinoJson6.cpp
@@ -305,7 +305,7 @@ class JsonTest6 : public TestGroup
 	{
 		PSTR_ARRAY(filename, "test.json");
 		if(!fileExist(filename)) {
-			FileStream fs(filename, eFO_CreateNewAlways | eFO_WriteOnly);
+			FileStream fs(filename, File::CreateNewAlways | File::WriteOnly);
 			REQUIRE(fs.isValid());
 			FSTR::Stream os(Resource::test_json);
 			REQUIRE(fs.copyFrom(&os, os.available()) == Resource::test_json.length());
diff --git a/tests/HostTests/modules/Files.cpp b/tests/HostTests/modules/Files.cpp
index 46c59d2b68..6a401b46c6 100644
--- a/tests/HostTests/modules/Files.cpp
+++ b/tests/HostTests/modules/Files.cpp
@@ -23,7 +23,7 @@ class FilesTest : public TestGroup
 			res = fileSetContent(testFileName, testContent);
 			debug_i("fileSetContent() returned %d", res);
 			REQUIRE(size_t(res) == testContent.length());
-			file = fileOpen(testFileName, eFO_ReadWrite);
+			file = fileOpen(testFileName, File::ReadWrite);
 			size = fileSeek(file, 0, SeekOrigin::End);
 			pos = fileSeek(file, 100, SeekOrigin::Start);
 			debug_i("pos = %d, size = %d", pos, size);
@@ -104,7 +104,7 @@ class FilesTest : public TestGroup
 		TEST_CASE("Truncate read/write file stream")
 		{
 			FileStream fs;
-			fs.open(testFileName, eFO_ReadWrite);
+			fs.open(testFileName, File::ReadWrite);
 			fs.seek(50);
 			res = fs.truncate(100);
 			pos = fs.getPos();
@@ -122,7 +122,7 @@ class FilesTest : public TestGroup
 		TEST_CASE("Seek file stream past end of file")
 		{
 			FileStream fs;
-			fs.open(testFileName, eFO_ReadWrite);
+			fs.open(testFileName, File::ReadWrite);
 			res = fs.seekFrom(101, SeekOrigin::Start);
 			pos = fs.getPos();
 			size = fs.getSize();
diff --git a/tests/HostTests/modules/TemplateStream.cpp b/tests/HostTests/modules/TemplateStream.cpp
index 9fe9011e17..1805d54c02 100644
--- a/tests/HostTests/modules/TemplateStream.cpp
+++ b/tests/HostTests/modules/TemplateStream.cpp
@@ -3,6 +3,11 @@
 #include <Data/Stream/MemoryDataStream.h>
 #include <Data/Stream/SectionTemplate.h>
 
+#ifdef ARCH_HOST
+#include <IFS/Host/FileSystem.h>
+#include <Data/Stream/HostFileStream.h>
+#endif
+
 DEFINE_FSTR_LOCAL(template1, "Stream containing {var1}, {var2} and {var3}. {} {{}} {{12345")
 DEFINE_FSTR_LOCAL(template1_1, "Stream containing value #1, value #2 and {var3}. {} {{}} {{12345")
 DEFINE_FSTR_LOCAL(template1_2, "Stream containing value #1, value #2 and [value #3]. {} {{}} {{12345")
@@ -89,6 +94,22 @@ class TemplateStreamTest : public TestGroup
 				return nullptr;
 			});
 
+#ifdef ARCH_HOST
+			{
+				HostFileStream fs("test-src1.out", eFO_CreateNewAlways | eFO_WriteOnly);
+				int res = fs.copyFrom(&tmpl);
+				debug_e("copyfrom(src) = %d", res);
+				tmpl.gotoSection(0);
+			}
+
+			{
+				HostFileStream fs("test-src2.out", eFO_CreateNewAlways | eFO_WriteOnly);
+				int res = fs.copyFrom(&tmpl);
+				debug_e("copyfrom(src) = %d", res);
+				tmpl.gotoSection(0);
+			}
+#endif
+
 			check(tmpl, Resource::ut_template1_out1_rst);
 		}
 	}

From d5a78b013172d5feb406a1698171cc35bddb0675 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Sun, 14 Feb 2021 10:14:54 +0000
Subject: [PATCH 14/91] Handle SPIFFS metadata more elegantly (#2218)

**IFS changes**

Define SPIFFS_OBJ_META_LEN as build variable so it's under user control
Don't read or write metadata if defined meta length is < 16
Add magic to start of SPIFFS metadata, set dirty flag when initialised
Newly created metadata is automatically flushed to storage, but only if file is open in write mode
Add filesystem info attribute to indicate if metadata is supported

Fix block size assignment for SPIFFS to support use with other device types
Define global `IFS::Host::fileSystem&` for easier use
Fix Basic_IFS sample handling for FWFS_HYBRID=1


**Replace `spiffy` with `spiffsgen` tool from ESP IDF**

Generate default metadata for each file, provided meta len >= 16
Add check in HostTests to compare spiffy output with spiffsgen.
Output messages for `samples` and `component-samples` target to make log easier to follow

**spiffsgen.py changes**

* Add `SPIFFS_ALIGNED_OBJECT_INDEX_TABLES` setting as page indices must be word-aligned
* Don't write image file if errors occur
* Set `--use-magic` and `--use-magic-len` defaults to False
* Allow spiffsgen `base_dir` to be empty
* Remove leading / from filenames
---
 .../Host/Components/spi_flash/flashmem.cpp    |   2 +-
 .../Host/Core/Data/Stream/HostFileStream.cpp  |   7 +-
 Sming/Components/IFS                          |   2 +-
 Sming/Components/spiffs/README.rst            |  10 +
 Sming/Components/spiffs/component.mk          |  22 +-
 Sming/Components/spiffs/spiffs_config.h       |   6 +-
 Sming/Components/spiffs/spiffsgen.py          | 565 ++++++++++++++++++
 Sming/Components/spiffs/spiffy/Makefile       |  41 --
 Sming/Components/spiffs/spiffy/spiffy.c       | 309 ----------
 Sming/Components/spiffs/spiffy_host.h         |  16 -
 Sming/Makefile                                |   3 +
 Sming/building.rst                            |   6 +-
 docs/source/upgrading/4.2-4.3.rst             |  13 +-
 samples/Basic_IFS/app/application.cpp         |   8 +-
 samples/Basic_IFS/basic_ifs.hw                |   4 -
 tests/HostTests/component.mk                  |  10 +
 tests/HostTests/modules/Spiffs.cpp            | 103 ++++
 tests/HostTests/spiffsgen/README.rst          |  14 +
 tests/HostTests/spiffsgen/build/.lastModified |   1 +
 .../spiffsgen/build/bootstrap-core.css.gz     | Bin 0 -> 15861 bytes
 tests/HostTests/spiffsgen/build/core.js.gz    | Bin 0 -> 30474 bytes
 tests/HostTests/spiffsgen/build/index.html    |   4 +
 tests/HostTests/spiffsgen/build/settings.html |   4 +
 .../spiffsgen/build/wifi-sprites.png          | Bin 0 -> 1769 bytes
 tests/HostTests/spiffsgen/spiff_rom_meta.bin  | Bin 0 -> 65536 bytes
 tests/HostTests/spiffsgen/spiff_rom_orig.bin  | Bin 0 -> 65536 bytes
 26 files changed, 749 insertions(+), 401 deletions(-)
 create mode 100644 Sming/Components/spiffs/spiffsgen.py
 delete mode 100644 Sming/Components/spiffs/spiffy/Makefile
 delete mode 100644 Sming/Components/spiffs/spiffy/spiffy.c
 delete mode 100644 Sming/Components/spiffs/spiffy_host.h
 create mode 100644 tests/HostTests/spiffsgen/README.rst
 create mode 100644 tests/HostTests/spiffsgen/build/.lastModified
 create mode 100644 tests/HostTests/spiffsgen/build/bootstrap-core.css.gz
 create mode 100644 tests/HostTests/spiffsgen/build/core.js.gz
 create mode 100644 tests/HostTests/spiffsgen/build/index.html
 create mode 100644 tests/HostTests/spiffsgen/build/settings.html
 create mode 100644 tests/HostTests/spiffsgen/build/wifi-sprites.png
 create mode 100644 tests/HostTests/spiffsgen/spiff_rom_meta.bin
 create mode 100644 tests/HostTests/spiffsgen/spiff_rom_orig.bin

diff --git a/Sming/Arch/Host/Components/spi_flash/flashmem.cpp b/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
index d1d645c78a..0237f9eaf4 100644
--- a/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
+++ b/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
@@ -25,7 +25,7 @@
 
 namespace
 {
-IFS::Host::FileSystem fileSys;
+IFS::IFileSystem& fileSys{IFS::Host::fileSystem};
 IFS::File::Handle flashFile{-1};
 size_t flashFileSize{0x400000U};
 char flashFileName[256];
diff --git a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp
index a467733794..95832ad28a 100644
--- a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp
+++ b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp
@@ -11,11 +11,6 @@
 #include "HostFileStream.h"
 #include <IFS/Host/FileSystem.h>
 
-namespace
-{
-IFS::Host::FileSystem hostFileSystem;
-}
-
-HostFileStream::HostFileStream() : IFS::FileStream(&hostFileSystem)
+HostFileStream::HostFileStream() : IFS::FileStream(&IFS::Host::fileSystem)
 {
 }
diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index ac268fb17a..dce62c0b14 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit ac268fb17a562a6b94fb16df64d43639a3e5aefe
+Subproject commit dce62c0b14c4af7e29c087e46dced25dae5799f0
diff --git a/Sming/Components/spiffs/README.rst b/Sming/Components/spiffs/README.rst
index 13e5852abc..3ac089846f 100644
--- a/Sming/Components/spiffs/README.rst
+++ b/Sming/Components/spiffs/README.rst
@@ -49,3 +49,13 @@ custom :ref:`hardware_config`.
    Default: 7
 
    Number of file descriptors allocated. This sets the maximum number of files which may be opened at once. 
+
+
+.. envvar:: SPIFFS_OBJ_META_LEN
+
+   Default: 16
+
+   Maximum size of metadata which SPIFFS stores in each file index header (after the filename).
+   If this value is changed, existing SPIFFS images will not be readable.
+
+   The default value given here is provided to support :component:`IFS` extended file attribute information.
diff --git a/Sming/Components/spiffs/component.mk b/Sming/Components/spiffs/component.mk
index f82bfa9608..bc7787fffc 100644
--- a/Sming/Components/spiffs/component.mk
+++ b/Sming/Components/spiffs/component.mk
@@ -4,14 +4,6 @@ COMPONENT_SRCDIRS		:= . spiffs/src
 COMPONENT_INCDIRS		:= . spiffs/src
 COMPONENT_DOXYGEN_INPUT	:= spiffs/src
 
-## Spiffy tool
-
-SPIFFY				:= $(TOOLS_BASE)/spiffy$(TOOL_EXT)
-COMPONENT_TARGETS	+= $(SPIFFY)
-$(COMPONENT_RULE)$(SPIFFY):
-	$(call MakeTarget,spiffy/Makefile)
-
-
 ## Application
 
 ifdef DISABLE_SPIFFS
@@ -29,8 +21,16 @@ COMPONENT_CFLAGS		+= -DSPIFF_FILEDESC_COUNT=$(SPIFF_FILEDESC_COUNT)
 
 COMPONENT_CFLAGS		+= -Wno-tautological-compare
 
+COMPONENT_RELINK_VARS += SPIFFS_OBJ_META_LEN
+SPIFFS_OBJ_META_LEN ?= 16
+COMPONENT_CFLAGS += -DSPIFFS_OBJ_META_LEN=$(SPIFFS_OBJ_META_LEN)
+
 ##@Building
 
+# Spiffs image generation tool
+SPIFFSGEN := $(PYTHON) $(COMPONENT_PATH)/spiffsgen.py
+SPIFFSGEN_SMING = $(SPIFFSGEN) --meta-len=$(SPIFFS_OBJ_META_LEN) --block-size=8192
+
 .PHONY: spiffs-image-update
 spiffs-image-update: spiffs-image-clean $(SPIFF_BIN_OUT) ##Rebuild the SPIFFS filesystem image
 
@@ -38,11 +38,11 @@ spiffs-image-update: spiffs-image-clean $(SPIFF_BIN_OUT) ##Rebuild the SPIFFS fi
 ifneq (,$(filter spiffsgen,$(MAKECMDGOALS)))
 PART_TARGET := $(PARTITION_$(PART)_FILENAME)
 $(eval PART_FILES := $(call HwExpr,part.build['files']))
-SPIFFY_ARGS := $(PARTITION_$(PART)_SIZE_BYTES) "$(or $(PART_FILES),dummy.dir)"
 .PHONY: spiffsgen
-spiffsgen: $(SPIFFY)
+spiffsgen:
 ifneq (,$(PART_TARGET))
+	@echo "Creating SPIFFS image '$(PART_TARGET)'"
 	$(Q) mkdir -p $(dir $(PART_TARGET))
-	$(Q) $(SPIFFY) $(SPIFFY_ARGS) $(PART_TARGET)
+	$(Q) $(SPIFFSGEN_SMING) $(PARTITION_$(PART)_SIZE_BYTES) "$(or $(PART_FILES),)" $(PART_TARGET)
 endif
 endif
diff --git a/Sming/Components/spiffs/spiffs_config.h b/Sming/Components/spiffs/spiffs_config.h
index 502ecc0e64..6699389ed5 100644
--- a/Sming/Components/spiffs/spiffs_config.h
+++ b/Sming/Components/spiffs/spiffs_config.h
@@ -9,11 +9,7 @@
 #define SPIFFS_CONFIG_H_
 
 // ----------- 8< ------------
-#ifdef __ets__
-	#include <user_config.h>
-#else
-	#include "spiffy_host.h"
-#endif /* __ets__ */
+#include <user_config.h>
 // ----------- >8 ------------
 
 // compile time switches
diff --git a/Sming/Components/spiffs/spiffsgen.py b/Sming/Components/spiffs/spiffsgen.py
new file mode 100644
index 0000000000..b161c1c957
--- /dev/null
+++ b/Sming/Components/spiffs/spiffsgen.py
@@ -0,0 +1,565 @@
+#!/usr/bin/env python
+#
+# spiffsgen is a tool used to generate a spiffs image from a directory
+#
+# Copyright 2019 Espressif Systems (Shanghai) PTE LTD
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http:#www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import division, print_function
+
+import argparse
+import ctypes
+import io
+import math
+import os
+import struct
+import sys
+
+SPIFFS_PH_FLAG_USED_FINAL_INDEX = 0xF8
+SPIFFS_PH_FLAG_USED_FINAL = 0xFC
+
+SPIFFS_PH_FLAG_LEN = 1
+SPIFFS_PH_IX_SIZE_LEN = 4
+SPIFFS_PH_IX_OBJ_TYPE_LEN = 1
+SPIFFS_TYPE_FILE = 1
+
+# Based on typedefs under spiffs_config.h
+SPIFFS_OBJ_ID_LEN = 2  # spiffs_obj_id
+SPIFFS_SPAN_IX_LEN = 2  # spiffs_span_ix
+SPIFFS_PAGE_IX_LEN = 2  # spiffs_page_ix
+SPIFFS_BLOCK_IX_LEN = 2  # spiffs_block_ix
+
+# Fixed config (see spiffs_config.h)
+SPIFFS_ALIGNED_OBJECT_INDEX_TABLES = True
+
+class SpiffsBuildConfig():
+    def __init__(self, page_size, page_ix_len, block_size,
+                 block_ix_len, meta_len, obj_name_len, obj_id_len,
+                 span_ix_len, packed, aligned, endianness, use_magic, use_magic_len):
+        if block_size % page_size != 0:
+            raise RuntimeError('block size should be a multiple of page size')
+
+        self.page_size = page_size
+        self.block_size = block_size
+        self.obj_id_len = obj_id_len
+        self.span_ix_len = span_ix_len
+        self.packed = packed
+        self.aligned = aligned
+        self.obj_name_len = obj_name_len
+        self.meta_len = meta_len
+        self.page_ix_len = page_ix_len
+        self.block_ix_len = block_ix_len
+        self.endianness = endianness
+        self.use_magic = use_magic
+        self.use_magic_len = use_magic_len
+
+        self.PAGES_PER_BLOCK = self.block_size // self.page_size
+        self.OBJ_LU_PAGES_PER_BLOCK = int(math.ceil(self.block_size / self.page_size * self.obj_id_len / self.page_size))
+        self.OBJ_USABLE_PAGES_PER_BLOCK = self.PAGES_PER_BLOCK - self.OBJ_LU_PAGES_PER_BLOCK
+
+        self.OBJ_LU_PAGES_OBJ_IDS_LIM = self.page_size // self.obj_id_len
+
+        self.OBJ_DATA_PAGE_HEADER_LEN = self.obj_id_len + self.span_ix_len + SPIFFS_PH_FLAG_LEN
+
+        pad = 4 - (4 if self.OBJ_DATA_PAGE_HEADER_LEN % 4 == 0 else self.OBJ_DATA_PAGE_HEADER_LEN % 4)
+
+        self.OBJ_DATA_PAGE_HEADER_LEN_ALIGNED = self.OBJ_DATA_PAGE_HEADER_LEN + pad
+        self.OBJ_DATA_PAGE_HEADER_LEN_ALIGNED_PAD = pad
+        self.OBJ_DATA_PAGE_CONTENT_LEN = self.page_size - self.OBJ_DATA_PAGE_HEADER_LEN
+
+        self.OBJ_INDEX_PAGES_HEADER_LEN = (self.OBJ_DATA_PAGE_HEADER_LEN_ALIGNED + SPIFFS_PH_IX_SIZE_LEN +
+                                           SPIFFS_PH_IX_OBJ_TYPE_LEN + self.obj_name_len + self.meta_len)
+        self.OBJ_INDEX_PAGES_OBJ_IDS_HEAD_LIM = (self.page_size - self.OBJ_INDEX_PAGES_HEADER_LEN) // self.block_ix_len
+        self.OBJ_INDEX_PAGES_OBJ_IDS_LIM = (self.page_size - self.OBJ_DATA_PAGE_HEADER_LEN_ALIGNED) / self.block_ix_len
+
+
+class SpiffsFullError(RuntimeError):
+    def __init__(self, message=None):
+        super(SpiffsFullError, self).__init__(message)
+
+
+class SpiffsPage():
+    _endianness_dict = {
+        'little': '<',
+        'big': '>'
+    }
+
+    _len_dict = {
+        1: 'B',
+        2: 'H',
+        4: 'I',
+        8: 'Q'
+    }
+
+    _type_dict = {
+        1: ctypes.c_ubyte,
+        2: ctypes.c_ushort,
+        4: ctypes.c_uint,
+        8: ctypes.c_ulonglong
+    }
+
+    def __init__(self, bix, build_config):
+        self.build_config = build_config
+        self.bix = bix
+
+
+class SpiffsObjLuPage(SpiffsPage):
+    def __init__(self, bix, build_config):
+        SpiffsPage.__init__(self, bix, build_config)
+
+        self.obj_ids_limit = self.build_config.OBJ_LU_PAGES_OBJ_IDS_LIM
+        self.obj_ids = list()
+
+    def _calc_magic(self, blocks_lim):
+        # Calculate the magic value mirrorring computation done by the macro SPIFFS_MAGIC defined in
+        # spiffs_nucleus.h
+        magic = 0x20140529 ^ self.build_config.page_size
+        if self.build_config.use_magic_len:
+            magic = magic ^ (blocks_lim - self.bix)
+        magic = SpiffsPage._type_dict[self.build_config.obj_id_len](magic)
+        return magic.value
+
+    def register_page(self, page):
+        if not self.obj_ids_limit > 0:
+            raise SpiffsFullError()
+
+        obj_id = (page.obj_id, page.__class__)
+        self.obj_ids.append(obj_id)
+        self.obj_ids_limit -= 1
+
+    def to_binary(self):
+        global test
+        img = b''
+
+        for (obj_id, page_type) in self.obj_ids:
+            if page_type == SpiffsObjIndexPage:
+                obj_id ^= (1 << ((self.build_config.obj_id_len * 8) - 1))
+            img += struct.pack(SpiffsPage._endianness_dict[self.build_config.endianness] +
+                               SpiffsPage._len_dict[self.build_config.obj_id_len], obj_id)
+
+        assert(len(img) <= self.build_config.page_size)
+
+        img += b'\xFF' * (self.build_config.page_size - len(img))
+
+        return img
+
+    def magicfy(self, blocks_lim):
+        # Only use magic value if no valid obj id has been written to the spot, which is the
+        # spot taken up by the last obj id on last lookup page. The parent is responsible
+        # for determining which is the last lookup page and calling this function.
+        remaining = self.obj_ids_limit
+        empty_obj_id_dict = {
+            1: 0xFF,
+            2: 0xFFFF,
+            4: 0xFFFFFFFF,
+            8: 0xFFFFFFFFFFFFFFFF
+        }
+        if (remaining >= 2):
+            for i in range(remaining):
+                if i == remaining - 2:
+                    self.obj_ids.append((self._calc_magic(blocks_lim), SpiffsObjDataPage))
+                    break
+                else:
+                    self.obj_ids.append((empty_obj_id_dict[self.build_config.obj_id_len], SpiffsObjDataPage))
+                self.obj_ids_limit -= 1
+
+
+class SpiffsObjIndexPage(SpiffsPage):
+    def __init__(self, obj_id, span_ix, size, name, build_config):
+        SpiffsPage.__init__(self, 0, build_config)
+        self.obj_id = obj_id
+        self.span_ix = span_ix
+        self.name = name
+        self.size = size
+
+        if self.span_ix == 0:
+            self.pages_lim = self.build_config.OBJ_INDEX_PAGES_OBJ_IDS_HEAD_LIM
+        else:
+            self.pages_lim = self.build_config.OBJ_INDEX_PAGES_OBJ_IDS_LIM
+
+        self.pages = list()
+
+    def register_page(self, page):
+        if not self.pages_lim > 0:
+            raise SpiffsFullError
+
+        self.pages.append(page.offset)
+        self.pages_lim -= 1
+
+    def to_binary(self):
+        obj_id = self.obj_id ^ (1 << ((self.build_config.obj_id_len * 8) - 1))
+        img = struct.pack(SpiffsPage._endianness_dict[self.build_config.endianness] +
+                          SpiffsPage._len_dict[self.build_config.obj_id_len] +
+                          SpiffsPage._len_dict[self.build_config.span_ix_len] +
+                          SpiffsPage._len_dict[SPIFFS_PH_FLAG_LEN],
+                          obj_id,
+                          self.span_ix,
+                          SPIFFS_PH_FLAG_USED_FINAL_INDEX)
+
+        # Add padding before the object index page specific information
+        img += b'\xFF' * self.build_config.OBJ_DATA_PAGE_HEADER_LEN_ALIGNED_PAD
+
+        # If this is the first object index page for the object, add filname, type
+        # and size information
+        if self.span_ix == 0:
+            img += struct.pack(SpiffsPage._endianness_dict[self.build_config.endianness] +
+                               SpiffsPage._len_dict[SPIFFS_PH_IX_SIZE_LEN]  +
+                               SpiffsPage._len_dict[SPIFFS_PH_FLAG_LEN],
+                               self.size,
+                               SPIFFS_TYPE_FILE)
+
+            # Append name
+            name = self.name.encode()
+            img += name + (b'\x00' * (self.build_config.obj_name_len - len(name)))
+
+            if self.build_config.meta_len >= 16:
+                # Build default IFS metadata
+                magic = 0xE3457A77
+                mtime = self.mtime
+                attr = 0
+                flags = 0xff
+                userRole_admin = 0x04
+                meta = struct.pack(b'<LLBBBB', magic, mtime, attr, flags, userRole_admin, userRole_admin)
+                meta += b'\x00' * (self.build_config.meta_len - 12)
+            else:
+                meta = b'\00' * self.build_config.meta_len
+
+            img += meta
+
+        if SPIFFS_ALIGNED_OBJECT_INDEX_TABLES:
+            # Align to word boundary
+            off = len(img) % SPIFFS_PAGE_IX_LEN
+            if off != 0:
+                img += b'\xff' * (SPIFFS_PAGE_IX_LEN - off)
+
+        # Finally, add the page index of data pages
+        for page in self.pages:
+            page = page >> int(math.log(self.build_config.page_size, 2))
+            img += struct.pack(SpiffsPage._endianness_dict[self.build_config.endianness] +
+                               SpiffsPage._len_dict[self.build_config.page_ix_len], page)
+
+        assert(len(img) <= self.build_config.page_size)
+
+        img += b'\xFF' * (self.build_config.page_size - len(img))
+
+        return img
+
+
+class SpiffsObjDataPage(SpiffsPage):
+    def __init__(self, offset, obj_id, span_ix, contents, build_config):
+        SpiffsPage.__init__(self, 0, build_config)
+        self.obj_id = obj_id
+        self.span_ix = span_ix
+        self.contents = contents
+        self.offset = offset
+
+    def to_binary(self):
+        img = struct.pack(SpiffsPage._endianness_dict[self.build_config.endianness] +
+                          SpiffsPage._len_dict[self.build_config.obj_id_len] +
+                          SpiffsPage._len_dict[self.build_config.span_ix_len] +
+                          SpiffsPage._len_dict[SPIFFS_PH_FLAG_LEN],
+                          self.obj_id,
+                          self.span_ix,
+                          SPIFFS_PH_FLAG_USED_FINAL)
+
+        img += self.contents
+
+        assert(len(img) <= self.build_config.page_size)
+
+        img += b'\xFF' * (self.build_config.page_size - len(img))
+
+        return img
+
+
+class SpiffsBlock():
+    def _reset(self):
+        self.cur_obj_index_span_ix = 0
+        self.cur_obj_data_span_ix = 0
+        self.cur_obj_id = 0
+        self.cur_obj_idx_page = None
+
+    def __init__(self, bix, blocks_lim, build_config):
+        self.build_config = build_config
+        self.offset = bix * self.build_config.block_size
+        self.remaining_pages = self.build_config.OBJ_USABLE_PAGES_PER_BLOCK
+        self.pages = list()
+        self.bix = bix
+
+        lu_pages = list()
+        for i in range(self.build_config.OBJ_LU_PAGES_PER_BLOCK):
+            page = SpiffsObjLuPage(self.bix, self.build_config)
+            lu_pages.append(page)
+
+        self.pages.extend(lu_pages)
+
+        self.lu_page_iter = iter(lu_pages)
+        self.lu_page = next(self.lu_page_iter)
+
+        self._reset()
+
+    def _register_page(self, page):
+        if isinstance(page, SpiffsObjDataPage):
+            self.cur_obj_idx_page.register_page(page)  # can raise SpiffsFullError
+
+        try:
+            self.lu_page.register_page(page)
+        except SpiffsFullError:
+            self.lu_page = next(self.lu_page_iter)
+            try:
+                self.lu_page.register_page(page)
+            except AttributeError:  # no next lookup page
+                # Since the amount of lookup pages is pre-computed at every block instance,
+                # this should never occur
+                raise RuntimeError('invalid attempt to add page to a block when there is no more space in lookup')
+
+        self.pages.append(page)
+
+    def begin_obj(self, obj_id, size, name, mtime, obj_index_span_ix=0, obj_data_span_ix=0):
+        if not self.remaining_pages > 0:
+            raise SpiffsFullError()
+        self._reset()
+
+        self.cur_obj_id = obj_id
+        self.cur_obj_index_span_ix = obj_index_span_ix
+        self.cur_obj_data_span_ix = obj_data_span_ix
+
+        page = SpiffsObjIndexPage(obj_id, self.cur_obj_index_span_ix, size, name, self.build_config)
+        page.mtime = mtime
+        self._register_page(page)
+
+        self.cur_obj_idx_page = page
+
+        self.remaining_pages -= 1
+        self.cur_obj_index_span_ix += 1
+
+    def update_obj(self, contents):
+        if not self.remaining_pages > 0:
+            raise SpiffsFullError()
+        page = SpiffsObjDataPage(self.offset + (len(self.pages) * self.build_config.page_size),
+                                 self.cur_obj_id, self.cur_obj_data_span_ix, contents, self.build_config)
+
+        self._register_page(page)
+
+        self.cur_obj_data_span_ix += 1
+        self.remaining_pages -= 1
+
+    def end_obj(self):
+        self._reset()
+
+    def is_full(self):
+        return self.remaining_pages <= 0
+
+    def to_binary(self, blocks_lim):
+        img = b''
+
+        if self.build_config.use_magic:
+            for (idx, page) in enumerate(self.pages):
+                if idx == self.build_config.OBJ_LU_PAGES_PER_BLOCK - 1:
+                    page.magicfy(blocks_lim)
+                img += page.to_binary()
+        else:
+            for page in self.pages:
+                img += page.to_binary()
+
+        assert(len(img) <= self.build_config.block_size)
+
+        img += b'\xFF' * (self.build_config.block_size - len(img))
+        return img
+
+
+class SpiffsFS():
+    def __init__(self, img_size, build_config):
+        if img_size % build_config.block_size != 0:
+            raise RuntimeError('image size should be a multiple of block size (0x%08x, 0x%04x)' % (img_size, build_config.block_size))
+
+        self.img_size = img_size
+        self.build_config = build_config
+
+        self.blocks = list()
+        self.blocks_lim = self.img_size // self.build_config.block_size
+        self.remaining_blocks = self.blocks_lim
+        self.cur_obj_id = 1  # starting object id
+
+    def _create_block(self):
+        if self.is_full():
+            raise SpiffsFullError('the image size has been exceeded')
+
+        block = SpiffsBlock(len(self.blocks), self.blocks_lim, self.build_config)
+        self.blocks.append(block)
+        self.remaining_blocks -= 1
+        return block
+
+    def is_full(self):
+        return self.remaining_blocks <= 0
+
+    def create_file(self, img_path, file_path):
+        contents = None
+
+        if len(img_path) > self.build_config.obj_name_len:
+            raise RuntimeError("object name '%s' too long" % img_path)
+
+        name = img_path
+
+        with open(file_path, 'rb') as obj:
+            contents = obj.read()
+
+        stream = io.BytesIO(contents)
+
+        mtime = int(os.path.getmtime(file_path))
+        try:
+            block = self.blocks[-1]
+            block.begin_obj(self.cur_obj_id, len(contents), name, mtime)
+        except (IndexError, SpiffsFullError):
+            block = self._create_block()
+            block.begin_obj(self.cur_obj_id, len(contents), name, mtime)
+
+        contents_chunk = stream.read(self.build_config.OBJ_DATA_PAGE_CONTENT_LEN)
+
+        while contents_chunk:
+            try:
+                block = self.blocks[-1]
+                try:
+                    # This can fail because either (1) all the pages in block have been
+                    # used or (2) object index has been exhausted.
+                    block.update_obj(contents_chunk)
+                except SpiffsFullError:
+                    # If its (1), use the outer exception handler
+                    if block.is_full():
+                        raise SpiffsFullError
+                    # If its (2), write another object index page
+                    block.begin_obj(self.cur_obj_id, len(contents), name, mtime,
+                                    obj_index_span_ix=block.cur_obj_index_span_ix,
+                                    obj_data_span_ix=block.cur_obj_data_span_ix)
+                    continue
+            except (IndexError, SpiffsFullError):
+                # All pages in the block have been exhausted. Create a new block, copying
+                # the previous state of the block to a new one for the continuation of the
+                # current object
+                prev_block = block
+                block = self._create_block()
+                block.cur_obj_id = prev_block.cur_obj_id
+                block.cur_obj_idx_page = prev_block.cur_obj_idx_page
+                block.cur_obj_data_span_ix = prev_block.cur_obj_data_span_ix
+                block.cur_obj_index_span_ix = prev_block.cur_obj_index_span_ix
+                continue
+
+            contents_chunk = stream.read(self.build_config.OBJ_DATA_PAGE_CONTENT_LEN)
+
+        block.end_obj()
+
+        self.cur_obj_id += 1
+
+    def to_binary(self):
+        img = b''
+        for block in self.blocks:
+            img += block.to_binary(self.blocks_lim)
+        bix = len(self.blocks)
+        if self.build_config.use_magic:
+            # Create empty blocks with magic numbers
+            while self.remaining_blocks > 0:
+                block = SpiffsBlock(bix, self.blocks_lim, self.build_config)
+                img += block.to_binary(self.blocks_lim)
+                self.remaining_blocks -= 1
+                bix += 1
+        else:
+            # Just fill remaining spaces FF's
+            img += b'\xFF' * (self.img_size - len(img))
+        return img
+
+
+def main():
+    if sys.version_info[0] < 3:
+        print('WARNING: Support for Python 2 is deprecated and will be removed in future versions.', file=sys.stderr)
+    elif sys.version_info[0] == 3 and sys.version_info[1] < 6:
+        print('WARNING: Python 3 versions older than 3.6 are not supported.', file=sys.stderr)
+    parser = argparse.ArgumentParser(description='SPIFFS Image Generator',
+                                     formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+
+    parser.add_argument('image_size',
+                        help='Size of the created image')
+
+    parser.add_argument('base_dir',
+                        help='Path to directory from which the image will be created')
+
+    parser.add_argument('output_file',
+                        help='Created image output file path')
+
+    parser.add_argument('--page-size',
+                        help='Logical page size. Set to value same as CONFIG_SPIFFS_PAGE_SIZE.',
+                        type=int,
+                        default=256)
+
+    parser.add_argument('--block-size',
+                        help="Logical block size. Set to the same value as the flash chip's sector size (g_rom_flashchip.sector_size).",
+                        type=int,
+                        default=4096)
+
+    parser.add_argument('--obj-name-len',
+                        help='File full path maximum length. Set to value same as CONFIG_SPIFFS_OBJ_NAME_LEN.',
+                        type=int,
+                        default=32)
+
+    parser.add_argument('--meta-len',
+                        help='File metadata length. Set to value same as CONFIG_SPIFFS_META_LENGTH.',
+                        type=int,
+                        default=4)
+
+    parser.add_argument('--use-magic',
+                        help='Use magic number to create an identifiable SPIFFS image. Specify if CONFIG_SPIFFS_USE_MAGIC.',
+                        action='store_true',
+                        default=False)
+
+    parser.add_argument('--follow-symlinks',
+                        help='Take into account symbolic links during partition image creation.',
+                        action='store_true',
+                        default=False)
+
+    parser.add_argument('--use-magic-len',
+                        help='Use position in memory to create different magic numbers for each block. Specify if CONFIG_SPIFFS_USE_MAGIC_LENGTH.',
+                        action='store_true',
+                        default=False)
+
+    parser.add_argument('--big-endian',
+                        help='Specify if the target architecture is big-endian. If not specified, little-endian is assumed.',
+                        action='store_true',
+                        default=False)
+
+    args = parser.parse_args()
+
+    if args.base_dir != '' and not os.path.exists(args.base_dir):
+        raise RuntimeError('given base directory %s does not exist' % args.base_dir)
+
+    image_size = int(args.image_size, 0)
+    spiffs_build_default = SpiffsBuildConfig(args.page_size, SPIFFS_PAGE_IX_LEN,
+                                                args.block_size, SPIFFS_BLOCK_IX_LEN, args.meta_len,
+                                                args.obj_name_len, SPIFFS_OBJ_ID_LEN, SPIFFS_SPAN_IX_LEN,
+                                                True, True, 'big' if args.big_endian else 'little',
+                                                args.use_magic, args.use_magic_len)
+
+    spiffs = SpiffsFS(image_size, spiffs_build_default)
+
+    if args.base_dir != '':
+        for root, dirs, files in os.walk(args.base_dir, followlinks=args.follow_symlinks):
+            for f in files:
+                full_path = os.path.join(root, f)
+                rel_path = os.path.relpath(full_path, args.base_dir)
+                print("'%s', '%s', '%s'" % (rel_path, full_path, args.base_dir))
+                spiffs.create_file(rel_path.replace('\\', '/'), full_path)
+
+    image = spiffs.to_binary()
+    open(args.output_file, 'wb').write(image)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/Sming/Components/spiffs/spiffy/Makefile b/Sming/Components/spiffs/spiffy/Makefile
deleted file mode 100644
index b830ed7ce4..0000000000
--- a/Sming/Components/spiffs/spiffy/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Makefile for spiffy
-#
-# Pass in TARGET, BUILD_DIR , SPIFFS_SMING, SPIFFS_BASE
-#
-
-HOST_CC ?= gcc
-HOST_LD ?= gcc
-
-INCDIR := -I.. -I../spiffs/src
-CFLAGS := -O2 -Wall -Wno-unused-value
-
-ifeq ("$(V)","1")
-Q :=
-vecho := @true
-else
-Q := @
-vecho := @echo
-endif
-
-BUILD_DIR	?= .
-TARGET		?= spiffy
-
-OBJS := $(addprefix $(BUILD_DIR)/,spiffy.o spiffs_cache.o spiffs_nucleus.o spiffs_hydrogen.o spiffs_gc.o spiffs_check.o)
-
-all: $(TARGET)
-
-$(BUILD_DIR)/%.o: ../spiffs/src/%.c
-	$(vecho) "CC $<"
-	$(Q) $(HOST_CC) $(CFLAGS) $(INCDIR) -c $< -o $@
-
-$(BUILD_DIR)/spiffy.o: spiffy.c
-	$(vecho) "CC $<"
-	$(Q) $(HOST_CC) $(CFLAGS) $(INCDIR) -c $< -o $@
-
-$(TARGET): $(OBJS)
-	$(vecho) "LD $@"
-	$(Q) $(HOST_LD) -o $@ $^
-
-clean:
-	rm -f $(OBJS) $(TARGET)
diff --git a/Sming/Components/spiffs/spiffy/spiffy.c b/Sming/Components/spiffs/spiffy/spiffy.c
deleted file mode 100644
index 6dab9cedac..0000000000
--- a/Sming/Components/spiffs/spiffy/spiffy.c
+++ /dev/null
@@ -1,309 +0,0 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <spiffs.h>
-#include <sys/stat.h>
-
-#define LOG_PAGE_SIZE       256
-#define SPI_FLASH_SEC_SIZE 4096
-
-#define ROM_ERASE 0xFF
-
-#define DEFAULT_FOLDER   "files"
-#define DEFAULT_ROM_NAME "spiff_rom.bin"
-#define DEFAULT_ROM_SIZE 0x30000
-
-static spiffs fs;
-static u8_t spiffs_work_buf[LOG_PAGE_SIZE*2];
-static u8_t spiffs_fds[32*4];
-static u8_t spiffs_cache_buf[(LOG_PAGE_SIZE+32)*4];
-
-#define S_DBG(fmt, ...)
-//#define S_DBG printf
-
-static FILE *rom = 0;
-
-void hexdump_mem(u8_t *b, u32_t len) {
-	int i;
-	for (i = 0; i < len; i++) {
-		S_DBG("%02x", *b++);
-		if ((i % 16) == 15) S_DBG("\n");
-		else if ((i % 16) == 7) S_DBG(" ");
-	}
-	if ((i % 16) != 0) S_DBG("\n");
-}
-
-static s32_t my_spiffs_read(struct spiffs_t* fs, u32_t addr, u32_t size, u8_t *dst) {
-
-	int res;
-
-	if (fseek(rom, addr, SEEK_SET)) {
-		printf("Unable to seek to %d.\n", addr);
-		return SPIFFS_ERR_END_OF_OBJECT;
-	}
-
-	res = fread(dst, 1, size, rom);
-	if (res != size) {
-		printf("Unable to read - tried to get %d bytes only got %d.\n", size, res);
-		return SPIFFS_ERR_NOT_READABLE;
-	}
-
-	S_DBG("Read %d bytes from offset %d.\n", size, addr);
-	//hexdump_mem(dst, size);
-	return SPIFFS_OK;
-}
-
-static s32_t my_spiffs_write(struct spiffs_t* fs, u32_t addr, u32_t size, u8_t *src) {
-
-	int ret = SPIFFS_OK;
-	u8_t *buff = 0;
-
-	buff = malloc(size);
-	if (!buff) {
-		printf("Unable to malloc %d bytes.\n", size);
-		ret = SPIFFS_ERR_INTERNAL;
-	} else {
-		ret = my_spiffs_read(fs, addr, size, buff);
-		if (ret == SPIFFS_OK) {
-			int i;
-			for(i = 0; i < size; i++) buff[i] &= src[i];
-			//hexdump_mem(buff, size);
-			if (fseek(rom, addr, SEEK_SET)) {
-				printf("Unable to seek to %d.\n", addr);
-				ret = SPIFFS_ERR_END_OF_OBJECT;
-			} else {
-				if (fwrite(src, 1, size, rom) != size) {
-					printf("Unable to write.\n");
-					ret = SPIFFS_ERR_NOT_WRITABLE;
-				} else {
-					fflush(rom);
-					S_DBG("Wrote %d bytes to offset %d.\n", size, addr);
-				}
-			}
-		}
-	}
-
-	if (buff) free (buff);
-	return ret;
-}
-
-static s32_t my_spiffs_erase(struct spiffs_t* fs, u32_t addr, u32_t size) {
-
-	int i;
-
-	if (fseek(rom, addr, SEEK_SET)) {
-		printf("Unable to seek to %d.\n", addr);
-		return SPIFFS_ERR_END_OF_OBJECT;
-	}
-
-	for (i = 0; i < size; i++) {
-		if (fputc(ROM_ERASE, rom) == EOF) {
-			printf("Unable to write.\n");
-			return SPIFFS_ERR_NOT_WRITABLE;
-		}
-	}
-
-	fflush(rom);
-	S_DBG("Erased %d bytes at offset %d.\n", size, addr);
-
-	return SPIFFS_OK;
-}
-
-int my_spiffs_mount(u32_t msize) {
-
-	spiffs_config cfg;
-
-	cfg.phys_size = msize;
-	cfg.phys_addr = 0;
-
-	cfg.phys_erase_block = SPI_FLASH_SEC_SIZE;
-	cfg.log_block_size = SPI_FLASH_SEC_SIZE * 2;
-	cfg.log_page_size = LOG_PAGE_SIZE;
-
-	cfg.hal_read_f = my_spiffs_read;
-	cfg.hal_write_f = my_spiffs_write;
-	cfg.hal_erase_f = my_spiffs_erase;
-
-	int res = SPIFFS_mount(&fs,
-			&cfg,
-			spiffs_work_buf,
-			spiffs_fds,
-			sizeof(spiffs_fds),
-			spiffs_cache_buf,
-			sizeof(spiffs_cache_buf),
-			0);
-	S_DBG("Mount result: %d.\n", res);
-
-	return res;
-}
-
-void my_spiffs_unmount() {
-	SPIFFS_unmount(&fs);
-}
-
-int my_spiffs_format() {
-	int res  = SPIFFS_format(&fs);
-	S_DBG("Format result: %d.\n", res);
-	return res;
-}
-
-int write_to_spiffs(char *fname, u8_t *data, int size) {
-
-	int ret = 0;
-
-	spiffs_file fd = SPIFFS_open(&fs, fname, SPIFFS_CREAT | SPIFFS_TRUNC | SPIFFS_RDWR, 0);
-	if (fd < 0) {
-		printf("Unable to open spiffs file '%s', error %d.\n", fname, fd);
-	} else {
-		S_DBG("Opened spiffs file '%s'.\n", fname);
-		if (SPIFFS_write(&fs, fd, (u8_t *)data, size) < SPIFFS_OK) {
-			printf("Unable to write to spiffs file '%s', errno %d.\n", fname, SPIFFS_errno(&fs));
-		} else {
-			ret = 1;
-		}
-	}
-
-	if (fd >= 0) {
-		SPIFFS_close(&fs, fd);
-		S_DBG("Closed spiffs file '%s'.\n", fname);
-	}
-	return ret;
-}
-
-int add_file(const char* fdir, char* fname) {
-
-	int ret = 0;
-	u8_t *buff = 0;
-	FILE *fp = 0;
-	char *path = 0;
-
-	path = malloc(1024);
-	if (!path) {
-		printf("Unable to malloc %d bytes.\n", 1024);
-	} else {
-		struct stat st;
-		sprintf(path, "%s/%s", fdir, fname);
-		if (stat(path, &st) || !S_ISREG(st.st_mode)) {
-			S_DBG("Skipping non-file '%s'.\n", fname);
-		} else {
-			fp = fopen(path, "rb");
-			if (!fp) {
-				S_DBG("Unable to open '%s'.\n", fname);
-			} else {
-				int size = (int)st.st_size;
-				buff = malloc(size);
-				if (!buff) {
-					printf("Unable to malloc %d bytes.\n", size);
-				} else {
-					if (fread(buff, 1, size, fp) != size) {
-						printf("Unable to read file '%s'.\n", fname);
-					} else {
-						S_DBG("%d bytes read from '%s'.\n", size, fname);
-						if (write_to_spiffs(fname, buff, size)) {
-							printf("Added '%s' to spiffs (%d bytes).\n", fname, size);
-							ret = 1;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	if (buff) free(buff);
-	if (path) free(path);
-	if (fp) fclose(fp);
-
-	return ret;
-}
-
-int get_rom_size (const char *str) {
-
-	long val;
-
-	// accept decimal or hex, but not octal
-	if ((strlen(str) > 2) && (str[0] == '0') &&
-		(((str[1] == 'x')) || ((str[1] == 'X')))) {
-		val = strtol(str, NULL, 16);
-	} else {
-		val = strtol(str, NULL, 10);
-	}
-
-	return (int)val;
-}
-
-int main(int argc, char **argv) {
-
-	const char *folder;
-	const char *romfile;
-	int romsize;
-	int ret = EXIT_SUCCESS;
-
-	if (argc == 1) {
-		romsize = DEFAULT_ROM_SIZE;
-		folder = DEFAULT_FOLDER;
-		romfile = DEFAULT_ROM_NAME;
-		printf("Usage: %s maxFsSizeinByte spiffsBaseDir [outfile.bin]\n"
-			"There is no specific size or files directory.\n"
-			"Starting in compatibility mode.\n"
-			"Default fs size is 0x%x (%d) bytes and directory is '%s'.\n",
-			argv[0], romsize, romsize, DEFAULT_FOLDER);
-	} else if (argc == 3) {
-		romsize = get_rom_size(argv[1]);
-		folder = argv[2];
-		romfile = DEFAULT_ROM_NAME;
-	} else if (argc == 4) {
-		romsize = get_rom_size(argv[1]);
-		folder = argv[2];
-		romfile = argv[3];
-	} else {
-		printf ("Usage: %s <FsSizeInBytes> <FilesDir> [OutFile.bin]\n", argv[0]);
-		printf ("  FsSizeInBytes can be in hex (starting with 0x) or decimal.\n");
-		printf ("  To create an empty filesystem pass 'dummy.dir' as FilesDir.\n");
-		exit(EXIT_FAILURE);
-	}
-
-	printf("Creating rom '%s' of size 0x%x (%d) bytes.\n", romfile, romsize, romsize);
-	rom = fopen(romfile, "wb+");
-
-	if (!rom) {
-		printf("Unable to open file '%s' for writing.\n", romfile);
-	} else {
-
-		fseek(rom, romsize - 1, SEEK_SET);
-		fputc(ROM_ERASE, rom);
-
-		// we have to do this before calling format
-		if (!my_spiffs_mount(romsize)) {
-			my_spiffs_unmount();
-		}
-
-		int res;
-		if ((res =  my_spiffs_format()) != SPIFFS_OK) {
-			printf("Failed to format spiffs, error %d.\n", res);
-			ret = EXIT_FAILURE;
-		} else if ((res = my_spiffs_mount(romsize)) != SPIFFS_OK) {
-			printf("Failed to mount spiffs, error %d.\n", res);
-			ret = EXIT_FAILURE;
-		} else {
-			DIR *dir;
-			struct dirent *ent;
-			if (!strcmp(folder, "dummy.dir")) {
-				printf("Creating empty filesystem.\n");
-			} else if ((dir = opendir(folder)) != NULL) {
-				printf("Adding files in directory '%s'.\n", folder);
-				while ((ent = readdir(dir)) != NULL) {
-					add_file(folder, ent->d_name);
-				}
-				closedir(dir);
-			} else {
-				printf("Unable to open directory '%s'.\n", folder);
-				ret = EXIT_FAILURE;
-			}
-			my_spiffs_unmount();
-		}
-	}
-
-	if (rom) fclose(rom);
-	if (ret == EXIT_FAILURE) unlink(romfile);
-	exit(ret);
-}
diff --git a/Sming/Components/spiffs/spiffy_host.h b/Sming/Components/spiffs/spiffy_host.h
deleted file mode 100644
index f621ef6557..0000000000
--- a/Sming/Components/spiffs/spiffy_host.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#pragma once
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <stdint.h>
-
-typedef signed int s32_t;
-typedef unsigned int u32_t;
-typedef signed short s16_t;
-typedef unsigned short u16_t;
-typedef signed char s8_t;
-typedef unsigned char u8_t;
diff --git a/Sming/Makefile b/Sming/Makefile
index 4ad8476a79..c058d057e6 100644
--- a/Sming/Makefile
+++ b/Sming/Makefile
@@ -112,6 +112,7 @@ SAMPLE_NAMES		= $(shell ls -1 $(SAMPLES_DIR))
 samples: | $(SAMPLE_NAMES) ##Build all sample applications
 
 $(SAMPLE_NAMES):
+	@printf "\n\n** Building ${@F} **\n\n"
 	$(Q) $(MAKE) --no-print-directory -C $(SAMPLES_DIR)/$@ PIP_ARGS=-q python-requirements all
 
 # Build component samples
@@ -127,6 +128,7 @@ COMPONENT_SAMPLE_TARGETS = $(addsuffix $(BUILT_SUFFIX),$(wildcard $(foreach c,$(
 build-component-samples: $(COMPONENT_SAMPLE_TARGETS)
 
 $(COMPONENT_SAMPLE_TARGETS):
+	@printf "\n\n** Building $(notdir $(@:$(BUILT_SUFFIX)=)) **\n\n"
 	$(Q) $(MAKE) --no-print-directory -C $(@:$(BUILT_SUFFIX)=) PIP_ARGS=-q python-requirements all
 	$(Q) touch $@
 
@@ -143,6 +145,7 @@ PHONY: build-and-run-tests
 build-and-run-tests: $(TESTS_COMPLETED) ##Build and run all test applications
 
 $(TESTS_COMPLETED):
+	@printf "\n\n** Building $(notdir $(@D)) **\n\n"
 	$(Q) $(MAKE) -C $(@D) execute
 	$(Q) touch $@
 
diff --git a/Sming/building.rst b/Sming/building.rst
index e5c6513b50..988a84fb50 100644
--- a/Sming/building.rst
+++ b/Sming/building.rst
@@ -693,10 +693,8 @@ clean and easy to follow.
 
 Components can be rebuilt and cleaned individually. For example:
 
--  ``make spiffs-build`` runs the Component ‘make’ for spiffs, which
-   contains the spiffs library and spiffy tool.
--  ``make spiffs-clean`` removes all intermediate build files for the
-   Component
+-  ``make spiffs-build`` runs the Component ‘make’ for spiffs, which contains the SPIFFS library.
+-  ``make spiffs-clean`` removes all intermediate build files for the Component
 -  ``make spiffs-rebuild`` cleans and then re-builds the Component
 
 By default, a regular ``make`` performs an incremental build on the
diff --git a/docs/source/upgrading/4.2-4.3.rst b/docs/source/upgrading/4.2-4.3.rst
index 63be9b39f8..ff7822422d 100644
--- a/docs/source/upgrading/4.2-4.3.rst
+++ b/docs/source/upgrading/4.2-4.3.rst
@@ -114,8 +114,17 @@ SPIFFS
 
     Applications should not use SPIFFS functions directly.
 
-    SPIFFS is now built with ``SPIFFS_OBJ_META_LEN=16`` to store extended attribute information,
-    but existing volumes should still be readable.
+    .. important::
+
+        SPIFFS is now built with ``SPIFFS_OBJ_META_LEN=16`` to store extended attribute information.
+        Existing volumes built with other values will not be directly compatible; the file listing may be
+        correct but file contents will not.
+
+        To accommodate use of existing pre-built SPIFFS images, :envvar:`SPIFFS_OBJ_META_LEN` has been added::
+
+            make SPIFFS_OBJ_META_LEN=0
+
+        You will, however, lose the additional file information (such as modification time).
 
 File open flags
     e.g. eFO_ReadOnly. These will still work but are now deprecated and should be replaced with their
diff --git a/samples/Basic_IFS/app/application.cpp b/samples/Basic_IFS/app/application.cpp
index 5828f96d24..07f0c8ae98 100644
--- a/samples/Basic_IFS/app/application.cpp
+++ b/samples/Basic_IFS/app/application.cpp
@@ -130,7 +130,13 @@ bool initFileSystem()
 	IFS::IFileSystem* fs;
 #ifdef FWFS_HYBRID
 	// Create a read/write filesystem
-	fs = IFS::createHybridFilesystem(part);
+	auto spiffsPart = *Storage::findPartition(Storage::Partition::SubType::Data::spiffs);
+	if(spiffsPart) {
+		debug_i("Found '%s'", spiffsPart.name().c_str());
+	} else {
+		debug_e("No SPIFFS partition found");
+	}
+	fs = IFS::createHybridFilesystem(part, spiffsPart);
 #else
 	// Read-only
 	fs = IFS::createFirmwareFilesystem(part);
diff --git a/samples/Basic_IFS/basic_ifs.hw b/samples/Basic_IFS/basic_ifs.hw
index b001259618..0c4d66a6a5 100644
--- a/samples/Basic_IFS/basic_ifs.hw
+++ b/samples/Basic_IFS/basic_ifs.hw
@@ -2,10 +2,6 @@
     "name": "Basic IFS sample",
     "base_config": "spiffs",
     "partitions": {
-        "spiffs0": {
-            "size": "0x20000",
-            "build": {}
-        },
         "fwfs1": {
             "address": "0x280000",
             "size": "0x60000",
diff --git a/tests/HostTests/component.mk b/tests/HostTests/component.mk
index 284b9f0aab..38f213d5e5 100644
--- a/tests/HostTests/component.mk
+++ b/tests/HostTests/component.mk
@@ -36,3 +36,13 @@ APP_CFLAGS += -DRESTART_DELAY=$(RESTART_DELAY)
 
 .PHONY: execute
 execute: flash run
+
+SPIFFSGEN_BIN := out/spiff_rom_test.bin
+CUSTOM_TARGETS += $(SPIFFSGEN_BIN)
+$(SPIFFSGEN_BIN):
+	$(Q) $(SPIFFSGEN_SMING) 0x10000 spiffsgen/build $@
+
+clean: resource-clean
+.PHONY: resource-clean
+resource-clean:
+	rm -f $(SPIFFSGEN_BIN)
diff --git a/tests/HostTests/modules/Spiffs.cpp b/tests/HostTests/modules/Spiffs.cpp
index 67e73475ee..058d0a5a4d 100644
--- a/tests/HostTests/modules/Spiffs.cpp
+++ b/tests/HostTests/modules/Spiffs.cpp
@@ -1,6 +1,13 @@
 #include <HostTests.h>
 #include <Storage.h>
 
+#ifdef ARCH_HOST
+#include <Storage/FileDevice.h>
+#include <IFS/Host/FileSystem.h>
+#include <IFS/SPIFFS/FileSystem.h>
+using IFileSystem = IFS::IFileSystem;
+#endif
+
 class SpiffsTest : public TestGroup
 {
 public:
@@ -10,6 +17,13 @@ class SpiffsTest : public TestGroup
 
 	void execute() override
 	{
+#ifdef ARCH_HOST
+		TEST_CASE("Check Spiffsgen.py")
+		{
+			checkSpiffsGen();
+		}
+#endif
+
 		TEST_CASE("Cycle flash")
 		{
 			cycleFlash();
@@ -33,6 +47,7 @@ class SpiffsTest : public TestGroup
 		DEFINE_FSTR_LOCAL(testContent, "Some test content to write to a file");
 
 		auto part = *Storage::findPartition(Storage::Partition::SubType::Data::spiffs);
+		REQUIRE(part.name() == "spiffs0");
 
 		// Write to filesystem until sector #0 gets erased
 		unsigned writeCount = 0;
@@ -59,6 +74,94 @@ class SpiffsTest : public TestGroup
 		auto content = fileGetContent(testFile);
 		REQUIRE(testContent == content);
 	}
+
+#ifdef ARCH_HOST
+	/*
+	 * Verify that a legacy volume (i.e. one generated with spiffy before IFS was introduced)
+	 * can still be read correctly.
+	 * 
+	 * Compare content of all files to ensure they are identical.
+	 */
+	void checkSpiffsGen()
+	{
+		IFS::IFileSystem::Info info;
+		int err = fileGetSystemInfo(info);
+		CHECK(err >= 0);
+		debug_i("fs attr = %s", toString(info.attr).c_str());
+
+		IFileSystem* fsOld;
+		if(info.attr[IFileSystem::Attribute::NoMeta]) {
+			fsOld = mountSpiffsFromFile("old", "spiffsgen/spiff_rom_orig.bin");
+		} else {
+			fsOld = mountSpiffsFromFile("old", "spiffsgen/spiff_rom_meta.bin");
+		}
+		auto fsNew = mountSpiffsFromFile("new", "out/spiff_rom_test.bin");
+
+		readCheck(fsOld, fsNew);
+
+		delete fsNew;
+		delete fsOld;
+
+		delete Storage::findDevice("new");
+		delete Storage::findDevice("old");
+	}
+
+	IFileSystem* mountSpiffsFromFile(const String& tag, const String& filename)
+	{
+		auto& hfs = IFS::Host::fileSystem;
+		auto f = hfs.open(filename, IFS::File::ReadOnly);
+		if(f < 0) {
+			debug_e("Failed to open '%s': %s", filename.c_str(), hfs.getErrorString(f).c_str());
+			return nullptr;
+		}
+		auto dev = new Storage::FileDevice(tag, hfs, f);
+		Storage::registerDevice(dev);
+		auto part = dev->createPartition(tag, Storage::Partition::SubType::Data::spiffs, 0, dev->getSize(),
+										 Storage::Partition::Flag::readOnly);
+
+		auto fs = new IFS::SPIFFS::FileSystem(part);
+		int err = fs->mount();
+		if(err < 0) {
+			debug_e("SPIFFS mount '%s' failed: %s", tag.c_str(), fs->getErrorString(err).c_str());
+			delete fs;
+			fs = nullptr;
+			delete dev;
+		}
+
+		debug_i("Mounted '%s' as '%s'", filename.c_str(), tag.c_str());
+		return fs;
+	}
+
+	void readCheck(IFileSystem* fsOld, IFileSystem* fsNew)
+	{
+		DirHandle dir{};
+		int res = fsOld->opendir(nullptr, dir);
+		if(res < 0) {
+			debug_e("opendir failed: %s", fsOld->getErrorString(res).c_str());
+			TEST_ASSERT(false);
+			return;
+		}
+
+		FileNameStat stat;
+		while((res = fsOld->readdir(dir, stat)) >= 0) {
+			FileStat statNew;
+			fsNew->stat(stat.name.buffer, &statNew);
+			debug_i("File '%s' size %u / %u", stat.name.buffer, stat.size, statNew.size);
+
+			String oldContent = fsOld->getContent(stat.name.buffer);
+			CHECK(oldContent);
+			String newContent = fsNew->getContent(stat.name.buffer);
+			CHECK(newContent);
+
+			CHECK_EQ(newContent, oldContent);
+		}
+
+		CHECK_EQ(res, IFS::Error::NoMoreFiles);
+		debug_i("readdir(): %s", fsOld->getErrorString(res).c_str());
+
+		fsOld->closedir(dir);
+	}
+#endif
 };
 
 void REGISTER_TEST(Spiffs)
diff --git a/tests/HostTests/spiffsgen/README.rst b/tests/HostTests/spiffsgen/README.rst
new file mode 100644
index 0000000000..00d6717feb
--- /dev/null
+++ b/tests/HostTests/spiffsgen/README.rst
@@ -0,0 +1,14 @@
+Spiffsgen
+=========
+
+Test SPIFFS images used by `Spiffs` module.
+Content is from `HttpServer_ConfigNetwork` sample, `web/build` directory.
+
+spiff_rom_orig.bin
+    Built using SPIFFY with no metadata
+spiff_rom_meta.bin
+    Build using SPIFFY with metadata (16 bytes)
+
+This test application builds an image using spiffsgen for comparison.
+
+Will fail if built with SPIFFS_OBJ_META_LEN set to anything other than 0 or 16.
diff --git a/tests/HostTests/spiffsgen/build/.lastModified b/tests/HostTests/spiffsgen/build/.lastModified
new file mode 100644
index 0000000000..9685abd72b
--- /dev/null
+++ b/tests/HostTests/spiffsgen/build/.lastModified
@@ -0,0 +1 @@
+Mon, 24 Jul 2017 17:20:31 GMT
diff --git a/tests/HostTests/spiffsgen/build/bootstrap-core.css.gz b/tests/HostTests/spiffsgen/build/bootstrap-core.css.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8483876af3e9ba369e93d223ee6c03ca8ca9f77a
GIT binary patch
literal 15861
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
F{|_Xg0#E<|

literal 0
HcmV?d00001

diff --git a/tests/HostTests/spiffsgen/build/core.js.gz b/tests/HostTests/spiffsgen/build/core.js.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6765d5850bb1af07a91fbe34174bbaddefc10c1c
GIT binary patch
literal 30474
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
RkUbR7{twGu9YXg|0RTa39)AD;

literal 0
HcmV?d00001

diff --git a/tests/HostTests/spiffsgen/build/index.html b/tests/HostTests/spiffsgen/build/index.html
new file mode 100644
index 0000000000..a89f8c23ad
--- /dev/null
+++ b/tests/HostTests/spiffsgen/build/index.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content=""><meta name="author" content=""><link rel="icon" href="../../favicon.ico"><title>Sming Framework WiFi Network configuration</title><link rel="stylesheet" href="bootstrap-core.css"><script src="core.js"></script><!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]--></head><script>$(document).ready(function(){App.GetNetworks(!1),App.Events.ReloadNetworks()});var App={GetNetworksURL:"/ajax/get-networks",ConnectURL:"/ajax/connect",Connect:null,CurrentNetwork:null,GetNetworks:function(t){!function e(){$("#floatingCirclesG").show();var n=$.ajax({url:App.GetNetworksURL,type:"POST",data:{reconnect:t},success:function(t){App.SetNetworks(t.available,t.network),App.ShowConnectToNetwork(),App.ConnectToNetwork(),t.network&&App.Utilities.ShowCurrentNetwork($('div[data-name="'+t.network+'"]').parent())}}).done(function(){$("#floatingCirclesG").hide()}).fail(function(){setTimeout(e,5e3)});App.Utilities.AbortConnection(n)}()},ConnectToNetwork:function(){$(".connect-btn").unbind("click"),$(".connect-btn").on("click",function(){var t=this,e=$(t).parent().parent().parent(),n=e.find("input[type=password]").val(),i=e.find("h4").text();App.Utilities.ShowLoader(t),App.Connect&&(clearInterval(App.Connect),App.Utilities.HideLoader()),App.Utilities.ShowLoader(t),function o(){$(".error").empty();var r=$.ajax({url:App.ConnectURL,type:"POST",data:{network:i,password:n},success:function(r){1==r.connected&&($(t).parent().parent().empty(),App.Utilities.HideLoader(),App.Utilities.ShowCurrentNetwork(e)),r.error?($(".error").append('<div class="alert alert-danger" role="alert"><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span><span>Error:</span> '+r.error+"</div>"),App.Utilities.HideLoader()):0==r.connected&&(1==r.status?(i=null,n=null,App.Connect=setTimeout(o,50)):App.Utilities.HideLoader())},error:function(){setTimeout(o,5e3)}});App.Utilities.AbortConnection(r)}()})},SetNetworks:function(t,e){var n=App.Utilities.GetNetworksId();$.each(t,function(t,i){n.indexOf(i.id)!=-1?(App.Utilities.UpdateNetworkValues($(".network[data-id="+i.id+"]"),i),n.splice(n.indexOf(i.id),1)):App.AddNetwork(i,e)}),$.each(n,function(t,e){App.Utilities.RemoveNetwork($(".network[data-id="+e+"]"))})},ShowConnectToNetwork:function(){$(".network").unbind("click"),$(".network").on("click",function(t){$(".connect").each(function(){$(this).hide()}),$(this).find(".connect").show()})},AddNetwork:function(t,e){var n="";if(t.title!=e){var i="";"OPEN"!=t.encryption&&(i+='<label>Password: </label><input class="form-control" style="width: 200px" type="password">'),n+=i+'<div class="connect-btn-wrapper"><button class="btn btn-success connect-btn">Connect</button></div>'}return $(".networks").append('<div class="list-group-item network" href="#" data-id="'+t.id+'"><p class="list-group-item-text"><div><div class="wifi '+App.Utilities.GetNetworkSignalClass(t.signal)+'"></div><div class="network-info"><h4 class="list-group-item-heading">'+t.title+'</h4><div><span class="encryption"> '+t.encryption+'</span></div></div></div></p><div class="form-group connect"  style="display: none" data-name="'+t.title+'">'+n+"</div></div>"),!0},Events:{ReloadNetworks:function(){$(".reload").on("click",function(){App.GetNetworks(!0)})}},Utilities:{AbortConnection:function(t){4!=t.readyState&&setTimeout(function(){t.abort()},6e3)},RemoveNetwork:function(t){$(t).remove()},GetNetworkSignalClass:function(t){return t>=-100&&t<=-80?"wifi-1":t>-80&&t<=-65?"wifi-2":t>-65&&t<-50?"wifi-3":"wifi-4"},UpdateNetworkValues:function(t,e){$(t).find("h4").text(" "+e.title),$(t).find(".encryption").text(" "+e.encryption),$(t).find(".wifi").removeClass().addClass("wifi").addClass(App.Utilities.GetNetworkSignalClass(e.signal))},ShowCurrentNetwork:function(t){console.log(t),App.CurrentNetwork&&$(App.CurrentNetwork).css("background",""),App.CurrentNetwork=t,$(App.CurrentNetwork).css("background","#5BC0DE")},GetNetworksId:function(){var t=[];return $(".network").each(function(){t.push(parseInt($(this).attr("data-id")))}),t},ShowLoader:function(t){var e=$("#circularG");e.show(),e.css("margin-left","100px"),$(t).parent().append(e)},HideLoader:function(){$("#circularG").hide()}}}</script><body><div class="container"><div class="header"><nav><ul class="nav nav-pills pull-right"><li role="presentation" class="active"><a href="/">Networks</a></li><li role="presentation"><a href="/ipconfig">Settings</a></li></ul></nav><h3 class="text-muted">Sming Based</h3></div><div class="jumbotron"><h1>Network Settings</h1><p class="lead">Wireless network connection</p></div><div class="row"><div class="col-lg-6 col-md-offset-7"><button class="btn btn-success reload">Reload Networks</button></div><div class="col-lg-6 col-md-offset-3"><div class="error"></div><h3>Networks</h3><div id="floatingCirclesG"><div class="f_circleG" id="frotateG_01"></div><div class="f_circleG" id="frotateG_02"></div><div class="f_circleG" id="frotateG_03"></div><div class="f_circleG" id="frotateG_04"></div><div class="f_circleG" id="frotateG_05"></div><div class="f_circleG" id="frotateG_06"></div><div class="f_circleG" id="frotateG_07"></div><div class="f_circleG" id="frotateG_08"></div></div><div class="networks list-group"></div></div></div><div id="circularG" style="display:none"><div id="circularG_1" class="circularG"></div><div id="circularG_2" class="circularG"></div><div id="circularG_3" class="circularG"></div><div id="circularG_4" class="circularG"></div><div id="circularG_5" class="circularG"></div><div id="circularG_6" class="circularG"></div><div id="circularG_7" class="circularG"></div><div id="circularG_8" class="circularG"></div></div><footer class="footer"></footer></div></body></html>
\ No newline at end of file
diff --git a/tests/HostTests/spiffsgen/build/settings.html b/tests/HostTests/spiffsgen/build/settings.html
new file mode 100644
index 0000000000..315f279b8e
--- /dev/null
+++ b/tests/HostTests/spiffsgen/build/settings.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="description" content=""><meta name="author" content=""><link rel="icon" href="../../favicon.ico"><title>Sming Framework WiFi Network configuration</title><link rel="stylesheet" href="bootstrap-core.css"><script src="core.js"></script><!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]--></head><script>function ToggleReadonly(e){"1"==e?$(".form-control").each(function(){$(this).attr("readonly","readonly")}):$(".form-control").each(function(){$(this).removeAttr("readonly")})}$(document).ready(function(){ToggleReadonly($("input[checked=checked]").val()),$("input[name=dhcp]").on("click",function(){$("input[name=dhcp]").each(function(e){$(e).removeAttr("checked")}),$(this).attr("checked","checked"),ToggleReadonly($(this).val())})})</script><body><div class="container"><div class="header"><nav><ul class="nav nav-pills pull-right"><li role="presentation"><a href="/">Networks</a></li><li role="presentation" class="active"><a href="/ipconfig">Settings</a></li></ul></nav><h3 class="text-muted">Sming Based</h3></div><div class="jumbotron"><h1>Network Settings</h1><p class="lead">Wireless network connection</p></div><div class="row"><div class="col-lg-6 col-md-offset-3"><div class="alert alert-warning" role="alert">Changes will be applied after reboot</div><h2>Settings</h2><form method="post" action=""><fieldset><legend>IP Address</legend><div class="col-md-offset-2"><div class="form-group"><label>Use DHCP</label><div class="checkbox"><label><input type="radio" value="1" name="dhcp" {dhcpon}> Yes</label><label><input type="radio" value="0" name="dhcp" {dhcpoff}> No</label></div></div><div class="form-group"><label>IP Address</label><input class="form-control" style="width:250px" type="text" name="ip" value="{ip}"></div><div class="form-group"><label>Network Mask</label><input class="form-control" style="width:250px" type="text" name="netmask" value="{netmask}"></div><div class="form-group"><label>Gateway</label><input class="form-control" style="width:250px" type="text" name="gateway" value="{gateway}"></div></div></fieldset><div class="col-md-offset-3"><input type="submit" class="btn btn-success"></div></form></div></div><footer class="footer"></footer></div></body></html>
\ No newline at end of file
diff --git a/tests/HostTests/spiffsgen/build/wifi-sprites.png b/tests/HostTests/spiffsgen/build/wifi-sprites.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a61d71a115bb69eb2a847f6c63c5b35c585aaf6
GIT binary patch
literal 1769
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
GlKukF<4{Wg

literal 0
HcmV?d00001

diff --git a/tests/HostTests/spiffsgen/spiff_rom_meta.bin b/tests/HostTests/spiffsgen/spiff_rom_meta.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2ed1940b20e11e91b0e97dd5bff9450eb63c726e
GIT binary patch
literal 65536
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%0D)y(<qVAq$?Iw{`
zVN*u_7eggep3<9w@0^Y{<op+h@v%i%lQ-+$f-2%K&JPZMv2TTcXz^*KHBPlOugr74
z3v}VBgz1oALQr**1gSM-hKH!htob~(0@7FL_@J|KU3qmKb9koTzkj4P2*YV$EWXE5
ziyCQ5(0umLJkl8@NzWM)`oz~v=eh9!kCSy2I5Mb+Q*i9imC)kaN)_+ScV%&CqHe?I
zsiTsLPdmhD)R#N3Y~ldv|M3IB?<6L8Qe~NOw8hmK$%52qVRm;?J$2~$EjZ5YyMaQD
z2+JCSkSh(po>APoL9g7FW{)$z?^nNfY)>OmQ;ucjvZ=&A__Ir>B*o??dB{ka<aXeo
zaR+@#HOb`gbDrCv7|#4_1azONUc=RTV_pom_M8ubRn9w~??XevwC@8>ymNhzucc3?
zPK*u<F6Z=najvzB>|?HV$Vi*ncIQ$@mf8M8a%9PKUegji(rM4qr|S#?(?f}qsgHjx
zePcRRT;HBE-x^(icX@AF!5_V5PjBz4n7hS(Zl~GAZ{WUruDBPAg9via7b)K1>jV=Y
zDPae~e?6<~P{ja3e5%2L7QAuATeu|-pwXc4sinq5k9AFyNPvG}uD{pg+BZqRo?g7%
z?cNjO_;E<A5se<5P5)i)#CJaAR*3w_tvK;vVfCVZ`ssFux(l1>cG%B(jb;qUr(I_9
zH?k4w5kFVF>oo+?U*m@UxmK8#qr^K{mazn}u!bcr-3>}`<N10`Gr7ON%S|*DCR|Q5
z!Ndm#Nm2ErRo2gkco@doXT6g^vNB#HHg-uPiy=Jk^7hF};xjd5e5X>ENi9F_p2T2g
zOma`QE6yL3m){-sWe&4n{Jc6-S$f$zRZ<LBs*YH0gMP-y7^}@e4L!!n>>QDS%J8!{
zyCH$fAuXVP-q1nN5Kqwm{DujFc(w<@Li_{&`x`C@4&pZl_y2+a_5Z&X1OJTw3qt1q
z*@iRO8-`A-KDQ5`4J4et_{xSPu<Z5nK~Z|1bYOG4wUAy*v7a&#{41ye0X?@YMEE+A
z>UcZXaN5l!z{F;N4qfRvQ4#&EXCnG`+h6OZ1Vj|~b*<^4!0wE^FDAKlA+~w1hQEF=
z=#x8BE4}F6eFj+&HEh=@`8OC}sMTXu(fmvlYgoUAmcawfg}qAC`O0j>+PGV{VJ-e-
z;#^9UT%sG-xO(hcaaM7cxggjMzvbuJW8DCT_t&en6K1j)Od)L;?fd(>182&w$+#sn
z7$+?NK+cUDBc=;CBr?ttEeDNub}VHTBKdF@fV}FT6%E{pRk8O789+!p0WfCHlqKdg
z4930!00T0+Vj2Qp_Le#8P}3sb1cD<l;)WW4;3!BUAJ#R6<0z-E8w>icM}jv|h59Bp
zreazGEkz*t6&*oTl_DNF-|c7#C1hX@G+Yo=NQ{IqOaY%?o-pv^qTZT9$%I&m7LEoc
z5Id$@ZmP(rVLp(l_oBv5uiDqfsM}IxOCpbaq5=N#76T)&D+p5+MI@HAa(}@pH&6OZ
z&Mjc)ZFPg97a0G0JnL(17X3F{Ab2d&iw<rK`(}@QKa-iUKuUncVF1BlqBlF_z3NhL
z^f+&^Rs!b5()n6^`OWGx%g%{!yI)CIFQoq~42gfaZ3X_;>6gZFc&nIl$NoH^FFdh+
zz)T|4XC!IWn?7O5x4>+uWAjhW+f~0OVl{vzeWrmM!o7t=*S@`S*eFP!{(1Cb=HONv
zExl!=B>ZWl&F>9iBKLz^qRk(%4vr_J<pbz5K;dF!Dzhq}8H;+tDMvi#uT%3Rdwf-~
zT*ooanp6Fhvefb}%p9*&6!9lpFM3DA=@rAnHPQR|Z+<+VeZC$qM6NaU9eDr~-*f-;
zr85Mc>?3W%6N}-i3NnoP&AJ*GJ-t*5s%)j(XhN-cym|<M|9lp7RyM4eTwflTIK7v+
za??QWV@acXG=`RUU=8nKk3cE_LSjjPyH}qV*#+{l?65gEf=r7W;%=&nZrF1@B@Ye@
zoGHC0&hLpi`}W_V;CYtz&ddMT3}o^@c_V@TzvEw=!a?F+cv@RnGr2msSi70KGCMg~
z{zp)V|9AQC-$6bM7y*m|#sK4h3BV*^>VL!gAvA;z9I31%gNj6m1j(by$x42KRK-8g
zq6m;m0o?1C_W%HJb#jtoYF_IXn}!j%>csHZS67ph-JPD05Ea<Ib!wwO$4459sfMT+
z#^%R?WIl8Vi9V+kCqGJ~8W18u;!%tsiN2HgS&3P)DzIu2QsEcts6Y=*kE^XrzT=gF
zn)Pl^i_4Cqz3;C9TV1ZT9K8a^0hS)qnH&Jj|Ne^A-!oUgV)_zhF3RQG&aXi4S>QW`
z$8w(6dQaCK(2w$`c&WrZ5k_{gzkJ~FvFo?_>r$(uT4py6Xzj3^{#T!UnV{?7#LMTI
zZYlW*=zrp0q#ZG9st@Y6nx4(QV)=Xk{7_1f&viOu$ETU@Podu`c{zBHTMc-O4v+QS
zU74wDm1#b`n``+q)&By|&7`~&k$w-)vmJ)$*rlWOo~e7KM!bnG0xe2n!wt1_3&L2|
zc7!HRGV;q?u{pO}=xW)O0GwSnZeG`tzf;*ff5d<eiXZ?;4g$zQZ~#nwr~5~s-=Cdp
zX6u^gUo&i|WLu@ID!aNC?g|6DxL01<ffw2LQB80Me@-QEBi2<6ZnM(wA8UM-5(mSt
z5?eeJy!_2f`D@+)b=GgwWau_R319Fz@5Xxo(}gQ3T}+0bFU2<YxAC}x&Prgn;;ieS
zAx}VX=Y!F$r$E%-KaQQYgZGB_P|8T+yogYoD^`*i0^dGi6mGBJVYnAEolX8;=P<$O
zgwemic3$6bU0jB4p|W{=1So%yeoak8x9L2CCU>S=l(hil1kyQ|_o9lDm^9aETLRAD
z(tQQX<is?wSb$h;fQSevQArd4$OM3qcr4wFpKp3cU!AgHtbf<MDGK9nje18tJveP%
z>m^WTDQ!-OWq;X>@bTxV4hv~+I|kXWn<@x%FPAEX*xN-1D4|8pD$pf858Hh*v(#m(
z>9@5PP7r-lEtzV-2Au(%s9`mczfEwL7}J?k{xM77KKJFw={2!QwpofJIrl#;9`JDA
zmg!bnEps?dt}DN&t<cso*=8V12R9DcujyYsR%*V&GF$*jU>LPz5*xk*06H4S-Waia
z>#YwLBnpU_;Du&)GEqhYlPtj>1B#?j&9sueX9-XN;r)Eys&+~6LTgLU1m8MvJ+Ad?
z+XG0dw)^VU=TAtIpKvk$YgKGZZy{g5nJ`^0s;5v%c0I_8z~6UuDyy6kbbV}%1TYW%
znLg#M_i2RC+h;7hlz@1@#ofPqz5L02*3oIk@@_4U1~gCQnT!|s@0kNq#`Q&&LoEJm
zzyZFfrzi%kuADG>7JT_0!D*_j3J_cRSk~n3{ZITNu-|V4@{%QJS#a(cU4{@cwgG*>
z%luk+H14;DXK%QKHk_#6k^Ix~u0&3xkJgnEkm&f>?xKKZSthdC-K#gU;e~I*Kl7;#
zpvehGAiw1QIIozHpY`xJ41mMxLlfzxKqNOd>Snb@9!5Dmh>iDgbj0A{T<`Cij!^2K
z0!YjtRd*N=ffM49o5DyiJhzW_p!+_tx-NrXe1*hFhpEAG;8{m|RMXJn?X>aP%>V?B
zxc0l$-h9aMI5OOPRx90V?jK4II+J4WYO=tGyxW!lMR)+)(B{MR{@*{zFsvm~fEVpR
z1VAt%Yuh7g1KALH5MuY{JJh5yG^BM4e%0P5gb9*ZwOQQIS~*+g-l93X<^(AEci`fl
zUgeWYsl4(xz4NKSdlUXY*J*4e0Hd9~o2U=r5{_g33I8c|t%X7TE~53A{mc$*Mg^tI
zjVh0j(~Cem+Kb~?UW;x+tV*6xP@ebk_&up4x*ABLf&gP;gj}P?<9RN-%c3CV+RAr6
zQYE3g)g*b_YZ+|avl_7b`V4X0I3K&3ehma#s)afeh*ig4SZnPDc;8nh%5QnFQS$C`
zr}yOgAi}p|06++X!$E9{u@B-B&iC@-2w(8gNq%ID6jem@vnO?sr1p349`}*MInjMW
z6`&3ycW#Cl=tKV#|Dv9hwlF_HNEzAIcJ!<r17U}_u<Uiu)&>gyxM~1kqk=SXQmHFb
zse`3P*r}usY-ZcZB16H-0F+l3EPBOvH`j^XcxpIk&5WICGp^l)ptT)2qvB#0Fovkg
z-J8%&qbb>aSzKCa3uvBgTKZgd)2R?GLK!lgjPL2f0@os_w+df6;;|ffbVa88YSxbT
z`e!q8^L;IqZjiuAMKiB@+o|)>)2&vk`pc|q8W?Q5*}KouBR+FRgJdfgxTbD6(IYZ@
zH*2cHiAM2S-t+cnB=^Lihy9TQNWR(qtyDzvzrRekddpsekcg4r%c1{?fAP=5PEJZm
zvPRq}<lmq1|A&`hg8n1^87ZU+pqTB9UELHN%^=Mnb2G>X|Ni>-x*(tV->}8=Um;*1
zj9^7a2S##sPV!IgcI51=Y&_&_JpAme{2XlLGKy+Q|8<A|!%DD0|8f405h3T_)!fa^
z+QHJ5*~-n{?%z*7r2Oyf<a2;|zye?qumo5JtN>O4Yk+mY#(&%F-*@|8sSNwi`4^;+
z{4AlStt>_U54f=4KTC2uV+Ttikhud0QZ_d>6Be{LcQYn8wK8^rRFe?M-OYlD7qaeO
zpIW)OIWd_#yIXq*fwY*^#h4@<?VXI>tWE69LFA^64sPZSkX_`Ygv`w>&Hu+v4#xK8
zLLd)ob5AEn7q|bkou{>#o0X86xreo>In%!ijMfg;Zq~+jOs=NJcIHBC|Md`N=B}nL
z)=qBLjt>9nDF1aEV|O<zN0<M)+Roa+7WSX^FS(1koe;<xA}EO5%EjD52*k|H0{OEr
zhKS(kzzkVHj^<|VW@j#}Y7hB^kW0Hjg!goGu_f31zuLRf-nNl5%rDl5{(*j_Cx%VJ
zB;|Xzil`v#O|t>ENsyyOVFUpsjwEg<k{~G`5cC)N58I;meIK9lq0c)rymVyk#cnt4
zI)GzwILABh@w~?f<KVl2{+Q?D0iB1zXqsZ{anx<g5nWnGE|KL|A<xE~W4m&p<tqoV
zlH87-r306#I~md1md(BHrfr`ELp{v(M-TMxyy|^R$G^rPl1J8Qw`1I3IPoqAe&h_|
zNt@()oQ;F?_M!8Eb3o4<6#vRb2Rp;<kF}MqJ#osjB#!*{zH@|W)ziB9HqUqjh<#<-
z*ppN(wX@+g8W8977x8Em@@G)HI0~-}ZqC>~b6tLK%V5qhPA9maG0M|8WTwNt!PqE9
z8s==v$j3ouI$oZq220f(%&I<`bF))Sv_bLjHD*isBtGZ&n{#5K`Ih0wgXshcZaTEs
zRh^cFePGcbN~ZbQV9W<^xbLdpudt1CFEmWkD!T~l@W+FMUdEBZ24OIG!>q<m)pU)%
zO@4rNTi_o^tLRs&GLUa=Q2g6uS@GIp#V6BR+KA+_BpO^WEA8yZ{#CDwuW9Q8xYLX@
zILf^s;wdz%)=ZKYZIO50>%#M>?s(MkV<$lvW_mIWLpu#d;~b;IK!?l$8VOVk92aJW
zc25~ooAs0>X5F?2?Fxf+gNoItw)@tD)}0eBl@kStG-cL%u6#l@VH>ynblZaJ@nJDf
z&M$L&GR?V<Ap#;k@-mJ;*gHN%XKcH%_s^!2ehmE;;JRNBtygP}_j}!>m^%cgSnme`
zP>N@n9#voyabYjrcCuoTG`?tZd=Q6rII>TG$e}&)?RYrM=<e3HJhu;<U4gP`u8aTe
z3ong;c}($MG_v0582*80`US+K_qpyRNr<RP_l7x7fp!FJYUAUB8W-`<B@5Q!IL5IL
zS;iUAkVFtiE&~||zCs^92BPC5Kt=D-Q~kd0L*$UEYN{(zZ8zA+L31MlEJkTOP0${C
zeIE8+W?cXHlhdb|%<FGZ{ENoMgk+ul__7?)6;`X~R|#}4_52`aI#hp(r+o%xB|k={
z%Jdoiilcc?{~;%8#e!<xcg(W4YL?*;(>#vLS)>*%>C%cFHW(&JkULN&RzuJYy8kU?
zy6{Xc6W+FSaJ-jXGPPgQ?1H=iTT~mL1<4!?x(+#ocl@50y(xFIj-YGP0yCIk!ipf(
za9ye%dO5%FHt7Dht1pkLk(l+WqDnPXR4Fl5T3*A%rYe(7)-^Ai_9p=aN)lK5d8FgV
z&ZdI_Y@-xLo5Wj4My@u5F~TZK@zWFaAI2MW{~JA)10;TnSfTemMXFy7EiD!Q|LEI@
z|AWZqm+ON6Rq_9iwV!A|)qbY^T>FLgOYK+MueIN3ztw)H{a*Wn_DAhc+Ml(*Xn)oI
zru|*}hxSkHU)sOlyWD^(+~4H*zxDqT|9`;@phfY2kru3p*snMBmy`p%GoHSmB+f&g
zD~FO9oBO6kZ4b^74Q9?W9>$(uzC~Di_uNZ$^l)djVK1M3+F@<)Gw-rJlIQr>`~Ry!
zps#aQoNH13gRlwClQP(hS*LMCVP%a;2!*MoeAS5%lv}6MGzHfcw`E(6$(=G$$<5hj
z@t|{&p|LwdNQ!DLr$IVERQnJ~PBxA&3@Ne5-Ev4i#%!8~odv0bGK)g74tx6K`3q+G
zUhZ{fDOY56^0}p4VuJ>n1p#)c9l7J3dqIoxAB1Tkw{k}@LF&|VkfV6<B37de`D#UT
zIe2@U7J8WnAu1L)MitXESY>P(JMj5uM7J%2$DQ4B{O%5WwPQMoN6bY=IG>vivS40M
zE0H9wV&FLN!Cv$qdO=w4k6`*mFyZkuH@J1o56LhTl`YDD6sh<7sKcneAs9CzbB^f>
zg(#U&ag}mQhRT9a4;!%vq&SWGaHB=KDiYd-9;=gCGSu9qw9?`(64HtVB`?YkR^)PL
zD3%fN(V2+M6J(pvVZY3#t)T2SJ_2bJ$wI*z@*&HAD}?kZpo6DaSRjgG!}hiT_4Lw5
zC}E|P?b2ZNPIjy${R!BwCP5<KSY=^>(i&oE4GvFJ6sJ(jm?Zg?vVnBT2GqK%^<U|3
zC$I`WbfOi8keai7*G&tNaQe#~Z+&cY4a*fp3)`u0b>Y<tedl0DD))E~>#%aWUXmcc
zGj{69S3UFeDaAz5PA2^-@$6=a7ZsuGD7;F>RHM_&Pd2|qoI4S<0XqvusOfoW;MuSa
zpCiM}(<!C;ZJMUnZBhOsK0Y8BbX2>(v#TiHWirQMiz2P_!0hbRnM(W=T+UFUm}d8k
zz!i`g$zL@ca%-j;TgQ8*DbQ|>Qq3))D0KsDjwjQuY<rDar^2jZ*o1~H%6}C0SM%l;
z>PBRdk=xYc8o)pDp{QH3{FYZ`soV<88A_%UN<SGIffM-Vrfcut6Q)yb>}3M{;|f>5
zPswy9bVKQ}M8^R2fnAznm%*wrvlTfR>I?&JEG%K|E7qY>P=IxSU7*CJXpHJKVtaC9
zEy{litbQhnWW{jO)MaY8AO-V+e=9sh#X|{>YJxSuSiM~Zig27Yd?k2TQ|g3j3*blf
zP}b!nHWo&Xk(uzVM0CX;L28TczoycQQIk1icY~pkJEDHQ=_*|aP@TEUo;-c<m~Fbb
z!=piZC5rCQ_F&iDQDu&&3WhuSjk9VTKGg~j1&*=a4&=V;2D=TQfYDP_LT<;tz~Agi
zL`vJA<~h({b&5<!5yco(u;`&h_g@cCsgeU#7Q8c0c|J`ey`}>h*hs4^0#+Dgxh*P8
zHoiACDavz2f&UKEg`+1`CN~dV-U0kn#l7ZmTa;TwIjT{UqOWEFl-60}bKsm8o>E}|
zawF99LQ^cXRG?8hX9v*`ry4D~|GGOqDmb>V8=I=MRQ&4^?Lr?Qh4%PJQCP>~N+DPe
zq}DZr#z?$X)elh+Ri9D2td&5ja#kTNrWe&IKY;OjR~<b<K&1Fu1yG7QA~h;dyTtCz
zy}2c`gwCv<Cba1O>o?h=*`m~nZ~zitWtS2=YEWow?hzo&trFfkvxQ))S^!pkMD`;N
z3!cM4@a^pyiWji~A_GLI6p>L3c0$N*HSno1qwwCc#!uZV+G>i?7@+h!Z_)kNJ>c`+
z-u8Chb?p!L?x6~Z?*Z<!PTs?#Y(6<w%?G0S<d~Z6<D&B+>&Q_@3|v@-_S)LyS_HWg
zq^ih_>1>xv9iy-j5uk#xnqsLSPIj%@oBfG=h)%LY+5}A3_vJ@HC)u)SXwm)GFq-Qa
z7B37799|A{YFjjC0GbRZ6;2qB%80U&1Z;0_$yl<{YC8CvV+QMcgExdIk&k056?in$
zEjI^;h~{SVs_}P@KRVs}_yJCPYHE=^@+H0a${qY4v|Rf8+&z1BcNzP@u0`LIJIOQ~
z8^}{Kj_8=;$J()*f;?s-fiW#)WW+BS95?txF$RVE?9Kp*;5777WP*3WXyLCcF8ML>
z(oqoEAs-?MWl&XAr<KTyJgI<Yczmmh%&N77E3Gf$NT=DN`>*HoIq*rGA@{of_4BI&
zdY4b3u78~Mg^#XUbpJID>Hb&GuTZ-90PghNZeO8!PXd2&T95OY{<KB+UsK3X)W2)4
zXw`Yy@==-0-HPEj?t84lX?gZX^O5ggDtI)#-fPnTkUwOya~hLlc=&pczUr{#!iVd6
z)8W_kd(-(si|)U^{*a>^EpU9J-X}NeO;W!;-SkZr*?VD3i|)U6nF@+By^4PpMpWZS
zniX0t#wH>(k+N-ce2tSr6_r+l3!(}oDc`(4xKZ!J8}&Y_^={Gq*9G#fC+D~}<nw!<
z+^F{lH|qW2J9<kQtv~Eqan9AE`>($#hh1N1srh#8TMpcE;Fbfo9JuAcEeCEn@Sbqs
EKS%=V-v9sr

literal 0
HcmV?d00001

diff --git a/tests/HostTests/spiffsgen/spiff_rom_orig.bin b/tests/HostTests/spiffsgen/spiff_rom_orig.bin
new file mode 100644
index 0000000000000000000000000000000000000000..13e02bcec791637142c1362b66df35c446ff17b4
GIT binary patch
literal 65536
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

literal 0
HcmV?d00001


From ffa376e90d2a0062f17a7ab8468d69202c1c5430 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Tue, 16 Feb 2021 07:52:47 +0000
Subject: [PATCH 15/91] Use JSON for IFS build configuration, with schema
 (#2219)

Replaces existing .ini file, consistent with Storage config, more structured.
---
 Sming/Components/IFS                          |  2 +-
 Sming/Components/Storage/README.rst           |  3 +
 .../Storage/Tools/hwconfig/config.py          |  4 +-
 .../Storage/Tools/hwconfig/hwconfig.py        |  1 -
 Sming/Components/Storage/requirements.txt     |  1 +
 Tools/requirements.txt                        |  1 +
 samples/Basic_IFS/basic_ifs.hw                |  2 +-
 samples/Basic_IFS/fsimage.fwfs                | 71 +++++++++++++++++++
 samples/Basic_IFS/fsimage.ini                 | 32 ---------
 samples/Basic_Storage/basic_storage.hw        |  6 ++
 10 files changed, 87 insertions(+), 36 deletions(-)
 create mode 100644 samples/Basic_IFS/fsimage.fwfs
 delete mode 100644 samples/Basic_IFS/fsimage.ini

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index dce62c0b14..778a4a973f 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit dce62c0b14c4af7e29c087e46dced25dae5799f0
+Subproject commit 778a4a973ff5fa2eb091db653f66f2d41f737e59
diff --git a/Sming/Components/Storage/README.rst b/Sming/Components/Storage/README.rst
index e4afc51031..5b3f4f8bcf 100644
--- a/Sming/Components/Storage/README.rst
+++ b/Sming/Components/Storage/README.rst
@@ -26,6 +26,9 @@ Hardware configuration
 Each project has an associated ``Hardware configuration``, specified by the :envvar:`HWCONFIG` setting:
 this is a JSON file with a ``.hw`` extension.
 
+For user convenience, the configuration file may contain comments however these are stripped before
+processing.
+
 The build system locates the file by searching, in order:
 
 -  ``{PROJECT_DIR}`` the root project directory
diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
index b4972375f6..9e4e8101c6 100644
--- a/Sming/Components/Storage/Tools/hwconfig/config.py
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -5,6 +5,7 @@
 import os, partition, storage
 from common import *
 from builtins import classmethod
+from rjsmin import jsmin
 
 def findConfig(name):
     dirs = os.environ['HWCONFIG_DIRS'].split(' ')
@@ -32,7 +33,8 @@ def from_name(cls, name):
     def load(self, name):
         filename = findConfig(name)
         self.depends.append(filename)
-        data = json.load(open(filename))
+        din = open(filename).read()
+        data = json.loads(jsmin(din))
         self.parse_dict(data)
 
     def parse_dict(self, data):
diff --git a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
index 5a8cfbdf9b..dc33c3c1aa 100644
--- a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
+++ b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
@@ -59,7 +59,6 @@ def main():
         # Validate resulting hardware configuration against schema
         try:
             from jsonschema import Draft7Validator
-            from jsonschema.exceptions import ValidationError
         except ImportError:
             critical("hwconfig: `jsonschema` is not installed. Please run `make python-requirements`")
             sys.exit(1)
diff --git a/Sming/Components/Storage/requirements.txt b/Sming/Components/Storage/requirements.txt
index d89304b1a8..bcc6ba09ac 100644
--- a/Sming/Components/Storage/requirements.txt
+++ b/Sming/Components/Storage/requirements.txt
@@ -1 +1,2 @@
 jsonschema
+rjsmin
diff --git a/Tools/requirements.txt b/Tools/requirements.txt
index ee96c8f8e1..941e353f13 100644
--- a/Tools/requirements.txt
+++ b/Tools/requirements.txt
@@ -1,2 +1,3 @@
 pyserial
 jsonschema
+rjsmin
diff --git a/samples/Basic_IFS/basic_ifs.hw b/samples/Basic_IFS/basic_ifs.hw
index 0c4d66a6a5..ee67b4c91f 100644
--- a/samples/Basic_IFS/basic_ifs.hw
+++ b/samples/Basic_IFS/basic_ifs.hw
@@ -10,7 +10,7 @@
             "filename": "out/fwfs1.bin",
             "build": {
                 "target": "fwfs-build",
-                "config": "fsimage.ini"
+                "config": "fsimage.fwfs"
             }
         }
     }
diff --git a/samples/Basic_IFS/fsimage.fwfs b/samples/Basic_IFS/fsimage.fwfs
new file mode 100644
index 0000000000..bb1a6be2e2
--- /dev/null
+++ b/samples/Basic_IFS/fsimage.fwfs
@@ -0,0 +1,71 @@
+// Filesystem builder configuration
+{
+    "name": "Sming IFS demo volume",
+    "id": "0x12345678",
+    // Where to read files from
+    "source": {
+        "/": "files",
+        "README.rst": "README.rst",
+        "test.jsonc": "basic_ifs.hw",
+        "readme.md": "${SMING_HOME}/Components/IFS/README.rst",
+        "sming.png": "${SMING_HOME}/../docs/api-logo.png",
+        "Data": "${SMING_HOME}/Core/Data",
+        "framework": "${SMING_HOME}/../docs/source/framework",
+        "Sming": "${SMING_HOME}/Core"
+    },
+    // Directories to mount other object stores
+    "mountpoints": {
+        "config": 1
+    },
+    // Rules for file metadata. All rules are evaluated in sequence for every file
+    "rules": [
+        {
+            "mask": "*",
+            "read": "guest",
+            "write": "admin"
+        },
+        {
+            "mask": ".*",
+            "read": "admin"
+        },
+        {
+            "mask": "*.html",
+            "readonly": true
+        },
+        {
+            "mask": [
+                "*.js",
+                "*.png",
+                "*.ico",
+                "*.jpg",
+                "*.jpeg",
+                "*.html",
+                "*.css",
+                "*.txt",
+                "*.md"
+            ],
+            "compress": "gzip"
+        },
+        {
+            "mask": [
+                "/styles.css",
+                "*.ico",
+                "*.png"
+            ],
+            "read": "any"
+        },
+        {
+            "mask": [
+                "/Data/*",
+                "/framework/*",
+                "/Sming/*"
+            ],
+            "compress": "gzip"
+        },
+        //This is a template file so firmware needs to read it
+        {
+            "mask": "/error.html",
+            "compress": "none"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/samples/Basic_IFS/fsimage.ini b/samples/Basic_IFS/fsimage.ini
deleted file mode 100644
index 6e23dc647a..0000000000
--- a/samples/Basic_IFS/fsimage.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# Filesystem builder configuration
-[config]
-
-volumeName = Sming IFS demo volume
-volumeID = 0x12345678
-
-# Where to read files from
-[source]
-/ = files
-readme.md = ${SMING_HOME}/Components/IFS/README.rst
-sming.png = ${SMING_HOME}/../docs/api-logo.png
-Data = ${SMING_HOME}/Core/Data
-framework = ${SMING_HOME}/../docs/source/framework
-Sming = ${SMING_HOME}/Core
-
-# Directories to mount other object stores
-[mountpoints]
-config = 1
-
-# Rules for file metadata. All rules are evaluated in sequence for every file
-# The masks apply to the full target path
-[rules]
-*: read=guest,write=admin
-\.*: read=admin
-*.html: readonly=true
-*.js, *.png, *.ico, *.jpg, *.jpeg, *.html, *.css, *.txt, *.md: compress=gzip
-/layout.json, /full-layout.json: compress=gzip
-/Data/*, /framework/*, /Sming/*: compress=gzip
-/index.html, /index.js, /stswsio.js, /styles.css, *.ico, *.png: read=any
-# This is a template file so firmware needs to read it
-/error.html: compress=none
diff --git a/samples/Basic_Storage/basic_storage.hw b/samples/Basic_Storage/basic_storage.hw
index c878ea9713..aad639cc4f 100644
--- a/samples/Basic_Storage/basic_storage.hw
+++ b/samples/Basic_Storage/basic_storage.hw
@@ -2,12 +2,14 @@
 	"name": "Basic Storage sample",
 	"base_config": "spiffs",
 	"devices": {
+		// Override default (conservative) flash settings for maximum performance
 		"spiFlash": {
 			"mode": "qio",
 			"speed": 80
 		}
 	},
 	"partitions": {
+		// User-defined partition type
 		"user0": {
 			"address": "0x1F0000",
 			"size": "16K",
@@ -21,12 +23,15 @@
 			"type": "user",
 			"subtype": 1
 		},
+		// Override default SPIFFS partition with new address and source content
 		"spiffs0": {
 			"address": "0x200000",
 			"build": {
+				// target is already defined, just change the folder to pick up files from
 				"files": "files/spiffs0"
 			}
 		},
+		// Add a second SPIFFS partition
 		"spiffs1": {
 			"address": "0x280000",
 			"size": "256K",
@@ -38,6 +43,7 @@
 				"files": "files/spiffs1"
 			}
 		},
+		// And a third
 		"spiffs2": {
 			"address": "0x2C0000",
 			"size": "256K",

From 11836eb08306b3c5548f1c4c394e79d12be37016 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Thu, 18 Feb 2021 09:05:21 +0100
Subject: [PATCH 16/91] Added protocol buffers support using nanopb. (#2217)

---
 .gitmodules                            |  4 ++
 Sming/Libraries/nanopb/README.rst      | 56 ++++++++++++++++++++++++++
 Sming/Libraries/nanopb/component.mk    |  4 ++
 Sming/Libraries/nanopb/nanopb          |  1 +
 Sming/Libraries/nanopb/src/PbUtils.cpp | 41 +++++++++++++++++++
 Sming/Libraries/nanopb/src/PbUtils.h   | 27 +++++++++++++
 6 files changed, 133 insertions(+)
 create mode 100644 Sming/Libraries/nanopb/README.rst
 create mode 100644 Sming/Libraries/nanopb/component.mk
 create mode 160000 Sming/Libraries/nanopb/nanopb
 create mode 100644 Sming/Libraries/nanopb/src/PbUtils.cpp
 create mode 100644 Sming/Libraries/nanopb/src/PbUtils.h

diff --git a/.gitmodules b/.gitmodules
index 9bb87d3574..e2a90fbd3b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -227,6 +227,10 @@
 	path = Sming/Libraries/MultipartParser/multipart-parser
 	url = https://github.com/iafonov/multipart-parser-c.git
 	ignore = dirty
+[submodule "Libraries.nanopb"]
+	path = Sming/Libraries/nanopb/nanopb
+	url = https://github.com/nanopb/nanopb.git
+	ignore = dirty
 [submodule "Libraries.RapidXML"]
 	path = Sming/Libraries/RapidXML
 	url = https://github.com/mikee47/Sming-RapidXML
diff --git a/Sming/Libraries/nanopb/README.rst b/Sming/Libraries/nanopb/README.rst
new file mode 100644
index 0000000000..5a70236598
--- /dev/null
+++ b/Sming/Libraries/nanopb/README.rst
@@ -0,0 +1,56 @@
+Nano Protocol-Buffer
+====================
+
+Introduction
+------------
+
+This component adds support for `Nano Protocol-Buffer <https://github.com/nanopb/nanopb/>`_ implementation.
+
+   Nanopb is a small code-size `Protocol Buffers <https://developers.google.com/protocol-buffers>`_ implementation in ansi C. It is especially suitable for use in microcontrollers, but fits any memory restricted system.
+
+
+C file generation from Proto files
+----------------------------------
+
+Once this component is installed you can use it to add Nano Protocol-Buffer support to your project and generate C and header files from Proto files.
+One possible way to call the generator is to go to the directory where the proto file is located and run the generator. As shown below::
+
+   make -C $SMING_HOME fetch nano-pb
+   cd <folder-with-proto-file>
+   python $SMING_HOME/Libraries/nanopb/nanopb/generator/nanopb_generator.py <desired-proto-file>.proto
+
+After the generator tool is run you will have newly generated C and header files that can be used in your Sming application.
+
+Using
+-----
+
+1. Add ``COMPONENT_DEPENDS += nanopb`` to your application componenent.mk file.
+2. Add these lines to your application::
+
+      #include <PbUtils.h>
+      // The line below should be replaced with the generated header file
+      #include "cast_channel.pb.h"
+
+3. Example::
+
+      #include <PbUtils.h>
+      #include "cast_channel.pb.h"
+
+      void doSomething(const uint8_t* data, size_t length)
+      {
+         // ...
+
+         extensions_api_cast_channel_CastMessage message = extensions_api_cast_channel_CastMessage_init_default;
+
+         message.protocol_version = extensions_api_cast_channel_CastMessage_ProtocolVersion_CASTV2_1_0;
+         message.source_id.funcs.encode = &pbEncodeData;
+         message.source_id.arg = new PbData(sourceId);
+         message.destination_id.funcs.encode = &pbEncodeData;
+         message.destination_id.arg = new PbData(destinationId);
+         message.nameSpace.funcs.encode = &pbEncodeData;
+         message.nameSpace.arg = new PbData(ns);
+         message.payload_type = extensions_api_cast_channel_CastMessage_PayloadType_STRING;
+         message.payload_utf8.funcs.encode = &pbEncodeData;
+         message.payload_utf8.arg = new PbData((uint8_t*)data, length);
+         // ...
+      }
\ No newline at end of file
diff --git a/Sming/Libraries/nanopb/component.mk b/Sming/Libraries/nanopb/component.mk
new file mode 100644
index 0000000000..7145d462d4
--- /dev/null
+++ b/Sming/Libraries/nanopb/component.mk
@@ -0,0 +1,4 @@
+COMPONENT_SRCDIRS := nanopb src
+COMPONENT_INCDIRS := $(COMPONENT_SRCDIRS)
+
+COMPONENT_SUBMODULES += nanopb
\ No newline at end of file
diff --git a/Sming/Libraries/nanopb/nanopb b/Sming/Libraries/nanopb/nanopb
new file mode 160000
index 0000000000..049485ff55
--- /dev/null
+++ b/Sming/Libraries/nanopb/nanopb
@@ -0,0 +1 @@
+Subproject commit 049485ff557178f646d573eca3bd647f543b760b
diff --git a/Sming/Libraries/nanopb/src/PbUtils.cpp b/Sming/Libraries/nanopb/src/PbUtils.cpp
new file mode 100644
index 0000000000..2ba2047d1b
--- /dev/null
+++ b/Sming/Libraries/nanopb/src/PbUtils.cpp
@@ -0,0 +1,41 @@
+#include "PbUtils.h"
+
+// See: https://iam777.tistory.com/538
+
+bool pbEncodeData(pb_ostream_t *stream, const pb_field_t *field, void * const *arg)
+{
+  PbData *data = (PbData*) *arg;
+  if(data == nullptr) {
+	  return false;
+  }
+
+  if (!pb_encode_tag_for_field(stream, field)) {
+    return false;
+  }
+
+  return pb_encode_string(stream, (uint8_t*)data->value, data->length);
+}
+
+bool pbDecodeData(pb_istream_t *stream, const pb_field_t *field, void **arg)
+{
+  uint8_t buffer[1024] = {0};
+
+  /* We could read block-by-block to avoid the large buffer... */
+  if (stream->bytes_left > sizeof(buffer) - 1) {
+    return false;
+  }
+
+  size_t available = stream->bytes_left;
+  if (!pb_read(stream, buffer, stream->bytes_left)) {
+    return false;
+  }
+
+
+  MemoryDataStream* data = (MemoryDataStream*) *arg;
+  if(data == nullptr) {
+	  data = new MemoryDataStream();
+	  *arg = (void*)data;
+  }
+  data->write(buffer, available);
+  return true;
+}
diff --git a/Sming/Libraries/nanopb/src/PbUtils.h b/Sming/Libraries/nanopb/src/PbUtils.h
new file mode 100644
index 0000000000..78c221e659
--- /dev/null
+++ b/Sming/Libraries/nanopb/src/PbUtils.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <SmingCore.h>
+#include <Data/Stream/MemoryDataStream.h>
+#include <pb_encode.h>
+#include <pb_decode.h>
+
+class PbData
+{
+public:
+	uint8_t* value = nullptr;
+	size_t length = 0;
+
+	PbData(const String& text)
+	{
+		PbData((uint8_t *)text.c_str(), text.length());
+	}
+
+	PbData(uint8_t*  data, size_t length)
+	{
+		value = data;
+		this->length = length;
+	}
+};
+
+bool pbEncodeData(pb_ostream_t *stream, const pb_field_t *field, void * const *arg);
+bool pbDecodeData(pb_istream_t *stream, const pb_field_t *field, void **arg);

From 8f3c894ee9a790f1df0d0664fa71404f1b5eacd8 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Fri, 19 Feb 2021 07:45:21 +0000
Subject: [PATCH 17/91] Fix BitSet `&` operator, add XOR operator (#2220)

---
 Sming/Core/Data/BitSet.h           | 14 +++++++++++++-
 tests/HostTests/modules/BitSet.cpp |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Sming/Core/Data/BitSet.h b/Sming/Core/Data/BitSet.h
index 10dd5164ad..ee7a0b47e1 100644
--- a/Sming/Core/Data/BitSet.h
+++ b/Sming/Core/Data/BitSet.h
@@ -377,7 +377,7 @@ template <typename S, typename E, size_t size_ = sizeof(S) * 8> class BitSet
 template <typename S, typename E, size_t size_>
 inline constexpr BitSet<S, E, size_> operator&(const BitSet<S, E, size_>& x, const BitSet<S, E, size_>& y)
 {
-	return BitSet<S, E, size_>(S(x) & ~S(y));
+	return BitSet<S, E, size_>(S(x) & S(y));
 }
 
 template <typename S, typename E, size_t size_>
@@ -416,6 +416,18 @@ inline constexpr BitSet<S, E, size_> operator-(const BitSet<S, E, size_>& x, E b
 	return BitSet<S, E, size_>(S(x) & ~BitSet<S, E, size_>::bitVal(b));
 }
 
+template <typename S, typename E, size_t size_>
+inline constexpr BitSet<S, E, size_> operator^(BitSet<S, E, size_> x, BitSet<S, E, size_> y)
+{
+	return BitSet<S, E, size_>(S(x) ^ S(y));
+}
+
+template <typename S, typename E, size_t size_>
+inline constexpr BitSet<S, E, size_> operator^(BitSet<S, E, size_> x, E b)
+{
+	return x ^ BitSet<S, E, size_>(b);
+}
+
 /*
  * These allow construction of a maximally-sized BitSet in an expression,
  * which is then copy-constructed to the actual value. For example:
diff --git a/tests/HostTests/modules/BitSet.cpp b/tests/HostTests/modules/BitSet.cpp
index cfb5b5b2d3..331457e5f4 100644
--- a/tests/HostTests/modules/BitSet.cpp
+++ b/tests/HostTests/modules/BitSet.cpp
@@ -100,7 +100,11 @@ class BitSetTest : public TestGroup
 			basket -= Fruit::orange;
 			REQUIRE(basket.value() == (_BV(Fruit::banana) | _BV(Fruit::tomato)));
 
+			basket |= Fruit::kiwi;
+			REQUIRE(basket.value() == (_BV(Fruit::kiwi) | _BV(Fruit::banana) | _BV(Fruit::tomato)));
+
 			basket &= fixedBasket;
+			REQUIRE(basket.value() == (_BV(Fruit::banana) | _BV(Fruit::tomato)));
 
 			basket = ~fixedBasket;
 			debug_e("basket.value = 0x%08x", basket.value());

From 295a5f39af034de1a819915044323b2588666f11 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Sat, 20 Feb 2021 07:26:25 +0000
Subject: [PATCH 18/91] Catch missing python modules and print message (#2221)

* Add `python-requirements` target for main Sming Makefile to install core requirements

* Catch missing optional python modules and print more obvious message
---
 Sming/Components/IFS                              | 2 +-
 Sming/Components/Storage/Tools/hwconfig/config.py | 8 +++++++-
 Sming/Makefile                                    | 8 ++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index 778a4a973f..cd16dc51c4 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit 778a4a973ff5fa2eb091db653f66f2d41f737e59
+Subproject commit cd16dc51c49fc792e1ae92f96ab2d8eb74873538
diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
index 9e4e8101c6..e0b373ec70 100644
--- a/Sming/Components/Storage/Tools/hwconfig/config.py
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -5,7 +5,13 @@
 import os, partition, storage
 from common import *
 from builtins import classmethod
-from rjsmin import jsmin
+
+try:
+    from rjsmin import jsmin
+except ImportError as err:
+    sys.stderr.write("\n** %s: please run `make python-requirements` **\n\n" % str(err))
+    sys.exit(1)
+
 
 def findConfig(name):
     dirs = os.environ['HWCONFIG_DIRS'].split(' ')
diff --git a/Sming/Makefile b/Sming/Makefile
index c058d057e6..a64374e5ca 100644
--- a/Sming/Makefile
+++ b/Sming/Makefile
@@ -175,6 +175,14 @@ $(CLEAN_TESTS):
 
 ##@Tools
 
+CACHE_VARS += PIP_ARGS
+PIP_ARGS ?=
+.PHONY: python-requirements
+python-requirements: ##Install Python requirements for framework via pip (use PIP_ARGS=... for additional options)
+	@echo Installing Python requirements...
+	$(Q) $(PYTHON) -m pip install $(PIP_ARGS) -r $(SMING_HOME)/../Tools/requirements.txt
+
+
 # Recursive wildcard search
 # $1 -> list of directories
 # $2 -> file extensions filters (using % as wildcard)

From 3fcb3cad57e11955942350d9fc52fdd83d0e9a02 Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Mon, 22 Feb 2021 15:29:41 +0000
Subject: [PATCH 19/91] Fix issues with missing `rjsmin` python package

Add rjsmin.py directly to source (suggested by author https://github.com/ndparker/rjsmin)
Catch missing `jsonschema` and generate warning, but allow compilation to continue

IFS: Apply the same changes
---
 Sming/Components/IFS                          |   2 +-
 .../Storage/Tools/hwconfig/config.py          |   8 +-
 .../Storage/Tools/hwconfig/hwconfig.py        |  21 +-
 .../Storage/Tools/hwconfig/rjsmin.py          | 543 ++++++++++++++++++
 Sming/Components/Storage/requirements.txt     |   1 -
 Tools/requirements.txt                        |   1 -
 6 files changed, 555 insertions(+), 21 deletions(-)
 create mode 100644 Sming/Components/Storage/Tools/hwconfig/rjsmin.py

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index cd16dc51c4..1e50d014fa 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit cd16dc51c49fc792e1ae92f96ab2d8eb74873538
+Subproject commit 1e50d014fac7604026d0d4112f1855431a44496a
diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
index e0b373ec70..e8cc943156 100644
--- a/Sming/Components/Storage/Tools/hwconfig/config.py
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -3,16 +3,10 @@
 #
 
 import os, partition, storage
+from rjsmin import jsmin
 from common import *
 from builtins import classmethod
 
-try:
-    from rjsmin import jsmin
-except ImportError as err:
-    sys.stderr.write("\n** %s: please run `make python-requirements` **\n\n" % str(err))
-    sys.exit(1)
-
-
 def findConfig(name):
     dirs = os.environ['HWCONFIG_DIRS'].split(' ')
     for d in dirs:
diff --git a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
index dc33c3c1aa..a117ff87ff 100644
--- a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
+++ b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
@@ -59,17 +59,16 @@ def main():
         # Validate resulting hardware configuration against schema
         try:
             from jsonschema import Draft7Validator
-        except ImportError:
-            critical("hwconfig: `jsonschema` is not installed. Please run `make python-requirements`")
-            sys.exit(1)
-        inst = json.loads(config.to_json())
-        schema = json.load(open(args.expr))
-        v = Draft7Validator(schema)
-        errors = sorted(v.iter_errors(inst), key=lambda e: e.path)
-        if errors != []:
-            for e in errors:
-                critical("%s @ %s" % (e.message, e.path))
-            sys.exit(3)
+            inst = json.loads(config.to_json())
+            schema = json.load(open(args.expr))
+            v = Draft7Validator(schema)
+            errors = sorted(v.iter_errors(inst), key=lambda e: e.path)
+            if errors != []:
+                for e in errors:
+                    critical("%s @ %s" % (e.message, e.path))
+                sys.exit(3)
+        except ImportError as err:
+            critical("\n** WARNING! %s: Cannot validate '%s', please run `make python-requirements **\n\n" % (str(err), args.input))
     elif args.command == 'flashcheck':
         # Expect list of chunks, such as "0x100000=/out/Esp8266/debug/firmware/spiff_rom.bin 0x200000=custom.bin"
         list = args.expr.split()
diff --git a/Sming/Components/Storage/Tools/hwconfig/rjsmin.py b/Sming/Components/Storage/Tools/hwconfig/rjsmin.py
new file mode 100644
index 0000000000..68b65aeef0
--- /dev/null
+++ b/Sming/Components/Storage/Tools/hwconfig/rjsmin.py
@@ -0,0 +1,543 @@
+#!/usr/bin/env python
+# -*- coding: ascii -*-
+u"""
+=====================
+ Javascript Minifier
+=====================
+
+rJSmin is a javascript minifier written in python.
+
+The minifier is based on the semantics of `jsmin.c by Douglas Crockford`_\\.
+
+:Copyright:
+
+ Copyright 2011 - 2019
+ Andr\xe9 Malo or his licensors, as applicable
+
+:License:
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+The module is a re-implementation aiming for speed, so it can be used at
+runtime (rather than during a preprocessing step). Usually it produces the
+same results as the original ``jsmin.c``. It differs in the following ways:
+
+- there is no error detection: unterminated string, regex and comment
+  literals are treated as regular javascript code and minified as such.
+- Control characters inside string and regex literals are left untouched; they
+  are not converted to spaces (nor to \\n)
+- Newline characters are not allowed inside string and regex literals, except
+  for line continuations in string literals (ECMA-5).
+- "return /regex/" is recognized correctly.
+- More characters are allowed before regexes.
+- Line terminators after regex literals are handled more sensibly
+- "+ +" and "- -" sequences are not collapsed to '++' or '--'
+- Newlines before ! operators are removed more sensibly
+- (Unnested) template literals are supported (ECMA-6)
+- Comments starting with an exclamation mark (``!``) can be kept optionally
+- rJSmin does not handle streams, but only complete strings. (However, the
+  module provides a "streamy" interface).
+
+Since most parts of the logic are handled by the regex engine it's way faster
+than the original python port of ``jsmin.c`` by Baruch Even. The speed factor
+varies between about 6 and 55 depending on input and python version (it gets
+faster the more compressed the input already is). Compared to the
+speed-refactored python port by Dave St.Germain the performance gain is less
+dramatic but still between 3 and 50 (for huge inputs). See the docs/BENCHMARKS
+file for details.
+
+rjsmin.c is a reimplementation of rjsmin.py in C and speeds it up even more.
+
+Supported python versions are 2.7 and 3.4+.
+
+.. _jsmin.c by Douglas Crockford:
+   http://www.crockford.com/javascript/jsmin.c
+"""
+__author__ = u"Andr\xe9 Malo"
+__docformat__ = "restructuredtext en"
+__license__ = "Apache License, Version 2.0"
+__version__ = '1.1.0'
+__all__ = ['jsmin']
+
+import functools as _ft
+import re as _re
+
+
+def _make_jsmin(python_only=False):
+    """
+    Generate JS minifier based on `jsmin.c by Douglas Crockford`_
+
+    .. _jsmin.c by Douglas Crockford:
+       http://www.crockford.com/javascript/jsmin.c
+
+    :Parameters:
+      `python_only` : ``bool``
+        Use only the python variant. If true, the c extension is not even
+        tried to be loaded.
+
+    :Return: Minifier
+    :Rtype: ``callable``
+    """
+    # pylint: disable = unused-variable
+    # pylint: disable = too-many-locals
+
+    if not python_only:
+        try:
+            import _rjsmin
+        except ImportError:
+            pass
+        else:
+            # Ensure that the C version is in sync
+            # https://github.com/ndparker/rjsmin/issues/11
+            if getattr(_rjsmin, '__version__', None) == __version__:
+                return _rjsmin.jsmin
+    try:
+        xrange
+    except NameError:
+        xrange = range  # pylint: disable = redefined-builtin
+
+    space_chars = r'[\000-\011\013\014\016-\040]'
+
+    line_comment = r'(?://[^\r\n]*)'
+    space_comment = r'(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)'
+    space_comment_nobang = r'(?:/\*(?!!)[^*]*\*+(?:[^/*][^*]*\*+)*/)'
+    bang_comment = r'(?:/\*![^*]*\*+(?:[^/*][^*]*\*+)*/)'
+
+    string1 = r"(?:'[^'\\\r\n]*(?:\\(?:[^\r\n]|\r?\n|\r)[^'\\\r\n]*)*')"
+    string1 = string1.replace("'", r'\047')  # portability
+    string2 = r'(?:"[^"\\\r\n]*(?:\\(?:[^\r\n]|\r?\n|\r)[^"\\\r\n]*)*")'
+    string3 = r'(?:`[^`\\]*(?:\\(?:[^\r\n]|\r?\n|\r)[^`\\]*)*`)'
+    string3 = string3.replace('`', r'\140')  # portability
+    strings = r'(?:%s|%s|%s)' % (string1, string2, string3)
+
+    charclass = r'(?:\[[^\\\]\r\n]*(?:\\[^\r\n][^\\\]\r\n]*)*\])'
+    nospecial = r'[^/\\\[\r\n]'
+    regex = r'(?:/(?![\r\n/*])%s*(?:(?:\\[^\r\n]|%s)%s*)*/)' % (
+        nospecial, charclass, nospecial
+    )
+    space = r'(?:%s|%s)' % (space_chars, space_comment)
+    newline = r'(?:%s?[\r\n])' % line_comment
+
+    def fix_charclass(result):
+        """ Fixup string of chars to fit into a regex char class """
+        pos = result.find('-')
+        if pos >= 0:
+            result = r'%s%s-' % (result[:pos], result[pos + 1:])
+
+        def sequentize(string):
+            """
+            Notate consecutive characters as sequence
+
+            (1-4 instead of 1234)
+            """
+            first, last, result = None, None, []
+            for char in map(ord, string):
+                if last is None:
+                    first = last = char
+                elif last + 1 == char:
+                    last = char
+                else:
+                    result.append((first, last))
+                    first = last = char
+            if last is not None:
+                result.append((first, last))
+            return ''.join(['%s%s%s' % (
+                chr(first),
+                last > first + 1 and '-' or '',
+                last != first and chr(last) or ''
+            ) for first, last in result])  # noqa
+
+        return _re.sub(
+            r"([\000-\040'`])",  # ' and ` for better portability
+            lambda m: '\\%03o' % ord(m.group(1)), (
+                sequentize(result)
+                .replace('\\', '\\\\')
+                .replace('[', '\\[')
+                .replace(']', '\\]')
+            )
+        )
+
+    def id_literal_(what):
+        """ Make id_literal like char class """
+        match = _re.compile(what).match
+        result = ''.join([
+            chr(c) for c in xrange(127) if not match(chr(c))
+        ])
+        return '[^%s]' % fix_charclass(result)
+
+    def not_id_literal_(keep):
+        """ Make negated id_literal like char class """
+        match = _re.compile(id_literal_(keep)).match
+        result = ''.join([
+            chr(c) for c in xrange(127) if not match(chr(c))
+        ])
+        return r'[%s]' % fix_charclass(result)
+
+    not_id_literal = not_id_literal_(r'[a-zA-Z0-9_$]')
+    preregex1 = r'[(,=:\[!&|?{};\r\n+*-]'
+    preregex2 = r'%(not_id_literal)sreturn' % locals()
+
+    id_literal = id_literal_(r'[a-zA-Z0-9_$]')
+    id_literal_open = id_literal_(r'[a-zA-Z0-9_${\[(!+-]')
+    id_literal_close = id_literal_(r'[a-zA-Z0-9_$}\])"\047\140+-]')
+    post_regex_off = id_literal_(r'[^\000-\040}\])?:|,;.&=+-]')
+
+    dull = r'[^\047"\140/\000-\040]'
+
+    space_sub_simple = _re.compile((
+        # noqa pylint: disable = bad-continuation
+
+        r'(%(dull)s+)'                                         # 0
+        r'|(%(strings)s%(dull)s*)'                             # 1
+        r'|(?<=%(preregex1)s)'
+            r'%(space)s*(?:%(newline)s%(space)s*)*'
+            r'(%(regex)s)'                                     # 2
+            r'(%(space)s*(?:%(newline)s%(space)s*)+'           # 3
+                r'(?=%(post_regex_off)s))?'
+        r'|(?<=%(preregex2)s)'
+            r'%(space)s*(?:(%(newline)s)%(space)s*)*'          # 4
+            r'(%(regex)s)'                                     # 5
+            r'(%(space)s*(?:%(newline)s%(space)s*)+'           # 6
+                r'(?=%(post_regex_off)s))?'
+        r'|(?<=%(id_literal_close)s)'
+            r'%(space)s*(?:(%(newline)s)%(space)s*)+'          # 7
+            r'(?=%(id_literal_open)s)'
+        r'|(?<=%(id_literal)s)(%(space)s)+(?=%(id_literal)s)'  # 8
+        r'|(?<=\+)(%(space)s)+(?=\+)'                          # 9
+        r'|(?<=-)(%(space)s)+(?=-)'                            # 10
+        r'|%(space)s+'
+        r'|(?:%(newline)s%(space)s*)+'
+    ) % locals()).sub
+
+    # print(space_sub_simple.__self__.pattern)
+
+    def space_subber_simple(match):
+        """ Substitution callback """
+        # pylint: disable = too-many-return-statements
+
+        groups = match.groups()
+        if groups[0]:
+            return groups[0]
+        elif groups[1]:
+            return groups[1]
+        elif groups[2]:
+            if groups[3]:
+                return groups[2] + '\n'
+            return groups[2]
+        elif groups[5]:
+            return "%s%s%s" % (
+                groups[4] and '\n' or '',
+                groups[5],
+                groups[6] and '\n' or '',
+            )
+        elif groups[7]:
+            return '\n'
+        elif groups[8] or groups[9] or groups[10]:
+            return ' '
+        else:
+            return ''
+
+    space_sub_banged = _re.compile((
+        # noqa pylint: disable = bad-continuation
+
+        r'(%(dull)s+)'                                         # 0
+        r'|(%(strings)s%(dull)s*)'                             # 1
+        r'|(?<=%(preregex1)s)'
+            r'(%(space)s*(?:%(newline)s%(space)s*)*)'          # 2
+            r'(%(regex)s)'                                     # 3
+            r'(%(space)s*(?:%(newline)s%(space)s*)+'           # 4
+                r'(?=%(post_regex_off)s))?'
+        r'|(?<=%(preregex2)s)'
+            r'(%(space)s*(?:(%(newline)s)%(space)s*)*)'        # 5, 6
+            r'(%(regex)s)'                                     # 7
+            r'(%(space)s*(?:%(newline)s%(space)s*)+'           # 8
+                r'(?=%(post_regex_off)s))?'
+        r'|(?<=%(id_literal_close)s)'
+            r'(%(space)s*(?:%(newline)s%(space)s*)+)'          # 9
+            r'(?=%(id_literal_open)s)'
+        r'|(?<=%(id_literal)s)(%(space)s+)(?=%(id_literal)s)'  # 10
+        r'|(?<=\+)(%(space)s+)(?=\+)'                          # 11
+        r'|(?<=-)(%(space)s+)(?=-)'                            # 12
+        r'|(%(space)s+)'                                       # 13
+        r'|((?:%(newline)s%(space)s*)+)'                       # 14
+    ) % locals()).sub
+
+    # print(space_sub_banged.__self__.pattern)
+
+    keep = _re.compile((
+        r'%(space_chars)s+|%(space_comment_nobang)s+|%(newline)s+'
+        r'|(%(bang_comment)s+)'
+    ) % locals()).sub
+    keeper = lambda m: m.groups()[0] or ''
+
+    # print(keep.__self__.pattern)
+
+    def space_subber_banged(match):
+        """ Substitution callback """
+        # pylint: disable = too-many-return-statements
+
+        groups = match.groups()
+        if groups[0]:
+            return groups[0]
+        elif groups[1]:
+            return groups[1]
+        elif groups[3]:
+            return "%s%s%s%s" % (
+                keep(keeper, groups[2]),
+                groups[3],
+                keep(keeper, groups[4] or ''),
+                groups[4] and '\n' or '',
+            )
+        elif groups[7]:
+            return "%s%s%s%s%s" % (
+                keep(keeper, groups[5]),
+                groups[6] and '\n' or '',
+                groups[7],
+                keep(keeper, groups[8] or ''),
+                groups[8] and '\n' or '',
+            )
+        elif groups[9]:
+            return keep(keeper, groups[9]) + '\n'
+        elif groups[10] or groups[11] or groups[12]:
+            return keep(keeper, groups[10] or groups[11] or groups[12]) or ' '
+        else:
+            return keep(keeper, groups[13] or groups[14])
+
+    banged = _ft.partial(space_sub_banged, space_subber_banged)
+    simple = _ft.partial(space_sub_simple, space_subber_simple)
+
+    def jsmin(script, keep_bang_comments=False):
+        r"""
+        Minify javascript based on `jsmin.c by Douglas Crockford`_\.
+
+        Instead of parsing the stream char by char, it uses a regular
+        expression approach which minifies the whole script with one big
+        substitution regex.
+
+        .. _jsmin.c by Douglas Crockford:
+           http://www.crockford.com/javascript/jsmin.c
+
+        :Parameters:
+          `script` : ``str``
+            Script to minify
+
+          `keep_bang_comments` : ``bool``
+            Keep comments starting with an exclamation mark? (``/*!...*/``)
+
+        :Return: Minified script
+        :Rtype: ``str``
+        """
+        # pylint: disable = redefined-outer-name
+
+        is_bytes, script = _as_str(script)
+        script = (banged if keep_bang_comments else simple)(
+            '\n%s\n' % script
+        ).strip()
+        if is_bytes:
+            return script.encode('latin-1')
+        return script
+
+    return jsmin
+
+jsmin = _make_jsmin()
+
+
+def _as_str(script):
+    """ Make sure the script is a text string """
+    is_bytes = False
+    if str is bytes:
+        if not isinstance(script, basestring):  # noqa pylint: disable = undefined-variable
+            raise TypeError("Unexpected type")
+    elif isinstance(script, (bytes, bytearray)):
+        is_bytes = True
+        script = script.decode('latin-1')
+    elif not isinstance(script, str):
+        raise TypeError("Unexpected type")
+
+    return is_bytes, script
+
+
+def jsmin_for_posers(script, keep_bang_comments=False):
+    r"""
+    Minify javascript based on `jsmin.c by Douglas Crockford`_\.
+
+    Instead of parsing the stream char by char, it uses a regular
+    expression approach which minifies the whole script with one big
+    substitution regex.
+
+    .. _jsmin.c by Douglas Crockford:
+       http://www.crockford.com/javascript/jsmin.c
+
+    :Warning: This function is the digest of a _make_jsmin() call. It just
+              utilizes the resulting regexes. It's here for fun and may
+              vanish any time. Use the `jsmin` function instead.
+
+    :Parameters:
+      `script` : ``str``
+        Script to minify
+
+      `keep_bang_comments` : ``bool``
+        Keep comments starting with an exclamation mark? (``/*!...*/``)
+
+    :Return: Minified script
+    :Rtype: ``str``
+    """
+    if not keep_bang_comments:
+        rex = (
+            r'([^\047"\140/\000-\040]+)|((?:(?:\047[^\047\\\r\n]*(?:\\(?:[^'
+            r'\r\n]|\r?\n|\r)[^\047\\\r\n]*)*\047)|(?:"[^"\\\r\n]*(?:\\(?:[^'
+            r'\r\n]|\r?\n|\r)[^"\\\r\n]*)*")|(?:\140[^\140\\]*(?:\\(?:[^\r\n'
+            r']|\r?\n|\r)[^\140\\]*)*\140))[^\047"\140/\000-\040]*)|(?<=[(,='
+            r':\[!&|?{};\r\n+*-])(?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*'
+            r'\*+(?:[^/*][^*]*\*+)*/))*(?:(?:(?://[^\r\n]*)?[\r\n])(?:[\000-'
+            r'\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)*('
+            r'(?:/(?![\r\n/*])[^/\\\[\r\n]*(?:(?:\\[^\r\n]|(?:\[[^\\\]\r\n]*'
+            r'(?:\\[^\r\n][^\\\]\r\n]*)*\]))[^/\\\[\r\n]*)*/))((?:[\000-\011'
+            r'\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*(?:(?:('
+            r'?://[^\r\n]*)?[\r\n])(?:[\000-\011\013\014\016-\040]|(?:/\*[^*'
+            r']*\*+(?:[^/*][^*]*\*+)*/))*)+(?=[^\000-\040&)+,.:;=?\]|}-]))?|'
+            r'(?<=[\000-#%-,./:-@\[-^\140{-~-]return)(?:[\000-\011\013\014\0'
+            r'16-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*(?:((?:(?://[^\r'
+            r'\n]*)?[\r\n]))(?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?'
+            r':[^/*][^*]*\*+)*/))*)*((?:/(?![\r\n/*])[^/\\\[\r\n]*(?:(?:\\[^'
+            r'\r\n]|(?:\[[^\\\]\r\n]*(?:\\[^\r\n][^\\\]\r\n]*)*\]))[^/\\\[\r'
+            r'\n]*)*/))((?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/'
+            r'*][^*]*\*+)*/))*(?:(?:(?://[^\r\n]*)?[\r\n])(?:[\000-\011\013'
+            r'\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+(?=[^\000'
+            r'-\040&)+,.:;=?\]|}-]))?|(?<=[^\000-!#%&(*,./:-@\[\\^{|~])(?:['
+            r'\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)'
+            r')*(?:((?:(?://[^\r\n]*)?[\r\n]))(?:[\000-\011\013\014\016-\040'
+            r']|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+(?=[^\000-\040"#%-\047'
+            r')*,./:-@\\-^\140|-~])|(?<=[^\000-#%-,./:-@\[-^\140{-~-])((?:['
+            r'\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)'
+            r'))+(?=[^\000-#%-,./:-@\[-^\140{-~-])|(?<=\+)((?:[\000-\011\013'
+            r'\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)))+(?=\+)|(?<'
+            r'=-)((?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]'
+            r'*\*+)*/)))+(?=-)|(?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*'
+            r'+(?:[^/*][^*]*\*+)*/))+|(?:(?:(?://[^\r\n]*)?[\r\n])(?:[\000-'
+            r'\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+'
+        )
+
+        def subber(match):
+            """ Substitution callback """
+            groups = match.groups()
+            return (
+                groups[0] or
+                groups[1] or
+                (groups[3] and (groups[2] + '\n')) or
+                groups[2] or
+                (groups[5] and "%s%s%s" % (
+                    groups[4] and '\n' or '',
+                    groups[5],
+                    groups[6] and '\n' or '',
+                )) or
+                (groups[7] and '\n') or
+                (groups[8] and ' ') or
+                (groups[9] and ' ') or
+                (groups[10] and ' ') or
+                ''
+            )
+    else:
+        rex = (
+            r'([^\047"\140/\000-\040]+)|((?:(?:\047[^\047\\\r\n]*(?:\\(?:[^'
+            r'\r\n]|\r?\n|\r)[^\047\\\r\n]*)*\047)|(?:"[^"\\\r\n]*(?:\\(?:[^'
+            r'\r\n]|\r?\n|\r)[^"\\\r\n]*)*")|(?:\140[^\140\\]*(?:\\(?:[^\r\n'
+            r']|\r?\n|\r)[^\140\\]*)*\140))[^\047"\140/\000-\040]*)|(?<=[(,='
+            r':\[!&|?{};\r\n+*-])((?:[\000-\011\013\014\016-\040]|(?:/\*[^*]'
+            r'*\*+(?:[^/*][^*]*\*+)*/))*(?:(?:(?://[^\r\n]*)?[\r\n])(?:[\000'
+            r'-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)*'
+            r')((?:/(?![\r\n/*])[^/\\\[\r\n]*(?:(?:\\[^\r\n]|(?:\[[^\\\]\r\n'
+            r']*(?:\\[^\r\n][^\\\]\r\n]*)*\]))[^/\\\[\r\n]*)*/))((?:[\000-\0'
+            r'11\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*(?:(?'
+            r':(?://[^\r\n]*)?[\r\n])(?:[\000-\011\013\014\016-\040]|(?:/\*['
+            r'^*]*\*+(?:[^/*][^*]*\*+)*/))*)+(?=[^\000-\040&)+,.:;=?\]|}-]))'
+            r'?|(?<=[\000-#%-,./:-@\[-^\140{-~-]return)((?:[\000-\011\013\01'
+            r'4\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*(?:((?:(?://[^'
+            r'\r\n]*)?[\r\n]))(?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+'
+            r'(?:[^/*][^*]*\*+)*/))*)*)((?:/(?![\r\n/*])[^/\\\[\r\n]*(?:(?:'
+            r'\\[^\r\n]|(?:\[[^\\\]\r\n]*(?:\\[^\r\n][^\\\]\r\n]*)*\]))[^/'
+            r'\\\[\r\n]*)*/))((?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+'
+            r'(?:[^/*][^*]*\*+)*/))*(?:(?:(?://[^\r\n]*)?[\r\n])(?:[\000-\01'
+            r'1\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+(?=['
+            r'^\000-\040&)+,.:;=?\]|}-]))?|(?<=[^\000-!#%&(*,./:-@\[\\^{|~])'
+            r'((?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*'
+            r'+)*/))*(?:(?:(?://[^\r\n]*)?[\r\n])(?:[\000-\011\013\014\016-'
+            r'\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))*)+)(?=[^\000-\040"#%'
+            r'-\047)*,./:-@\\-^\140|-~])|(?<=[^\000-#%-,./:-@\[-^\140{-~-])('
+            r'(?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+'
+            r')*/))+)(?=[^\000-#%-,./:-@\[-^\140{-~-])|(?<=\+)((?:[\000-\011'
+            r'\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/))+)(?=\+)'
+            r'|(?<=-)((?:[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*]'
+            r'[^*]*\*+)*/))+)(?=-)|((?:[\000-\011\013\014\016-\040]|(?:/\*[^'
+            r'*]*\*+(?:[^/*][^*]*\*+)*/))+)|((?:(?:(?://[^\r\n]*)?[\r\n])(?:'
+            r'[\000-\011\013\014\016-\040]|(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/'
+            r'))*)+)'
+        )
+
+        keep = _re.compile(
+            r'[\000-\011\013\014\016-\040]+|(?:/\*(?!!)[^*]*\*+(?:[^/*][^*]*'
+            r'\*+)*/)+|(?:(?://[^\r\n]*)?[\r\n])+|((?:/\*![^*]*\*+(?:[^/*][^'
+            r'*]*\*+)*/)+)'
+        ).sub
+        keeper = lambda m: m.groups()[0] or ''
+
+        def subber(match):
+            """ Substitution callback """
+            groups = match.groups()
+            return (
+                groups[0] or
+                groups[1] or
+                groups[3] and "%s%s%s%s" % (
+                    keep(keeper, groups[2]),
+                    groups[3],
+                    keep(keeper, groups[4] or ''),
+                    groups[4] and '\n' or '',
+                ) or
+                groups[7] and "%s%s%s%s%s" % (
+                    keep(keeper, groups[5]),
+                    groups[6] and '\n' or '',
+                    groups[7],
+                    keep(keeper, groups[8] or ''),
+                    groups[8] and '\n' or '',
+                ) or
+                groups[9] and (keep(keeper, groups[9]) + '\n') or
+                groups[10] and (keep(keeper, groups[10]) or ' ') or
+                groups[11] and (keep(keeper, groups[11]) or ' ') or
+                groups[12] and (keep(keeper, groups[12]) or ' ') or
+                keep(keeper, groups[13] or groups[14])
+            )
+
+    is_bytes, script = _as_str(script)
+    script = _re.sub(rex, subber, '\n%s\n' % script).strip()
+    if is_bytes:
+        return script.encode('latin-1')
+    return script
+
+
+if __name__ == '__main__':
+    def main():
+        """ Main """
+        import sys as _sys
+
+        argv = _sys.argv[1:]
+        keep_bang_comments = '-b' in argv or '-bp' in argv or '-pb' in argv
+        if '-p' in argv or '-bp' in argv or '-pb' in argv:
+            xjsmin = _make_jsmin(python_only=True)
+        else:
+            xjsmin = jsmin
+
+        _sys.stdout.write(xjsmin(
+            _sys.stdin.read(), keep_bang_comments=keep_bang_comments
+        ))
+
+    main()
diff --git a/Sming/Components/Storage/requirements.txt b/Sming/Components/Storage/requirements.txt
index bcc6ba09ac..d89304b1a8 100644
--- a/Sming/Components/Storage/requirements.txt
+++ b/Sming/Components/Storage/requirements.txt
@@ -1,2 +1 @@
 jsonschema
-rjsmin
diff --git a/Tools/requirements.txt b/Tools/requirements.txt
index 941e353f13..ee96c8f8e1 100644
--- a/Tools/requirements.txt
+++ b/Tools/requirements.txt
@@ -1,3 +1,2 @@
 pyserial
 jsonschema
-rjsmin

From 25668a2154e3285ecffb4cba7a8fa3301f6ae102 Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Tue, 16 Feb 2021 13:02:06 +0000
Subject: [PATCH 20/91] Move `IFS::Directory` and `IFS::FsBase` objects into
 IFS library

Don't belong in Stream.
---
 Sming/Core/Data/Stream/Directory.h            |   2 +-
 Sming/Core/Data/Stream/IFS/Directory.cpp      | 102 ----------------
 Sming/Core/Data/Stream/IFS/Directory.h        | 111 ------------------
 .../Core/Data/Stream/IFS/DirectoryTemplate.h  |   2 +-
 Sming/Core/Data/Stream/IFS/FileStream.h       |   2 +-
 Sming/Core/Data/Stream/IFS/FsBase.h           |  72 ------------
 6 files changed, 3 insertions(+), 288 deletions(-)
 delete mode 100644 Sming/Core/Data/Stream/IFS/Directory.cpp
 delete mode 100644 Sming/Core/Data/Stream/IFS/Directory.h
 delete mode 100644 Sming/Core/Data/Stream/IFS/FsBase.h

diff --git a/Sming/Core/Data/Stream/Directory.h b/Sming/Core/Data/Stream/Directory.h
index e1c203d876..81ee133379 100644
--- a/Sming/Core/Data/Stream/Directory.h
+++ b/Sming/Core/Data/Stream/Directory.h
@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include "IFS/Directory.h"
+#include <IFS/Directory.h>
 #include <FileSystem.h>
 
 /**
diff --git a/Sming/Core/Data/Stream/IFS/Directory.cpp b/Sming/Core/Data/Stream/IFS/Directory.cpp
deleted file mode 100644
index 2405e208d7..0000000000
--- a/Sming/Core/Data/Stream/IFS/Directory.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/****
- * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
- * Created 2015 by Skurydin Alexey
- * http://github.com/anakod/Sming
- * All files of the Sming Core are provided under the LGPL v3 license.
- *
- * Directory.cpp
- *
- * @author mikee47 <mike@sillyhouse.net> May 2019
- *
- ****/
-
-#include "Directory.h"
-
-namespace IFS
-{
-bool Directory::open(const String& dirName)
-{
-	auto fs = getFileSystem();
-	if(fs == nullptr) {
-		return false;
-	}
-
-	DirHandle dir;
-	int err = fs->opendir(dirName, dir);
-	if(!check(err)) {
-		debug_w("Directory '%s' open error: %s", dirName.c_str(), fs->getErrorString(err).c_str());
-		return false;
-	}
-
-	close();
-	name = dirName ?: "";
-	this->dir = dir;
-
-	return true;
-}
-
-void Directory::close()
-{
-	if(dir != nullptr) {
-		auto fs = getFileSystem();
-		assert(fs != nullptr);
-		fs->closedir(dir);
-		dir = nullptr;
-	}
-	lastError = FS_OK;
-}
-
-bool Directory::rewind()
-{
-	auto fs = getFileSystem();
-	if(fs == nullptr) {
-		return false;
-	}
-
-	int err = fs->rewinddir(dir);
-	return err == FS_OK;
-}
-
-String Directory::getPath() const
-{
-	String path('/');
-	path += name;
-	if(name.length() != 0 && name[name.length() - 1] != '/') {
-		path += '/';
-	}
-	return path;
-}
-
-String Directory::getParent() const
-{
-	if(name.length() == 0 || name == "/") {
-		return nullptr;
-	}
-	String path('/');
-	int i = name.lastIndexOf('/');
-	if(i >= 0) {
-		path.concat(name.c_str(), i);
-	}
-	return path;
-}
-
-bool Directory::next()
-{
-	auto fs = getFileSystem();
-	if(fs == nullptr) {
-		return false;
-	}
-
-	int err = fs->readdir(dir, dirStat);
-	if(check(err)) {
-		totalSize += dirStat.size;
-		++currentIndex;
-		return true;
-	}
-
-	debug_w("Directory '%s' read error: %s", name.c_str(), getErrorString(err).c_str());
-
-	return false;
-}
-
-} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/Directory.h b/Sming/Core/Data/Stream/IFS/Directory.h
deleted file mode 100644
index 5b1af25adf..0000000000
--- a/Sming/Core/Data/Stream/IFS/Directory.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/****
- * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
- * Created 2015 by Skurydin Alexey
- * http://github.com/anakod/Sming
- * All files of the Sming Core are provided under the LGPL v3 license.
- *
- * Directory.h
- *
- * @author mikee47 <mike@sillyhouse.net> May 2019
- *
- ****/
-
-#pragma once
-
-#include "FsBase.h"
-
-namespace IFS
-{
-/**
-  * @brief Wrapper class for enumerating a directory
- */
-class Directory : public FsBase
-{
-public:
-	using FsBase::FsBase;
-
-	~Directory()
-	{
-		close();
-	}
-
-	/**
-	 * @brief Open a directory and attach this stream object to it
-	 * @param dirName
-	 * @retval bool true on success, false on error
-	 * @note call getLastError() to determine cause of failure
-	 */
-	bool open(const String& dirName);
-
-	/**
-	 * @brief Close directory
-	 */
-	void close();
-
-	/**
-	 * @brief Rewind directory stream to start so it can be re-enumerated
-	 * @retval bool true on success, false on error
-	 * @note call getLastError() to determine cause of failure
-	 */
-	bool rewind();
-
-	/**
-	 * @brief Name of directory stream is attached to
-	 * @retval String invalid if stream isn't open
-	 */
-	const String& getDirName() const
-	{
-		return name;
-	}
-
-	/**
-	 * @brief Determine if directory exists
-	 * @retval bool true if stream is attached to a directory
-	 */
-	bool dirExist() const
-	{
-		return dir != nullptr;
-	}
-
-	/**
-	 * @brief Get path with leading separator /path/to/dir
-	 */
-	String getPath() const;
-
-	/**
-	 * @brief Get parent directory
-	 * @retval String invalid if there is no parent directory
-	 */
-	String getParent() const;
-
-	int index() const
-	{
-		return currentIndex;
-	}
-
-	bool isValid() const
-	{
-		return currentIndex >= 0;
-	}
-
-	size_t size() const
-	{
-		return totalSize;
-	}
-
-	const FileStat& stat() const
-	{
-		return dirStat;
-	}
-
-	bool next();
-
-private:
-	String name;
-	DirHandle dir{};
-	FileNameStat dirStat;
-	int currentIndex{-1};
-	size_t totalSize{0};
-};
-
-} // namespace IFS
diff --git a/Sming/Core/Data/Stream/IFS/DirectoryTemplate.h b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.h
index 4e88dd5d0c..287c70b422 100644
--- a/Sming/Core/Data/Stream/IFS/DirectoryTemplate.h
+++ b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.h
@@ -14,7 +14,7 @@
 #pragma once
 
 #include "../SectionTemplate.h"
-#include "Directory.h"
+#include <IFS/Directory.h>
 
 #define DIRSTREAM_FIELD_MAP(XX)                                                                                        \
 	XX(file_id, "File identifier")                                                                                     \
diff --git a/Sming/Core/Data/Stream/IFS/FileStream.h b/Sming/Core/Data/Stream/IFS/FileStream.h
index 9fb9491317..3b8863a681 100644
--- a/Sming/Core/Data/Stream/IFS/FileStream.h
+++ b/Sming/Core/Data/Stream/IFS/FileStream.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "../ReadWriteStream.h"
-#include "FsBase.h"
+#include <IFS/FsBase.h>
 
 namespace IFS
 {
diff --git a/Sming/Core/Data/Stream/IFS/FsBase.h b/Sming/Core/Data/Stream/IFS/FsBase.h
deleted file mode 100644
index 98d00f4cf0..0000000000
--- a/Sming/Core/Data/Stream/IFS/FsBase.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****
- * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
- * Created 2015 by Skurydin Alexey
- * http://github.com/SmingHub/Sming
- * All files of the Sming Core are provided under the LGPL v3 license.
- *
- * FsBase.h - common base for file system classes
- *
- ****/
-
-#pragma once
-
-#include <IFS/FileSystem.h>
-
-namespace IFS
-{
-class FsBase
-{
-public:
-	FsBase(IFileSystem* filesys) : fileSystem(filesys)
-	{
-	}
-
-	/** @brief determine if an error occurred during operation
-	 *  @retval int filesystem error code
-	 */
-	int getLastError()
-	{
-		return lastError;
-	}
-
-	String getErrorString(int err) const
-	{
-		return fileSystem == nullptr ? Error::toString(err) : fileSystem->getErrorString(err);
-	}
-
-	String getLastErrorString() const
-	{
-		return getErrorString(lastError);
-	}
-
-	IFileSystem* getFileSystem() const
-	{
-		lastError = (fileSystem == nullptr) ? Error::NoFileSystem : FS_OK;
-		return fileSystem;
-	}
-
-protected:
-	/** @brief Check file operation result and note error code
-	 *  @param res result of fileXXX() operation to check
-	 *  @retval bool true if operation was successful, false if error occurred
-	 */
-	bool check(int res)
-	{
-		if(res >= 0) {
-			return true;
-		}
-
-		if(lastError >= 0) {
-			lastError = res;
-		}
-		return false;
-	}
-
-protected:
-	mutable int lastError{FS_OK};
-
-private:
-	IFileSystem* fileSystem;
-};
-
-} // namespace IFS

From dd98be29f92ccbe99dedfe82808be64ce69fc46a Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Fri, 19 Feb 2021 08:08:44 +0000
Subject: [PATCH 21/91] Add structure for Compression information

---
 Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp | 4 ++--
 Sming/Core/Network/Http/HttpResponse.cpp         | 6 +++---
 samples/Basic_IFS/app/application.cpp            | 6 +++---
 samples/Basic_IFS/resource/listing.json          | 3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp
index 460aa885a5..63453bd88a 100644
--- a/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp
+++ b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp
@@ -66,7 +66,7 @@ String DirectoryTemplate::getValue(const char* name)
 		return statValid ? String(s.size) : nullptr;
 
 	case Field::original_size:
-		return statValid ? String(s.originalSize) : nullptr;
+		return statValid ? String(s.compression.originalSize) : nullptr;
 
 	case Field::attr:
 		return statValid ? IFS::File::getAttributeString(s.attr) : nullptr;
@@ -80,7 +80,7 @@ String DirectoryTemplate::getValue(const char* name)
 		} else if(!s.attr[File::Attribute::Compressed]) {
 			return "";
 		} else {
-			return toString(s.compression);
+			return toString(s.compression.type);
 		}
 
 	case Field::access:
diff --git a/Sming/Core/Network/Http/HttpResponse.cpp b/Sming/Core/Network/Http/HttpResponse.cpp
index 6990cd6615..78f9173ad7 100644
--- a/Sming/Core/Network/Http/HttpResponse.cpp
+++ b/Sming/Core/Network/Http/HttpResponse.cpp
@@ -59,9 +59,9 @@ bool HttpResponse::sendString(String&& text) noexcept
 bool HttpResponse::sendFile(const FileStat& stat)
 {
 	auto file = new FileStream(stat);
-	if(stat.compression == File::Compression::GZip) {
+	if(stat.compression.type == File::Compression::Type::GZip) {
 		headers[HTTP_HEADER_CONTENT_ENCODING] = F("gzip");
-	} else if(stat.compression != File::Compression::None) {
+	} else if(stat.compression.type != File::Compression::Type::None) {
 		debug_e("Unsupported compression type: %u", stat.compression);
 	}
 
@@ -76,7 +76,7 @@ bool HttpResponse::sendFile(const String& fileName, bool allowGzipFileCheck)
 		String fnCompressed = fileName + _F(".gz");
 		if(fileStats(fnCompressed, stat) >= 0) {
 			debug_d("found %s", stat.name);
-			stat.compression = File::Compression::GZip;
+			stat.compression.type = File::Compression::Type::GZip;
 			stat.name = IFS::NameBuffer(fnCompressed);
 			return sendFile(stat);
 		}
diff --git a/samples/Basic_IFS/app/application.cpp b/samples/Basic_IFS/app/application.cpp
index 07f0c8ae98..57f8a9c0cd 100644
--- a/samples/Basic_IFS/app/application.cpp
+++ b/samples/Basic_IFS/app/application.cpp
@@ -80,10 +80,10 @@ void onFile(HttpRequest& request, HttpResponse& response)
 	} else {
 		//	response.setCache(86400, true); // It's important to use cache for better performance.
 		auto stream = new FileStream(stat);
-		if(stat.compression == File::Compression::GZip) {
+		if(stat.compression.type == File::Compression::Type::GZip) {
 			response.headers[HTTP_HEADER_CONTENT_ENCODING] = F("gzip");
-		} else if(stat.compression != File::Compression::None) {
-			debug_e("Unsupported compression type: %u", stat.compression);
+		} else if(stat.compression.type != File::Compression::Type::None) {
+			debug_e("Unsupported compression type: %u", stat.compression.type);
 		}
 
 		auto mimeType = ContentType::fromFullFileName(file.c_str(), MIME_TEXT);
diff --git a/samples/Basic_IFS/resource/listing.json b/samples/Basic_IFS/resource/listing.json
index 5a20750249..9c15c47968 100644
--- a/samples/Basic_IFS/resource/listing.json
+++ b/samples/Basic_IFS/resource/listing.json
@@ -12,7 +12,8 @@
 			"size": {{!as_int:size}},
 			"original_size": {{!as_int:original_size}},
 			"attr": "{{attr}}",
-			"access": "{{access}}"
+			"access": "{{access}}",
+			"compression": "{{compression}}"
 		}{/SECTION}
 
 {SECTION}

From 530e51a137d43b1101a44489ad776cde97c1cc22 Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Tue, 16 Feb 2021 08:43:50 +0000
Subject: [PATCH 22/91] Change setattr() to accept filename instead of handle

If file is set to read-only, then it can't be changed back!
---
 Sming/Core/FileSystem.h        | 16 ++++++++++++----
 samples/Basic_IFS/fsimage.fwfs |  6 +++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Sming/Core/FileSystem.h b/Sming/Core/FileSystem.h
index e34e5488a5..c7788e4c78 100644
--- a/Sming/Core/FileSystem.h
+++ b/Sming/Core/FileSystem.h
@@ -505,15 +505,23 @@ inline int fileSetACL(file_t file, const File::ACL& acl)
 	return fileSystem->setacl(file, acl);
 }
 
-/** @brief Set file attributes
- *  @param file handle to open file, must have write access
+/** @name Set file attributes
+ *  @param filename
+ *  @param attr
  *  @retval int Error code
+ *  @{
  */
-inline int fileSetAttr(file_t file, File::Attributes attr)
+inline int fileSetAttr(const char* filename, File::Attributes attr)
 {
 	CHECK_FS(setattr)
-	return fileSystem->setattr(file, attr);
+	return fileSystem->setattr(filename, attr);
+}
+
+inline int fileSetAttr(const String& filename, File::Attributes attr)
+{
+	return fileSetAttr(filename.c_str(), attr);
 }
+/** @} */
 
 /** @brief Set access control information for file
  *  @param file handle to open file, must have write access
diff --git a/samples/Basic_IFS/fsimage.fwfs b/samples/Basic_IFS/fsimage.fwfs
index bb1a6be2e2..b8e7cbe19a 100644
--- a/samples/Basic_IFS/fsimage.fwfs
+++ b/samples/Basic_IFS/fsimage.fwfs
@@ -29,7 +29,11 @@
             "read": "admin"
         },
         {
-            "mask": "*.html",
+            "mask": [
+                "*.html",
+                "*.css",
+                "*.png"
+            ],
             "readonly": true
         },
         {

From 658ee9856fd5b5350d27d356e8345c0bd55bf40b Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Sat, 20 Feb 2021 18:09:22 +0000
Subject: [PATCH 23/91] Define `_FILE_OFFSET_BITS=64` in Host builds to ensure
 file calls function correctly

---
 Sming/Arch/Host/build.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Sming/Arch/Host/build.mk b/Sming/Arch/Host/build.mk
index 5700a06743..db1582468f 100644
--- a/Sming/Arch/Host/build.mk
+++ b/Sming/Arch/Host/build.mk
@@ -21,7 +21,8 @@ GCC_UPGRADE_URL := https://sming.readthedocs.io/en/latest/arch/host/host-emulato
 
 CPPFLAGS += \
 	-m32 \
-	-Wno-deprecated-declarations
+	-Wno-deprecated-declarations \
+	-D_FILE_OFFSET_BITS=64
 
 # => Tools
 MEMANALYZER = size

From bd8c48f898360d85724df0e2e4ca866610041a7e Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Sat, 20 Feb 2021 11:19:40 +0000
Subject: [PATCH 24/91] CUSTOM_TARGETS handled in project.mk

---
 Sming/Arch/Esp32/app.mk   | 2 +-
 Sming/Arch/Esp8266/app.mk | 2 +-
 Sming/Arch/Host/app.mk    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sming/Arch/Esp32/app.mk b/Sming/Arch/Esp32/app.mk
index 4c9fca76bd..a4f06d5efb 100644
--- a/Sming/Arch/Esp32/app.mk
+++ b/Sming/Arch/Esp32/app.mk
@@ -11,7 +11,7 @@ LDFLAGS	+= \
 
 
 .PHONY: application
-application: $(CUSTOM_TARGETS) $(TARGET_BIN)
+application: $(TARGET_BIN)
 
 # $1 -> Linker script
 define LinkTarget
diff --git a/Sming/Arch/Esp8266/app.mk b/Sming/Arch/Esp8266/app.mk
index 2521c1df13..96ad91ec04 100644
--- a/Sming/Arch/Esp8266/app.mk
+++ b/Sming/Arch/Esp8266/app.mk
@@ -35,7 +35,7 @@ LDFLAGS	+= \
 
 
 .PHONY: application
-application: $(CUSTOM_TARGETS) $(FW_FILE_1) $(FW_FILE_2)
+application: $(FW_FILE_1) $(FW_FILE_2)
 
 # $1 -> Linker script
 define LinkTarget
diff --git a/Sming/Arch/Host/app.mk b/Sming/Arch/Host/app.mk
index d5484569cf..f94ae254cf 100644
--- a/Sming/Arch/Host/app.mk
+++ b/Sming/Arch/Host/app.mk
@@ -15,7 +15,7 @@ TARGET_OUT_0			:= $(FW_BASE)/$(APP_NAME)$(TOOL_EXT)
 # Target definitions
 
 .PHONY: application
-application: $(CUSTOM_TARGETS) $(TARGET_OUT_0)
+application: $(TARGET_OUT_0)
 
 $(TARGET_OUT_0): $(COMPONENTS_AR)
 	$(info $(notdir $(PROJECT_DIR)): Linking $@)

From bbf246338672d70d0de869c7cf8404ed14a2aab4 Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Sat, 20 Feb 2021 14:11:52 +0000
Subject: [PATCH 25/91] Define `HOME` in MinGW builds (required for openssl
 rand)

---
 Sming/Arch/Host/build.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Sming/Arch/Host/build.mk b/Sming/Arch/Host/build.mk
index db1582468f..c2fc4c9e8b 100644
--- a/Sming/Arch/Host/build.mk
+++ b/Sming/Arch/Host/build.mk
@@ -34,6 +34,9 @@ CLI_TARGET_OPTIONS =
 # $1 -> Command to execute
 ifeq ($(UNAME),Windows)
 DetachCommand = start $1
+# May be required by some applications (e.g. openssl)
+HOME ?= $(USERPROFILE)
+export HOME
 else
 DetachCommand = gnome-terminal -- bash -c "sleep 1; $1"
 endif

From 1a4e02e749f274f92e1849b2b82f88c4120fef75 Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Sun, 21 Feb 2021 14:51:29 +0000
Subject: [PATCH 26/91] Remove `File` namespace and reassign `File` as object
 for easier file manipulation

---
 .../Host/Components/spi_flash/flashmem.cpp    | 38 +++++-----
 .../Host/Core/Data/Stream/HostFileStream.cpp  |  3 +-
 .../Host/Core/Data/Stream/HostFileStream.h    |  2 +-
 Sming/Core/Data/Stream/Directory.h            | 28 --------
 .../Data/Stream/IFS/DirectoryTemplate.cpp     |  6 +-
 Sming/Core/Data/Stream/IFS/FileStream.cpp     | 14 ++--
 Sming/Core/Data/Stream/IFS/FileStream.h       |  8 +--
 .../Data/Stream/IFS/HtmlDirectoryTemplate.cpp |  2 +-
 Sming/Core/FileSystem.h                       | 70 ++++++++++++-------
 Sming/Core/Network/Http/HttpResponse.cpp      |  6 +-
 samples/Basic_IFS/app/application.cpp         |  7 +-
 tests/HostTests/modules/Spiffs.cpp            | 17 +++--
 12 files changed, 93 insertions(+), 108 deletions(-)
 delete mode 100644 Sming/Core/Data/Stream/Directory.h

diff --git a/Sming/Arch/Host/Components/spi_flash/flashmem.cpp b/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
index 0237f9eaf4..6fead07de7 100644
--- a/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
+++ b/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
@@ -21,12 +21,11 @@
 #include "flashmem.h"
 #include <string.h>
 #include <esp_spi_flash.h>
-#include <IFS/Host/FileSystem.h>
+#include <IFS/File.h>
 
 namespace
 {
-IFS::IFileSystem& fileSys{IFS::Host::fileSystem};
-IFS::File::Handle flashFile{-1};
+IFS::File flashFile(&IFS::Host::getFileSystem());
 size_t flashFileSize{0x400000U};
 char flashFileName[256];
 const char defaultFlashFileName[]{"flash.bin"};
@@ -59,26 +58,24 @@ bool host_flashmem_init(FlashmemConfig& config)
 		config.filename = flashFileName;
 	}
 
-	flashFile = fileSys.open(flashFileName, IFS::File::Create | IFS::File::ReadWrite);
-	if(flashFile < 0) {
+	if(!flashFile.open(flashFileName, IFS::File::Create | IFS::File::ReadWrite)) {
 		hostmsg("Error opening \"%s\"", flashFileName);
 		return false;
 	}
 
-	int res = fileSys.lseek(flashFile, 0, SeekOrigin::End);
+	int res = flashFile.seek(0, SeekOrigin::End);
 	if(res < 0) {
-		hostmsg("Error seeking \"%s\": %s", flashFileName, fileSys.getErrorString(res).c_str());
-		fileSys.close(flashFile);
-		flashFile = -1;
+		hostmsg("Error seeking \"%s\": %s", flashFileName, flashFile.getErrorString(res).c_str());
+		flashFile.close();
 		return false;
 	}
 
 	if(res == 0) {
 		size_t size = config.createSize ?: flashFileSize;
-		res = fileSys.lseek(flashFile, size, SeekOrigin::Start);
+		res = flashFile.seek(size, SeekOrigin::Start);
 		if(res != int(size)) {
 			hostmsg("Error seeking beyond end of file \"%s\"", flashFileName);
-		} else if(fileSys.truncate(flashFile, size) < 0) {
+		} else if(!flashFile.truncate(size)) {
 			hostmsg("Error truncating \"%s\" to %u bytes", flashFileName, size);
 		} else {
 			hostmsg("Created blank \"%s\", %u bytes", flashFileName, size);
@@ -95,37 +92,36 @@ bool host_flashmem_init(FlashmemConfig& config)
 
 void host_flashmem_cleanup()
 {
-	fileSys.close(flashFile);
-	flashFile = -1;
+	flashFile.close();
 	hostmsg("Closed \"%s\"", flashFileName);
 }
 
 static int readFlashFile(uint32_t offset, void* buffer, size_t count)
 {
-	if(flashFile < 0) {
+	if(!flashFile) {
 		return -1;
 	}
-	int res = fileSys.lseek(flashFile, offset, SeekOrigin::Start);
+	int res = flashFile.seek(offset, SeekOrigin::Start);
 	if(res >= 0) {
-		res = fileSys.read(flashFile, buffer, count);
+		res = flashFile.read(buffer, count);
 	}
 	if(res < 0) {
-		debug_w("readFlashFile(0x%08x, %u) failed: %s", offset, count, fileSys.getErrorString(res).c_str());
+		debug_w("readFlashFile(0x%08x, %u) failed: %s", offset, count, flashFile.getErrorString(res).c_str());
 	}
 	return res;
 }
 
 static int writeFlashFile(uint32_t offset, const void* data, size_t count)
 {
-	if(flashFile < 0) {
+	if(!flashFile) {
 		return -1;
 	}
-	int res = fileSys.lseek(flashFile, offset, SeekOrigin::Start);
+	int res = flashFile.seek(offset, SeekOrigin::Start);
 	if(res >= 0) {
-		res = fileSys.write(flashFile, data, count);
+		res = flashFile.write(data, count);
 	}
 	if(res < 0) {
-		debug_w("writeFlashFile(0x%08x, %u) failed: %s", offset, count, fileSys.getErrorString(res).c_str());
+		debug_w("writeFlashFile(0x%08x, %u) failed: %s", offset, count, flashFile.getErrorString(res).c_str());
 	}
 	return res;
 }
diff --git a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp
index 95832ad28a..70783b5703 100644
--- a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp
+++ b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.cpp
@@ -9,8 +9,7 @@
  ****/
 
 #include "HostFileStream.h"
-#include <IFS/Host/FileSystem.h>
 
-HostFileStream::HostFileStream() : IFS::FileStream(&IFS::Host::fileSystem)
+HostFileStream::HostFileStream() : IFS::FileStream(&IFS::Host::getFileSystem())
 {
 }
diff --git a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.h b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.h
index 0332203d5c..381e955812 100644
--- a/Sming/Arch/Host/Core/Data/Stream/HostFileStream.h
+++ b/Sming/Arch/Host/Core/Data/Stream/HostFileStream.h
@@ -21,7 +21,7 @@ class HostFileStream : public IFS::FileStream
 public:
 	HostFileStream();
 
-	HostFileStream(const String& fileName, IFS::File::OpenFlags openFlags = IFS::File::ReadOnly) : HostFileStream()
+	HostFileStream(const String& fileName, IFS::OpenFlags openFlags = IFS::OpenFlag::Read) : HostFileStream()
 	{
 		open(fileName, openFlags);
 	}
diff --git a/Sming/Core/Data/Stream/Directory.h b/Sming/Core/Data/Stream/Directory.h
deleted file mode 100644
index 81ee133379..0000000000
--- a/Sming/Core/Data/Stream/Directory.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/****
- * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
- * Created 2015 by Skurydin Alexey
- * http://github.com/anakod/Sming
- * All files of the Sming Core are provided under the LGPL v3 license.
- *
- * Directory.h
- *
- * @author mikee47 <mike@sillyhouse.net> May 2019
- *
- ****/
-
-#pragma once
-
-#include <IFS/Directory.h>
-#include <FileSystem.h>
-
-/**
-  * @brief      Directory stream class
-  * @ingroup    stream data
- */
-class Directory : public IFS::Directory
-{
-public:
-	Directory() : IFS::Directory(::getFileSystem())
-	{
-	}
-};
diff --git a/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp
index 63453bd88a..ca667ef846 100644
--- a/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp
+++ b/Sming/Core/Data/Stream/IFS/DirectoryTemplate.cpp
@@ -69,7 +69,7 @@ String DirectoryTemplate::getValue(const char* name)
 		return statValid ? String(s.compression.originalSize) : nullptr;
 
 	case Field::attr:
-		return statValid ? IFS::File::getAttributeString(s.attr) : nullptr;
+		return statValid ? IFS::getFileAttributeString(s.attr) : nullptr;
 
 	case Field::attr_long:
 		return statValid ? toString(s.attr) : nullptr;
@@ -77,14 +77,14 @@ String DirectoryTemplate::getValue(const char* name)
 	case Field::compression:
 		if(!statValid) {
 			return nullptr;
-		} else if(!s.attr[File::Attribute::Compressed]) {
+		} else if(!s.attr[FileAttribute::Compressed]) {
 			return "";
 		} else {
 			return toString(s.compression.type);
 		}
 
 	case Field::access:
-		return statValid ? IFS::File::getAclString(s.acl) : nullptr;
+		return statValid ? IFS::getAclString(s.acl) : nullptr;
 
 	case Field::access_long:
 		return statValid ? toString(s.acl) : nullptr;
diff --git a/Sming/Core/Data/Stream/IFS/FileStream.cpp b/Sming/Core/Data/Stream/IFS/FileStream.cpp
index 66caa0c383..4f83212156 100644
--- a/Sming/Core/Data/Stream/IFS/FileStream.cpp
+++ b/Sming/Core/Data/Stream/IFS/FileStream.cpp
@@ -14,7 +14,7 @@
 
 namespace IFS
 {
-void FileStream::attach(File::Handle file, size_t size)
+void FileStream::attach(FileHandle file, size_t size)
 {
 	close();
 	if(file < 0) {
@@ -33,7 +33,7 @@ void FileStream::attach(File::Handle file, size_t size)
 	debug_d("attached file: '%s' (%u bytes) #0x%08X", fileName().c_str(), size, this);
 }
 
-bool FileStream::open(const FileStat& stat, File::OpenFlags openFlags)
+bool FileStream::open(const Stat& stat, OpenFlags openFlags)
 {
 	auto fs = getFileSystem();
 	if(fs == nullptr) {
@@ -42,7 +42,7 @@ bool FileStream::open(const FileStat& stat, File::OpenFlags openFlags)
 
 	lastError = FS_OK;
 
-	File::Handle file = fs->fopen(stat, openFlags);
+	FileHandle file = fs->fopen(stat, openFlags);
 	if(!check(file)) {
 		return false;
 	}
@@ -51,7 +51,7 @@ bool FileStream::open(const FileStat& stat, File::OpenFlags openFlags)
 	return true;
 }
 
-bool FileStream::open(const String& fileName, File::OpenFlags openFlags)
+bool FileStream::open(const String& fileName, OpenFlags openFlags)
 {
 	auto fs = getFileSystem();
 	if(fs == nullptr) {
@@ -60,7 +60,7 @@ bool FileStream::open(const String& fileName, File::OpenFlags openFlags)
 
 	lastError = FS_OK;
 
-	File::Handle file = fs->open(fileName, openFlags);
+	FileHandle file = fs->open(fileName, openFlags);
 	if(!check(file)) {
 		debug_w("File '%s' open error: %s", fileName.c_str(), fs->getErrorString(file).c_str());
 		return false;
@@ -179,7 +179,7 @@ String FileStream::fileName() const
 		return nullptr;
 	}
 
-	FileNameStat stat;
+	NameStat stat;
 	int res = fs->fstat(handle, stat);
 	return (res < 0 || stat.name.length == 0) ? nullptr : stat.name.buffer;
 }
@@ -191,7 +191,7 @@ String FileStream::id() const
 		return 0;
 	}
 
-	FileStat stat;
+	Stat stat;
 	int res = fs->fstat(handle, stat);
 	if(res < 0) {
 		return nullptr;
diff --git a/Sming/Core/Data/Stream/IFS/FileStream.h b/Sming/Core/Data/Stream/IFS/FileStream.h
index 3b8863a681..bac5188ce4 100644
--- a/Sming/Core/Data/Stream/IFS/FileStream.h
+++ b/Sming/Core/Data/Stream/IFS/FileStream.h
@@ -33,9 +33,9 @@ class FileStream : public FsBase, public ReadWriteStream
 	 *  @param file
 	 *  @param size
 	 */
-	void attach(File::Handle file, size_t size);
+	void attach(FileHandle file, size_t size);
 
-	bool open(const FileStat& stat, File::OpenFlags openFlags = File::ReadOnly);
+	bool open(const Stat& stat, OpenFlags openFlags = OpenFlag::Read);
 
 	/** @brief Open a file and attach this stream object to it
 	 *  @param fileName
@@ -43,7 +43,7 @@ class FileStream : public FsBase, public ReadWriteStream
 	 *  @retval bool true on success, false on error
 	 *  @note call getLastError() to determine cause of failure
 	 */
-	bool open(const String& fileName, File::OpenFlags openFlags = File::ReadOnly);
+	bool open(const String& fileName, IFS::OpenFlags openFlags = OpenFlag::Read);
 
 	/** @brief Close file
 	 */
@@ -138,7 +138,7 @@ class FileStream : public FsBase, public ReadWriteStream
 	}
 
 private:
-	File::Handle handle{-1};
+	FileHandle handle{-1};
 	size_t pos{0};
 	size_t size{0};
 };
diff --git a/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp b/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp
index 05cdeb47c7..579e709f9e 100644
--- a/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp
+++ b/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp
@@ -27,7 +27,7 @@ String HtmlDirectoryTemplate::getValue(const char* name)
 		auto& stat = dir().stat();
 
 		if(FS("icon") == name) {
-			if(stat.attr[File::Attribute::Directory]) {
+			if(stat.attr[FileAttribute::Directory]) {
 				return F("&#128193;");
 			}
 
diff --git a/Sming/Core/FileSystem.h b/Sming/Core/FileSystem.h
index c7788e4c78..3255f8e959 100644
--- a/Sming/Core/FileSystem.h
+++ b/Sming/Core/FileSystem.h
@@ -16,32 +16,23 @@
 #pragma once
 
 #include <IFS/Helpers.h>
+#include <IFS/File.h>
+#include <IFS/Directory.h>
 #include <spiffs_sming.h>
 #include "WVector.h" ///< @deprecated see fileList()
 
-namespace File
-{
-using namespace IFS::File;
-}
-
-using file_t = IFS::File::Handle;
+using file_t = IFS::FileHandle;
 typedef SeekOrigin SeekOriginFlags; ///< @deprecated Use `SeekOrigin` instead
+using FileHandle = IFS::FileHandle;
 using DirHandle = IFS::DirHandle;
-using FileOpenFlag = File::OpenFlag;
-using FileOpenFlags = File::OpenFlags;
-using FileStat = File::Stat;
-using FileNameStat = File::NameStat;
+using FileOpenFlag = IFS::OpenFlag;
+using FileOpenFlags = IFS::OpenFlags;
+using FileAttribute = IFS::FileAttribute;
+using FileAttributes = IFS::FileAttributes;
+using FileStat = IFS::Stat;
+using FileNameStat = IFS::NameStat;
 constexpr int FS_OK = IFS::FS_OK;
 
-// Various file flag combinations
-constexpr FileOpenFlags eFO_ReadOnly SMING_DEPRECATED{File::ReadOnly};   ///< @deprecated use File::ReadOnly
-constexpr FileOpenFlags eFO_WriteOnly SMING_DEPRECATED{File::WriteOnly}; ///< @deprecated use File::WriteOnly
-constexpr FileOpenFlags eFO_ReadWrite{File::ReadWrite};					 ///< @deprecated use File::ReadWrite
-constexpr FileOpenFlags eFO_CreateIfNotExist{File::Create};				 ///< @deprecated use File::Create
-constexpr FileOpenFlags eFO_Append{File::Append};						 ///< @deprecated use File::Append
-constexpr FileOpenFlags eFO_Truncate{File::Truncate};					 ///< @deprecated use File::Truncate
-constexpr FileOpenFlags eFO_CreateNewAlways{File::CreateNewAlways};		 ///< @deprecated use File::CreateNewAlways
-
 constexpr SeekOrigin eSO_FileStart{SeekOrigin::Start};	///< @deprecated use SeekOrigin::Start
 constexpr SeekOrigin eSO_CurrentPos{SeekOrigin::Current}; ///< @deprecated use SeekOrigin::Current
 constexpr SeekOrigin eSO_FileEnd{SeekOrigin::End};		  ///< @deprecated use SeekOrigin::End
@@ -60,11 +51,40 @@ extern IFS::IFileSystem* activeFileSystem;
 
 } // namespace SmingInternal
 
+class File : public IFS::File
+{
+public:
+	File() : IFS::File(SmingInternal::activeFileSystem)
+	{
+	}
+};
+
+/**
+  * @brief      Directory stream class
+  * @ingroup    stream data
+ */
+class Directory : public IFS::Directory
+{
+public:
+	Directory() : IFS::Directory(SmingInternal::activeFileSystem)
+	{
+	}
+};
+
+// Various file flag combinations
+constexpr FileOpenFlags eFO_ReadOnly{File::ReadOnly};				///< @deprecated use File::ReadOnly
+constexpr FileOpenFlags eFO_WriteOnly{File::WriteOnly};				///< @deprecated use File::WriteOnly
+constexpr FileOpenFlags eFO_ReadWrite{File::ReadWrite};				///< @deprecated use File::ReadWrite
+constexpr FileOpenFlags eFO_CreateIfNotExist{File::Create};			///< @deprecated use File::Create
+constexpr FileOpenFlags eFO_Append{File::Append};					///< @deprecated use File::Append
+constexpr FileOpenFlags eFO_Truncate{File::Truncate};				///< @deprecated use File::Truncate
+constexpr FileOpenFlags eFO_CreateNewAlways{File::CreateNewAlways}; ///< @deprecated use File::CreateNewAlways
+
 /*
  * Boilerplate check for file function wrappers to catch undefined filesystem.
  */
 #define CHECK_FS(_method)                                                                                              \
-	auto fileSystem = SmingInternal::activeFileSystem;                                                                 \
+	auto fileSystem = static_cast<IFS::FileSystem*>(SmingInternal::activeFileSystem);                                  \
 	if(fileSystem == nullptr) {                                                                                        \
 		debug_e("ERROR in %s(): No active file system", __FUNCTION__);                                                 \
 		return file_t(IFS::Error::NoFileSystem);                                                                       \
@@ -74,12 +94,12 @@ extern IFS::IFileSystem* activeFileSystem;
  * @brief Get the currently active file system, if any
  * @retval IFS::IFileSystem*
  */
-inline IFS::IFileSystem* getFileSystem()
+inline IFS::FileSystem* getFileSystem()
 {
 	if(SmingInternal::activeFileSystem == nullptr) {
 		debug_e("ERROR: No active file system");
 	}
-	return SmingInternal::activeFileSystem;
+	return static_cast<IFS::FileSystem*>(SmingInternal::activeFileSystem);
 }
 
 /** @brief Sets the currently active file system
@@ -499,7 +519,7 @@ inline int fileSystemCheck()
  *  @param acl
  *  @retval int Error code
  */
-inline int fileSetACL(file_t file, const File::ACL& acl)
+inline int fileSetACL(file_t file, const IFS::ACL& acl)
 {
 	CHECK_FS(setacl)
 	return fileSystem->setacl(file, acl);
@@ -511,13 +531,13 @@ inline int fileSetACL(file_t file, const File::ACL& acl)
  *  @retval int Error code
  *  @{
  */
-inline int fileSetAttr(const char* filename, File::Attributes attr)
+inline int fileSetAttr(const char* filename, FileAttributes attr)
 {
 	CHECK_FS(setattr)
 	return fileSystem->setattr(filename, attr);
 }
 
-inline int fileSetAttr(const String& filename, File::Attributes attr)
+inline int fileSetAttr(const String& filename, FileAttributes attr)
 {
 	return fileSetAttr(filename.c_str(), attr);
 }
diff --git a/Sming/Core/Network/Http/HttpResponse.cpp b/Sming/Core/Network/Http/HttpResponse.cpp
index 78f9173ad7..0f8e9e52b5 100644
--- a/Sming/Core/Network/Http/HttpResponse.cpp
+++ b/Sming/Core/Network/Http/HttpResponse.cpp
@@ -59,9 +59,9 @@ bool HttpResponse::sendString(String&& text) noexcept
 bool HttpResponse::sendFile(const FileStat& stat)
 {
 	auto file = new FileStream(stat);
-	if(stat.compression.type == File::Compression::Type::GZip) {
+	if(stat.compression.type == IFS::Compression::Type::GZip) {
 		headers[HTTP_HEADER_CONTENT_ENCODING] = F("gzip");
-	} else if(stat.compression.type != File::Compression::Type::None) {
+	} else if(stat.compression.type != IFS::Compression::Type::None) {
 		debug_e("Unsupported compression type: %u", stat.compression);
 	}
 
@@ -76,7 +76,7 @@ bool HttpResponse::sendFile(const String& fileName, bool allowGzipFileCheck)
 		String fnCompressed = fileName + _F(".gz");
 		if(fileStats(fnCompressed, stat) >= 0) {
 			debug_d("found %s", stat.name);
-			stat.compression.type = File::Compression::Type::GZip;
+			stat.compression.type = IFS::Compression::Type::GZip;
 			stat.name = IFS::NameBuffer(fnCompressed);
 			return sendFile(stat);
 		}
diff --git a/samples/Basic_IFS/app/application.cpp b/samples/Basic_IFS/app/application.cpp
index 57f8a9c0cd..3af196cb5b 100644
--- a/samples/Basic_IFS/app/application.cpp
+++ b/samples/Basic_IFS/app/application.cpp
@@ -5,7 +5,6 @@
 
 #include <SmingCore.h>
 #include <Data/Stream/MemoryDataStream.h>
-#include <Data/Stream/Directory.h>
 #include <Data/Stream/IFS/DirectoryTemplate.h>
 #include <Data/Stream/IFS/HtmlDirectoryTemplate.h>
 #include <Data/Stream/IFS/JsonDirectoryTemplate.h>
@@ -59,7 +58,7 @@ void onFile(HttpRequest& request, HttpResponse& response)
 		return;
 	}
 
-	if(stat.attr[File::Attribute::Directory]) {
+	if(stat.attr[FileAttribute::Directory]) {
 		auto dir = new Directory;
 		IFS::DirectoryTemplate* tmpl;
 		String fmt = request.uri.Query["format"];
@@ -80,9 +79,9 @@ void onFile(HttpRequest& request, HttpResponse& response)
 	} else {
 		//	response.setCache(86400, true); // It's important to use cache for better performance.
 		auto stream = new FileStream(stat);
-		if(stat.compression.type == File::Compression::Type::GZip) {
+		if(stat.compression.type == IFS::Compression::Type::GZip) {
 			response.headers[HTTP_HEADER_CONTENT_ENCODING] = F("gzip");
-		} else if(stat.compression.type != File::Compression::Type::None) {
+		} else if(stat.compression.type != IFS::Compression::Type::None) {
 			debug_e("Unsupported compression type: %u", stat.compression.type);
 		}
 
diff --git a/tests/HostTests/modules/Spiffs.cpp b/tests/HostTests/modules/Spiffs.cpp
index 058d0a5a4d..75fd9e6eb1 100644
--- a/tests/HostTests/modules/Spiffs.cpp
+++ b/tests/HostTests/modules/Spiffs.cpp
@@ -3,9 +3,8 @@
 
 #ifdef ARCH_HOST
 #include <Storage/FileDevice.h>
-#include <IFS/Host/FileSystem.h>
 #include <IFS/SPIFFS/FileSystem.h>
-using IFileSystem = IFS::IFileSystem;
+using FileSystem = IFS::FileSystem;
 #endif
 
 class SpiffsTest : public TestGroup
@@ -84,13 +83,13 @@ class SpiffsTest : public TestGroup
 	 */
 	void checkSpiffsGen()
 	{
-		IFS::IFileSystem::Info info;
+		FileSystem::Info info;
 		int err = fileGetSystemInfo(info);
 		CHECK(err >= 0);
 		debug_i("fs attr = %s", toString(info.attr).c_str());
 
-		IFileSystem* fsOld;
-		if(info.attr[IFileSystem::Attribute::NoMeta]) {
+		FileSystem* fsOld;
+		if(info.attr[FileSystem::Attribute::NoMeta]) {
 			fsOld = mountSpiffsFromFile("old", "spiffsgen/spiff_rom_orig.bin");
 		} else {
 			fsOld = mountSpiffsFromFile("old", "spiffsgen/spiff_rom_meta.bin");
@@ -106,9 +105,9 @@ class SpiffsTest : public TestGroup
 		delete Storage::findDevice("old");
 	}
 
-	IFileSystem* mountSpiffsFromFile(const String& tag, const String& filename)
+	FileSystem* mountSpiffsFromFile(const String& tag, const String& filename)
 	{
-		auto& hfs = IFS::Host::fileSystem;
+		auto& hfs = IFS::Host::getFileSystem();
 		auto f = hfs.open(filename, IFS::File::ReadOnly);
 		if(f < 0) {
 			debug_e("Failed to open '%s': %s", filename.c_str(), hfs.getErrorString(f).c_str());
@@ -129,10 +128,10 @@ class SpiffsTest : public TestGroup
 		}
 
 		debug_i("Mounted '%s' as '%s'", filename.c_str(), tag.c_str());
-		return fs;
+		return FileSystem::cast(fs);
 	}
 
-	void readCheck(IFileSystem* fsOld, IFileSystem* fsNew)
+	void readCheck(IFS::FileSystem* fsOld, IFS::FileSystem* fsNew)
 	{
 		DirHandle dir{};
 		int res = fsOld->opendir(nullptr, dir);

From 1a32a4b7c74ced8d8472e979df65221a4afb15b6 Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Sun, 21 Feb 2021 17:22:49 +0000
Subject: [PATCH 27/91] Remove x permission

---
 .ci/build.cmd            | 0
 .ci/install.cmd          | 0
 Sming/Core/DateTime.cpp  | 0
 Sming/Core/DateTime.h    | 0
 Sming/Core/SmingLocale.h | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 .ci/build.cmd
 mode change 100755 => 100644 .ci/install.cmd
 mode change 100755 => 100644 Sming/Core/DateTime.cpp
 mode change 100755 => 100644 Sming/Core/DateTime.h
 mode change 100755 => 100644 Sming/Core/SmingLocale.h

diff --git a/.ci/build.cmd b/.ci/build.cmd
old mode 100755
new mode 100644
diff --git a/.ci/install.cmd b/.ci/install.cmd
old mode 100755
new mode 100644
diff --git a/Sming/Core/DateTime.cpp b/Sming/Core/DateTime.cpp
old mode 100755
new mode 100644
diff --git a/Sming/Core/DateTime.h b/Sming/Core/DateTime.h
old mode 100755
new mode 100644
diff --git a/Sming/Core/SmingLocale.h b/Sming/Core/SmingLocale.h
old mode 100755
new mode 100644

From a68081cfe2f7128f72072f6296656b2caaab4d11 Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Mon, 22 Feb 2021 09:18:35 +0000
Subject: [PATCH 28/91] Rename `truncate` -> `ftruncate` for consistency

---
 Sming/Core/Data/Stream/IFS/FileStream.cpp | 2 +-
 Sming/Core/FileSystem.h                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sming/Core/Data/Stream/IFS/FileStream.cpp b/Sming/Core/Data/Stream/IFS/FileStream.cpp
index 4f83212156..d4f9e5be6d 100644
--- a/Sming/Core/Data/Stream/IFS/FileStream.cpp
+++ b/Sming/Core/Data/Stream/IFS/FileStream.cpp
@@ -210,7 +210,7 @@ bool FileStream::truncate(size_t newSize)
 		return 0;
 	}
 
-	bool res = check(fs->truncate(handle, newSize));
+	bool res = check(fs->ftruncate(handle, newSize));
 	if(res) {
 		size = newSize;
 		if(pos > size) {
diff --git a/Sming/Core/FileSystem.h b/Sming/Core/FileSystem.h
index 3255f8e959..3c1feb5e33 100644
--- a/Sming/Core/FileSystem.h
+++ b/Sming/Core/FileSystem.h
@@ -277,7 +277,7 @@ template <typename TFileName> inline uint32_t fileGetSize(const TFileName& fileN
 inline int fileTruncate(file_t file, size_t newSize)
 {
 	CHECK_FS(truncate);
-	return fileSystem->truncate(file, newSize);
+	return fileSystem->ftruncate(file, newSize);
 }
 
 /** @brief Truncate an open file at the current cursor position
@@ -287,7 +287,7 @@ inline int fileTruncate(file_t file, size_t newSize)
 inline int fileTruncate(file_t file)
 {
 	CHECK_FS(truncate);
-	return fileSystem->truncate(file);
+	return fileSystem->ftruncate(file);
 }
 
 /** @brief Truncate (reduce) the size of a file

From 4a47a8cbb279451c0b9856064f52db1ea422226a Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Sat, 20 Feb 2021 18:09:49 +0000
Subject: [PATCH 29/91] Update IFS library

---
 Sming/Components/IFS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index 1e50d014fa..4d6fcdb7d1 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit 1e50d014fac7604026d0d4112f1855431a44496a
+Subproject commit 4d6fcdb7d1e808b66acc8f03a99b77b79abac67d

From 723c5cb4bd56392160972d1d0213929564ffb7bb Mon Sep 17 00:00:00 2001
From: mikee47 <mike@sillyhouse.net>
Date: Mon, 22 Feb 2021 22:31:54 +0000
Subject: [PATCH 30/91] Update spiffsgen.py to reflect revised metadata layout

---
 Sming/Components/spiffs/spiffsgen.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Sming/Components/spiffs/spiffsgen.py b/Sming/Components/spiffs/spiffsgen.py
index b161c1c957..0ca153dcca 100644
--- a/Sming/Components/spiffs/spiffsgen.py
+++ b/Sming/Components/spiffs/spiffsgen.py
@@ -228,9 +228,10 @@ def to_binary(self):
                 magic = 0xE3457A77
                 mtime = self.mtime
                 attr = 0
-                flags = 0xff
                 userRole_admin = 0x04
-                meta = struct.pack(b'<LLBBBB', magic, mtime, attr, flags, userRole_admin, userRole_admin)
+                compression_none = 0
+                original_size = 0
+                meta = struct.pack(b'<LLBBBBB', magic, mtime, attr, userRole_admin, userRole_admin, compression_none, original_size)
                 meta += b'\x00' * (self.build_config.meta_len - 12)
             else:
                 meta = b'\00' * self.build_config.meta_len

From 9e55859d5218d25532df3e7107b02f7b35f6f493 Mon Sep 17 00:00:00 2001
From: Mateusz Zakarczemny <m.zakarczemny@gmail.com>
Date: Tue, 23 Feb 2021 10:32:58 +0100
Subject: [PATCH 31/91] Revert removed spiffs-image-clean (#2225)

It was removed in
https://github.com/SmingHub/Sming/commit/fdb772a76316c2697d3e0aa795bd67efd206ecd1?branch=fdb772a76316c2697d3e0aa795bd67efd206ecd1&diff=unified#diff-47632947d7b1a3ebdc4dc2b67f68638bf31eda6ef22844a7edda489de702acbdL62

but is required by `spiffs-image-update`
---
 Sming/Components/spiffs/component.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Sming/Components/spiffs/component.mk b/Sming/Components/spiffs/component.mk
index bc7787fffc..e82a68d993 100644
--- a/Sming/Components/spiffs/component.mk
+++ b/Sming/Components/spiffs/component.mk
@@ -25,6 +25,13 @@ COMPONENT_RELINK_VARS += SPIFFS_OBJ_META_LEN
 SPIFFS_OBJ_META_LEN ?= 16
 COMPONENT_CFLAGS += -DSPIFFS_OBJ_META_LEN=$(SPIFFS_OBJ_META_LEN)
 
+##@Cleaning
+
+.PHONY: spiffs-image-clean
+spiffs-image-clean: ##Remove SPIFFS image file
+	$(info Cleaning $(SPIFF_BIN_OUT))
+	$(Q) rm -f $(SPIFF_BIN_OUT)
+
 ##@Building
 
 # Spiffs image generation tool

From ca3b7a1e425ff36f162ef5a49354c6b6470b8de9 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 24 Feb 2021 08:50:55 +0100
Subject: [PATCH 32/91] Fix handling of `.gz` files in HttpResponse (#2226)

* Most browsers expect correct mime type of data otherwise they refuse to load CSS, JavaScript and so on.

* Override `FileStream::getMimeType()` to account for compressed files

Fixes incorrect behaviour of `Basic_WebSkeletonApp` sample.

Co-authored-by: mikee47 <mike@sillyhouse.net>
---
 Sming/Core/Data/Stream/IFS/FileStream.cpp | 9 +++++++++
 Sming/Core/Data/Stream/IFS/FileStream.h   | 2 ++
 Sming/Core/Network/Http/HttpResponse.cpp  | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Sming/Core/Data/Stream/IFS/FileStream.cpp b/Sming/Core/Data/Stream/IFS/FileStream.cpp
index d4f9e5be6d..ef4ebd06a4 100644
--- a/Sming/Core/Data/Stream/IFS/FileStream.cpp
+++ b/Sming/Core/Data/Stream/IFS/FileStream.cpp
@@ -184,6 +184,15 @@ String FileStream::fileName() const
 	return (res < 0 || stat.name.length == 0) ? nullptr : stat.name.buffer;
 }
 
+MimeType FileStream::getMimeType() const
+{
+	String name = fileName();
+	if(name.endsWith(".gz")) {
+		name.remove(name.length() - 3);
+	}
+	return ContentType::fromFullFileName(name, MIME_UNKNOWN);
+}
+
 String FileStream::id() const
 {
 	auto fs = getFileSystem();
diff --git a/Sming/Core/Data/Stream/IFS/FileStream.h b/Sming/Core/Data/Stream/IFS/FileStream.h
index bac5188ce4..f8d0430547 100644
--- a/Sming/Core/Data/Stream/IFS/FileStream.h
+++ b/Sming/Core/Data/Stream/IFS/FileStream.h
@@ -92,6 +92,8 @@ class FileStream : public FsBase, public ReadWriteStream
 		return fileName();
 	}
 
+	MimeType getMimeType() const override;
+
 	bool isValid() const override
 	{
 		return fileExist();
diff --git a/Sming/Core/Network/Http/HttpResponse.cpp b/Sming/Core/Network/Http/HttpResponse.cpp
index 0f8e9e52b5..b0877e1902 100644
--- a/Sming/Core/Network/Http/HttpResponse.cpp
+++ b/Sming/Core/Network/Http/HttpResponse.cpp
@@ -77,14 +77,14 @@ bool HttpResponse::sendFile(const String& fileName, bool allowGzipFileCheck)
 		if(fileStats(fnCompressed, stat) >= 0) {
 			debug_d("found %s", stat.name);
 			stat.compression.type = IFS::Compression::Type::GZip;
-			stat.name = IFS::NameBuffer(fnCompressed);
+			stat.name = IFS::NameBuffer(const_cast<String&>(fileName));
 			return sendFile(stat);
 		}
 	}
 
 	if(fileStats(fileName, stat) >= 0) {
 		debug_d("found %s", fileName.c_str());
-		stat.name = IFS::NameBuffer((char*)fileName.c_str(), fileName.length(), fileName.length());
+		stat.name = IFS::NameBuffer(const_cast<String&>(fileName));
 		return sendFile(stat);
 	}
 

From 7d66eb9e1f67320eeda473aa83ef38adc094005f Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 24 Feb 2021 20:14:01 +0000
Subject: [PATCH 33/91] Add web test support to HostTests CI application
 (#2228)

* Enable loopback on host network interfaces and add CI web test module

* Enable support for Windows loopback, but don't enable in CI

Requires manual network adapter setup, no need to repeat tests already handling in Linux

* Serialise file requests and add more checks

* Prevent Windows host run from stalling
---
 .../Host/Components/lwip/Linux/host_lwip.c    |   1 +
 .../Host/Components/lwip/Windows/host_lwip.c  |   1 +
 Sming/Arch/Host/Components/lwip/lwipopts.h    |   3 +
 Sming/Arch/Host/Tools/ci/build.setup.sh       |   5 +
 tests/HostTests/app/application.cpp           |  39 ++++--
 tests/HostTests/component.mk                  |   4 +-
 tests/HostTests/fwfs0.json                    |   9 ++
 tests/HostTests/host-tests.hw                 |  11 ++
 tests/HostTests/include/modules.h             |   3 +-
 tests/HostTests/modules/HttpRequest.cpp       | 116 ++++++++++++++++++
 10 files changed, 181 insertions(+), 11 deletions(-)
 create mode 100644 tests/HostTests/fwfs0.json
 create mode 100644 tests/HostTests/modules/HttpRequest.cpp

diff --git a/Sming/Arch/Host/Components/lwip/Linux/host_lwip.c b/Sming/Arch/Host/Components/lwip/Linux/host_lwip.c
index 5de4cf3891..d5c38414c4 100644
--- a/Sming/Arch/Host/Components/lwip/Linux/host_lwip.c
+++ b/Sming/Arch/Host/Components/lwip/Linux/host_lwip.c
@@ -170,6 +170,7 @@ void host_lwip_service(void)
 {
 	/* poll netif, pass packet to lwIP */
 	tapif_select(&netif);
+	netif_poll(&netif);
 	sys_check_timeouts();
 }
 
diff --git a/Sming/Arch/Host/Components/lwip/Windows/host_lwip.c b/Sming/Arch/Host/Components/lwip/Windows/host_lwip.c
index 404e049739..521be8507b 100644
--- a/Sming/Arch/Host/Components/lwip/Windows/host_lwip.c
+++ b/Sming/Arch/Host/Components/lwip/Windows/host_lwip.c
@@ -216,6 +216,7 @@ void host_lwip_service(void)
 {
 	/* check for packets and link status*/
 	pcapif_poll(&netif);
+	netif_poll(&netif);
 	sys_check_timeouts();
 }
 
diff --git a/Sming/Arch/Host/Components/lwip/lwipopts.h b/Sming/Arch/Host/Components/lwip/lwipopts.h
index 6a66da4e4e..b94fa08ccc 100644
--- a/Sming/Arch/Host/Components/lwip/lwipopts.h
+++ b/Sming/Arch/Host/Components/lwip/lwipopts.h
@@ -382,6 +382,9 @@
  */
 #define LWIP_HAVE_LOOPIF                0
 
+// Enable loopback on interfaces
+#define LWIP_NETIF_LOOPBACK             1
+
 /*
    ----------------------------------------------
    ---------- Sequential layer options ----------
diff --git a/Sming/Arch/Host/Tools/ci/build.setup.sh b/Sming/Arch/Host/Tools/ci/build.setup.sh
index 692cdae27a..2dc3d0c044 100755
--- a/Sming/Arch/Host/Tools/ci/build.setup.sh
+++ b/Sming/Arch/Host/Tools/ci/build.setup.sh
@@ -19,5 +19,10 @@ if [ -n "$SMING_SECRET" ]; then
 fi
 set -x
 
+# Setup networking
+sudo ip tuntap add dev tap0 mode tap user $(whoami)
+sudo ip a a dev tap0 192.168.13.1/24
+sudo ip link set tap0 up
+
 # Build documentation
 make -C $SMING_HOME docs
diff --git a/tests/HostTests/app/application.cpp b/tests/HostTests/app/application.cpp
index 522e6e2332..e1668b2b3c 100644
--- a/tests/HostTests/app/application.cpp
+++ b/tests/HostTests/app/application.cpp
@@ -8,11 +8,18 @@
 #include <SmingTest.h>
 #include <modules.h>
 
+#ifndef WIFI_SSID
+#define WIFI_SSID "PleaseEnterSSID"
+#define WIFI_PWD "PleaseEnterPass"
+#endif
+
 #define XX(t) extern void REGISTER_TEST(t);
 TEST_MAP(XX)
 #undef XX
 
-static void registerTests()
+namespace
+{
+void registerTests()
 {
 #define XX(t)                                                                                                          \
 	REGISTER_TEST(t);                                                                                                  \
@@ -21,7 +28,7 @@ static void registerTests()
 #undef XX
 }
 
-static void testsComplete()
+void testsComplete()
 {
 #if RESTART_DELAY == 0
 	System.restart();
@@ -30,6 +37,14 @@ static void testsComplete()
 #endif
 }
 
+void beginTests()
+{
+	SmingTest::runner.setGroupIntervalMs(TEST_GROUP_INTERVAL);
+	System.onReady([]() { SmingTest::runner.execute(testsComplete); });
+}
+
+} // namespace
+
 void init()
 {
 	Serial.setTxBufferSize(1024);
@@ -40,13 +55,19 @@ void init()
 
 	spiffs_mount();
 
-#ifndef DISABLE_WIFI
-	WifiStation.enable(false, false);
-	WifiAccessPoint.enable(false, false);
-#endif
-
 	registerTests();
 
-	SmingTest::runner.setGroupIntervalMs(TEST_GROUP_INTERVAL);
-	System.onReady([]() { SmingTest::runner.execute(testsComplete); });
+#ifdef DISABLE_WIFI
+	beginTests();
+#else
+	WifiAccessPoint.enable(false);
+	if(netif_default == nullptr) {
+		WifiStation.enable(false);
+		beginTests();
+	} else {
+		WifiStation.enable(true);
+		WifiStation.config(WIFI_SSID, WIFI_PWD);
+		WifiEvents.onStationGotIP([](IpAddress ip, IpAddress netmask, IpAddress gateway) { beginTests(); });
+	}
+#endif
 }
diff --git a/tests/HostTests/component.mk b/tests/HostTests/component.mk
index 38f213d5e5..91d000f57d 100644
--- a/tests/HostTests/component.mk
+++ b/tests/HostTests/component.mk
@@ -14,8 +14,10 @@ COMPONENT_DEPENDS := \
 	axtls-8266 \
 	bearssl-esp8266
 
-# Don't need network
+ifeq ($(UNAME),Windows)
+# Network tests run on Linux only
 HOST_NETWORK_OPTIONS := --nonet
+endif
 
 # Time in milliseconds to pause after a test group has completed
 CONFIG_VARS += TEST_GROUP_INTERVAL
diff --git a/tests/HostTests/fwfs0.json b/tests/HostTests/fwfs0.json
new file mode 100644
index 0000000000..7ba67a8fab
--- /dev/null
+++ b/tests/HostTests/fwfs0.json
@@ -0,0 +1,9 @@
+{
+    "name": "Test files for web requests",
+    "id": "0x12345678",
+    "source": {
+        "/": "../../samples/Basic_WebSkeletonApp/files"
+    },
+    "mountpoints": {},
+    "rules": []
+}
\ No newline at end of file
diff --git a/tests/HostTests/host-tests.hw b/tests/HostTests/host-tests.hw
index 954c4865ff..33131de523 100644
--- a/tests/HostTests/host-tests.hw
+++ b/tests/HostTests/host-tests.hw
@@ -12,6 +12,17 @@
 			"size": "0x10000",
 			"filename": ""
 		},
+		"fwfs0": {
+			"address": "0x220000",
+			"size": "0x40000",
+			"type": "data",
+			"subtype": "fwfs",
+			"filename": "$(FW_BASE)/fwfs0.bin",
+			"build": {
+				"target": "fwfs-build",
+				"config": "fwfs0.json"
+			}
+		},
 		"external1": {
 			"device": "testDevice",
 			"address": 0,
diff --git a/tests/HostTests/include/modules.h b/tests/HostTests/include/modules.h
index 97583b28b3..93e0b83d4b 100644
--- a/tests/HostTests/include/modules.h
+++ b/tests/HostTests/include/modules.h
@@ -25,4 +25,5 @@
 	XX(Spiffs)                                                                                                         \
 	XX(Rational)                                                                                                       \
 	XX(Clocks)                                                                                                         \
-	XX(Timers)
+	XX(Timers)                                                                                                         \
+	XX(HttpRequest)
diff --git a/tests/HostTests/modules/HttpRequest.cpp b/tests/HostTests/modules/HttpRequest.cpp
new file mode 100644
index 0000000000..bf061a3b36
--- /dev/null
+++ b/tests/HostTests/modules/HttpRequest.cpp
@@ -0,0 +1,116 @@
+#include <HostTests.h>
+
+#include "Network/HttpServer.h"
+#include "Network/HttpClient.h"
+#include <Platform/Station.h>
+#include <IFS/Helpers.h>
+
+namespace
+{
+struct TestFile {
+	const char* name;	 // Name of file requested via HTTP
+	const char* realName; // Actual filename on disk (optional, defaults to name)
+	MimeType mimeType;
+	const char* contentEncoding;
+
+	size_t getSize() const
+	{
+		return fileGetSize(realName ?: name);
+	}
+};
+
+TestFile testFiles[]{
+	{"bootstrap.min.css", "bootstrap.min.css.gz", MimeType::CSS, "gzip"},
+	{"bootstrap.min.css.gz", nullptr, MimeType::UNKNOWN, ""},
+	{"index.html", nullptr, MimeType::HTML, ""},
+	{"index.js", nullptr, MimeType::JS, ""},
+};
+
+} // namespace
+
+class HttpRequestTest : public TestGroup
+{
+public:
+	HttpRequestTest() : TestGroup(_F("HTTP"))
+	{
+		server = new HttpServer;
+	}
+
+	void execute() override
+	{
+		if(!WifiStation.isConnected()) {
+			Serial.println("No network, skipping tests");
+			return;
+		}
+
+		auto fs = IFS::createFirmwareFilesystem(*Storage::findPartition(Storage::Partition::SubType::Data::fwfs));
+		CHECK(fs != nullptr);
+		CHECK(fs->mount() == FS_OK);
+		fileSetFileSystem(fs);
+
+		server->listen(80);
+		server->paths.setDefault([](HttpRequest& request, HttpResponse& response) {
+			auto path = request.uri.getRelativePath();
+			bool ok = response.sendFile(path);
+			debug_i("Request from '%s' for '%s': %s", request.uri.Host.c_str(), path.c_str(), ok ? "OK" : "FAIL");
+		});
+
+		requestNextFile();
+		pending();
+	}
+
+	void requestNextFile()
+	{
+		if(fileIndex >= ARRAY_SIZE(testFiles)) {
+			shutdown();
+			return;
+		}
+
+		auto& file = testFiles[fileIndex++];
+		Url url;
+		url.Host = WifiStation.getIP().toString();
+		url.Port = 80;
+		url.Path = String('/') + file.name;
+
+		auto req = new HttpRequest(url);
+		req->onRequestComplete([this, file](HttpConnection& connection, bool success) -> int {
+			auto response = connection.getResponse();
+			debug_i("Client received '%s'", connection.getRequest()->uri.toString().c_str());
+			Serial.print(response->toString());
+
+			REQUIRE(response->code == HTTP_STATUS_OK);
+			REQUIRE(response->headers[HTTP_HEADER_CONTENT_TYPE] == toString(file.mimeType));
+			REQUIRE(response->headers[HTTP_HEADER_CONTENT_ENCODING] == file.contentEncoding);
+			REQUIRE(response->headers[HTTP_HEADER_CONTENT_LENGTH] == String(file.getSize()));
+
+			Serial.println();
+
+			requestNextFile();
+			return 0;
+		});
+		bool ok = client.send(req);
+		debug_i("Requested '%s': %s", file.name, ok ? "OK" : "FAIL");
+	}
+
+	void shutdown()
+	{
+		server->shutdown();
+		server = nullptr;
+		timer.initializeMs<1000>([this]() { complete(); });
+		timer.startOnce();
+	}
+
+private:
+	HttpServer* server{nullptr};
+	unsigned fileIndex{0};
+	HttpClient client;
+	Timer timer;
+};
+
+void REGISTER_TEST(HttpRequest)
+{
+	// Currently only supported for Host CI
+#if defined(ARCH_HOST)
+	registerGroup<HttpRequestTest>();
+#endif
+}

From 90908fed7ed40f779f44c33dae3fcbf7dd18470e Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Thu, 25 Feb 2021 07:43:45 +0000
Subject: [PATCH 34/91] Replace `toString(uint8_t)` with template to avoid
 unintentional truncation of values (#2229)

e.g. uint32_t -> uint8_t gets truncated without warning
---
 Sming/Core/Data/BitSet.h           | 5 ++++-
 tests/HostTests/modules/BitSet.cpp | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Sming/Core/Data/BitSet.h b/Sming/Core/Data/BitSet.h
index ee7a0b47e1..27aaef3d76 100644
--- a/Sming/Core/Data/BitSet.h
+++ b/Sming/Core/Data/BitSet.h
@@ -453,7 +453,10 @@ constexpr
 	return a | b;
 }
 
-String toString(uint8_t value);
+template <typename T> typename std::enable_if<std::is_integral<T>::value, String>::type toString(T value)
+{
+	return String(value);
+}
 
 /**
  * @brief Class template to print the contents of a BitSet to a String
diff --git a/tests/HostTests/modules/BitSet.cpp b/tests/HostTests/modules/BitSet.cpp
index 331457e5f4..df0b238ff1 100644
--- a/tests/HostTests/modules/BitSet.cpp
+++ b/tests/HostTests/modules/BitSet.cpp
@@ -144,6 +144,13 @@ class BitSetTest : public TestGroup
 			REQUIRE(sizeof(large) == 8);
 			REQUIRE(large.domain().value() == 0x7FFFFFFFFULL);
 		}
+
+		TEST_CASE("toString")
+		{
+			REQUIRE(toString(12) == "12");
+			REQUIRE(toString(12345678) == "12345678");
+			REQUIRE(toString(12345678912345ULL) == "12345678912345");
+		}
 	}
 };
 

From 3d3ddabb6f8920e41c5497d212ef954ab99c47b9 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Thu, 25 Feb 2021 08:58:53 +0100
Subject: [PATCH 35/91] Fixed coverity scan compilation.

The coverity scan compilation of HttpServer_FirmwareUpload was failing on Host. (#2230) Replaced it with HttpServer_WebSockets.

[scan:coverity]
---
 Sming/Arch/Host/Tools/ci/coverity-scan.sh     | 2 +-
 Sming/Arch/Host/Tools/travis/coverity-scan.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sming/Arch/Host/Tools/ci/coverity-scan.sh b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
index f53b2afb6a..984660af48 100755
--- a/Sming/Arch/Host/Tools/ci/coverity-scan.sh
+++ b/Sming/Arch/Host/Tools/ci/coverity-scan.sh
@@ -4,7 +4,7 @@ set -e
 
 COVERITY_SCAN_PROJECT_NAME=SmingHub/Sming
 COVERITY_SCAN_NOTIFICATION_EMAIL="slaff@attachix.com"
-COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_FirmwareUpload SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"
+COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_WebSockets SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"
 
 set +x
 source /tmp/secrets.sh
diff --git a/Sming/Arch/Host/Tools/travis/coverity-scan.sh b/Sming/Arch/Host/Tools/travis/coverity-scan.sh
index 11a1248da8..f4fd35c2ef 100755
--- a/Sming/Arch/Host/Tools/travis/coverity-scan.sh
+++ b/Sming/Arch/Host/Tools/travis/coverity-scan.sh
@@ -4,7 +4,7 @@ set -e
 
 COVERITY_SCAN_PROJECT_NAME=${TRAVIS_REPO_SLUG}
 COVERITY_SCAN_NOTIFICATION_EMAIL="slaff@attachix.com"
-COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_FirmwareUpload SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"
+COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_WebSockets SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"
 
 # Environment check
 [ -z "$COVERITY_SCAN_PROJECT_NAME" ] && echo "ERROR: COVERITY_SCAN_PROJECT_NAME must be set" && exit 1

From 3dcc6250b3af916aa1e150a57cdbe6e9312c4472 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Fri, 26 Feb 2021 13:02:24 +0000
Subject: [PATCH 36/91] Fix IFS code quality issues (#2232)

---
 Sming/Components/IFS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index 4d6fcdb7d1..fbe21e8965 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit 4d6fcdb7d1e808b66acc8f03a99b77b79abac67d
+Subproject commit fbe21e8965af1955d5881b841938079e4e55855d

From ef18984d86a3e49e0b6f8b9e72962ecc061f3a67 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Fri, 26 Feb 2021 13:14:20 +0000
Subject: [PATCH 37/91] Add vscode configuration support (#2231)

* Add `vscode` build target

* Update docs

Add new help topic called "IDE tools"
Rename vscode target to ide-vscode. This way the autocompletion in bash can hint the user to find easily all supported ide operations by typing make ide[PRESS-TAB]

Co-authored-by: Slavey Karadzhov <slav@attachix.com>
---
 .gitignore                                    |   1 +
 Sming/project.mk                              |  19 ++
 Tools/vscode/setup.py                         | 149 ++++++++++++
 .../template/intellisense/configuration.json  |   9 +
 .../template/intellisense/properties.json     |   4 +
 Tools/vscode/template/launch.json             |  41 ++++
 Tools/vscode/template/tasks.json              |  80 +++++++
 Tools/vscode/template/workspace.json          |  28 +++
 docs/source/tools/vscode.rst                  | 222 ++++++++----------
 docs/source/tools/vscode1.png                 | Bin 0 -> 33508 bytes
 docs/source/tools/vscode2.png                 | Bin 0 -> 27504 bytes
 lgtm.yml                                      |   4 +
 12 files changed, 434 insertions(+), 123 deletions(-)
 create mode 100644 Tools/vscode/setup.py
 create mode 100644 Tools/vscode/template/intellisense/configuration.json
 create mode 100644 Tools/vscode/template/intellisense/properties.json
 create mode 100644 Tools/vscode/template/launch.json
 create mode 100644 Tools/vscode/template/tasks.json
 create mode 100644 Tools/vscode/template/workspace.json
 create mode 100644 docs/source/tools/vscode1.png
 create mode 100644 docs/source/tools/vscode2.png
 create mode 100644 lgtm.yml

diff --git a/.gitignore b/.gitignore
index f112376880..a30086cd31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ language.settings.xml
 nbproject
 .*.swp
 .vscode
+*.code-workspace
 GTAGS
 GRTAGS
 GPATH
diff --git a/Sming/project.mk b/Sming/project.mk
index 91b7db27df..39f0b48561 100644
--- a/Sming/project.mk
+++ b/Sming/project.mk
@@ -515,6 +515,25 @@ else
 	$(Q) $(PYTHON) -m pip install $(PIP_ARGS) $(foreach reqfile,$(PYTHON_REQUIREMENTS),-r $(reqfile))
 endif
 
+##@IDE Tools
+
+.PHONY: ide-vscode
+ide-vscode: checkdirs submodules ##Create/update vscode project configuration
+	$(Q) $(MAKE) --no-print-directory ide-vscode-update
+
+.PHONY: ide-vscode-update
+ide-vscode-update:
+	$(Q) CXX=$(CXX) \
+	SMING_HOME=$(SMING_HOME) \
+	ESP_HOME=$(ESP_HOME) \
+	IDF_PATH=$(IDF_PATH) \
+	IDF_TOOLS_PATH=$(IDF_TOOLS_PATH) \
+	SMING_ARCH=$(SMING_ARCH) \
+	GDB=$(GDB) \
+	COM_SPEED_GDB=$(COM_SPEED_GDB) \
+	WSL_ROOT=$(WSL_ROOT) \
+	$(PYTHON) $(SMING_HOME)/../Tools/vscode/setup.py
+
 ##@Testing
 
 # OTA Server
diff --git a/Tools/vscode/setup.py b/Tools/vscode/setup.py
new file mode 100644
index 0000000000..8746079ea6
--- /dev/null
+++ b/Tools/vscode/setup.py
@@ -0,0 +1,149 @@
+#!/usr/bin/env python3
+#
+# Sming hardware configuration tool
+#
+
+import os, sys, json
+
+def fix_path(path):
+    if path[1:3] == ':/':
+        return '/' + path[0] + path[2:]
+    return path
+
+def env_replace(path, name, prefix):
+    if name in os.environ:
+        s = fix_path(path)
+        value = fix_path(os.environ[name])
+        if value != '' and s.startswith(value):
+            return '${%s%s}%s' % (prefix, name, s[len(value):])
+    else:
+        print("env['%s'] not found" % name)
+    return path
+
+def env_subst_path(path, prefix=''):
+    path = env_replace(path, 'SMING_HOME', prefix)
+    path = env_replace(path, 'ESP_HOME', prefix)
+    path = env_replace(path, 'IDF_PATH', prefix)
+    path = env_replace(path, 'IDF_TOOLS_PATH', prefix)
+    return path
+
+def load_json(filename, must_exist=True):
+    if must_exist or os.path.exists(filename):
+        import rjsmin
+        s = open(filename, 'r').read()
+        return json.loads(rjsmin.jsmin(s))
+    return None
+
+def save_json(data, filename):
+    dir = os.path.dirname(filename)
+    if dir != '':
+        os.makedirs(dir, exist_ok=True)
+    with open(filename, 'w') as f:
+        json.dump(data, f, indent=4)
+
+def load_template(name):
+    dir = os.path.dirname(__file__)
+    filename = os.path.join(dir, 'template', name)
+    return load_json(filename)
+
+def find_object(data, name):
+    for o in data:
+        if o['name'] == name:
+            return o
+    return None
+
+def get_property(data, name, default):
+    if not name in data:
+        data[name] = default
+    return data[name]
+
+def update_intellisense():
+    dirs = os.environ['COMPONENTS_EXTRA_INCDIR'].split()
+    for i, d in enumerate(dirs):
+        dirs[i] = env_subst_path(d)
+
+    propertiesFile = '.vscode/c_cpp_properties.json'
+    if os.path.exists(propertiesFile):
+        properties = load_json(propertiesFile)
+    else:
+        properties = load_template('intellisense/properties.json')
+
+    configurations = get_property(properties, 'configurations', [])
+
+    arch = os.environ['SMING_ARCH']
+    config = find_object(configurations, arch)
+
+    if config is None:
+        config = load_template('intellisense/configuration.json')
+        config['name'] = arch
+        config['defines'].append('ARCH_%s=1' % arch.upper())
+        configurations.append(config)
+
+    config['compilerPath'] = env_subst_path(os.environ['CXX'])
+    config['includePath'] = dirs
+
+    save_json(properties, propertiesFile)
+
+
+def update_tasks():
+    filename = '.vscode/tasks.json'
+    launch = load_json(filename, False)
+    if launch is None:
+        template = load_template('tasks.json')
+        launch = template.copy()
+        # TODO: Make any changes as required
+        save_json(launch, filename)
+
+def update_launch():
+    filename = '.vscode/launch.json'
+    launch = load_json(filename, False)
+    template = load_template('launch.json')
+    if launch is None:
+        launch = template.copy()
+    configurations = get_property(launch, 'configurations', [])
+    for template_config in template['configurations']:
+        config = find_object(configurations, template_config['name'])
+        if not config is None:
+            configurations.remove(config)
+        config = template_config.copy()
+        configurations.append(config)
+
+    arch = os.environ['SMING_ARCH']
+    is_wsl = (os.environ['WSL_ROOT'] != '')
+    config = find_object(configurations, "%s GDB" % arch)
+    if not config is None:
+        path = env_subst_path(os.environ['GDB'], 'env:')
+        if sys.platform == 'win32':
+            path = os.path.splitext(path)[0] + '.exe'
+        config['miDebuggerPath'] = path
+        args = "-x ${env:SMING_HOME}/Arch/%s/Components/gdbstub/gdbcmds" % arch
+        if arch == 'Esp8266':
+            if not is_wsl:
+                args += " -b %s" % os.environ['COM_SPEED_GDB']
+            config['miDebuggerServerAddress'] = os.environ['COM_PORT_GDB']
+        config['miDebuggerArgs'] = args
+
+    save_json(launch, filename)
+
+def update_workspace():
+    filename = 'sming.code-workspace'
+    ws = load_json(filename, False)
+    if ws is None:
+        template = load_template('workspace.json')
+        ws = template.copy()
+        # TODO: Make any required changes to generated
+        save_json(ws, filename)
+
+def main():
+    # So we can find rjsmin.py
+    sys.path.append(os.path.join(os.environ['SMING_HOME'], 'Components/Storage/Tools/hwconfig'))
+
+    update_intellisense()
+    update_tasks()
+    update_launch()
+    update_workspace()
+
+
+
+if __name__ == '__main__':
+    main()
diff --git a/Tools/vscode/template/intellisense/configuration.json b/Tools/vscode/template/intellisense/configuration.json
new file mode 100644
index 0000000000..a884e7ee5d
--- /dev/null
+++ b/Tools/vscode/template/intellisense/configuration.json
@@ -0,0 +1,9 @@
+{
+    "name": "",
+    "includePath": [],
+    "defines": [],
+    "compilerPath": "",
+    "cStandard": "c11",
+    "cppStandard": "c++17",
+    "intelliSenseMode": "gcc-x86"
+}
\ No newline at end of file
diff --git a/Tools/vscode/template/intellisense/properties.json b/Tools/vscode/template/intellisense/properties.json
new file mode 100644
index 0000000000..144b7d5268
--- /dev/null
+++ b/Tools/vscode/template/intellisense/properties.json
@@ -0,0 +1,4 @@
+{
+    "configurations": [],
+    "version": 4
+}
\ No newline at end of file
diff --git a/Tools/vscode/template/launch.json b/Tools/vscode/template/launch.json
new file mode 100644
index 0000000000..5d623e3415
--- /dev/null
+++ b/Tools/vscode/template/launch.json
@@ -0,0 +1,41 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Esp8266 GDB",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/out/Esp8266/debug/build/app_0.out",
+            "args": [],
+            "stopAtEntry": true,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": true,
+            "MIMode": "gdb",
+            "miDebuggerPath": "${env:ESP_HOME}/xtensa-lx106-elf/bin/xtensa-lx106-elf-gdb",
+            "miDebuggerArgs": "-x ${env:SMING_HOME}/Arch/Esp8266/Components/gdbstub/gdbcmds -b 115200",
+            "miDebuggerServerAddress": "192.168.1.101:7778"
+        },
+        {
+            "name": "Host GDB",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/out/Host/debug/firmware/app",
+            "args": [],
+            "stopAtEntry": true,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ],
+            "miDebuggerPath": "/usr/bin/gdb",
+            "miDebuggerArgs": "-x ${env:SMING_HOME}/Arch/Host/Components/gdbstub/gdbcmds"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Tools/vscode/template/tasks.json b/Tools/vscode/template/tasks.json
new file mode 100644
index 0000000000..b67d903ec2
--- /dev/null
+++ b/Tools/vscode/template/tasks.json
@@ -0,0 +1,80 @@
+{
+    "version": "2.0.0",
+    "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": true,
+        "panel": "shared",
+        "showReuseMessage": true,
+        "clear": false
+    },
+    "tasks": [
+        {
+            "label": "Build",
+            "detail": "Normal build",
+            "type": "shell",
+            "command": "make -j SMING_ARCH=${command:cpptools.activeConfigName}",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Full rebuild (no debugging0",
+            "detail": "Rebuild application and all Components",
+            "type": "shell",
+            "command": "make clean components-clean SMING_ARCH=${command:cpptools.activeConfigName} && make -j ENABLE_GDB=",
+            "problemMatcher": []
+        },
+        {
+            "label": "Full rebuild (with debugging)",
+            "detail": "Rebuild application and all Components",
+            "type": "shell",
+            "command": "make clean components-clean SMING_ARCH=${command:cpptools.activeConfigName} && make -j ENABLE_GDB=1",
+            "problemMatcher": []
+        },
+        {
+            "label": "flash",
+            "detail": "Write all partitions to device",
+            "type": "shell",
+            "command": "make flash SMING_ARCH=${command:cpptools.activeConfigName}",
+            "problemMatcher": []
+        },
+        {
+            "label": "run",
+            "detail": "Run application for Host",
+            "type": "shell",
+            "command": "make -j run SMING_ARCH=Host",
+            "problemMatcher": []
+        },
+        {
+            "label": "Flash and Run",
+            "detail": "Build, flash and run application for Host",
+            "type": "shell",
+            "command": "make -j flash run SMING_ARCH=Host",
+            "problemMatcher": []
+        },
+        {
+            "label": "clean",
+            "detail": "Clean just the application",
+            "type": "shell",
+            "command": "make clean SMING_ARCH=${command:cpptools.activeConfigName}",
+            "problemMatcher": []
+        },
+        {
+            "label": "Full clean",
+            "detail": "Clean application and all Components",
+            "type": "shell",
+            "command": "make clean components-clean SMING_ARCH=${command:cpptools.activeConfigName}",
+            "problemMatcher": []
+        },
+        {
+            "label": "Distribution Clean",
+            "detail": "Cleans application, all components and re-initialises all submodules",
+            "type": "shell",
+            "command": "make dist-clean",
+            "problemMatcher": []
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Tools/vscode/template/workspace.json b/Tools/vscode/template/workspace.json
new file mode 100644
index 0000000000..f5d5823978
--- /dev/null
+++ b/Tools/vscode/template/workspace.json
@@ -0,0 +1,28 @@
+{
+    "folders": [
+        {
+            "path": "."
+        }
+    ],
+    "settings": {
+        "files.associations": {
+            "*.hw": "jsonc",
+            "*.fwfs": "jsonc",
+            "optional": "cpp"
+        },
+        "json.schemas": [
+            {
+                "fileMatch": [
+                    "*.hw"
+                ],
+                "url": "{$SMING_HOME}/Components/Storage/schema.json"
+            },
+            {
+                "fileMatch": [
+                    "*.fwfs"
+                ],
+                "url": "${SMING_HOME}/Components/IFS/fsbuild/schema.json"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/docs/source/tools/vscode.rst b/docs/source/tools/vscode.rst
index 9ddb197ab1..015efd36d5 100644
--- a/docs/source/tools/vscode.rst
+++ b/docs/source/tools/vscode.rst
@@ -1,131 +1,107 @@
-********************************
 Using with MS Visual Studio Code
-********************************
+================================
 
+.. highlight:: bash
 
-`Visual Studio Code <https://code.visualstudio.com/>`__ is free (as in
-“free beer�, and they claim the code is Open Source) code editor for
-Windows, Linux and Mac. While not as sophisticated in C/C++ support as
-full featured Visual Studio, it already has some official support with
-`C/C++ extension from
-Microsoft <https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools>`__.
-GNU Global replaces venerable ``ctags`` tool and help collecting symbols
-for Intellisense engine.
+Microsoft `Visual Studio Code <https://code.visualstudio.com/>`__ is a free (as in
+"free beer") and Open Source code editor for Windows, Linux and Mac.
+
+For easier integration make sure you have both :envvar:`ESP_HOME` and
+:envvar:`SMING_HOME` exported in your working environment.
 
-For easier integration make sure you have both ``ESP_HOME`` and
-``SMING_HOME`` exported in your working environment.
-``${workspaceRoot}`` below is the directory with your project, this
-notation is used also in VS Code config files. All environment variables
-are available in configuration using this notation, eg. ``${HOME}`` etc.
 
 Software involved
-=================
+-----------------
 
 -  `Visual Studio Code <https://code.visualstudio.com/>`__
--  `C/C++
-   extension <https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools>`__
--  `RunOnSave
-   extension <https://marketplace.visualstudio.com/items?itemName=emeraldwalk.RunOnSave>`__
--  `C++ Intellisense
-   extension <https://marketplace.visualstudio.com/items?itemName=austin.code-gnu-global>`__
--  `GNU Global <https://www.gnu.org/software/global/>`__
-
-Fire and forget way
-===================
-
--  install VS Code, extensions and tools
--  download sming-qstart.py from
-   https://github.com/zgoda/sming-qstart/blob/master/sming-qstart.py
--  run it from terminal, eg. ``python sming-qstart.py myproject``, see
-   the `program
-   documentation <https://github.com/zgoda/sming-qstart/blob/master/README.md>`__
-   for detailed invocation options
-
-Easy way
-========
-
--  install VS Code, extensions and tools
--  clone project skeleton using https://github.com/zgoda/sming-skel.git
-   as source
--  remove unwanted bits (at least ``.git`` directory)
--  update paths configuration in
-   ``${workspaceRoot}/.vscode/c_cpp_properties.json`` - should already
-   work out of the box with Linux providing you have ``ESP_HOME`` and
-   ``SMING_HOME`` properly exported
-
-Step by step
-============
-
--  install VS Code, extensions and tools
--  update paths configuration in
-   ``${workspaceRoot}/.vscode/c_cpp_properties.json`` so the list
-   includes toolchain include path
-   (``${ESP_HOME}/xtensa-lx106-elf/xtensa-lx106-elf/include``), Sming
-   framework include paths (``${SMING_HOME}`` and
-   ``${SMING_HOME}/system/include``) and possibly your project
-   additional paths (eg. ``${workspaceRoot}/lib``), if you screw your
-   configuration just close VS Code, delete this file and start from
-   scratch
--  make sure ``path`` list in ``browse`` section contains the same
-   entries as ``includePath`` list in root section
--  define RunOnSave task in your
-   ``${workspaceRoot}/.vscode/settings.json`` (create file if does not
-   exist) to regenerate GNU Global database on every save, eg:
-
-.. code-block:: json
-
-   {
-     "emeraldwalk.runonsave": {
-       "commands": [
-         {
-           "match": "\\.(c|cpp|h|hpp)$",
-           "isAsync": true,
-           "cmd": "gtags ${workspaceRoot}"
-         }
-       ]
-     }
-   }
-
--  create file ``${workspaceRoot}/.vscode/tasks.json`` and define tasks
-   you want to run from command palette, eg minimal set:
-
-.. code-block:: json
-
-   {
-     "version": "0.1.0",
-     "command": "make",
-     "isShellCommand": true,
-     "showOutput": "always",
-     "echoCommand": true,
-     "suppressTaskName": true,
-     "tasks": [
-       {
-         "taskName": "Build",
-         "isBuildCommand": true
-       },
-       {
-         "taskName": "Clean",
-         "args": [
-           "clean"
-         ]
-       },
-       {
-         "taskName": "Flash",
-         "args": [
-           "flash"
-         ]
-       }
-     ]
-   }
-
--  add tools and binary artifacts to ``.gitignore``, eg:
-
-::
-
-   out
-
-   # development tools
-   .vscode
-   GTAGS
-   GRTAGS
-   GPATH
+-  `C/C++ extension <https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools>`__
+
+
+Installation
+------------
+
+-  Install VS Code, extensions and tools
+-  Navigate to project folder and create configuration as described below
+-  Open workspace. If vscode is in your system path you can do this::
+
+      code .
+
+
+Configuration
+-------------
+
+One of the strengths of vscode is the use of well-documented configuration files.
+You can find comprehensive documentation for these online.
+
+However, setting these up is time-consuming so the build system can create them for you.
+The vscode workspace root directory is your project directory.
+
+Change to your project directory (e.g. ``samples/Basic_Blink``) and run these commands::
+
+   make ide-vscode SMING_ARCH=Esp8266
+   make ide-vscode SMING_ARCH=Host
+
+Now open the workspace in vscode, and open a source file (.c, .cpp, .h).
+You should now be able to select the architecture from the icon in the bottom-right corner:
+
+.. figure:: vscode1.png
+
+   VS Code language selection
+
+A selection of tasks are provided which you can view via ``Terminal`` -> ``Run Task``.
+
+To debug your application, follow these steps:
+
+-  Select the appropriate architecture (e.g. Host, Esp8266)
+-  Select ``Terminal`` -> ``Run Task`` -> ``Full rebuild (with debugging)``
+-  Confirm that the baud rate (:envvar:`COM_SPEED_GDB`) and port (:envvar:`COM_PORT_GDB`) are
+   set correctly::
+
+      make gdb SMING_ARCH=Esp8266 COM_PORT_GDB=/dev/ttyUSB0 COM_SPEED_GDB=115200
+
+-  Update the vscode configuration::
+
+      make ide-vscode
+
+-  In vscode, select the require 'Run' task:
+
+.. figure:: vscode2.png
+
+   VS Code debug selection
+
+
+Manual configuration changes
+----------------------------
+
+When you run ``make ide-vscode`` the configuration files are actually generated using a python script
+``Tools/vscode/setup.py``. Configuration variables are passed from the project makefile.
+
+If you make any changes to the configuration files, please note the following behaviour:
+
+-  The ``Host``, ``Esp32`` or ``Esp8266`` intellisense settings will be overwritten.
+-  The ``Esp8266 GDB`` and ``Host GDB`` launch configurations will be overwritten
+-  The ``sming.code-workspace`` and ``.vscode/tasks.json`` files will be created if they do not already exist.
+   To re-create these they must first be deleted.
+
+Ideally the vscode configuration files should not need to be kept under configuration control,
+but generated when required.
+
+Some settings are necessarily configured via the ``setup.py`` script, however most settings can
+be changed by editing the files in ``Tools/vscode/template``.
+
+If you do this, remember to keep a copy as they'll be overwritten otherwise.
+
+And, please consider contributing any changes or suggestions to the community!
+
+
+Known issues / features
+-----------------------
+
+-  The vscode configuration files are only updated when you manually run ``make ide-vscode``.
+   If you update change critical build variables or add/remove Components to your project,
+   you may need to run it again to update them.
+-  When running ``make ide-vscode``, comments in the configuration files will be discarded.
+-  ``make ide-vscode`` may overwrite parts of your configuration: be warned!
+-  When debugging for esp8266 output in the console is not formatted correctly.
+   Lines appear with @ in front of them.
+-  A debugging configuration is not currently provided for ESP32.
diff --git a/docs/source/tools/vscode1.png b/docs/source/tools/vscode1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ecaa35b1636dc1e47dfcaf1bdd8c3efd7edc9ad
GIT binary patch
literal 33508
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
b;G;YH&iZ`{>B*@Fz>l1il4LRDmGA!nu{p;Z

literal 0
HcmV?d00001

diff --git a/docs/source/tools/vscode2.png b/docs/source/tools/vscode2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae880e72b5a891066c3e327019f45d8dc3a60044
GIT binary patch
literal 27504
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

literal 0
HcmV?d00001

diff --git a/lgtm.yml b/lgtm.yml
new file mode 100644
index 0000000000..a3d9cfe7ff
--- /dev/null
+++ b/lgtm.yml
@@ -0,0 +1,4 @@
+extraction:
+  python:
+    python_setup: 
+      version: 3

From f0298d331291bd9f10bab138761bbb61c862b813 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 1 Mar 2021 08:19:11 +0000
Subject: [PATCH 38/91] Add wrapper classes to support nanopb (#2233)

* Add nanopb requirements

* Add `Protobuf` namespace, with Callback/Stream class wrappers

Handle detail of encode/decode using `InputStream` and `OutputStream` classes.
`Callback` classes wrap individual data elements

* Add `getCapacity()` method to LimitedMemoryStream

Co-authored-by: Slavey Karadzhov <slav@attachix.com>
---
 Sming/Core/Data/Stream/LimitedMemoryStream.h  |   5 +
 Sming/Libraries/nanopb/component.mk           |   2 +-
 Sming/Libraries/nanopb/requirements.txt       |   1 +
 Sming/Libraries/nanopb/src/Callback.cpp       |  42 ++++++
 Sming/Libraries/nanopb/src/PbUtils.cpp        |  41 ------
 Sming/Libraries/nanopb/src/PbUtils.h          |  27 ----
 Sming/Libraries/nanopb/src/Stream.cpp         |  46 +++++++
 Sming/Libraries/nanopb/src/include/Protobuf.h |  23 ++++
 .../nanopb/src/include/Protobuf/Callback.h    | 123 ++++++++++++++++++
 .../nanopb/src/include/Protobuf/Stream.h      |  90 +++++++++++++
 10 files changed, 331 insertions(+), 69 deletions(-)
 create mode 100644 Sming/Libraries/nanopb/requirements.txt
 create mode 100644 Sming/Libraries/nanopb/src/Callback.cpp
 delete mode 100644 Sming/Libraries/nanopb/src/PbUtils.cpp
 delete mode 100644 Sming/Libraries/nanopb/src/PbUtils.h
 create mode 100644 Sming/Libraries/nanopb/src/Stream.cpp
 create mode 100644 Sming/Libraries/nanopb/src/include/Protobuf.h
 create mode 100644 Sming/Libraries/nanopb/src/include/Protobuf/Callback.h
 create mode 100644 Sming/Libraries/nanopb/src/include/Protobuf/Stream.h

diff --git a/Sming/Core/Data/Stream/LimitedMemoryStream.h b/Sming/Core/Data/Stream/LimitedMemoryStream.h
index 4efc62726d..b414b6edef 100644
--- a/Sming/Core/Data/Stream/LimitedMemoryStream.h
+++ b/Sming/Core/Data/Stream/LimitedMemoryStream.h
@@ -66,6 +66,11 @@ class LimitedMemoryStream : public ReadWriteStream
 		return writePos - readPos;
 	}
 
+	size_t getCapacity() const
+	{
+		return capacity;
+	}
+
 	uint16_t readMemoryBlock(char* data, int bufSize) override;
 
 	int seekFrom(int offset, SeekOrigin origin) override;
diff --git a/Sming/Libraries/nanopb/component.mk b/Sming/Libraries/nanopb/component.mk
index 7145d462d4..28bb9259eb 100644
--- a/Sming/Libraries/nanopb/component.mk
+++ b/Sming/Libraries/nanopb/component.mk
@@ -1,4 +1,4 @@
 COMPONENT_SRCDIRS := nanopb src
-COMPONENT_INCDIRS := $(COMPONENT_SRCDIRS)
+COMPONENT_INCDIRS := nanopb src/include
 
 COMPONENT_SUBMODULES += nanopb
\ No newline at end of file
diff --git a/Sming/Libraries/nanopb/requirements.txt b/Sming/Libraries/nanopb/requirements.txt
new file mode 100644
index 0000000000..b0c79cc0ec
--- /dev/null
+++ b/Sming/Libraries/nanopb/requirements.txt
@@ -0,0 +1 @@
+protobuf
diff --git a/Sming/Libraries/nanopb/src/Callback.cpp b/Sming/Libraries/nanopb/src/Callback.cpp
new file mode 100644
index 0000000000..9dad3d4881
--- /dev/null
+++ b/Sming/Libraries/nanopb/src/Callback.cpp
@@ -0,0 +1,42 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Callback.cpp
+ *
+ ****/
+
+#include "include/Protobuf/Callback.h"
+#include <pb_encode.h>
+#include <pb_decode.h>
+
+// See: https://iam777.tistory.com/538
+
+namespace Protobuf
+{
+bool OutputCallback::encode(pb_ostream_t* stream, const pb_field_t* field)
+{
+	if(!pb_encode_tag_for_field(stream, field)) {
+		return false;
+	}
+
+	return pb_encode_string(stream, data, length);
+}
+
+bool InputCallback::decode(pb_istream_t* stream, const pb_field_t* field)
+{
+	size_t available = stream->bytes_left;
+	auto new_buf = realloc(data, length + available);
+	if(new_buf == nullptr) {
+		return false;
+	}
+	data = static_cast<uint8_t*>(new_buf);
+	auto old_length{length};
+	length += available;
+
+	return pb_read(stream, &data[old_length], available);
+}
+
+} // namespace Protobuf
diff --git a/Sming/Libraries/nanopb/src/PbUtils.cpp b/Sming/Libraries/nanopb/src/PbUtils.cpp
deleted file mode 100644
index 2ba2047d1b..0000000000
--- a/Sming/Libraries/nanopb/src/PbUtils.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "PbUtils.h"
-
-// See: https://iam777.tistory.com/538
-
-bool pbEncodeData(pb_ostream_t *stream, const pb_field_t *field, void * const *arg)
-{
-  PbData *data = (PbData*) *arg;
-  if(data == nullptr) {
-	  return false;
-  }
-
-  if (!pb_encode_tag_for_field(stream, field)) {
-    return false;
-  }
-
-  return pb_encode_string(stream, (uint8_t*)data->value, data->length);
-}
-
-bool pbDecodeData(pb_istream_t *stream, const pb_field_t *field, void **arg)
-{
-  uint8_t buffer[1024] = {0};
-
-  /* We could read block-by-block to avoid the large buffer... */
-  if (stream->bytes_left > sizeof(buffer) - 1) {
-    return false;
-  }
-
-  size_t available = stream->bytes_left;
-  if (!pb_read(stream, buffer, stream->bytes_left)) {
-    return false;
-  }
-
-
-  MemoryDataStream* data = (MemoryDataStream*) *arg;
-  if(data == nullptr) {
-	  data = new MemoryDataStream();
-	  *arg = (void*)data;
-  }
-  data->write(buffer, available);
-  return true;
-}
diff --git a/Sming/Libraries/nanopb/src/PbUtils.h b/Sming/Libraries/nanopb/src/PbUtils.h
deleted file mode 100644
index 78c221e659..0000000000
--- a/Sming/Libraries/nanopb/src/PbUtils.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <SmingCore.h>
-#include <Data/Stream/MemoryDataStream.h>
-#include <pb_encode.h>
-#include <pb_decode.h>
-
-class PbData
-{
-public:
-	uint8_t* value = nullptr;
-	size_t length = 0;
-
-	PbData(const String& text)
-	{
-		PbData((uint8_t *)text.c_str(), text.length());
-	}
-
-	PbData(uint8_t*  data, size_t length)
-	{
-		value = data;
-		this->length = length;
-	}
-};
-
-bool pbEncodeData(pb_ostream_t *stream, const pb_field_t *field, void * const *arg);
-bool pbDecodeData(pb_istream_t *stream, const pb_field_t *field, void **arg);
diff --git a/Sming/Libraries/nanopb/src/Stream.cpp b/Sming/Libraries/nanopb/src/Stream.cpp
new file mode 100644
index 0000000000..2b44e3b4c1
--- /dev/null
+++ b/Sming/Libraries/nanopb/src/Stream.cpp
@@ -0,0 +1,46 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Stream.cpp
+ *
+ ****/
+
+#include "include/Protobuf/Stream.h"
+
+// See: https://iam777.tistory.com/538
+
+namespace Protobuf
+{
+bool InputStream::decode(const pb_msgdesc_t* fields, void* dest_struct)
+{
+	int avail = stream.available();
+	if(avail <= 0) {
+		return false;
+	}
+	pb_istream_t is{};
+	is.callback = [](pb_istream_t* stream, pb_byte_t* buf, size_t count) -> bool {
+		auto self = static_cast<InputStream*>(stream->state);
+		assert(self != nullptr);
+		size_t read = self->stream.readBytes(reinterpret_cast<char*>(buf), count);
+		return true;
+	};
+	is.state = this;
+	is.bytes_left = size_t(avail);
+	is.errmsg = nullptr;
+	return pb_decode(&is, fields, dest_struct);
+}
+
+size_t OutputStream::encode(const pb_msgdesc_t* fields, const void* src_struct)
+{
+	pb_ostream_t os{};
+	os.state = const_cast<OutputStream*>(this);
+	os.callback = buf_write;
+	os.max_size = SIZE_MAX;
+
+	return pb_encode(&os, fields, src_struct) ? os.bytes_written : 0;
+}
+
+} // namespace Protobuf
diff --git a/Sming/Libraries/nanopb/src/include/Protobuf.h b/Sming/Libraries/nanopb/src/include/Protobuf.h
new file mode 100644
index 0000000000..b8a1b57fcf
--- /dev/null
+++ b/Sming/Libraries/nanopb/src/include/Protobuf.h
@@ -0,0 +1,23 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Protobuf.h
+ *
+ ****/
+
+#pragma once
+
+#include "Protobuf/Stream.h"
+#include "Protobuf/Callback.h"
+
+namespace Protobuf
+{
+inline size_t getEncodeSize(const pb_msgdesc_t* fields, const void* src_struct)
+{
+	return DummyOutputStream().encode(fields, src_struct);
+}
+
+} // namespace Protobuf
diff --git a/Sming/Libraries/nanopb/src/include/Protobuf/Callback.h b/Sming/Libraries/nanopb/src/include/Protobuf/Callback.h
new file mode 100644
index 0000000000..dad64b7665
--- /dev/null
+++ b/Sming/Libraries/nanopb/src/include/Protobuf/Callback.h
@@ -0,0 +1,123 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Callback.h
+ *
+ ****/
+
+#pragma once
+
+#include <WString.h>
+#include <pb.h>
+
+namespace Protobuf
+{
+/**
+ * @brief Base class to manage handling of pb_callback_t instances
+ */
+class Callback
+{
+public:
+	Callback(pb_callback_t& cb) : cb(cb)
+	{
+		cb.arg = this;
+	}
+
+	virtual ~Callback()
+	{
+		free(data);
+		cb.arg = nullptr;
+		cb.funcs.encode = nullptr;
+		cb.funcs.decode = nullptr;
+	}
+
+	bool operator==(const String& s) const
+	{
+		return s.equals(reinterpret_cast<const char*>(data), length);
+	}
+
+	bool operator!=(const String& s) const
+	{
+		return !operator==(s);
+	}
+
+	uint8_t* getData()
+	{
+		return data;
+	}
+
+	size_t getLength()
+	{
+		return length;
+	}
+
+	explicit operator String() const
+	{
+		return String(reinterpret_cast<const char*>(data), length);
+	}
+
+protected:
+	pb_callback_t& cb;
+	uint8_t* data{nullptr};
+	size_t length{0};
+};
+
+/**
+ * @brief Handles input data decoding
+ */
+class InputCallback : public Callback
+{
+public:
+	/**
+	 * @brief Construct a decoding instance
+	 */
+	InputCallback(pb_callback_t& cb) : Callback(cb)
+	{
+		cb.funcs.decode = static_decode;
+	}
+
+protected:
+	static bool static_decode(pb_istream_t* stream, const pb_field_t* field, void** arg)
+	{
+		auto self = static_cast<InputCallback*>(*arg);
+		return self ? self->decode(stream, field) : false;
+	}
+	bool decode(pb_istream_t* stream, const pb_field_t* field);
+};
+
+/**
+ * @brief Handles output data encoding
+ */
+class OutputCallback : public Callback
+{
+public:
+	/**
+	 * @brief Construct an encoding instance
+	 * @param data
+	 * @param len
+	 */
+	OutputCallback(pb_callback_t& cb, const void* data, size_t len) : Callback(cb)
+	{
+		cb.funcs.encode = static_encode;
+		this->data = new uint8_t[len];
+		memcpy(this->data, data, len);
+		length = len;
+	}
+
+	OutputCallback(pb_callback_t& cb, const String& value) : OutputCallback(cb, value.c_str(), value.length())
+	{
+	}
+
+protected:
+	static bool static_encode(pb_ostream_t* stream, const pb_field_t* field, void* const* arg)
+	{
+		auto self = static_cast<OutputCallback*>(*arg);
+		return self ? self->encode(stream, field) : false;
+	}
+	bool encode(pb_ostream_t* stream, const pb_field_t* field);
+};
+
+} // namespace Protobuf
diff --git a/Sming/Libraries/nanopb/src/include/Protobuf/Stream.h b/Sming/Libraries/nanopb/src/include/Protobuf/Stream.h
new file mode 100644
index 0000000000..6e7cfbbcab
--- /dev/null
+++ b/Sming/Libraries/nanopb/src/include/Protobuf/Stream.h
@@ -0,0 +1,90 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Stream.h
+ *
+ ****/
+
+#pragma once
+
+#include <WString.h>
+#include <Data/Stream/DataSourceStream.h>
+#include <pb_encode.h>
+#include <pb_decode.h>
+#include <Network/TcpClient.h>
+
+namespace Protobuf
+{
+class Stream
+{
+public:
+	~Stream()
+	{
+	}
+};
+
+class InputStream : public Stream
+{
+public:
+	InputStream(IDataSourceStream& source) : stream(source)
+	{
+	}
+
+	bool decode(const pb_msgdesc_t* fields, void* dest_struct);
+
+	String getErrorString() const
+	{
+		return errmsg;
+	}
+
+private:
+	const char* errmsg{nullptr};
+	IDataSourceStream& stream;
+};
+
+class OutputStream : public Stream
+{
+public:
+	size_t encode(const pb_msgdesc_t* fields, const void* src_struct);
+
+protected:
+	static bool buf_write(pb_ostream_t* stream, const pb_byte_t* buf, size_t count)
+	{
+		auto self = static_cast<OutputStream*>(stream->state);
+		assert(self != nullptr);
+		return self->write(buf, count);
+	}
+	virtual bool write(const pb_byte_t* buf, size_t count) = 0;
+};
+
+class DummyOutputStream : public OutputStream
+{
+protected:
+	bool write(const pb_byte_t* buf, size_t count) override
+	{
+		return true;
+	}
+};
+
+class TcpClientOutputStream : public OutputStream
+{
+public:
+	TcpClientOutputStream(TcpClient& client) : client(client)
+	{
+	}
+
+protected:
+	bool write(const pb_byte_t* buf, size_t count) override
+	{
+		int err = client.send(reinterpret_cast<const char*>(buf), count);
+		// debug_i("client.send(%u): %d", count, err);
+		return err > 0;
+	}
+
+	TcpClient& client;
+};
+
+} // namespace Protobuf

From e321fe90de060aed63e6c76b61077fe98eef4a0c Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 1 Mar 2021 08:19:56 +0000
Subject: [PATCH 39/91] Provide `LinkedObject` for general use (#2234)

Move `Storage::Object`, etc. into `Core/Data` and rename as `LinkedObject...`
---
 .../Storage/src/include/Storage/Device.h      |  8 ++--
 .../Object.h => Core/Data/LinkedObject.h}     | 32 +++++++--------
 .../Data/LinkedObjectList.cpp}                | 14 +++----
 .../Data/LinkedObjectList.h}                  | 39 ++++++++-----------
 4 files changed, 42 insertions(+), 51 deletions(-)
 rename Sming/{Components/Storage/src/include/Storage/Object.h => Core/Data/LinkedObject.h} (76%)
 rename Sming/{Components/Storage/src/ObjectList.cpp => Core/Data/LinkedObjectList.cpp} (81%)
 rename Sming/{Components/Storage/src/include/Storage/ObjectList.h => Core/Data/LinkedObjectList.h} (66%)

diff --git a/Sming/Components/Storage/src/include/Storage/Device.h b/Sming/Components/Storage/src/include/Storage/Device.h
index cf54588b19..b680b960a3 100644
--- a/Sming/Components/Storage/src/include/Storage/Device.h
+++ b/Sming/Components/Storage/src/include/Storage/Device.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include <WString.h>
-#include "ObjectList.h"
+#include <Core/Data/LinkedObjectList.h>
 #include "PartitionTable.h"
 
 #define STORAGE_TYPE_MAP(XX)                                                                                           \
@@ -29,11 +29,11 @@ class SpiFlash;
 /**
  * @brief Represents a storage device (e.g. flash memory)
  */
-class Device : public ObjectTemplate<Device>
+class Device : public LinkedObjectTemplate<Device>
 {
 public:
-	using List = ObjectListTemplate<Device>;
-	using OwnedList = OwnedObjectListTemplate<Device>;
+	using List = LinkedObjectListTemplate<Device>;
+	using OwnedList = OwnedLinkedObjectListTemplate<Device>;
 
 	/**
 	 * @brief Storage type
diff --git a/Sming/Components/Storage/src/include/Storage/Object.h b/Sming/Core/Data/LinkedObject.h
similarity index 76%
rename from Sming/Components/Storage/src/include/Storage/Object.h
rename to Sming/Core/Data/LinkedObject.h
index 0d6914f643..7b4cecbd86 100644
--- a/Sming/Components/Storage/src/include/Storage/Object.h
+++ b/Sming/Core/Data/LinkedObject.h
@@ -4,7 +4,7 @@
  * http://github.com/SmingHub/Sming
  * All files of the Sming Core are provided under the LGPL v3 license.
  *
- * Object.h - Base Storage object definition
+ * LinkedObject.h
  *
  ****/
 #pragma once
@@ -12,46 +12,48 @@
 #include <iterator>
 #include <algorithm>
 
-namespace Storage
-{
-class ObjectList;
-
-class Object
+/**
+ * @brief Base virtual class to allow objects to be linked together
+ * 
+ * This can be more efficient than defining a separate list, as each object
+ * requires only an additional pointer field for 'next'.
+ */
+class LinkedObject
 {
 public:
-	virtual ~Object()
+	virtual ~LinkedObject()
 	{
 	}
 
-	virtual Object* next() const
+	virtual LinkedObject* next() const
 	{
 		return mNext;
 	}
 
-	Object* getNext() const
+	LinkedObject* getNext() const
 	{
 		return mNext;
 	}
 
-	bool operator==(const Object& other) const
+	bool operator==(const LinkedObject& other) const
 	{
 		return this == &other;
 	}
 
-	bool operator!=(const Object& other) const
+	bool operator!=(const LinkedObject& other) const
 	{
 		return this != &other;
 	}
 
 private:
-	friend class ObjectList;
-	Object* mNext{nullptr};
+	friend class LinkedObjectList;
+	LinkedObject* mNext{nullptr};
 };
 
 /**
  * @brief Base class template for linked items with type casting
  */
-template <typename ObjectType> class ObjectTemplate : public Object
+template <typename ObjectType> class LinkedObjectTemplate : public LinkedObject
 {
 public:
 	template <typename T, typename TPtr, typename TRef>
@@ -140,5 +142,3 @@ template <typename ObjectType> class ObjectTemplate : public Object
 		return ConstIterator(nullptr);
 	}
 };
-
-} // namespace Storage
diff --git a/Sming/Components/Storage/src/ObjectList.cpp b/Sming/Core/Data/LinkedObjectList.cpp
similarity index 81%
rename from Sming/Components/Storage/src/ObjectList.cpp
rename to Sming/Core/Data/LinkedObjectList.cpp
index 4ec5cc3d15..a1634d7e2f 100644
--- a/Sming/Components/Storage/src/ObjectList.cpp
+++ b/Sming/Core/Data/LinkedObjectList.cpp
@@ -4,21 +4,19 @@
  * http://github.com/SmingHub/Sming
  * All files of the Sming Core are provided under the LGPL v3 license.
  *
- * ObjectList.cpp
+ * LinkedObjectList.cpp
  *
  ****/
 
-#include "include/Storage/ObjectList.h"
+#include "LinkedObjectList.h"
 
-namespace Storage
-{
-bool ObjectList::add(Object* object)
+bool LinkedObjectList::add(LinkedObject* object)
 {
 	if(object == nullptr) {
 		return false;
 	}
 
-	Object* prev = nullptr;
+	LinkedObject* prev = nullptr;
 	auto it = mHead;
 	while(it != nullptr) {
 		if(it == object) {
@@ -38,7 +36,7 @@ bool ObjectList::add(Object* object)
 	return true;
 }
 
-bool ObjectList::remove(Object* object)
+bool LinkedObjectList::remove(LinkedObject* object)
 {
 	if(object == nullptr || mHead == nullptr) {
 		return false;
@@ -61,5 +59,3 @@ bool ObjectList::remove(Object* object)
 
 	return false;
 }
-
-} // namespace Storage
diff --git a/Sming/Components/Storage/src/include/Storage/ObjectList.h b/Sming/Core/Data/LinkedObjectList.h
similarity index 66%
rename from Sming/Components/Storage/src/include/Storage/ObjectList.h
rename to Sming/Core/Data/LinkedObjectList.h
index da015dd0d8..2014756ba7 100644
--- a/Sming/Components/Storage/src/include/Storage/ObjectList.h
+++ b/Sming/Core/Data/LinkedObjectList.h
@@ -4,51 +4,48 @@
  * http://github.com/SmingHub/Sming
  * All files of the Sming Core are provided under the LGPL v3 license.
  *
- * Object.h - Base Storage object definition
+ * LinkedObjectList.h
  *
  ****/
 #pragma once
 
-#include "Object.h"
-#include <vector>
+#include "LinkedObject.h"
 
-namespace Storage
-{
 /**
  * @brief Singly-linked list of objects
  * @note We don't own the items, just keep references to them
  */
-class ObjectList
+class LinkedObjectList
 {
 public:
-	ObjectList()
+	LinkedObjectList()
 	{
 	}
 
-	ObjectList(Object* object) : mHead(object)
+	LinkedObjectList(LinkedObject* object) : mHead(object)
 	{
 	}
 
-	bool add(Object* object);
+	bool add(LinkedObject* object);
 
-	bool add(const Object* object)
+	bool add(const LinkedObject* object)
 	{
-		return add(const_cast<Object*>(object));
+		return add(const_cast<LinkedObject*>(object));
 	}
 
-	bool remove(Object* object);
+	bool remove(LinkedObject* object);
 
 	void clear()
 	{
 		mHead = nullptr;
 	}
 
-	Object* head()
+	LinkedObject* head()
 	{
 		return mHead;
 	}
 
-	const Object* head() const
+	const LinkedObject* head() const
 	{
 		return mHead;
 	}
@@ -59,15 +56,15 @@ class ObjectList
 	}
 
 protected:
-	Object* mHead{nullptr};
+	LinkedObject* mHead{nullptr};
 };
 
-template <typename ObjectType> class ObjectListTemplate : public ObjectList
+template <typename ObjectType> class LinkedObjectListTemplate : public LinkedObjectList
 {
 public:
-	ObjectListTemplate() = default;
+	LinkedObjectListTemplate() = default;
 
-	ObjectListTemplate(ObjectType* object) : ObjectList(object)
+	LinkedObjectListTemplate(ObjectType* object) : LinkedObjectList(object)
 	{
 	}
 
@@ -116,12 +113,12 @@ template <typename ObjectType> class ObjectListTemplate : public ObjectList
  * @brief Class template for singly-linked list of objects
  * @note We own the objects so are responsible for destroying them when removed
  */
-template <typename ObjectType> class OwnedObjectListTemplate : public ObjectListTemplate<ObjectType>
+template <typename ObjectType> class OwnedLinkedObjectListTemplate : public LinkedObjectListTemplate<ObjectType>
 {
 public:
 	bool remove(ObjectType* object)
 	{
-		bool res = ObjectList::remove(object);
+		bool res = LinkedObjectList::remove(object);
 		delete object;
 		return res;
 	}
@@ -133,5 +130,3 @@ template <typename ObjectType> class OwnedObjectListTemplate : public ObjectList
 		}
 	}
 };
-
-} // namespace Storage

From 7c6fbf05efd6b6e7017d9fa167bff2f0c95031ca Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 1 Mar 2021 08:20:43 +0000
Subject: [PATCH 40/91] Use esp82xx-nonos-linklayer github fork (#2235)

Link to savannah keeps breaking during CI
---
 .gitmodules                               | 2 +-
 Sming/Arch/Esp8266/Components/lwip2/lwip2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index e2a90fbd3b..e5ea539ace 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -93,7 +93,7 @@
 	ignore = dirty
 [submodule "Esp8266.lwip2"]
 	path = Sming/Arch/Esp8266/Components/lwip2/lwip2
-	url = https://github.com/d-a-v/esp82xx-nonos-linklayer.git
+	url = https://github.com/mikee47/esp82xx-nonos-linklayer.git
 	ignore = dirty
 [submodule "Esp8266.new-pwm"]
 	path = Sming/Arch/Esp8266/Components/driver/new-pwm
diff --git a/Sming/Arch/Esp8266/Components/lwip2/lwip2 b/Sming/Arch/Esp8266/Components/lwip2/lwip2
index 5b73bb11d5..8bd8607b4e 160000
--- a/Sming/Arch/Esp8266/Components/lwip2/lwip2
+++ b/Sming/Arch/Esp8266/Components/lwip2/lwip2
@@ -1 +1 @@
-Subproject commit 5b73bb11d59285d49a6efeb20726186cc5cc2b74
+Subproject commit 8bd8607b4ed3b81cf656a72729aa70a09b5f4d6e

From 1ad27fab3c57dbed3bcdbdad5c824a8fb19df9b6 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 1 Mar 2021 15:09:52 +0000
Subject: [PATCH 41/91] Revise install scripts and documentation (#2204)

* add install scripts for faster and easier installation

Co-authored-by: Slavey Karadzhov <slav@attachix.com>
---
 .ci/install.sh                                |  13 -
 .github/workflows/codeql-analysis.yml         |  18 +-
 .travis.yml                                   |   6 +-
 .travis/tools/esptool2                        | Bin 22261 -> 0 bytes
 CONTRIBUTING.md                               |   2 +-
 Sming/Arch/Esp32/README.rst                   |  19 +-
 Sming/Arch/Esp32/Tools/ci/install.cmd         |   3 +
 Sming/Arch/Esp32/Tools/ci/install.sh          |  14 --
 Sming/Arch/Esp32/Tools/install.sh             |  50 ++++
 Sming/Arch/Esp8266/README.rst                 |   1 +
 Sming/Arch/Esp8266/Tools/ci/install.cmd       |   5 +-
 Sming/Arch/Esp8266/Tools/ci/install.sh        |  14 --
 Sming/Arch/Esp8266/Tools/docker/Dockerfile    |  15 --
 Sming/Arch/Esp8266/Tools/install.sh           |  26 ++
 Sming/Arch/Host/Components/vflash/README.rst  |   2 +-
 Sming/Arch/Host/README.rst                    |  11 +-
 Sming/Arch/Host/Tools/ci/build.setup.sh       |   4 +-
 Sming/Arch/Host/Tools/ci/install.cmd          |  14 +-
 Sming/Arch/Host/Tools/ci/install.sh           |   8 -
 Sming/Arch/Host/Tools/install.sh              |   8 +
 Sming/Libraries/Adafruit_ILI9341/component.mk |   2 +-
 Sming/README.rst                              |   2 +-
 Sming/building.rst                            |   2 +-
 Sming/project.mk                              |  14 +-
 .../Tools/docker => Tools/Docker}/README.md   |   0
 Tools/Docker/cli/Dockerfile                   |  43 ++++
 Tools/Docker/cli/docker-compose.yml           |  16 ++
 Tools/Docker/ide/Dockerfile                   |  42 ++++
 Tools/Docker/ide/LICENSE                      |  22 ++
 .../Docker/ide}/assets/welcome.html           |  13 +-
 .../Docker/ide}/assets/welcome.js             |   0
 .../Docker/ide}/docker-compose.yml            |  20 +-
 Tools/Docker/ide/supervisord.conf             |  14 ++
 Tools/choco-install.cmd                       |  19 ++
 {.ci => Tools/ci}/build.cmd                   |   0
 {.ci => Tools/ci}/build.sh                    |   0
 {.ci => Tools/ci}/deploy.sh                   |   0
 {.ci => Tools/ci}/install.cmd                 |   2 +
 {.ci => Tools/ci}/secrets.sh.enc              |   0
 Tools/export.sh                               |  35 +++
 Tools/install.sh                              | 184 ++++++++++++++
 Tools/tcp_serial_redirect.py                  | 232 ++++++++++++++++++
 {.travis => Tools/travis}/build.sh            |   0
 {.travis => Tools/travis}/deploy.sh           |   0
 {.travis => Tools/travis}/install.sh          |   0
 Tools/vscode/setup.py                         |  21 +-
 appveyor.yml                                  |  18 +-
 docs/Tools/install.sh                         |  26 ++
 docs/requirements.txt                         |   3 +-
 .../arch/esp32/getting-started/index.rst      |  52 ----
 .../arch/esp8266/getting-started/index.rst    |  30 ---
 .../arch/esp8266/getting-started/linux.rst    | 109 --------
 .../host/{host-emulator.rst => index.rst}     |  20 +-
 .../esp8266 => }/getting-started/config.rst   |  15 +-
 .../docker}/c9-1.png                          | Bin
 .../docker/index.rst}                         |  52 ++--
 .../index.rst}                                |  26 +-
 docs/source/getting-started/linux/index.rst   |  78 ++++++
 .../macos/index.rst}                          |  10 +-
 .../windows/index.rst}                        |  89 +++----
 .../windows/manual.rst}                       |   2 +-
 .../windows/wsl.rst}                          |  28 ++-
 docs/source/index.rst                         |   4 +-
 .../develop}/clang-tools.rst                  |   0
 .../source/information/develop/components.rst |   2 +-
 docs/source/information/flash.rst             |   2 +-
 docs/source/link-roles.py                     |   1 +
 docs/source/samples.rst                       |   3 +
 docs/source/tools/index.rst                   |   2 +
 .../source/troubleshooting/random-restart.rst |   2 +-
 samples/Basic_rBoot/README.rst                |   2 +-
 71 files changed, 1046 insertions(+), 446 deletions(-)
 delete mode 100755 .ci/install.sh
 delete mode 100755 .travis/tools/esptool2
 delete mode 100755 Sming/Arch/Esp32/Tools/ci/install.sh
 create mode 100755 Sming/Arch/Esp32/Tools/install.sh
 delete mode 100755 Sming/Arch/Esp8266/Tools/ci/install.sh
 delete mode 100644 Sming/Arch/Esp8266/Tools/docker/Dockerfile
 create mode 100755 Sming/Arch/Esp8266/Tools/install.sh
 delete mode 100755 Sming/Arch/Host/Tools/ci/install.sh
 create mode 100755 Sming/Arch/Host/Tools/install.sh
 rename {Sming/Arch/Esp8266/Tools/docker => Tools/Docker}/README.md (100%)
 create mode 100644 Tools/Docker/cli/Dockerfile
 create mode 100644 Tools/Docker/cli/docker-compose.yml
 create mode 100644 Tools/Docker/ide/Dockerfile
 create mode 100644 Tools/Docker/ide/LICENSE
 rename {Sming/Arch/Esp8266/Tools/docker => Tools/Docker/ide}/assets/welcome.html (64%)
 rename {Sming/Arch/Esp8266/Tools/docker => Tools/Docker/ide}/assets/welcome.js (100%)
 rename {Sming/Arch/Esp8266/Tools/docker => Tools/Docker/ide}/docker-compose.yml (53%)
 create mode 100644 Tools/Docker/ide/supervisord.conf
 create mode 100644 Tools/choco-install.cmd
 rename {.ci => Tools/ci}/build.cmd (100%)
 rename {.ci => Tools/ci}/build.sh (100%)
 rename {.ci => Tools/ci}/deploy.sh (100%)
 rename {.ci => Tools/ci}/install.cmd (76%)
 rename {.ci => Tools/ci}/secrets.sh.enc (100%)
 create mode 100755 Tools/export.sh
 create mode 100755 Tools/install.sh
 create mode 100644 Tools/tcp_serial_redirect.py
 rename {.travis => Tools/travis}/build.sh (100%)
 rename {.travis => Tools/travis}/deploy.sh (100%)
 rename {.travis => Tools/travis}/install.sh (100%)
 create mode 100644 docs/Tools/install.sh
 delete mode 100644 docs/source/arch/esp32/getting-started/index.rst
 delete mode 100644 docs/source/arch/esp8266/getting-started/index.rst
 delete mode 100644 docs/source/arch/esp8266/getting-started/linux.rst
 rename docs/source/arch/host/{host-emulator.rst => index.rst} (92%)
 rename docs/source/{arch/esp8266 => }/getting-started/config.rst (76%)
 rename docs/source/{arch/esp8266/getting-started => getting-started/docker}/c9-1.png (100%)
 rename docs/source/{arch/esp8266/getting-started/docker.rst => getting-started/docker/index.rst} (51%)
 rename docs/source/{getting-started.rst => getting-started/index.rst} (91%)
 create mode 100644 docs/source/getting-started/linux/index.rst
 rename docs/source/{arch/esp8266/getting-started/macos.rst => getting-started/macos/index.rst} (95%)
 rename docs/source/{arch/esp8266/getting-started/windows.rst => getting-started/windows/index.rst} (54%)
 rename docs/source/{arch/esp8266/getting-started/windows-manual.rst => getting-started/windows/manual.rst} (99%)
 rename docs/source/{windows-wsl.rst => getting-started/windows/wsl.rst} (78%)
 rename docs/source/{contribute => information/develop}/clang-tools.rst (100%)

diff --git a/.ci/install.sh b/.ci/install.sh
deleted file mode 100755
index 21a90b2d2c..0000000000
--- a/.ci/install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -ex # exit with nonzero exit code if anything fails
-
-# Common install
-
-sudo apt-get update
-
-sudo update-alternatives --set gcc /usr/bin/gcc-9
-python -m pip install --upgrade pip -r $SMING_HOME/../Tools/requirements.txt
-
-sudo apt-get install -y gcc-9-multilib g++-9-multilib python3-setuptools
-
-source $SMING_HOME/Arch/$SMING_ARCH/Tools/ci/install.sh
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 634f26726d..da50404adc 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -17,7 +17,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: false
@@ -61,16 +61,10 @@ jobs:
     - if: matrix.language == 'cpp' || matrix.language == 'c'
       name: Build Sming C/C++
       run: |
-       sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-       sudo apt-get update -y
-       sudo apt-get install gcc-9-multilib g++-9-multilib python3-wheel python3-setuptools
-       sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
-       python3 -m pip install --upgrade pip wheel -r Tools/requirements.txt
-       env
-       cd Sming
-       export SMING_HOME=$(pwd)
-       cd ../samples/Basic_Blink
-       make -j3 SMING_ARCH=Host
-       
+        sudo Tools/install.sh host
+        . Tools/export.sh
+        cd samples/Basic_Blink
+        make -j3 SMING_ARCH=Host
+
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v1
diff --git a/.travis.yml b/.travis.yml
index 1228bc56d0..97b2443e0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,11 +56,11 @@ addons:
     update: true
     packages:
     - xmlstarlet
-install: ".travis/install.sh"
-script: ".travis/build.sh"
+install: "Tools/travis/install.sh"
+script: "Tools/travis/build.sh"
 deploy:
   provider: script
-  script: ".travis/deploy.sh $TRAVIS_TAG"
+  script: "Tools/travis/deploy.sh $TRAVIS_TAG"
   skip_cleanup: true
   on:
     tags: true
diff --git a/.travis/tools/esptool2 b/.travis/tools/esptool2
deleted file mode 100755
index 7de8b1f191fbec7b1576216b89f1ec5f2826dfad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22261
zcmeHvdvsgXmG_nGfXKsgAQbZ`xugoQAyy>kffJG-*>Z9nlwjh7M<K|vB*&WAk}F*W
z2Qt(kn?V(3vSvCh)6SY^70ODdtRdg`wGaYd<UB}1r_%|P(zN*sf%1@ILIMPu^3wO)
z=OJAwHeqJ1nZLMR*4cZXz4zH?pMCZ@_v-3=yT!ZAY%(eGGAm0J!rnOF#Yp^9QL395
zDrk+$d5TN9T)9*^2b2l;cd;5OIV8)|LbWU{g0BK)CH@=DoX}`?F+i4=ak3&yX(5%=
zUh#4Xke5H7&rw+_ipmHiN48ckWhlxH2FP-ou;ZX8r5vFoS1aUdg`6x83BzP5`$v7F
z|20D28nX)+;Vvo^5Bn^Z#7kG(n|hGoZYM)gx)>nK2RT`hrIfo7a%AV1y{ZM{YSG?!
zemN=nCrg1Ub9%y^3+Bz~3D)<7BZ>a{{>BCM3+CD5QF{aHH|Zzd<*U}RmZTqRfRWA9
z@J}&7^$UMznzZIs$D8kexM11Q>n>a6ed-@0RCfXXNeA_7fPj0e%|s*F3-Mp~^#?Co
z_<s7b6ITSRK*zkcgL?iLH4ltK|N1!e-f`&njYId1L!UVgeZe^Ne;$Y4JP!T)<Ipb}
zhyDxDRs5G<T_B9*w<Y7yCyhhDdmQ?Tap<>zK2^C`8F6(0QWQC#bihPESVo@;`uWNf
z#c`nvkfJ=oKJkJ03{W^OP`aXhp@<TS#iB8#OAqz*C~-X&3G{7Je7?Bu4{Y!Sx;OZ`
z{NWy@H`E&s=}K2T6xu*Yptlc9U45}|MDHRthz6qxa0Ggy@sQH%@9BvKlvt=Yx-mp`
zXhrF|GZxlEN>?o84?=olsd$X*B=e~CnC|QKha<!t0`vObXhe{G%5raOQ?swZKCb}H
zHNXvaN_A$;BD46bEI>5dB$e0G^r6cHeuCxvpB4^Jp&7YP(DaML=h4jkwZIdX5N=lf
z0GzJV*LARx<|G6QmmDw3%``{lCC7{CG;ifqBgXMu5TtEXryA%Ybuy7!1HFP#_=m$l
zm${H?8Vz*gdf_tAjrmeD(8(rwwHfF#7OCzQ104=3Tpb4b!~zxh+(4(fBCkFJeX=B?
z>^IPjejYH;s|@@P80f}ixWz!1V@_fZ8|XBL<h9j6H_m@8`Hn?PPk8PcRndk<^a<HN
zK|)LJv+R|Uyv)!4-(bnl{5d|Y(_MfF@21M!(LAo1|3WwodF~Lye@r+Hb#8>=KOnq<
z@a+u$JHlybb6Xky9l~iyb6XgGAK^5VxdDdXMK}#%u8-j{!fEJo9Sr{~!fD8IZ4B=u
zoQ5jrV)!=+ry<HY7`~ct8k(HS@D+s9kmRZv-b6SJMNVP(BEo41awk6rVP*s2<oeuE
zhF?WExjc6Wxcg@JP42bsHEY|od*68g)MVbIrF5HWeW(+iY;oqb;fSThdEArwc)!Qi
zrr^Ux9~+ee9$OFs;5h>PPLwY`Lw<Gdc%t5=xOb6{+)q=_-KqTOrCrwP9)QW`Ogo7y
zx!0s6pR;%texfh(rbCK1b-<f?&zpMdgU9qgWPT0}fI<1-G3(Gp5CA{P3K=)kk=XA^
zopz^wm)heT$&6g-Qc`Pdjh@u)HirjLZ8i!wqo#V6OUVW}>>~JP!0zN{CQlk%o;3IY
zG+Kvl!7vUiS-3z|6n)CT5+?!Hp=B8SmcbYGNyE*ig?p?I%>a&eJ(k16&1T&~Br9jJ
z4%NU?EpS9jdu?jn9&LEuAJJ7v=e6|W-)rgHofhlRMg&*O;1TQ4QUE(2K~J^RE7>@P
zcyPozsDbDl0VOlT4pSe8|A5}RkH+S<b?)2U>)dy^eS59b2T8M%d0Kkv`41jTOeGh&
z*(l_Gh|%rZlG)AcpQeZehjssiTj#5aDYqHb*6B*-U}^p2{Sy|k`rA>z>pxiK+vL(d
za%nd?*qid&9Nv@%4qp0MK0h?#O#}9#%gl}B)NXQWU!qQiNUjRn$Wau67?FpsMAw`c
zh2+6}ZaSiL*UP-6>^q-+kw)v_y_l)H{wSC;XJPge^BaQs@6N*PCgz-A4xNR$2?M_C
zgkWww3-fehJ|&nZorU>RjQ_5W1@kMPe6crvPt1A2{J+k^JVMNs2r6&t?d;%Lm{Y_&
zQ83?p7Urp#>bt51^HpbI{sX+>wmw;D+f|Q{tlR&9$L2u7skILEqfPg~W}B(OI`nk`
zn;q7nsRFLRWSjt)@{l?A4BF8Ud1~qfZP??e#+1=gd$P|UsxXg+cEHbC>ecMkALsKF
zWls}M>>dQF%LAy*`lQ#k5fNRDhz&9w?&NFdLXSIn)T$xCE!JH~Y^h3H_Dv*Y(%K0v
zquVH~DTn2*fenPP<%2rT5@SvUgedQ$D8C*#h1y>TNzhzGyGGDvavEi>>|VG<=BlSS
z%yQMwID8!?gCB8t3+1rC=kP&-|AxcWwSe#D@F&C{<*-I@fWsZcb2Epx5q!OY|2hue
zNc?j-e3W=*aagSbe5rw-(q3jAxSb=}3Qq4Po<C!d(3c$qk8;>@72sDn+(r6-!{Iif
zAK>s7f}i2=VS=CFu;psNj|hH(zt7>V1gANiCHUJMuAL1y&fyM%*K?Tp<TeiXlMOcj
z&TIz<>~H4u!^D3L(Jh!(pkGZeNdlfuaGJvx5d1w3pG)vI4u67JK;KzgCjisfFF_1~
zc6ugsUkg7GtqwGb7E|v1(;PDAvI45ey}}`vDfg0q%(-6*2pbhZyLO^I%w)>Vn<+Q<
z<G+t`b2sJY#_W&(EOSRA<>qb#c^~EGe#*_8twY~K0Mkq|<-YZ0)U|)1I{g>BzIGOS
z&i_IM2|H}L)0BG?T*wX{n`!a9gqyN~*^zjJ$_gd%L$X)N?FLVBv#pj^VYd1wnpoPX
zPb^{rN}>U~g<KYFi?OPAVtwI?tV1^mm{Q3Kz@*Tc>jNiRaMW9e{trO5mB4U2Fvr>E
z0kDl=nvj6mBA-ssFn81RqunD7=}lsQDs$7J1*%;YxeEa~kGG~?xI;_5t|i|%*|w(j
zz{trNSo9C<9$>|Rf%Bl`Hy`Hnr@FT6$hbO`wOaiS6k76hm6m$*PV>6GJ1|&m<9ljd
zhN|*Mt<wjHwu3Oqzx#9r_>l#*-N&xeOoy}=PA4F|lNhz37xh!?wA6ks|GJPLSkhXr
zDoSGNT1aN^flJoypRfQV(+AjNz{=#3{;R;CUtTa_+S-h|6xOBQ%pY2pyBi|dN95wX
z#4hqMS{uX;202|rOgc2gBsL9j2Sul*Ut_H!uh)5P9o9MorM2##Yy*(7);((5!pg^O
zTUq&Y+jdqyYa2m1u;fRxRha71h6im&LC{hkYw0C-fv638ZI)daBHEN%EUeCBt42<@
zsh~`D2ue-%(+{u=+`Er#<o)~awD;uIDm+(a?=M08^7eZF=j=7Qwct-U_zE%@!&h)8
zb8x9!fAW6OtzEe6a({~Zi`0L(Z)#0_q@`YVuWe0z=3dj9dTFgE^;|pd>1sU)iOJb>
zFl4x`(^7kBb)IY;Y{6K%29H|@AICtY`zoCy>FX`d<1ItalOd3qreEfKF?G=W=l8V0
zv7zJlRJrSNt%2OIXNm%jX{q;}Bkoidw-A}eZ(w#^h<&Fwb%Hk9SMj!5Q_ookk3%~)
z=lZSM@Mc>z?lyK(?65$}?x8LvPh0fGq-6kFoFmR7*}J)>>?7|{^}gEFVZ*MxYfIWy
zncAPb0h58>@1)x;P|Gx;{cJCkf}|}xl=vyEz65nz>KLoej39w#z0~T$=MrfR8LmUo
z=cJo0LnHUp($=NJ`ee0pMBGO;teK!_Y48kdxG5SjJ#f*r*IPDc`QHDwLi=R9h1s6n
zjm^6ANNzdR6~_ld@>|^gX{irsJZiH4h8qPw6nf{b)mQ^HnEe=ac4(wEwNGD)O_g?_
z(gr`_j_>&vIOTb7>KGDBwwk%-?bLJGmrsHpo3Eu4p)9$tCY9w*+Pg(dy_?y=?QxPl
z$47rx9xn(M7AYUXtkl1^JCDGw?x2>goLP%DDH3l%68?s?(_^c#4xTb$*vMLP@@Z<F
zS!*4firh@TtJztL`&KayZ>KdCDo%oL=(zQvtq>k=$$N);Y>w7p&wdNFp|%dU;7%BK
zHtfE&HNAkmU6Z|S0u-`PwGRFWf?B$-dgpW)MlJvA2@11Zda9P(T{(PT{`1d2|MQDi
z9GW?ROV6eD>^@fg(}4k`IuGs*Z!~LG&o7k`E&2NjZ(VNad7U*;o6MP*Lr-g_zl>fW
z^0c<_Ao99CjfQ$)kv(w&g#Bh8Xo+_)HPY>vBCs*jhF)f8VgKn#H&=R7JvPfq*wc(4
z%<UX7cmSJPc;H>w%eqAqgLd((XP6i-qeGCw?f=k7qHeSuK{p5zZEbem4mV3jx|0V?
z*=^9`S$MZ)<7`@xKRRH=#(ILHzXV=iIqzn{d*@5u)N4Dj59X>eYr)u>+;7QVPbR^Y
z&F{jM*V2QCp#j7di)*@Zxf^so60cDNq;=aZL2d3l78|L<iTMb(Zo`ZupUC*fj%)N;
z=aJDJUIgJu9)yn*@rmqwXywl*c)oHMLa@d82A+*1-_g>8wgH&yq4Yvos|E}FoD;w<
z%YGkwIvEp-jFA{2V<}kR(iMnA>yx^zCew|+dLGzpYe=2keYA2S^x+<8Zn{~8vUwPl
z?!Ukoa5i9ru@Su4n+0Jm2t!0z1_F8x=FE2qUjW>l{M>9Ed<iCchl4hU^~piDnrayM
zLQ;bRVYMTN_MF+*j>9-4xWoo@jTYXa5$i*hFkhhF^rN;1n7SU@oMhIta(MGT%jg9>
z|Fq)K+scKXS_gka9I4s1*7P(Rl7aha_(FLaS};@Jr5x}vY#SU&{2GoNt=^J3j39K5
z0LeO0K_mUscc^?dI~CD@(bGJsqlN(#@z45H(iiH;F?=`?=5J@G$<F*U7Ld!d;Wf57
zWK1>eaPKHuGx$6=&Dyd@JbA&*-7U;Q>)<z$8FTv(Y}n6`VSO+R)9oL3AG^$S2)BfF
zhmeU^xt}Ga8OuzU;;!509Py;yS{ZmFOB+Yn=S{tC$maJzL+iqQ`o$Rs*m<`XVV9Vz
zL{lu@XyKVd{URHgWVV(3kvwhE=Vm$zQk5k2Yi8R3IN|a_2<Omp?ip4ElaimC+|QCS
z>(GxtLqFWl(j)Hdk4F(Bb^9_8Go8Zf&px7r^>+3rsD$ZQ6nEtztECQP8$dF2h|=2=
zAW?VbWDXV#+ravLBKxOf`TR;`(?KU%CFc7;=-QH-0aUINa@`QFXW?-K@`EF8>p$!p
z-2uPTR^fB@K$2D@>r=}c;fZ^0O=ivB^m@&C1WDRe(YpK1iqR_WzvSK;@4`|2n%1;_
z8J+>0$o>o3MbdhUR+>Y!q+X0ZYN^Am70WakS9=Tj3|yE*jdQ^F9(LfI0g-bDv3L+X
z{Ml&g1Ec^;dYJ{!p3h0!hmI$%)Y5UR#+fZ7+Jz?Yln!%(D=6x3O??VqE`v?T18}eY
z&DQi{8@4X*X5HM-dh7>U)01r?rJl&9a$=9LCxLZjA5ynmJt;1EtG7_ACt)yox&{Ky
zk<kHI^A>gZFzC*aTrXm53tQSh%d}xoDT_I>&wyFxDjI6%$kSM)G2*X&p#5yu=a45S
z{z7t9U<pMuX~P?^D(>Dn53I~kVmg|Is^sZ;`l3u0_8@cJftI!Owc1b~Pv~Eu>h#?%
zj>QSXEZ=~VxynJV+Pjm|#V!-XN#iT1L>3ylA4Ka@&5OF=?v>W3;#e53b-rkQ;$%g<
zHhUgy!vJ5Zr6=vA9f7dt?Q9!0kvv_i-<8?oVD|j_6sE=o+VIHrD{~8KvQHAdo%|zx
z_9!TDw!=BX%qsF%b4`OJaRr;T185W0zMC1LLD)bQ7TyHn1zU}2FwUAeNbRhm%2CV!
z#6S~SM{7Z|OLrrASF=84uVr0MT#h^QY2+>5oAjjYeQzTSh`4Z%J|m+zS%*Hu?Lh7a
zP{>9a9)E`jDG;nrZD_PU^_jLIUz7bEM0r!1{&MoT$@<WbVKQ>=|E0t*+Rfsq%y}1(
z44jt;B9S{skh?3|U72&xMLbf@{ubL(Z|bO4(X7Fy$;kdSskTah)hT*<HZ9d=ff$Ks
zskUkiUE{*+Jr0y|<ep3Ir?Fd!RxqabQUjSr^eKBa-Qc7S=Z;}FNagD&4fhWSo^~zu
ziM~8@IS;YxX@e|7Eb<m1GQ_GmrtyF?6P9}Qw%lLdG>rdkdy9Kty1%9SlRUdWp_>!z
zguTNv`!7{-OFdjqWxKcTP3%B-e^x;WAe(?LZRoguxr`_5)V!&WJkXJ!_Wv~cQe)w0
z;#e^gu!r@A{(P_(u|wZwVPXSBV#c-rR||bTyhv>i1@v$<qRyHbpQT2ky4n>@M1pEK
zqK109)UI$($UcRptKtp@!;$rB+`vCu^#_B{;pm^~XzZV@#>01o7O69XYVFnd=-i}-
z;<fQQwGUhnt>cPByUXzHb110lQI&mpT%wn#;a>mxkg<Is*X)nX(pCC`TgBJXeF+#0
zMcn+ZXpCt?W5VcSKa1^sN!dU&64%uPz6YP%poSuPY?F_At1c1Uy_UP>KjRl>)Rc)O
znrFt(P+MN#gT5|-ThU^%s!>%T8uaV_+t#7>ZaJRCesaHd<2(6KYz&XK@lg?uzB8<M
z)5y`FVa$r|8&9to)H4;2GrocDP+&tm(R-!<1s5(ikFU-sVsN9=?v!COTbdPDqh0DO
zM}Jq>EHZDLc8c=xK7Sw-EA&M0-x^J*y$OtLye||8cWqMZI}z(QtXA<_PbVvd$0(RO
z6X71j=%zk731Fu|Prx6c8B@^otwcDatA0$M`e3Lt!GlonuL5Hz5>2e{R{gQ{iC#oh
zT#YCC`g+2lprJo&qEWTiAK5exm!gE?eR?$7)1Yo_usiGywO*|a)Ts>)=X`Z_IMD5n
z1y#4&l!)n=)Qe-B;_qa*Ydzk)=&=W)y-P*#qCac8!*R7Q7F{3n_o@JU!hujEj;V<>
zK!MX8QkS=R)s1t7C)-0IMr6~@+uGc+s=WnCBc=vJI<&{Z#*~YGuZ_e)f#~{3m{dml
z3c02*E`|QE0l1B`#Mh~d!x7AGA2qX7UCie?$GGi9IU2w(Bd0D#O7n>Xw$yItCKUCE
zf&Z_oqA*reezo-XMPoYiR6Mu=UhRzeW1G}kdpH*Db=dV#zg{<+`OUB5t(ZvA-xH05
zRDWNe@QlzCvah$RMH?w818Zzpu)r6N>UQ{r@}M0)5JOtpKJkkl$5nrvCuN$0ezjSZ
zkzP#lMf<;GyWJ}5ifX4!q}pRqDw!q1j%K_Rq=!`4N8K;P8D)3gePib_b7=ndM3J+C
z<cs)hl`<146#DpN!<=F3lkA#ZZH)wa62TDWl)>9<4wot{#GTMr)=!G1ar`?@PlcYM
z;aCvssTY`<R5*Fjpw<RMUH(LmE^6ya#|vtN)RMAzn9Y`DN=39dBPq!a#nePRB(xO#
zBlS43D2ypXxz*rL$=~n={0&#DwP=d99&1ALDq=V;Iw1S6s<m>*z!Pk@e<Q{{gvARl
zOm5)g8H?i0GQ>mACZ;UVjd#khkh8Q<rZ3(XW*Z8%c0*?!T-q>yfm%P`*`U@t9S!q<
zJLWa2_46Efd7|i9)R+5}^z=r9*qGFRD;&iKO_};2f%IaVK^WCixHu1x-C;*xC=?_c
zFs2O)?AK7cYJH=_AUw}eW`CFmq)PLhwo`Hegc>5@)jC=YYyCa(s2YL#IF<*0CtS6j
zxS5-oM#KeQSJ*pwSOg<*UWhhtYHuhW$2^L&7yutzbTG%TXHk(~Vt(XgEJM(Txasv%
z?k$9i0{(hL7JL&6i4llnQ1E)+ooX!^gb@pOshgsSSYazjkr~6f#dZsRbyoc>GV#t%
zWy-|Arv1>Ai7MM2HT2I`+OZj=ZHuF!A2m(bS5Sx<(78plg|=4=Z6szxj#OxQR%mHZ
z>Up|SxH}ZyTh!B3<AswK4PXgJ@qyt58-eT<MhYQ?LP%jDq_7ZDSO_VGF;UtRfdD+)
zmFR(|11x_9*#?tx$6E6EA^`9otl|K-jKe$=i&=34i|jb@FAqgRF@KMAHIY__^h7Me
zYQgWo&|*ix+UBa9MCrn!nuyUnXQ4++Ov$y3?bnUlaxzn_zBkbF(1k$3C~vv~^jN3z
zZM*=Fru{*=Fwh2zw*Rbq5lX%kgmN+ym9FM!0(&8LhY&`dE^kn_$oJ>;CTIzZ%GQT2
znhRx$g{AF=`wF!iD-}YM$zZJ_ZPJX=cGzBCDlBw@*(>xK>?!c^;Sw4JUn}i4*u6wt
z4Msz8y36Q^Mrq~VfMvOOJEYcjqHkQq82jWFao5C@Fn3|kj*U?SD=yx`CC}=Z=EV)=
znRXi43Qj!3bwaMto@fTEJZ$al(>IOXob+GuK7o%FHx2U}wy9?{29J(mrx-GX&lm!x
zODnE@5OVbFGW&8qPhWu69L56>+<tC;EuY^8y!-Wh9yg>)&7bml73D#cE|mRm<ntXw
z#~t-{l-p3!`}nnZ5aWXUHaxIAin0;UU>y~BM;GM)${qNA<six$e0!8d`2b1>J@3Ia
zjTegPuGNaEzuI)^<Z~@sOy^b;oqluitE2h+Rf30#vH2CnhC1T6pilIDy;4=Ztg2>(
zb<&-d0p+?&uDxomZ3d`}2ajiz4)pbLA}p^uYBE1sMUTemA{{~epZtRQLDUbxM~|T7
z@;@xddqH{>|JCr>_sEW>s_MTrw^Y?URH0R=!<8*nwGU44R5|WH$5YjqJl9jzVctEl
zs<FAs;jXG}s#2S(Y9P^6Woe!SVMSSt|5NzyfbWw;K<zN;d$7V?rQToZsj5vvpUZsH
z#H!lnD%CCJo47pLGY@ubhy2|b8*UF;d8neLV2_*ZX(oG?Rc$p@)SF=uXk`|;Nh9eS
zgubH~`@hCm8v0k%$NJ~y{Tnb<giX)~TA4mg>U#<L27a5*2hWrGn0@fZaAgzui`mEY
zEw36eRs0j_JJY^asn3Rfjvyw#19fEIL*%dF3g~;V5;ojV{!gA`z7ZaS4+|b&F{#Z!
z@bDp}{_5m6JfzJCeZywR2>(N0a>DW|M}R9UxPQeYb2CUD!-#muK8n44(ANijzYyc`
zpc!KKSF~2CNsMQkIX#g{xmg^zCz-bZZ?3B0_zKd(<8(6opT(S8O$1L>b<%v##45|G
zNp6@<?aW4fE#_c|>Wgt$94C#&U88YYS>@^(%cpF<>Cn>#J!I}z*H<3+$^&0{;42S&
z<$<p}@RbMtyF9S<0vA&~AWGQ|ZK>&!<z$X3wH6nHrU?Ah431wcaQXY{O9d|X`<Dp3
z25+*`Mf-ocWc`Pq=c9x_Y<5vm_|5m>N{-`Q6?PpoyI9HZ$`$1;hA9f)t>NBB;PiW8
z<3(F&cDXuOA@^8xe?^zP-#M3~%0;5=KgY!&Np}cb+N}vb+EUXc+s8M=tUo6wxELK@
zSTkJu6Sry%-zDl9)BnJS{2hCFQ(a<QH;VFpQGQR9kBRb0QSKMz%c6Wslpl%mobz0)
ziLZ(BN>MHl<uXy;B+4#PZWLv?eaoAh7pb*tI};H-q0X~6+UM0bBpBwr$2rgLm{-TC
z${CCe_0ENYlk+qviaoxm7x(%o^%yU^C4{Gkp;(_{$D^K*-QCn$ulv^vY<(nQXWxm{
zhl7fpFg&U0R_wt|5$NNk9^*9|L$Np>IF=wj)Wt$Qei9H+UyqLGeUUIe={pg{-US48
z?281&9_sdW;ftw|uR91?iE#;^KNj<E;t~@6s{q)b-QODypy?<S;=|5bp~p#zy)zzH
z=qoV#2Cm%4{}r6(ImNV`PmN|5u;Muna-K6HK4kn${2KshZb|tyW*4yHISMMniXW9l
zkU>s-8s&Afi_zJ=Bp@5ZiXY|j9#r9FqNr?N=AVZJ!68KPt|q(Wycejl3cw`%OL>`}
z<hc^nqJr`l^<B!#JaH3fl$)fy%y)-{p)$XLg<a+Ty8~3pEmB_Q6ZUIR)XnB%g?uXc
zWVr$Ll&d5z^VLbwVV96Ew_lKzy8w`>QeNgq2MOSk`LW!8vj2nNG0Mw)+b`s0ekOTZ
zgUbE)5NPBR!CqLOY6YWQcfi6f;Z}(%DL_W~Hj%&Dggkr3Rp2iEj-H<D(e+*Y8|CS@
zC3Fpl1tBIEMn)~l3sm_50HeHIPfyL@9CBTe{N?s<74p*m$~Rn`l_nN0_Df|BvQKHZ
zBy9sg?Mr!i?ua~(<Uz?O%JTM~ER#QtcZ}#dO%oH>vlQHhOOBr;jR2^^zhsm92YEh8
zIe$6+E67?6@^XJsBhGIr=P$<(Lzen4+oxaJ(4~G!`9Fe}Vo%D;^;Mo9bBL7VlJP0q
zm*emj>WuBn^A=8D$HWTp&aq<rOFg4y@`|g2v$}Y(jTePaDJRQQs4=#`O~`L^aS>^!
zR3POf{xJZe$^MTB`5i9KA?G>A&WwM0C6d~ANCr_#`ITjK;Z7z)Ra5aV+cvUJaC6Ke
z1w>^T%Jj(CH_C5m<yeiFfL{knAuana`$g4bwZDx$EL4=0WfP{necsC0pLB9ZquF&v
zC7tjg*GXe#1uT*4Un#w^u&*wqPf!k;T}BdvD-f-69Wqu{V5ODoODWx=$aSNXex4%N
zgHrlLMdtZZ`lLesE~QUaWL_?%PeGn_8A%MTKt_>y)L4lhAu5IZXsD>bw=^>E8OZSF
zROB(2k;LE%oIoS<l(Dh`C!xsvQ%awPe9~bgF}MP!8p(WNtgKMJrpP={O2=J^m|vyz
z8b!|AQhM=Rol^QGMwG!6mzBzUG#yJWT60Y}hvx;+u8iMlg8pI|o%VYs_?doOMVHJU
zHo#-)p98uHcVFfHq3>hNIB}->0vDj-bt6EcyUOT6K`+0Ly$f`*|4^BoDMmkYytWHH
zTg&u6%lOY6_amT>)vxjTdyMIss%)R{0#v+C102f_#4(nB`rQbfgj61H7lLjYBd#tN
z{N-`$Wc+8w)pF43oTZa9T+|SJ&aaypT_A=cJPv(m9QqH&q5muBszI*=e+l|n=S022
z_|J_09O&muVMF;Tqfb$`UhZO4_FWU8Ds+(gTV2EH>^nTrr-NRNyL$TBukpH)@f#@|
zUL^FCpHJmt^fU9)GQmGE&BYWvE>wEQ(NDj9W_Akuza#iJN<9~GJxM|T8$myMA*ZwN
zN>TUyarFO8@Nc<<^Rw?B!T+?N9}@FI+L;+g&nx55-v^!iS)Q-xORurUi+=V$7X3=l
zRoGR2%?Ev|xklOU>L{sdBDx{}%VqgS(8-?zGhB>6B&7U|E)YYJ0KFRd<gly5Kvk5x
zgdTa0qO81k96jF^ddlN!tI#9YHTGRCl>KBJJv%^GWn+f&SL5&>1)cm;-tIf&@Sh7u
zjivtz(9g%6uY4XTo2H{H#yYo+j$t4_t211TRcw!x7D4Zr&gtyCTH=r|ecA&GdjSm3
zQrPQUDBIi~PwT4XN&qio=?T2-AHYd!E1FmPyshnPd_M5SLhHkEJje0ry*`}W774|1
zX4@GgpD!5ot?!9;`g?pqJsQKi=!t#>4@dfXLONbcUa;_*xzIcY6W+v)g!w}kAA30-
z=ef~inqZ>0myVe;U_N@fQ^G2H=EEB~%=Bfe-78ysEvr1Rop(gSC9*hN&U5Q3_sZ60
za2aaYTWN}Kx%Y-9x7T;WvSsZpYkX_mP2Lt#hqtr>zCb*|OlHT<xm@y~IXY6V^uW4e
z9UVP~XJT}2UXe%w{P4R{ny+=uN?+0KYgRUs)7Q}3G*CjXpOx~{vnYP-9a-cLmewv0
z>3FY4yb|T1$5#9`S`D0`*fPAYtN23faTY(8uT(n34*uiaWf6le!bOH-|BC!LY0ub}
z!e3i1Hm=-ENBbFYeqdlx0Xc*l*A$L0%h>ye((i0&*nxkgBK)YqQW^rS=oNS#=LVKC
zu(J$HNo5BJLPb34>&ENU<f7Ia&~LoV=EKXYbTDBd5-4`WQHEveLJ=_Xcw%QFmR0-k
z^iWjuLk#H!v@)I*8-1(ARBP_>$K#lK{D8zVJ|BXl5c7s36N_vVfh@4()GY}sHUlWQ
WFy2KO8jrQ?B|Z$A;>F8+RQ`VyzOW?#

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 19039ad569..a7f6067b20 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ __Sming Contributing flow__:
 
 4. Document your code
 
-  As a bare minimum, please include a `README.rst` or `README.md` file. See :doc:`/contribute/documentation` for further information.
+  As a bare minimum, please include a `README.rst` or `README.md` file. See :doc:`/information/develop/documentation` for further information.
 
 5. Commit changes
 
diff --git a/Sming/Arch/Esp32/README.rst b/Sming/Arch/Esp32/README.rst
index 6a39bb46d8..5c249ba8a9 100644
--- a/Sming/Arch/Esp32/README.rst
+++ b/Sming/Arch/Esp32/README.rst
@@ -15,15 +15,19 @@ Requirements
 ------------
 
 In order to be able to compile for the ESP32 architecture you should have ESP-IDF v4.1 installed.
-A detailed installation manual can be found in the `ESP-IDF documentation <https://docs.espressif.com/projects/esp-idf/en/v4.1/get-started/index.html#installation-step-by-step>`__.
+The Sming installers can do this for you - see :doc:`/getting-started/index`.
+
+You can find further details in the `ESP-IDF documentation <https://docs.espressif.com/projects/esp-idf/en/v4.1/get-started/index.html#installation-step-by-step>`__.
 
 Building
 --------
 
-Make sure that the IDF_PATH environmental variable is set. Also make sure that the other ESP-IDF environmental variables are set.
-For example on Linux this can be done using the following command::
+Make sure that the :envvar:`IDF_PATH` is set.
+Also make sure that the other ESP-IDF environmental variables are set.
+
+In Linux this can be done using the following command::
 
-  source $IDF_PATH/export.sh
+  source $SMING_HOME/Tools/export.sh
 
 Build the framework and application as usual, specifying :envvar:`SMING_ARCH` =Esp32. For example::
 
@@ -51,6 +55,13 @@ If you want to revert to using the default pre-compiled SDK then issue the follo
 
   make SMING_ARCH=Esp32 sdk-default
 
+.. note::
+
+   If you have an ESP32-S2 device you'll need to change :envvar:`ESP_VARIANT`::
+   
+      make ESP_VARIANT=esp32s2
+
+See :component-esp32:`esp32` for further details.
 
 Components
 ----------
diff --git a/Sming/Arch/Esp32/Tools/ci/install.cmd b/Sming/Arch/Esp32/Tools/ci/install.cmd
index 087ec4fa00..7007813206 100644
--- a/Sming/Arch/Esp32/Tools/ci/install.cmd
+++ b/Sming/Arch/Esp32/Tools/ci/install.cmd
@@ -1,5 +1,8 @@
 REM Esp32 install.cmd
 
+if "%IDF_PATH%"=="" goto :EOF
+if "%IDF_TOOLS_PATH%"=="" goto :EOF
+
 git clone -b release/v4.1 https://github.com/espressif/esp-idf.git %IDF_PATH%
 
 REM Espressif downloads very slow, fetch from SmingTools
diff --git a/Sming/Arch/Esp32/Tools/ci/install.sh b/Sming/Arch/Esp32/Tools/ci/install.sh
deleted file mode 100755
index 17a7577081..0000000000
--- a/Sming/Arch/Esp32/Tools/ci/install.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Esp32 install.sh
-
-sudo apt-get install -y git wget flex bison gperf ninja-build ccache libffi-dev libssl-dev dfu-util
-
-git clone -b release/v4.1 https://github.com/espressif/esp-idf.git $IDF_PATH
-
-# Espressif downloads very slow, fetch from SmingTools
-mkdir -p $IDF_TOOLS_PATH
-ESPTOOLS=esp32-tools-linux-4.1.zip
-wget --no-verbose $SMINGTOOLS/$ESPTOOLS
-unzip $ESPTOOLS -d $IDF_TOOLS_PATH/dist
-
-python $IDF_PATH/tools/idf_tools.py install
-python -m pip install -r $IDF_PATH/requirements.txt
diff --git a/Sming/Arch/Esp32/Tools/install.sh b/Sming/Arch/Esp32/Tools/install.sh
new file mode 100755
index 0000000000..6639c15ffc
--- /dev/null
+++ b/Sming/Arch/Esp32/Tools/install.sh
@@ -0,0 +1,50 @@
+# Esp32 install.sh
+
+if [ -n "$IDF_PATH" ] && [ -n "$IDF_TOOLS_PATH" ]; then
+
+PACKAGES=(\
+    bison \
+    ccache \
+    dfu-util \
+    flex \
+    gperf \
+    ninja-build \
+    )
+
+case $DIST in
+    debian)
+        PACKAGES+=(\
+            libffi-dev \
+            libssl-dev \
+            )
+        ;;
+
+    fedora)
+        PACKAGES+=(\
+            libffi-devel \
+            )
+        ;;
+esac
+
+$PKG_INSTALL ${PACKAGES[*]}
+
+if [ -d "$IDF_PATH" ]; then
+    printf "\n\n** Skipping ESP-IDF clone: '$IDF_PATH' exists\n\n"
+else
+    git clone -b release/v4.1 https://github.com/espressif/esp-idf.git $IDF_PATH
+fi
+
+# Espressif downloads very slow, fetch from SmingTools
+mkdir -p $IDF_TOOLS_PATH
+ESPTOOLS=esp32-tools-linux-4.1.zip
+$WGET $SMINGTOOLS/$ESPTOOLS -O $DOWNLOADS/$ESPTOOLS
+unzip $DOWNLOADS/$ESPTOOLS -d $IDF_TOOLS_PATH/dist
+
+python3 $IDF_PATH/tools/idf_tools.py install
+python3 -m pip install -r $IDF_PATH/requirements.txt
+
+if [ -z "$KEEP_DOWNLOADS" ]; then
+    rm -rf $IDF_TOOLS_PATH/dist
+fi
+
+fi
diff --git a/Sming/Arch/Esp8266/README.rst b/Sming/Arch/Esp8266/README.rst
index b97391a15c..a001a3c628 100644
--- a/Sming/Arch/Esp8266/README.rst
+++ b/Sming/Arch/Esp8266/README.rst
@@ -3,6 +3,7 @@ Sming Esp8266 Architecture
 
 Support building Sming for the Esp8266 architecture.
 
+See also :doc:`/arch/esp8266/getting-started/eqt`.
 
 Build variables
 ---------------
diff --git a/Sming/Arch/Esp8266/Tools/ci/install.cmd b/Sming/Arch/Esp8266/Tools/ci/install.cmd
index 8aa477c552..e7525a4b2a 100644
--- a/Sming/Arch/Esp8266/Tools/ci/install.cmd
+++ b/Sming/Arch/Esp8266/Tools/ci/install.cmd
@@ -1,10 +1,11 @@
 REM Esp8266 install.cmd
 
-call :install %UDK_ROOT% esp-udk-win32.7z
-call :install %EQT_ROOT% x86_64-w64-mingw32.xtensa-lx106-elf-e6a192b.201211.zip
+call :install "%UDK_ROOT%" esp-udk-win32.7z
+call :install "%EQT_ROOT%" x86_64-w64-mingw32.xtensa-lx106-elf-e6a192b.201211.zip
 goto :EOF
 
 :install
+if "%1"=="" goto :EOF
 mkdir %1
 curl -LO %SMINGTOOLS%/%2
 7z -o%1 x %2
diff --git a/Sming/Arch/Esp8266/Tools/ci/install.sh b/Sming/Arch/Esp8266/Tools/ci/install.sh
deleted file mode 100755
index 87a3918c0f..0000000000
--- a/Sming/Arch/Esp8266/Tools/ci/install.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-# Esp8266 install.sh
-
-# Old toolchain
-TOOLCHAIN=esp-open-sdk-linux-x86_64.tar.gz
-wget --no-verbose $SMINGTOOLS/$TOOLCHAIN
-tar -zxf $TOOLCHAIN
-mkdir -p $UDK_ROOT
-ln -s $(pwd)/esp-open-sdk/xtensa-lx106-elf $UDK_ROOT/.
-
-# New toolchain
-TOOLCHAIN=x86_64-linux-gnu.xtensa-lx106-elf-e6a192b.201211.tar.gz
-wget --no-verbose $SMINGTOOLS/$TOOLCHAIN
-mkdir -p $EQT_ROOT
-tar -zxf $TOOLCHAIN -C $EQT_ROOT --totals
diff --git a/Sming/Arch/Esp8266/Tools/docker/Dockerfile b/Sming/Arch/Esp8266/Tools/docker/Dockerfile
deleted file mode 100644
index 98b53dfe02..0000000000
--- a/Sming/Arch/Esp8266/Tools/docker/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# ------------------------------------
-# Fast dockerized development environment 
-# for the Sming Framework: https://github.com/SmingHub/Sming.git
-# ------------------------------------
-FROM attachix/c9-esp8266-sdk:latest
-MAINTAINER Slavey Karadzhov <slav@attachix.com>
-
-COPY assets/welcome.html /cloud9/plugins/c9.ide.welcome/welcome.html
-COPY assets/welcome.js /cloud9/plugins/c9.ide.welcome/welcome.js
-
-RUN git clone https://github.com/SmingHub/Sming.git /workspace/Sming 
-
-ENV SMING_HOME /workspace/Sming/Sming
-
-ENTRYPOINT /usr/bin/supervisord
diff --git a/Sming/Arch/Esp8266/Tools/install.sh b/Sming/Arch/Esp8266/Tools/install.sh
new file mode 100755
index 0000000000..c940fcd930
--- /dev/null
+++ b/Sming/Arch/Esp8266/Tools/install.sh
@@ -0,0 +1,26 @@
+# Esp8266 install.sh
+
+# Old toolchain
+if [ -n "$UDK_ROOT" ]; then
+    if [ -d "$EQT_ROOT" ]; then
+        printf "\n\n** Skipping Esp8266 tools installation: '$EQT_ROOT' exists\n\n"
+    else
+        TOOLCHAIN=esp-open-sdk-linux-x86_64.tar.gz
+        $WGET $SMINGTOOLS/$TOOLCHAIN -O $DOWNLOADS/$TOOLCHAIN
+        tar -zxf $DOWNLOADS/$TOOLCHAIN
+        mkdir -p $UDK_ROOT
+        ln -s $(pwd)/esp-open-sdk/xtensa-lx106-elf $UDK_ROOT/.
+    fi
+fi
+
+# New toolchain
+if [ -n "$EQT_ROOT" ]; then
+    if [ -d "$EQT_ROOT" ]; then
+        printf "\n\n** Skipping Esp8266 tools installation: '$EQT_ROOT' exists\n\n"
+    else
+        TOOLCHAIN=x86_64-linux-gnu.xtensa-lx106-elf-e6a192b.201211.tar.gz
+        $WGET $SMINGTOOLS/$TOOLCHAIN -O $DOWNLOADS/$TOOLCHAIN
+        mkdir -p $EQT_ROOT
+        tar -zxf $DOWNLOADS/$TOOLCHAIN -C $EQT_ROOT --totals
+    fi
+fi
diff --git a/Sming/Arch/Host/Components/vflash/README.rst b/Sming/Arch/Host/Components/vflash/README.rst
index 862312c3af..5fa2f06fa0 100644
--- a/Sming/Arch/Host/Components/vflash/README.rst
+++ b/Sming/Arch/Host/Components/vflash/README.rst
@@ -21,7 +21,7 @@ The following options are interpreted and used to provide command-line parameter
 
 The size of the flash memory is set via :ref:`hardware_config`.
 
-See :component-esp8266:`esptool` for details and other applicable variables.
+See :component:`esptool` for details and other applicable variables.
 
 
 Build targets
diff --git a/Sming/Arch/Host/README.rst b/Sming/Arch/Host/README.rst
index 7e20eca7b6..96867e170f 100644
--- a/Sming/Arch/Host/README.rst
+++ b/Sming/Arch/Host/README.rst
@@ -26,7 +26,7 @@ For Linux, you may require the ``gcc-multilib`` and ``g++-multilib``
 packages to build 32-bit executables on a 64-bit OS.
 
 For Windows, make sure your ``MinGW`` distro is up to date.
-See :doc:`/arch/esp8266/getting-started/windows-manual` for further details.
+See :doc:`/getting-started/windows` for further details.
 
 Building
 --------
@@ -58,12 +58,3 @@ Components
 
    Components/sming-arch/index
    Components/*/index
-
-
-todo
-----
-
-* Add passthrough support for real serial ports to permit connection of physical devices.
-* Consider how this mechanism might be used to support emulation of other devices (SPI, I2C, etc).
-* Development platforms with SPI or I2C (e.g. Raspberry Pi) could be supported.
-* Are there any generic device emulators available? For example, to simulate specific types of SPI slave.
diff --git a/Sming/Arch/Host/Tools/ci/build.setup.sh b/Sming/Arch/Host/Tools/ci/build.setup.sh
index 2dc3d0c044..a2370b039b 100755
--- a/Sming/Arch/Host/Tools/ci/build.setup.sh
+++ b/Sming/Arch/Host/Tools/ci/build.setup.sh
@@ -3,7 +3,7 @@
 # Check coding style
 make cs
 DIFFS=$(git diff)
-if [ "$DIFFS" != "" ]; then
+if [ -n "$DIFFS" ]; then
   echo "!!! Coding Style issues Found!!!"
   echo "    Run: 'make cs' to fix them. "
   echo "$DIFFS"
@@ -13,7 +13,7 @@ fi
 # Make deployment keys, etc. available
 set +x
 if [ -n "$SMING_SECRET" ]; then
-  openssl aes-256-cbc -d -a -iter 100 -in $CI_BUILD_DIR/.ci/secrets.sh.enc -out /tmp/secrets.sh -pass pass:$SMING_SECRET
+  openssl aes-256-cbc -d -a -iter 100 -in $CI_BUILD_DIR/Tools/ci/secrets.sh.enc -out /tmp/secrets.sh -pass pass:$SMING_SECRET
   source /tmp/secrets.sh
   unset SMING_SECRET
 fi
diff --git a/Sming/Arch/Host/Tools/ci/install.cmd b/Sming/Arch/Host/Tools/ci/install.cmd
index 3cee90ae9a..556cb4dd2f 100644
--- a/Sming/Arch/Host/Tools/ci/install.cmd
+++ b/Sming/Arch/Host/Tools/ci/install.cmd
@@ -1,8 +1,14 @@
 REM Host install.cmd
 
-curl -LO https://doxygen.nl/files/doxygen-1.9.1-setup.exe
-doxygen-1.9.1-setup /silent
-
-choco install -y graphviz
+call :install "c:\tools\doxygen" doxygen-1.9.1.windows.bin.zip
+call :install "c:\tools" stable_windows_10_msbuild_Release_Win32_graphviz-2.46.1-win32.zip
 
 python -m pip install -r %SMING_HOME%/../docs/requirements.txt
+
+goto :EOF
+
+:install
+if "%~1"=="" goto :EOF
+mkdir %1
+curl -LO %SMINGTOOLS%/%2
+7z -o%1 -y x %2
diff --git a/Sming/Arch/Host/Tools/ci/install.sh b/Sming/Arch/Host/Tools/ci/install.sh
deleted file mode 100755
index 673729e2fc..0000000000
--- a/Sming/Arch/Host/Tools/ci/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Host install.sh
-
-sudo apt-get install -y clang-format-6.0 \
-  python3-sphinx python3-setuptools python3-cairocffi \
-  doxygen graphviz-dev xmlstarlet jq
-sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 100
-
-python -m pip install -r $SMING_HOME/../docs/requirements.txt
diff --git a/Sming/Arch/Host/Tools/install.sh b/Sming/Arch/Host/Tools/install.sh
new file mode 100755
index 0000000000..4b21178d6b
--- /dev/null
+++ b/Sming/Arch/Host/Tools/install.sh
@@ -0,0 +1,8 @@
+# Host install.sh
+
+# Required by deployment script
+if [ -n "$APPVEYOR" ]; then
+    $PKG_INSTALL \
+        jq \
+        xmlstarlet
+fi
diff --git a/Sming/Libraries/Adafruit_ILI9341/component.mk b/Sming/Libraries/Adafruit_ILI9341/component.mk
index 169766e78e..91e2591dae 100644
--- a/Sming/Libraries/Adafruit_ILI9341/component.mk
+++ b/Sming/Libraries/Adafruit_ILI9341/component.mk
@@ -10,7 +10,7 @@ else ifeq ($(SMING_ARCH),Esp32)
 TFT_CS_PIN		?= 18
 TFT_DC_PIN		?= 19
 TFT_RESET_PIN	?= 21
-else
+else ifndef MAKE_DOCS
 $(warning Arch unsupported)
 endif
 
diff --git a/Sming/README.rst b/Sming/README.rst
index f199106129..bc32255df2 100644
--- a/Sming/README.rst
+++ b/Sming/README.rst
@@ -18,7 +18,7 @@ Serial Communications
 
    This will recompile your application to use the revised baud rate.
    Note that this will change the default speed used for both flashing and serial comms.
-   See also :component-esp8266:`esptool` and :component:`terminal` for further details.
+   See also :component:`esptool` and :component:`terminal` for further details.
 
 The default rate for serial ports is 115200 baud. You can change it like this::
 
diff --git a/Sming/building.rst b/Sming/building.rst
index 988a84fb50..397d553f0a 100644
--- a/Sming/building.rst
+++ b/Sming/building.rst
@@ -132,7 +132,7 @@ Hardware configuration
 
 The appropriate hardware configuration should be selected in the
 project's component.mk file. Use one of the standard configurations
-or create your own. See :ref:`hardware-config`.
+or create your own. See :ref:`hardware_config`.
 
 Configuration variables
 ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Sming/project.mk b/Sming/project.mk
index 39f0b48561..9833848499 100644
--- a/Sming/project.mk
+++ b/Sming/project.mk
@@ -486,7 +486,7 @@ cs-dev: ##Apply coding style to all files changed from current upstream develop
 	$(SMING_MAKE) $@
 
 .PHONY: gdb
-gdb: kill_term ##Run the debugger console
+gdb: ##Run the debugger console
 	$(GDB_CMDLINE)
 
 .PHONY: fetch
@@ -544,6 +544,18 @@ otaserver: all ##Launch a simple python HTTP server for testing OTA updates
 	$(info Starting OTA server for TESTING)
 	$(Q) cd $(FW_BASE) && $(PYTHON) -m SimpleHTTPServer $(SERVER_OTA_PORT)
 
+
+#
+.PHONY: tcp-serial-redirect
+tcp-serial-redirect: ##Redirect COM port to TCP port
+	$(info Starting serial redirector)
+ifdef WSL_ROOT
+	$(Q) cmd.exe /c start /MIN python3 $(WSL_ROOT)/$(SMING_HOME)/../Tools/tcp_serial_redirect.py $(COM_PORT) $(COM_SPEED_SERIAL)
+else
+	$(Q) gnome-terminal -- bash -c "$(PYTHON) $(SMING_HOME)/../Tools/tcp_serial_redirect.py $(COM_PORT) $(COM_SPEED_SERIAL)"
+endif
+
+
 ##@Help
 
 .PHONY: list-config
diff --git a/Sming/Arch/Esp8266/Tools/docker/README.md b/Tools/Docker/README.md
similarity index 100%
rename from Sming/Arch/Esp8266/Tools/docker/README.md
rename to Tools/Docker/README.md
diff --git a/Tools/Docker/cli/Dockerfile b/Tools/Docker/cli/Dockerfile
new file mode 100644
index 0000000000..4a49c5cd20
--- /dev/null
+++ b/Tools/Docker/cli/Dockerfile
@@ -0,0 +1,43 @@
+FROM ubuntu
+
+# ------------------------------------------------------------------------------
+# Set Environment
+# ------------------------------------------------------------------------------
+
+# Common
+ENV SMING_HOME /opt/Sming/Sming
+ENV PYTHON /usr/bin/python3
+
+# Esp8266
+#ENV UDK_ROOT /opt/esp-open-sdk
+ENV EQT_ROOT /opt/esp-quick-toolchain
+ENV ESP_HOME $EQT_ROOT
+
+# Esp32
+ENV IDF_PATH /opt/esp-idf
+ENV IDF_TOOLS_PATH /opt/esp32
+ENV ESP32_PYTHON_PATH $PYTHON
+
+# ------------------------------------------------------------------------------
+# Pre-requisites
+# ------------------------------------------------------------------------------
+
+RUN apt-get -y update \
+    && DEBIAN_FRONTEND=noninteractive \
+    TZ=Europe/London \
+    apt-get install -y \
+    git \
+    sudo \
+    tzdata
+
+# ------------------------------------------------------------------------------
+# Fetch Sming and install tools
+# ------------------------------------------------------------------------------
+
+ARG SMING_BRANCH=develop
+ARG SMING_REPO=SmingHub/Sming
+ARG INSTALL_ARGS=all
+
+RUN git clone -b $SMING_BRANCH -- https://github.com/$SMING_REPO $(readlink -m $SMING_HOME/..)
+
+RUN $SMING_HOME/../Tools/install.sh $INSTALL_ARGS
diff --git a/Tools/Docker/cli/docker-compose.yml b/Tools/Docker/cli/docker-compose.yml
new file mode 100644
index 0000000000..15c63a5d56
--- /dev/null
+++ b/Tools/Docker/cli/docker-compose.yml
@@ -0,0 +1,16 @@
+sming-cli:
+
+  build: .
+
+# Uncomment the lines below if you want to use the source code in your host computer
+#  volumes:
+#    - ../../Sming/:/workspace/Sming/
+
+  ports:
+    - "10080:80"
+
+# Modify the line below if you serial adapter is mapped to a different port
+#  devices:
+#    - "/dev/ttyUSB0:/dev/ttyUSB0"
+
+  privileged: true
diff --git a/Tools/Docker/ide/Dockerfile b/Tools/Docker/ide/Dockerfile
new file mode 100644
index 0000000000..bc046b46a3
--- /dev/null
+++ b/Tools/Docker/ide/Dockerfile
@@ -0,0 +1,42 @@
+# ------------------------------------
+# Fast dockerized development environment 
+# for the Sming Framework: https://github.com/SmingHub/Sming.git
+# ------------------------------------
+FROM docker_sming-cli
+MAINTAINER Slavey Karadzhov "slav@attachix.com"
+
+# ------------------------------------------------------------------------------
+# Install Cloud9 and Supervisor
+# ------------------------------------------------------------------------------
+
+RUN apt-get update -y \
+    && apt-get install -y \
+        apache2-utils \
+      	libxml2-dev \
+        locales-all \
+      	npm \
+      	nodejs \
+      	sshfs \
+      	supervisor \
+      	tmux
+
+RUN git clone https://github.com/c9/core.git /cloud9 \
+    && curl -s -L https://raw.githubusercontent.com/c9/install/master/install.sh | bash \
+    && /cloud9/scripts/install-sdk.sh \
+    && sed -i -e 's_127.0.0.1_0.0.0.0_g' /cloud9/configs/standalone.js \
+    && mkdir -p /var/log/supervisor
+
+ADD supervisord.conf /etc/
+
+# VOLUME /workspace
+
+EXPOSE 80
+
+SHELL ["/bin/bash", "-c"]
+
+CMD ["/usr/bin/supervisord", "--nodaemon", "--configuration", "/etc/supervisord.conf"]
+
+COPY assets/welcome.html /cloud9/plugins/c9.ide.welcome/welcome.html
+COPY assets/welcome.js /cloud9/plugins/c9.ide.welcome/welcome.js
+
+ENTRYPOINT /usr/bin/supervisord
diff --git a/Tools/Docker/ide/LICENSE b/Tools/Docker/ide/LICENSE
new file mode 100644
index 0000000000..725e164f24
--- /dev/null
+++ b/Tools/Docker/ide/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Slavey Karadzhov
+Copyright (c) 2014 Kevin Delfour
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Sming/Arch/Esp8266/Tools/docker/assets/welcome.html b/Tools/Docker/ide/assets/welcome.html
similarity index 64%
rename from Sming/Arch/Esp8266/Tools/docker/assets/welcome.html
rename to Tools/Docker/ide/assets/welcome.html
index eae672a9f8..1dbce867cf 100644
--- a/Sming/Arch/Esp8266/Tools/docker/assets/welcome.html
+++ b/Tools/Docker/ide/assets/welcome.html
@@ -6,7 +6,7 @@
 
         <div class="next">
               Welcome to the simplified Sming development environment. If you look on the left side you will see a workspace pane.
-              Under workscpace/Sming/samples you will find all available examples that will get you started.
+              Under workspace/Sming/samples you will find all available examples that will get you started.
               If you want to compile your first project we recommend you to try the Basic_Blink project.
               To do this go to the <a href="#" class="openterminal">terminal window</a> and type in there:
               <pre>
@@ -25,15 +25,10 @@
     <div class="sidepanel">
         <h3>Docs</h3>
         <div class="article">
-            <h4><a href="https://sminghub.github.io/Sming/api/" target="_blank">API documentations</a></h4>
-            <p>This is the documentation for the API of Sming - a C++ framework for development on the ESP8266 microcontroller platform.</p>
+            <h4><a href="https://sming.readthedocs.io/" target="_blank">Sming Documentation</a></h4>
+            <p>This is the documentation for Sming - a C++ framework for development on the ESP8266 microcontroller platform.</p>
         </div>
-        
-        <div class="article">
-            <h4><a href="https://github.com/SmingHub/Sming/wiki" target="_blank">Wiki</a></h4>
-            <p>Short introductory articles can be find in our Wik.</p>
-        </div>
-        
+
         <br /><br />
     </div>
 </html>
diff --git a/Sming/Arch/Esp8266/Tools/docker/assets/welcome.js b/Tools/Docker/ide/assets/welcome.js
similarity index 100%
rename from Sming/Arch/Esp8266/Tools/docker/assets/welcome.js
rename to Tools/Docker/ide/assets/welcome.js
diff --git a/Sming/Arch/Esp8266/Tools/docker/docker-compose.yml b/Tools/Docker/ide/docker-compose.yml
similarity index 53%
rename from Sming/Arch/Esp8266/Tools/docker/docker-compose.yml
rename to Tools/Docker/ide/docker-compose.yml
index 84ca1fa873..5153c90ce8 100644
--- a/Sming/Arch/Esp8266/Tools/docker/docker-compose.yml
+++ b/Tools/Docker/ide/docker-compose.yml
@@ -1,16 +1,16 @@
 sming-ide:
 
- build: .
+  build: .
  
 # Uncomment the lines below if you want to use the source code in you host computer
-# volumes:
-#  - ../../Sming/:/workspace/Sming/
-   
- ports:
- - "10080:80"
- 
- devices:
+#  volumes:
+#    - ../../Sming/:/workspace/Sming/
+
+  ports:
+    - "10080:80"
+
+  devices:
 # Modify the line below if you serial adapter is mapped to a different port
- - "/dev/ttyUSB0:/dev/ttyUSB0"
+    - "/dev/ttyUSB0:/dev/ttyUSB0"
  
- privileged: true
\ No newline at end of file
+  privileged: true
diff --git a/Tools/Docker/ide/supervisord.conf b/Tools/Docker/ide/supervisord.conf
new file mode 100644
index 0000000000..bff2a07b3c
--- /dev/null
+++ b/Tools/Docker/ide/supervisord.conf
@@ -0,0 +1,14 @@
+[supervisord]
+nodaemon=true
+pidfile=/var/run/supervisord.pid
+logfile=/var/log/supervisor/supervisord.log
+
+[program:cloud9]
+command = node /cloud9/server.js --listen 0.0.0.0 --port 80 -w /workspace
+directory = /cloud9
+user = root
+autostart = true
+autorestart = true
+stdout_logfile = /var/log/supervisor/cloud9.log
+stderr_logfile = /var/log/supervisor/cloud9_errors.log
+environment = NODE_ENV="production"
diff --git a/Tools/choco-install.cmd b/Tools/choco-install.cmd
new file mode 100644
index 0000000000..6d98056ef0
--- /dev/null
+++ b/Tools/choco-install.cmd
@@ -0,0 +1,19 @@
+@echo off
+
+REM
+REM Sming installer bootstrap script for Windows
+REM
+
+REM Fetch the Chocolatey powershell installer script.
+REM Note: Local scripts are blocked by default for 'security reasons'
+REM Microsoft have kindly set up some hoops for us to jump through
+REM (presumably making this 'secure'). OK, lets jump now.
+REM Warning: Get the fire extinguisher, hoops may be on fire.
+@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))"
+if "%errorlevel%" == "1" then goto :EOF
+
+SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
+
+choco sources add -name smingrepo -source 'https://www.myget.org/F/sming/'
+
+choco install -y sming
diff --git a/.ci/build.cmd b/Tools/ci/build.cmd
similarity index 100%
rename from .ci/build.cmd
rename to Tools/ci/build.cmd
diff --git a/.ci/build.sh b/Tools/ci/build.sh
similarity index 100%
rename from .ci/build.sh
rename to Tools/ci/build.sh
diff --git a/.ci/deploy.sh b/Tools/ci/deploy.sh
similarity index 100%
rename from .ci/deploy.sh
rename to Tools/ci/deploy.sh
diff --git a/.ci/install.cmd b/Tools/ci/install.cmd
similarity index 76%
rename from .ci/install.cmd
rename to Tools/ci/install.cmd
index 9dfc9811b3..aa49e52a34 100644
--- a/.ci/install.cmd
+++ b/Tools/ci/install.cmd
@@ -1,5 +1,7 @@
 REM Windows install script
 
+set SMINGTOOLS=https://github.com/SmingHub/SmingTools/releases/download/1.0
+
 python -m pip install --upgrade pip -r %SMING_HOME%\..\Tools\requirements.txt
 
 rmdir /s /q c:\MinGW
diff --git a/.ci/secrets.sh.enc b/Tools/ci/secrets.sh.enc
similarity index 100%
rename from .ci/secrets.sh.enc
rename to Tools/ci/secrets.sh.enc
diff --git a/Tools/export.sh b/Tools/export.sh
new file mode 100755
index 0000000000..a9b9e7facd
--- /dev/null
+++ b/Tools/export.sh
@@ -0,0 +1,35 @@
+#
+# Set default environment variables from shell:
+#
+#       source export.sh
+#
+# Do this **before** calling install.sh
+#
+# These variables should be persisted.
+# For example, with Ubuntu list these in ~/.pam_environment file:
+#
+#   SMING_HOME=/opt/sming/Sming
+#   etc...
+#
+# With Windows WSL you can append them in .bashrc instead:
+#
+#   export SMING_HOME=/opt/sming/Sming
+#   etc...
+#
+
+if [ -z "$SMING_HOME" ]; then
+    export SMING_HOME=$(readlink -m $BASH_SOURCE/../../Sming)
+fi
+
+# Common
+export PYTHON=${PYTHON:=/usr/bin/python3}
+
+# Esp8266
+#export UDK_ROOT=${UDK_ROOT:=/opt/esp-open-sdk}
+export EQT_ROOT=${EQT_ROOT:=/opt/esp-quick-toolchain}
+export ESP_HOME=${ESP_HOME:=$EQT_ROOT}
+
+# Esp32
+export IDF_PATH=${IDF_PATH:=/opt/esp-idf}
+export IDF_TOOLS_PATH=${IDF_TOOLS_PATH:=/opt/esp32}
+export ESP32_PYTHON_PATH=${ESP32_PYTHON_PATH:=/usr/bin}
diff --git a/Tools/install.sh b/Tools/install.sh
new file mode 100755
index 0000000000..c739ba63c7
--- /dev/null
+++ b/Tools/install.sh
@@ -0,0 +1,184 @@
+#!/bin/bash -e
+#
+# This file should be sourced after pulling in Sming repo, i.e:
+#
+#    . /opt/sming/Tools/install.sh
+#
+
+set -e
+
+[ "$0" = "$BASH_SOURCE" ]; sourced=$?
+
+inst_host=0
+inst_doc=0
+inst_esp8266=0
+inst_esp32=0
+err=0
+
+for opt in "$@"; do
+    case $opt in
+        all)
+            inst_host=1
+            inst_doc=1
+            inst_esp8266=1
+            inst_esp32=1
+            ;;
+
+        host | doc | esp8266 | esp32)
+            eval "inst_$opt=1"
+            ;;
+
+        *)
+            echo "Unknown option '$opt'"
+            err=1
+            ;;
+    esac
+done
+
+if [[ $err -eq 1 ]] || [ $# -eq 0 ]; then
+    echo 'Sming Installation options:'
+    echo '   host      Host development tools'
+    echo '   doc       Tools required to build documentation'
+    echo '   esp8266   ESP8266 development tools'
+    echo '   esp32     ESP32 development tools'
+    echo '   all       Install everything'
+    echo
+    if [ $sourced = 1 ]; then
+        return 1
+    else
+        exit 1
+    fi
+fi
+
+# Sming repository for binary archives
+SMINGTOOLS=https://github.com/SmingHub/SmingTools/releases/download/1.0
+
+# Set default environment variables and WGET options
+if [ -z "$APPVEYOR" ]; then
+    source $(dirname $BASH_SOURCE)/export.sh
+
+    # Ensure default path is writeable
+    sudo mkdir -p /opt
+    sudo chown $USER:$USER /opt
+
+    WGET="wget"
+else
+    # Don't clutter up logfiles for CI builds
+    WGET="wget --no-verbose"
+fi
+
+# Installers put downloaded archives here
+DOWNLOADS="downloads"
+mkdir -p $DOWNLOADS
+
+# Identify package installer for distribution
+if [ -n "$(grep debian /etc/os-release)" ]; then
+    DIST=debian
+    PKG_INSTALL="sudo apt-get install -y"
+elif [ -n "$(grep fedora /etc/os-release)" ]; then
+    DIST=fedora
+    PKG_INSTALL="sudo dnf install -y"
+else
+    echo "Unsupported distribution"
+    if [ $sourced = 1 ]; then
+        return 1
+    else
+        exit 1
+    fi
+fi
+
+# Common install
+
+if [ -n "$APPVEYOR" ] || [ -n "$GITHUB_ACTION" ]; then
+
+    sudo apt-get -y update
+    $PKG_INSTALL \
+        clang-format-6.0 \
+        g++-9-multilib \
+        python3-setuptools
+
+    sudo update-alternatives --set gcc /usr/bin/gcc-9
+
+else
+
+    case $DIST in
+        debian)
+            sudo apt-get -y update
+            $PKG_INSTALL \
+                clang-format-6.0 \
+                cmake \
+            	curl \
+            	git \
+            	make \
+                unzip \
+                g++ \
+            	g++-multilib \
+            	python3 \
+            	python3-pip \
+            	python3-setuptools \
+                wget
+            ;;
+
+        fedora)
+            $PKG_INSTALL \
+                cmake \
+                gawk \
+                gcc \
+                gcc-c++ \
+                gettext \
+                git \
+                glibc-devel.i686 \
+                libstdc++.i686 \
+                make \
+                python3 \
+                python3-pip \
+                sed \
+                unzip \
+                wget
+            ;;
+
+    esac
+
+    sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 100
+
+fi
+
+sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 100
+
+python3 -m pip install --upgrade pip -r $SMING_HOME/../Tools/requirements.txt
+
+
+install() {
+    source $SMING_HOME/Arch/$1/Tools/install.sh
+}
+
+if [ $inst_host -eq 1 ]; then
+    install Host
+fi
+
+if [ $inst_doc -eq 1 ]; then
+    source $SMING_HOME/../docs/Tools/install.sh
+fi
+
+if [ $inst_esp8266 -eq 1 ]; then
+    install Esp8266
+fi
+
+if [ $inst_esp32 -eq 1 ]; then
+    install Esp32
+fi
+
+if [ -z "$KEEP_DOWNLOADS" ]; then
+    rm -f $DOWNLOADS/*
+fi
+
+
+echo
+echo Installation complete
+echo
+
+if [ $sourced != 1 ]; then
+    echo "You may need to set environment variables:"
+    echo "  source $SMING_HOME/../Tools/export.sh"
+    echo
+fi
diff --git a/Tools/tcp_serial_redirect.py b/Tools/tcp_serial_redirect.py
new file mode 100644
index 0000000000..500fbeea01
--- /dev/null
+++ b/Tools/tcp_serial_redirect.py
@@ -0,0 +1,232 @@
+#!/usr/bin/env python
+#
+# Redirect data from a TCP/IP connection to a serial port and vice versa.
+#
+# (C) 2002-2020 Chris Liechti <cliechti@gmx.net>
+#
+# SPDX-License-Identifier:    BSD-3-Clause
+#
+
+#
+# Amended 2021 mikee47 <mike@sillyhouse.net>
+#
+# Original source: https://github.com/pyserial/pyserial/blob/master/examples/tcp_serial_redirect.py
+#
+# Amended as follows:
+#   - Client mode removed, server-only;
+#   - Serial port is not opened until client connected
+#   - Serial port closed on client disconnect
+#
+# This allows for simpler sharing of the serial port by other applications (e.g. esptool).
+#
+
+import sys
+import socket
+import serial
+import serial.threaded
+
+
+class SerialToNet(serial.threaded.Protocol):
+    """serial->socket"""
+
+    def __init__(self):
+        self.socket = None
+
+    def __call__(self):
+        return self
+
+    def data_received(self, data):
+        if self.socket is not None:
+            self.socket.sendall(data)
+
+
+if __name__ == '__main__':  # noqa
+    import argparse
+
+    parser = argparse.ArgumentParser(
+        description='Simple Serial to Network (TCP/IP) redirector.',
+        epilog="""\
+NOTE: no security measures are implemented. Anyone can remotely connect
+to this service over the network.
+
+Only one connection at once is supported. When the connection is terminated
+it waits for the next connect.
+""")
+
+    parser.add_argument(
+        'SERIALPORT',
+        help="serial port name")
+
+    parser.add_argument(
+        'BAUDRATE',
+        type=int,
+        nargs='?',
+        help='set baud rate, default: %(default)s',
+        default=115200)
+
+    parser.add_argument(
+        '-q', '--quiet',
+        action='store_true',
+        help='suppress non error messages',
+        default=False)
+
+    parser.add_argument(
+        '--develop',
+        action='store_true',
+        help='Development mode, prints Python internals on errors',
+        default=False)
+
+    group = parser.add_argument_group('serial port')
+
+    group.add_argument(
+        "--bytesize",
+        choices=[5, 6, 7, 8],
+        type=int,
+        help="set bytesize, one of {5 6 7 8}, default: 8",
+        default=8)
+
+    group.add_argument(
+        "--parity",
+        choices=['N', 'E', 'O', 'S', 'M'],
+        type=lambda c: c.upper(),
+        help="set parity, one of {N E O S M}, default: N",
+        default='N')
+
+    group.add_argument(
+        "--stopbits",
+        choices=[1, 1.5, 2],
+        type=float,
+        help="set stopbits, one of {1 1.5 2}, default: 1",
+        default=1)
+
+    group.add_argument(
+        '--rtscts',
+        action='store_true',
+        help='enable RTS/CTS flow control (default off)',
+        default=False)
+
+    group.add_argument(
+        '--xonxoff',
+        action='store_true',
+        help='enable software flow control (default off)',
+        default=False)
+
+    group.add_argument(
+        '--rts',
+        type=int,
+        help='set initial RTS line state (possible values: 0, 1)',
+        default=None)
+
+    group.add_argument(
+        '--dtr',
+        type=int,
+        help='set initial DTR line state (possible values: 0, 1)',
+        default=None)
+
+    group = parser.add_argument_group('network settings')
+
+    exclusive_group = group.add_mutually_exclusive_group()
+
+    exclusive_group.add_argument(
+        '-P', '--localport',
+        type=int,
+        help='local TCP port',
+        default=7780)
+
+    args = parser.parse_args()
+
+    # connect to serial port
+    ser = serial.serial_for_url(args.SERIALPORT, do_not_open=True)
+    ser.baudrate = args.BAUDRATE
+    ser.bytesize = args.bytesize
+    ser.parity = args.parity
+    ser.stopbits = args.stopbits
+    ser.rtscts = args.rtscts
+    ser.xonxoff = args.xonxoff
+
+    if args.rts is not None:
+        ser.rts = args.rts
+
+    if args.dtr is not None:
+        ser.dtr = args.dtr
+
+    if not args.quiet:
+        sys.stderr.write(
+            '--- TCP/IP to Serial redirect on {p.name}  {p.baudrate},{p.bytesize},{p.parity},{p.stopbits} ---\n'
+            '--- type Ctrl-C / BREAK to quit\n'.format(p=ser))
+
+
+    # Determine primary IP address
+    try:
+        with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
+            # doesn't even have to be reachable
+            s.connect(('10.255.255.255', 1))
+            local_ip = s.getsockname()[0]
+    except Exception:
+        local_ip = '127.0.0.1'
+
+    srv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    srv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    srv.bind((local_ip, args.localport))
+    srv.listen(1)
+    try:
+        while True:
+            sys.stderr.write('Waiting for connection on %s:%d...\n' % (str(local_ip), args.localport))
+            client_socket, addr = srv.accept()
+            sys.stderr.write('Connected by {}\n'.format(addr))
+            # More quickly detect bad clients who quit without closing the
+            # connection: After 1 second of idle, start sending TCP keep-alive
+            # packets every 1 second. If 3 consecutive keep-alive packets
+            # fail, assume the client is gone and close the connection.
+            try:
+                client_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, 1)
+                client_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 1)
+                client_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 3)
+                client_socket.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+            except AttributeError:
+                pass # XXX not available on windows
+            client_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+
+            # Open serial port and set up a worker thread to communicate with it
+            try:
+                ser.open()
+            except serial.SerialException as e:
+                msg = "%s\n" % e
+                sys.stderr.write(msg)
+                client_socket.sendall(msg.encode())
+                client_socket.close()
+                continue
+
+            ser_to_net = SerialToNet()
+            ser_to_net.socket = client_socket
+            serial_worker = serial.threaded.ReaderThread(ser, ser_to_net)
+            serial_worker.start()
+
+            try:
+                # enter network <-> serial loop
+                while True:
+                    try:
+                        data = client_socket.recv(1024)
+                        if not data:
+                            break
+                        ser.write(data)                 # get a bunch of bytes and send them
+                    except socket.error as msg:
+                        if args.develop:
+                            raise
+                        sys.stderr.write('ERROR: {}\n'.format(msg))
+                        # probably got disconnected
+                        break
+            except socket.error as msg:
+                if args.develop:
+                    raise
+                sys.stderr.write('ERROR: {}\n'.format(msg))
+            finally:
+                ser_to_net.socket = None
+                sys.stderr.write('Disconnected\n')
+                client_socket.close()
+                serial_worker.stop()
+                ser.close()
+    except KeyboardInterrupt:
+        pass
+
+    sys.stderr.write('\n--- exit ---\n')
diff --git a/.travis/build.sh b/Tools/travis/build.sh
similarity index 100%
rename from .travis/build.sh
rename to Tools/travis/build.sh
diff --git a/.travis/deploy.sh b/Tools/travis/deploy.sh
similarity index 100%
rename from .travis/deploy.sh
rename to Tools/travis/deploy.sh
diff --git a/.travis/install.sh b/Tools/travis/install.sh
similarity index 100%
rename from .travis/install.sh
rename to Tools/travis/install.sh
diff --git a/Tools/vscode/setup.py b/Tools/vscode/setup.py
index 8746079ea6..b866202ad9 100644
--- a/Tools/vscode/setup.py
+++ b/Tools/vscode/setup.py
@@ -3,13 +3,25 @@
 # Sming hardware configuration tool
 #
 
-import os, sys, json
+import os, sys, json, shutil
 
 def fix_path(path):
     if path[1:3] == ':/':
         return '/' + path[0] + path[2:]
     return path
 
+def find_tool(name):
+    if os.path.isabs(name):
+        path = name
+    else:
+        path = shutil.which(name)
+        if path is None:
+            sys.stderr.write("Warning! '%s' not found in path\n" % name)
+            path = name
+    if not os.path.exists(path):
+        sys.stderr.write("Warning! '%s' doesn't exist\n" % path)
+    return env_subst_path(path, 'env:')
+
 def env_replace(path, name, prefix):
     if name in os.environ:
         s = fix_path(path)
@@ -79,7 +91,7 @@ def update_intellisense():
         config['defines'].append('ARCH_%s=1' % arch.upper())
         configurations.append(config)
 
-    config['compilerPath'] = env_subst_path(os.environ['CXX'])
+    config['compilerPath'] = find_tool(os.environ['CXX'])
     config['includePath'] = dirs
 
     save_json(properties, propertiesFile)
@@ -112,10 +124,7 @@ def update_launch():
     is_wsl = (os.environ['WSL_ROOT'] != '')
     config = find_object(configurations, "%s GDB" % arch)
     if not config is None:
-        path = env_subst_path(os.environ['GDB'], 'env:')
-        if sys.platform == 'win32':
-            path = os.path.splitext(path)[0] + '.exe'
-        config['miDebuggerPath'] = path
+        config['miDebuggerPath'] = find_tool(os.environ['GDB'])
         args = "-x ${env:SMING_HOME}/Arch/%s/Components/gdbstub/gdbcmds" % arch
         if arch == 'Esp8266':
             if not is_wsl:
diff --git a/appveyor.yml b/appveyor.yml
index f0886bc55d..ddb897acc3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,20 +5,23 @@ image:
 platform: x86
 
 environment:
-  SMINGTOOLS: https://github.com/SmingHub/SmingTools/releases/download/1.0
   SMING_SECRET:
     secure: rCs19uNvDR07w1d2pfwJIzewiEQ2zpKXdqFp5BqHQAA=
 
   matrix:
     - SMING_ARCH: Host
+      INSTALL_OPTS: host doc
 
     - SMING_ARCH: Esp8266
+      INSTALL_OPTS: esp8266
       BUILD_COMPILER: udk
 
     - SMING_ARCH: Esp8266
+      INSTALL_OPTS: esp8266
       BUILD_COMPILER: eqt
 
     - SMING_ARCH: Esp32
+      INSTALL_OPTS: esp32
 
 
 install:
@@ -48,14 +51,15 @@ install:
       set PATH=C:\Python39;C:\MinGW\msys\1.0\bin;C:\MinGW\bin;%PATH%
       set PYTHON=C:\Python39\python
       set ESP32_PYTHON_PATH=C:\Python39
-      .ci\install.cmd
-      set PATH=C:\Python39\Scripts;%PATH%;C:\Program Files\doxygen\bin
+      Tools\ci\install.cmd
+      set PATH=C:\Python39\Scripts;C:\tools\doxygen;C:\tools\Graphviz\bin;%PATH%
 
   - sh: |
       export PYTHON=$HOME/venv3.9/bin/python
       export ESP32_PYTHON_PATH=$HOME/venv3.9/bin
       source $HOME/venv3.9/bin/activate
-      .ci/install.sh
+      Tools/install.sh $INSTALL_OPTS
+      cd $CI_BUILD_DIR
 
 
 before_build:
@@ -67,8 +71,8 @@ before_build:
       fi
 
 build_script:
-  - cmd: .ci\build.cmd
-  - sh: .ci/build.sh
+  - cmd: Tools\ci\build.cmd
+  - sh: Tools/ci/build.sh
 
 after_build:
   - ps: |
@@ -82,5 +86,5 @@ after_build:
 deploy_script:
   - sh: |
       if [[ $APPVEYOR_REPO_TAG_NAME != "" && $APPVEYOR_BUILD_WORKER_IMAGE == "Ubuntu2004" && $SMING_ARCH == "Host" ]]; then
-        .ci/deploy.sh $APPVEYOR_REPO_TAG_NAME
+        Tools/ci/deploy.sh $APPVEYOR_REPO_TAG_NAME
       fi
diff --git a/docs/Tools/install.sh b/docs/Tools/install.sh
new file mode 100644
index 0000000000..e1137a71e7
--- /dev/null
+++ b/docs/Tools/install.sh
@@ -0,0 +1,26 @@
+# Documentation build tools
+
+PACKAGES=(\
+    doxygen \
+    python3-sphinx \
+    python3-cairocffi \
+    )
+
+case $DIST in
+    debian)
+        PACKAGES+=(\
+            graphviz-dev \
+            )
+        ;;
+
+    fedora)
+        PACKAGES+=(\
+            python-wheel \
+            graphviz-devel \
+            )
+        ;;
+esac
+
+$PKG_INSTALL ${PACKAGES[*]}
+
+python3 -m pip install -r $SMING_HOME/../docs/requirements.txt
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 648e046d21..a73ee6596b 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,9 +1,10 @@
 # Requirements file for pip
 # list of Python packages used in documentation build
-sphinx==2.0.0
+sphinx==2.4.4
 sphinx-rtd-theme
 m2r
 breathe==4.13.0
 sphinxcontrib-wavedrom
 sphinx-copybutton
 sphinxcontrib-seqdiag>=0.8.5
+jinja2>=2.11.3
diff --git a/docs/source/arch/esp32/getting-started/index.rst b/docs/source/arch/esp32/getting-started/index.rst
deleted file mode 100644
index 3cb84c18ea..0000000000
--- a/docs/source/arch/esp32/getting-started/index.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-Getting Started: Esp32
-======================
-
-Requirements
-------------
-
-In order to be able to compile for the ESP32 architecture you should have ESP-IDF v4.1 installed.
-
-Get the latest `release/v4.1` branch. This can be done using the following command::
-
-    git clone -b release/v4.1 https://github.com/espressif/esp-idf.git
-
-Note that a recursive clone is not required as the necessary submodules will be fetched during the build stage.
-
-Now install the toolchain::
-
-   esp-idf/install
-
-For information about pre-requisites and other issues, see
-`ESP-IDF documentation <https://docs.espressif.com/projects/esp-idf/en/v4.1/get-started/index.html#installation-step-by-step>`__.
-
-Building
---------
-
-Make sure that the IDF_PATH environmental variable is set. On Linux you can use for example the following command::
-
-    export IDF_PATH=path/to/esp-idf
-
-Replace `path/to` with the correct path.
-
-Note that you do not need to run ``IDF export.sh`` as this is handled by the Sming build system.
-This simplifies use within the Eclipse IDE as there is only one environment variable to set.
-
-Build the framework and application as usual, specifying :envvar:`SMING_ARCH` =Esp32. For example::
-
-   cd $SMING_HOME/../samples/Basic_Serial
-   make SMING_ARCH=Esp32
-
-This builds the application. Once built the application needs to be flashed on a real Esp32 microcontroller to run.
-Flashing can be done using the following command::
-
-  make flash
-
-
-.. note::
-
-   If you have an ESP32-S2 device you'll need to change :envvar:`ESP_VARIANT`::
-   
-      make ESP_VARIANT=esp32s2
-
-
-See :component-esp32:`esp32` for further details.
diff --git a/docs/source/arch/esp8266/getting-started/index.rst b/docs/source/arch/esp8266/getting-started/index.rst
deleted file mode 100644
index 5dd87ce4d2..0000000000
--- a/docs/source/arch/esp8266/getting-started/index.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-Getting Started: Esp8266
-========================
-
-Development Environment
------------------------
-
-Please select the appropriate instructions for setting up the development environment for your platform:
-
--  :doc:`Linux <linux>`
--  :doc:`Mac OS <macos>`
--  :doc:`Windows <windows>`
-
-Note that the standard installation now uses :doc:`eqt` which provides support for the latest compiler versions. 
-
-Toolchains can all be found in the `SmingTools <https://github.com/SmingHub/SmingTools/releases>`__ repository.
-
-Contents
---------
-
-.. toctree::
-   :glob:
-   :maxdepth: 1
-   
-   linux
-   macos
-   windows
-   windows-manual
-   docker
-   eqt
-   config
diff --git a/docs/source/arch/esp8266/getting-started/linux.rst b/docs/source/arch/esp8266/getting-started/linux.rst
deleted file mode 100644
index 8b6f31ca2e..0000000000
--- a/docs/source/arch/esp8266/getting-started/linux.rst
+++ /dev/null
@@ -1,109 +0,0 @@
-Linux Installation
-==================
-
-.. highlight:: bash
-
-Pre-requisites
---------------
-
-Ubuntu::
-
-   sudo apt-get install make unrar autoconf automake libtool libtool-bin gcc g++ gperf \
-      flex bison texinfo gawk ncurses-dev libexpat1-dev python sed python-serial \
-      python-dev srecord bc git help2man unzip bzip2
-
-Fedora::
-
-   sudo dnf install make autoconf automake libtool gcc gcc-c++ gperf flex bison texinfo \
-      gawk ncurses-devel expat-devel python sed pyserial srecord bc git patch \
-      unzip help2man python-devel
-
-Prepare directory
------------------
-
-We recommend ``/opt/`` but you can use anything you want::
-
-   mkdir -p /opt/
-   cd /opt/
-
-Install Toolchain
------------------
-
-You can find pre-compiled toolchains in the `SmingTools <https://github.com/SmingHub/SmingTools/releases>`__ repository.
-
-Install as follows::
-
-   export ESP_HOME=/opt/esp-quick-toolchain
-   sudo mkdir $(ESP_HOME)
-   sudo chown $USER:$USER $(ESP_HOME)
-   wget https://github.com/SmingHub/SmingTools/releases/download/1.0/x86_64-linux-gnu.xtensa-lx106-elf-e6a192b.201211.tar.gz
-   tar -zxf x86_64-linux-gnu.xtensa-lx106-elf-e6a192b.201211.tar.gz -C $(ESP_HOME)
-
-Espressif SDK
--------------
-
-Sming uses the `Espressif 3.0.1 SDK <https://github.com/espressif/ESP8266_NONOS_SDK>`__
-which is pulled in automatically during the build.
-
-Previous versions are no longer officially supported.
-
-Environment Variables
----------------------
-
-From the command line::
-
-   export ESP_HOME=/opt/esp-quick-toolchain
-   export SMING_HOME=/opt/Sming/Sming
-
-To set these permanently, add them to your home ``.profile`` file.
-
-You can alternatively add them to ``/etc/environment`` for all users, like this::
-
-   ESP_HOME="/opt/esp-quick-toolchain"
-   SMING_HOME="/opt/Sming/Sming"
-
-
-See also
-`Setting up Sming and Netbeans <https://primalcortex.wordpress.com/2015/10/08/esp8266-setting-up-sming-and-netbeans/>`__
-(external page).
-
-Get Sming Core
---------------
-
-Clone the Sming ``develop`` branch to your working directory::
-
-   cd $SMING_HOME/../..
-   git clone https://github.com/SmingHub/Sming.git
-   cd Sming
-
-.. warning::
-
-   Do NOT use the ``--recursive`` option with ``git``.
-   Our build mechanism will take care to get the third-party sources and patch them, if needed.
-
-This will fetch the `develop` branch which is intended for developers,
-and is the one where all new cool (unstable) features are landing.
-
-If you want to use our stable branch::
-
-   git checkout master
-   git pull
-
-
-Build a ‘Basic Blink’ example
------------------------------
-
-Change to the application directory and build::
-
-   cd $SMING_HOME/../samples/Basic_Blink
-   make
-
-Flash to your device (using ttyUSB0)::
-
-   cd $SMING_HOME/../samples/Basic_Blink
-   make flash
-
-Next steps
-----------
-
-Proceed to :doc:`config`.
diff --git a/docs/source/arch/host/host-emulator.rst b/docs/source/arch/host/index.rst
similarity index 92%
rename from docs/source/arch/host/host-emulator.rst
rename to docs/source/arch/host/index.rst
index 07d3fe9594..7ddf0d0e1d 100644
--- a/docs/source/arch/host/host-emulator.rst
+++ b/docs/source/arch/host/index.rst
@@ -1,5 +1,5 @@
-Getting Started: Host (Linux/Windows)
-=====================================
+Host Emulator
+=============
 
 .. highlight:: bash
 
@@ -11,6 +11,11 @@ If you want to try it we have an
 `interactive tutorial <https://www.katacoda.com/slaff/scenarios/sming-host-emulator>`__
 that can be run directly from your browser.
 
+See :doc:`/getting-started/index` for installation details.
+
+The following sections provide more background detail.
+
+
 Requirements (Linux)
 --------------------
 
@@ -24,10 +29,9 @@ C/C++ 32 bit compiler and libraries
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The latest versions of Sming require GCC version 8 or newer.
-If your OS is 64 bit then you should install also 32 bit C/C++ compiler and libraries.
+If your OS is 64 bit then 32 bit C/C++ compiler and libraries are also required.
 Here's a summary of how to do this::
 
-   sudo add-apt-repository ppa:ubuntu-toolchain-r/test
    sudo apt update
    sudo apt install gcc-9 g++-9
 
@@ -60,7 +64,7 @@ The current version is `GCC 8.2.0 <https://gcc.gnu.org/gcc-8>`__.
 
 .. note::
 
-   If you don't already have MinGW installed, see :doc:`/arch/esp8266/getting-started/windows` for the Esp8266.
+   If you don't already have MinGW installed, see :doc:`/getting-started/windows/index`.
 
 
 
@@ -131,7 +135,7 @@ first, and requires root privilege. You can use the
 
    sudo ip tuntap add dev tap0 mode tap user `whoami`
    sudo ip a a dev tap0 192.168.13.1/24
-   sudo ifconfig tap0 up
+   sudo ip link set tap0 up
 
    # The following lines are needed if you plan to access Internet
    sudo sysctl net.ipv4.ip_forward=1
@@ -148,6 +152,10 @@ This creates the ``tap0`` interface. The emulator will automatically
 select the first ``tap`` interface found. To override this, use the
 ``--ifname`` option.
 
+You can list available network interfaces thus::
+
+   ip link
+
 Troubleshooting
 ---------------
 
diff --git a/docs/source/arch/esp8266/getting-started/config.rst b/docs/source/getting-started/config.rst
similarity index 76%
rename from docs/source/arch/esp8266/getting-started/config.rst
rename to docs/source/getting-started/config.rst
index 1798cd59d6..970f0e4250 100644
--- a/docs/source/arch/esp8266/getting-started/config.rst
+++ b/docs/source/getting-started/config.rst
@@ -1,5 +1,5 @@
-Configuring your Esp8266 device
--------------------------------
+Configuring your device
+-----------------------
 
 .. highlight:: bash
 
@@ -12,15 +12,16 @@ You can set these initially on the command line, like this::
 
    make SMING_ARCH=Esp8266 COM_PORT=/dev/ttyUSB3 COM_SPEED_ESPTOOL=921600
 
-For Windows expect to use COM2, COM3, etc.
+(For Windows or :doc:`windows/wsl` expect to use COM2, COM3, etc.)
 
-You can list the current set of configuration variables like this::
+Once you're happy with the settings, you can add them to your project's ``component.mk`` file.
+You may need to do this to reset the cached values::
 
-   make list-config
+   make config-clean
 
-If you want to reset back to default values, do this::
+The current set of configuration variables can be seen thus::
 
-   make config-clean
+   make list-config
 
 Other hardware-specific settings are stored in the hardware configuration file.
 You can examine the current configuration like this::
diff --git a/docs/source/arch/esp8266/getting-started/c9-1.png b/docs/source/getting-started/docker/c9-1.png
similarity index 100%
rename from docs/source/arch/esp8266/getting-started/c9-1.png
rename to docs/source/getting-started/docker/c9-1.png
diff --git a/docs/source/arch/esp8266/getting-started/docker.rst b/docs/source/getting-started/docker/index.rst
similarity index 51%
rename from docs/source/arch/esp8266/getting-started/docker.rst
rename to docs/source/getting-started/docker/index.rst
index b440586fe3..ec38705164 100644
--- a/docs/source/arch/esp8266/getting-started/docker.rst
+++ b/docs/source/getting-started/docker/index.rst
@@ -1,6 +1,14 @@
-*******************
-Docker Installation
-*******************
+******
+Docker
+******
+
+Docker is a useful tool if you want to experiment with Sming in an isolated environment.
+
+If you're unfamiliar with Docker, you can find a good overview in the article,
+`What is a Container? <https://www.docker.com/resources/what-container>`__.
+
+This page shows how to create docker containers with all the necessary tools to
+build Sming applications.
 
 Install Docker
 ==============
@@ -16,14 +24,26 @@ Docker Compose makes dealing with the orchestration processes of Docker
 containers (such as starting up, shutting down, and setting up
 intra-container linking and volumes) really easy.
 
-With docker compose we can define the entire multi-container application
-in single file and then the application can be spinned up using one
-command.
+With *docker compose* we can define the entire multi-container application
+in a single file and spin it up using one command.
 
 Visit the official
 `Docker Compose Installation Page <https://docs.docker.com/compose/install/>`__
 and follow the instructions tailored for your operating system.
 
+Building images
+===============
+
+You can find the related Docker scripts in ``$SMING_HOME/Tools/Docker``.
+
+To build your own images, do this::
+
+   cd $SMING_HOME/Tools/Docker/cli
+   docker-compose build
+   cd $SMING_HOME/Tools/Docker/ide
+   docker-compose build
+
+
 Adjust your settings
 ====================
 
@@ -31,28 +51,28 @@ Adjust your settings
 
    sming-ide:
 
-    build: .
-    
-    volumes:
-      - ../../Sming/:/opt/sming/
-      
+     build: .
+
+     volumes:
+       - ../../Sming/:/opt/sming/
+
     ports:
     #choose a free port to connect to the web C9 editor
     - "10080:80"
-    
+
     devices:
-     # uncomment to map your serial USB adaptor 
-     #- "/dev/ttyUSB0:/dev/ttyUSB0"
+      # uncomment to map your serial USB adaptor 
+      #- "/dev/ttyUSB0:/dev/ttyUSB0"
 
-    
     privileged: true
 
+
 Start your container
 ====================
 
 .. code-block:: bash
 
-   cd /opt/sming/docker/ && docker-compose -f sming-ide.yml up -d
+   cd /opt/sming/Tools/Docker/ide && docker-compose up -d
 
 Open your browser
 =================
diff --git a/docs/source/getting-started.rst b/docs/source/getting-started/index.rst
similarity index 91%
rename from docs/source/getting-started.rst
rename to docs/source/getting-started/index.rst
index a2c85a0d44..6cc85ce883 100644
--- a/docs/source/getting-started.rst
+++ b/docs/source/getting-started/index.rst
@@ -5,22 +5,27 @@ Getting Started
 
 Development System Installation
 -------------------------------
-Sming supports multiple architectures. Choose the architecture of your choice to install the needed development software and toolchain(s).
 
+Choose your preferred development environment for how to install the needed development software and toolchain(s):
 
 .. toctree::
    :titlesonly:
    :maxdepth: 1
 
-   /arch/esp8266/getting-started/index
-   /arch/esp32/getting-started/index
-   /arch/host/host-emulator
+   linux/index
+   macos/index
+   windows/index
+   docker/index
 
 You can also try Sming without installing anything locally.
 We have an  `interactive tutorial <https://www.katacoda.com/slaff/scenarios/sming-host-emulator>`__ that can be run directly from your browser.
 
-Windows users may also wish to consider building in a Linux virtual environment.
-See :doc:`Windows WSL <windows-wsl>` for further details.
+
+.. toctree::
+   :titlesonly:
+   :maxdepth: 1
+
+   config
 
 
 Documentation
@@ -35,13 +40,6 @@ Examples
 --------
 
 The examples are a great way to learn the API and brush up your C/C++ knowledge.
-Once you have completed the installation of the development tools, you can get the latest source code.
-
-::
-
-   git clone https://github.com/SmingHub/Sming.git
-
-And check some of the examples.
 
 -  `Basic Blink <#basic-blink>`__
 -  `Simple GPIO input/output <#simple-gpio-inputoutput>`__
@@ -53,7 +51,7 @@ And check some of the examples.
 -  `Embedded HTTP Web Server <#embedded-http-web-server>`__
 -  `Email Client <#email-client>`__
 
-Further documentation about the :doc:`samples` is available too.
+Further documentation about the :doc:`/samples` is available too.
 
 Basic Blink
 ~~~~~~~~~~~
diff --git a/docs/source/getting-started/linux/index.rst b/docs/source/getting-started/linux/index.rst
new file mode 100644
index 0000000000..b2575b35a3
--- /dev/null
+++ b/docs/source/getting-started/linux/index.rst
@@ -0,0 +1,78 @@
+Linux Installation
+==================
+
+.. highlight:: bash
+
+Quick Install
+-------------
+
+Debian (Ubuntu) and Fedora systems can use the scripted installer.
+
+1. Prepare installation directory
+
+   Let's use /opt as the main directory for tools and Sming.
+   
+   Regular users may not have access to */opt*, so do this::
+   
+      sudo chown $USER:$USER /opt
+   
+   (alternatively, use a different directory).
+
+
+2. Install GIT
+
+   **Debian**::
+   
+      sudo apt-get install -y git
+   
+   **Fedora**::
+   
+      dnf install -y git
+   
+
+3. Fetch the Sming repository
+
+   ::
+
+      git clone https://github.com/SmingHub/Sming /opt/sming
+
+4. Run the installer
+
+   ::
+
+      source /opt/sming/Tools/install.sh all
+
+
+If you want to save disk space then you can select which tools to install.
+Get a list of available options like this::
+
+   /opt/sming/Tools/install.sh
+
+Install locations can be customised by setting environment variables before
+running the install. See ``/opt/sming/Tools/export.sh`` for details.
+
+If you want to use the stable (release) branch::
+
+   cd /opt/sming
+   git checkout master
+   git pull
+
+
+Build a ‘Basic Blink’ example
+-----------------------------
+
+Change to the application directory and build::
+
+   cd $SMING_HOME/../samples/Basic_Blink
+   make
+
+Flash to your device (using default serial port)::
+
+   cd $SMING_HOME/../samples/Basic_Blink
+   make flash
+
+
+Next steps
+----------
+
+Proceed to :doc:`../config`.
diff --git a/docs/source/arch/esp8266/getting-started/macos.rst b/docs/source/getting-started/macos/index.rst
similarity index 95%
rename from docs/source/arch/esp8266/getting-started/macos.rst
rename to docs/source/getting-started/macos/index.rst
index 9074c47157..c5dcba4ea4 100644
--- a/docs/source/arch/esp8266/getting-started/macos.rst
+++ b/docs/source/getting-started/macos/index.rst
@@ -54,10 +54,10 @@ We pull this in from the `SmingTools <https://github.com/SmingHub/SmingTools/rel
 
    cd ~/
    export ESP_HOME=/opt/esp-quick-toolchain
-   curl -L -O https://github.com/SmingHub/SmingTools/releases/download/1.0/x86_64-apple-darwin14.xtensa-lx106-elf-e6a192b.201211.tar.gz
-   sudo mkdir -p $(ESP_HOME)
-   sudo tar -zxf x86_64-apple-darwin14.xtensa-lx106-elf-e6a192b.201211.tar.gz-C $(ESP_HOME)
-   sudo chmod -R 775 -C $(ESP_HOME)
+   curl -LO https://github.com/SmingHub/SmingTools/releases/download/1.0/x86_64-apple-darwin14.xtensa-lx106-elf-e6a192b.201211.tar.gz
+   sudo mkdir -p $ESP_HOME
+   sudo tar -zxf x86_64-apple-darwin14.xtensa-lx106-elf-e6a192b.201211.tar.gz -C $ESP_HOME
+   sudo chmod -R 775 $ESP_HOME
 
 You can also build it yourself
 `with Homebrew <https://github.com/pfalcon/esp-open-sdk#macos>`__ or
@@ -176,4 +176,4 @@ If you want to test some of the examples, try this::
 Next steps
 ----------
 
-Proceed to :doc:`config`.
+Proceed to :doc:`../config`.
diff --git a/docs/source/arch/esp8266/getting-started/windows.rst b/docs/source/getting-started/windows/index.rst
similarity index 54%
rename from docs/source/arch/esp8266/getting-started/windows.rst
rename to docs/source/getting-started/windows/index.rst
index 9e97c79bf7..d9fa84bfaa 100644
--- a/docs/source/arch/esp8266/getting-started/windows.rst
+++ b/docs/source/getting-started/windows/index.rst
@@ -6,51 +6,52 @@ Windows Installation
 This page describes how to install the required tools and obtain the current
 release version of Sming using the `Chocolatey <https://chocolatey.org>`__ package manager.
 
-Use :doc:`windows-manual` for control over installation locations. 
+See also:
 
+.. toctree::
+   :titlesonly:
+   :maxdepth: 1
 
-Install Chocolatey
-------------------
+   manual
+   wsl
+
+
+Quick Install
+-------------
 
 Open an *administrative* **cmd.exe** command prompt and paste the text from the box below and press enter::
 
-   @powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
+   curl -LO https://raw.githubusercontent.com/SmingHub/Sming/develop/Tools/choco-install.cmd && choco-install.cmd
 
-Upgrade .NET
-------------
 
-Choco requires a recent version of .NET in order to be able to access HTTPS links.
-To check if you need to upgrade, type the following command::
+.. important::
 
-   choco --v
+   After installation, please close the administrative command prompt and open a new, regular command shell.
 
-If you see a warning similar to the one below then make sure to upgrade your .NET version:
+   This ensures that environment variables are set correctly.
 
-.. code-block:: text
+   It is also inadvisable to continue running with elevated privileges.
 
-   Choco prefers to use TLS v1.2 if it is available, but this client is running on .NET 4.3,
-   which uses an older SSL. It's using TLS 1.0 or earlier, which makes it susceptible to BEAST
-   and also doesn't implement the 1/n-1 record splitting mitigation for Cipher-Block Chaining.
-   Upgrade to at least .NET 4.5 at your earliest convenience.
 
-You can upgrade the .NET version from this
-`direct link <https://www.microsoft.com/en-us/download/details.aspx?id=55170>`__
-or search in internet for “.NET upgrade�.
+The installer uses the latest **develop** branch.
+The command below will get for you the latest ``stable`` release::
 
+   cd %SMING_HOME%
+   git checkout master
+   git pull
 
-Install packages
-----------------
 
-First, tell Chocolatey about the Sming package repository::
+In case something is broken, this will perform a forced re-install of all packages::
 
-   choco sources add -name smingrepo -source 'https://www.myget.org/F/sming/'
+   rmdir /s /q c:\tools\sming
+   choco install sming -y -f -x
 
-(You can find the installer sources at `https://github.com/slaff/chocolatey-packages`.)
 
-You can now install with::
 
-   choco install -y sming
+Packages
+--------
 
+You can find the installer sources at https://github.com/slaff/chocolatey-packages.
 Packages are as follows:
 
 git
@@ -84,6 +85,9 @@ esp8266-eqt
 
    Sets a system-wide :envvar:`ESP_HOME` variable.
 
+sming.esp32
+   Sming-compatible version of ESP-IDF and tools.
+
 sming.core
    Latest stable version of `Sming <https://github.com/SmingHub/Sming/tree/master>`__.
 
@@ -94,15 +98,6 @@ not need to be set every time a command prompt is opened, and will be seen by ec
 without any further configuration.
 
 
-.. important::
-
-   After installation, please close the administrative command prompt and open a new, regular command shell.
-
-   This ensures that environment variables are set correctly.
-
-   It is also inadvisable to continue running with elevated privileges.
-
-
 Build Basic_Blink
 -----------------
 
@@ -114,32 +109,8 @@ To check the installation, open a command prompt and type these commands::
 The project should build without error.
    
 
-Update Sming
-------------
-
-Sming is very dynamic and updates are usually announced in gitter. The command below will get for you the latest ``stable`` release::
-
-   cd %SMING_HOME%
-   git pull
-
-If you would like access to the latest features and bug-fixes, use the ``develop`` branch::
-
-   cd %SMING_HOME%
-   git checkout develop
-
-
-Force Reinstall Sming
----------------------
-
-In case something is broken, this will perform a forced re-install of all packages::
-
-   rmdir /s /q c:\tools\sming
-   choco install sming -y -f -x
-
-
-
 Next steps
 ----------
 
-Proceed to :doc:`config`.
+Proceed to :doc:`../config`.
 
diff --git a/docs/source/arch/esp8266/getting-started/windows-manual.rst b/docs/source/getting-started/windows/manual.rst
similarity index 99%
rename from docs/source/arch/esp8266/getting-started/windows-manual.rst
rename to docs/source/getting-started/windows/manual.rst
index e0ad5c8143..8b145668ca 100644
--- a/docs/source/arch/esp8266/getting-started/windows-manual.rst
+++ b/docs/source/getting-started/windows/manual.rst
@@ -215,4 +215,4 @@ the same settings will be used.
 Next steps
 ----------
 
-Proceed to :doc:`config`.
+Proceed to :doc:`../config`.
diff --git a/docs/source/windows-wsl.rst b/docs/source/getting-started/windows/wsl.rst
similarity index 78%
rename from docs/source/windows-wsl.rst
rename to docs/source/getting-started/windows/wsl.rst
index dcc4748729..71b25d9f3b 100644
--- a/docs/source/windows-wsl.rst
+++ b/docs/source/getting-started/windows/wsl.rst
@@ -47,6 +47,8 @@ Installing WSL
 
 See instructions here https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps.
 
+Install an up-to-date Linux distribution from the Microsoft store, currently ``Ubuntu-20.04``.
+
 .. note::
 
    You may encounter an error message similar to this during installation::
@@ -76,7 +78,7 @@ See instructions here https://docs.microsoft.com/en-us/windows/wsl/install-win10
 Installing Sming
 ----------------
 
-Open a WSL command prompt and follow the :doc:`Linux installation instructions <../linux>`.
+Open a WSL command prompt and follow the instructions in :doc:`../linux/index`.
 
 
 Flashing devices
@@ -92,6 +94,30 @@ For example::
    make flash COM_PORT=COM4
 
 
+Serial debugging
+----------------
+
+Again, as we have no direct access to USB COM ports a workaround is required.
+A small python application can be run on Windows to act as a simple bridge between the serial port and a TCP port.
+See ``Tools/tcp_serial_redirect.py`` - run without arguments to see available options.
+
+You can start the server like this::
+
+   make tcp-serial-redirect
+
+A new console will be created (minimised) showing something like this::
+
+   --- TCP/IP to Serial redirect on COM4  115200,8,N,1 ---
+   --- type Ctrl-C / BREAK to quit
+   Waiting for connection on 192.168.1.101:7780...
+
+This uses the current :envvar:`COM_PORT` and :envvar:`COM_SPEED_SERIAL` settings.
+
+Now we can start the debugger::
+
+   make gdb COM_PORT_GDB=192.168.1.101:7780
+
+
 Valgrind
 --------
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
index e196b08cf5..fdb883e3f1 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -42,14 +42,14 @@ Summary
 
 -  Linux/Windows features
 
-  -  Sming has a :doc:`host emulator <arch/host/host-emulator>` that allows libraries and sample applications to be compiled on a Linux/Windows host system
+  -  Sming has a :doc:`host emulator <arch/host/index>` that allows libraries and sample applications to be compiled on a Linux/Windows host system
      and be tested before uploading them to an actual microcontroller.
 
 .. toctree::
    :caption: Contents:
    :hidden:
 
-   getting-started
+   getting-started/index
    features
    framework/index
    samples
diff --git a/docs/source/contribute/clang-tools.rst b/docs/source/information/develop/clang-tools.rst
similarity index 100%
rename from docs/source/contribute/clang-tools.rst
rename to docs/source/information/develop/clang-tools.rst
diff --git a/docs/source/information/develop/components.rst b/docs/source/information/develop/components.rst
index b428880436..5e880c3c2e 100644
--- a/docs/source/information/develop/components.rst
+++ b/docs/source/information/develop/components.rst
@@ -84,7 +84,7 @@ Supported architectures
 
 Unless there are specific reasons not to do so, Components should work on all
 supported architectures. In particular, it should build and run under the
-:doc:`Host Emulator </arch/host/host-emulator>`.
+:doc:`Host Emulator </arch/host/index>`.
 
 In order to do this, you should remove any low-level code from the library by:
 
diff --git a/docs/source/information/flash.rst b/docs/source/information/flash.rst
index 90eb70b700..884da9ccc4 100644
--- a/docs/source/information/flash.rst
+++ b/docs/source/information/flash.rst
@@ -12,7 +12,7 @@ Up to 16MBytes are supported for custom designs.
 Sming version 4.3 introduced partition tables to support multiple architectures,
 different hardware variants and custom flash layouts without restriction.
 
-See :ref:`hardware-config` for details.
+See :ref:`hardware_config` for details.
 
 A typical layout for a 4MByte device might look like this:
 
diff --git a/docs/source/link-roles.py b/docs/source/link-roles.py
index 2cca6aa1cd..7ae29a2727 100644
--- a/docs/source/link-roles.py
+++ b/docs/source/link-roles.py
@@ -46,6 +46,7 @@ def setup(app):
     app.add_role('sample', doclink('/_inc/samples/{}/index'))
     app.add_role('component', doclink('/_inc/Sming/Components/{}/index'))
     app.add_role('component-esp8266', doclink('/_inc/Sming/Arch/Esp8266/Components/{}/index'))
+    app.add_role('component-esp32', doclink('/_inc/Sming/Arch/Esp32/Components/{}/index'))
     app.add_role('component-host', doclink('/_inc/Sming/Arch/Host/Components/{}/index'))
     app.add_role('library', doclink('/_inc/Sming/Libraries/{}/index'))
 
diff --git a/docs/source/samples.rst b/docs/source/samples.rst
index 9367d125c1..9f6027f1a3 100644
--- a/docs/source/samples.rst
+++ b/docs/source/samples.rst
@@ -11,3 +11,6 @@ of the framework. Some are related to specific :doc:`libraries`.
    :titlesonly:
 
    /_inc/samples/*/index
+   /_inc/Sming/Components/*/samples/*/index
+   /_inc/Sming/Libraries/*/samples/*/index
+
diff --git a/docs/source/tools/index.rst b/docs/source/tools/index.rst
index cae1211b40..34ce3ebee5 100644
--- a/docs/source/tools/index.rst
+++ b/docs/source/tools/index.rst
@@ -1,6 +1,8 @@
 Tools Integration
 =================
 
+Details of Sming support for Integrated Development Environments (IDEs).
+
 .. toctree::
    :maxdepth: 1
 
diff --git a/docs/source/troubleshooting/random-restart.rst b/docs/source/troubleshooting/random-restart.rst
index 3076a189fe..c9d4032ed0 100644
--- a/docs/source/troubleshooting/random-restart.rst
+++ b/docs/source/troubleshooting/random-restart.rst
@@ -13,7 +13,7 @@ device.
 
 To achieve this do the following:
 
-1) Check the :ref:`hardware-config` especially ``flash_size`` setting.
+1) Check the :ref:`hardware_config` especially ``flash_size`` setting.
 
 2) Run ``flashinit``::
 
diff --git a/samples/Basic_rBoot/README.rst b/samples/Basic_rBoot/README.rst
index 2fdcbf7e2d..f49ea3da08 100644
--- a/samples/Basic_rBoot/README.rst
+++ b/samples/Basic_rBoot/README.rst
@@ -52,7 +52,7 @@ Technical Notes
       auto part = PartitionTable().find('spiffs0');
       spiffs_mount(part);
 
-   See :ref:`hardware-config` for further details.
+   See :ref:`hardware_config` for further details.
 
 Important compiler flags used:
 

From 582682e287c59f816afff67d5daa268982d177a1 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Tue, 2 Mar 2021 10:32:53 +0100
Subject: [PATCH 42/91] Clean all compiled files before running coverity scan.
 (#2236)

[scan:coverity]
---
 Sming/Arch/Host/Tools/travis/coverity-scan.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Sming/Arch/Host/Tools/travis/coverity-scan.sh b/Sming/Arch/Host/Tools/travis/coverity-scan.sh
index f4fd35c2ef..2f74499e34 100755
--- a/Sming/Arch/Host/Tools/travis/coverity-scan.sh
+++ b/Sming/Arch/Host/Tools/travis/coverity-scan.sh
@@ -4,7 +4,7 @@ set -e
 
 COVERITY_SCAN_PROJECT_NAME=${TRAVIS_REPO_SLUG}
 COVERITY_SCAN_NOTIFICATION_EMAIL="slaff@attachix.com"
-COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_WebSockets SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"
+COVERITY_SCAN_BUILD_COMMAND="$MAKE_PARALLEL dist-clean Basic_Blink Basic_DateTime Basic_Delegates Basic_Interrupts Basic_ProgMem Basic_Serial Basic_Servo Basic_Ssl HttpServer_WebSockets SMING_ARCH=Host DEBUG_VERBOSE_LEVEL=3"
 
 # Environment check
 [ -z "$COVERITY_SCAN_PROJECT_NAME" ] && echo "ERROR: COVERITY_SCAN_PROJECT_NAME must be set" && exit 1
@@ -63,6 +63,7 @@ TOOL_DIR=$(find $TOOL_BASE -type d -name 'cov-analysis*')
 export PATH=$TOOL_DIR/bin:$PATH
 
 # Build
+
 echo -e "\033[33;1mRunning Coverity Scan Analysis Tool...\033[0m"
 COV_BUILD_OPTIONS=""
 #COV_BUILD_OPTIONS="--return-emit-failures 8 --parse-error-threshold 85"

From a450eb62204787de3d9414d7a4264061998e21d6 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 3 Mar 2021 11:44:20 +0100
Subject: [PATCH 43/91] Fixed private key and certificate generation. (#2238)

---
 Sming/Components/ssl/Tools/make_certs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sming/Components/ssl/Tools/make_certs.sh b/Sming/Components/ssl/Tools/make_certs.sh
index b79373e175..f9240bf8a1 100755
--- a/Sming/Components/ssl/Tools/make_certs.sh
+++ b/Sming/Components/ssl/Tools/make_certs.sh
@@ -177,6 +177,6 @@ cat ca_x509.pem >> x509_device.pem
 
 # set default key/cert for use in the server
 xxd -i x509_1024.cer | sed -e \
-        "s/axTLS_x509_1024_cer/default_certificate/" > $SSL_INCLUDE_DIR/cert.h
+        "s/x509_1024_cer/default_certificate/" > $SSL_INCLUDE_DIR/cert.h
 xxd -i key_1024 | sed -e \
-        "s/axTLS_key_1024/default_private_key/" > $SSL_INCLUDE_DIR/private_key.h
+        "s/key_1024/default_private_key/" > $SSL_INCLUDE_DIR/private_key.h

From 52f0ea39dcc0b1c3b77b36a9fb8492d0530ef397 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Fri, 5 Mar 2021 08:24:30 +0100
Subject: [PATCH 44/91] Multiple minor fixes to documentation and samples
 (#2239)

* Fixed WebcamServer to use spiffs.

* Remove potential memory leak. A Wifi station can get disconnected and connected multiple times.

* Renamed sample to what it actually is: Telnet_Server.

* Minor typos.

* Fixed broken links.

* Fix the documents installation on travis.

* Removed obsolete setting.

* Demonstrate WIFI disabling.

* Removed empty component.mk.

* Renamed sample output to the standard example.output.txt.

* Removed example output that is not matching the sample application.

* Minor code reorganization and text changes.

* Spiffs are not required for the instapush and thingspeak samples.

* Removed dump.bat file. Not related to the sample.

* Removed spaces around value.

* Minor cleanup to HttpServer Bootstrap sample.

* Moved user0.bin to files/.

* Fixed URL path.
---
 README.md                                           | 10 +++++-----
 Sming/Arch/Host/Tools/travis/build.run.sh           |  1 +
 docs/source/getting-started/index.rst               |  2 +-
 docs/source/getting-started/macos/index.rst         |  2 +-
 samples/Arducam/app/application.cpp                 |  2 +-
 samples/Basic_APA102/app/application.cpp            |  8 ++++----
 samples/Basic_AWS/app/application.cpp               |  2 +-
 samples/Basic_Capsense/README.rst                   |  2 +-
 samples/Basic_Capsense/app/application.cpp          |  4 ++--
 samples/Basic_IFS/app/application.cpp               |  2 +-
 samples/Basic_Neopixel/app/application.cpp          |  8 +++++---
 samples/Basic_ScannerI2C/component.mk               |  0
 .../{printf_test_output.txt => example.output.txt}  |  0
 samples/Basic_SmartConfig/README.rst                |  4 ++--
 samples/Basic_Ssl/README.rst                        |  2 +-
 samples/Basic_Ssl/app/application.cpp               |  4 ++--
 samples/Basic_Storage/basic_storage.hw              |  2 +-
 samples/Basic_Storage/{ => files}/user0.bin         |  0
 samples/Basic_WebSkeletonApp/app/configuration.cpp  |  2 +-
 .../Basic_WebSkeletonApp_LTS/app/configuration.cpp  |  2 +-
 samples/Basic_WiFi/app/application.cpp              |  2 +-
 samples/Basic_rBoot/app/application.cpp             |  2 +-
 samples/CommandProcessing_Debug/app/application.cpp |  2 +-
 samples/CommandProcessing_Debug/files/index.html    |  6 +++---
 samples/Compass_HMC5883L/README.rst                 |  2 +-
 samples/Compass_HMC5883L/example.output.txt         |  5 -----
 samples/DFPlayerMini/README.rst                     | 10 +++++-----
 samples/DFPlayerMini/app/application.cpp            | 13 +++++++------
 samples/DS3232RTC_NTP_Setter/app/application.cpp    |  2 +-
 samples/Echo_Ssl/app/application.cpp                |  4 ++--
 samples/FtpServer_Files/app/application.cpp         |  2 +-
 samples/HttpClient_Instapush/app/application.cpp    |  4 +---
 samples/HttpClient_Instapush/component.mk           |  2 --
 samples/HttpClient_ThingSpeak/README.rst            |  2 +-
 samples/HttpClient_ThingSpeak/app/application.cpp   |  4 +---
 samples/HttpClient_ThingSpeak/component.mk          |  2 --
 samples/HttpServer_AJAX/app/application.cpp         |  2 +-
 samples/HttpServer_Bootstrap/README.rst             |  6 ++----
 samples/HttpServer_Bootstrap/app/application.cpp    |  3 +--
 samples/HttpServer_WebSockets/app/application.cpp   |  2 +-
 samples/LED_YeelightBulb/app/application.cpp        |  4 ++--
 samples/MeteoControl/dump.bat                       |  1 -
 samples/MeteoControl/include/configuration.h        |  2 +-
 samples/MeteoControl_mqtt/dump.bat                  |  1 -
 samples/MqttClient_Hello/app/application.cpp        |  2 +-
 samples/Nextion_Button/component.mk                 |  2 --
 samples/ScreenLCD_5110/README.rst                   |  2 +-
 samples/ScreenTFT_ILI9340-ILI9341/README.rst        |  2 +-
 .../ScreenTFT_ILI9340-ILI9341/app/application.cpp   |  2 +-
 samples/ScreenTFT_ST7735/README.rst                 |  2 +-
 samples/SmtpClient/app/application.cpp              |  4 ++--
 samples/SystemClock_NTP/app/application.cpp         |  8 +++++---
 samples/TcpClient_NarodMon/README.rst               |  2 +-
 samples/TcpClient_NarodMon/app/application.cpp      |  2 +-
 .../.cproject                                       |  0
 .../.project                                        |  2 +-
 .../Makefile                                        |  0
 .../README.rst                                      |  0
 .../app/application.cpp                             |  0
 samples/Temperature_DS1820/README.rst               |  2 +-
 samples/Temperature_DS1820/app/application.cpp      |  2 +-
 samples/UdpServer_Echo/app/application.cpp          |  2 +-
 samples/UdpServer_mDNS/app/application.cpp          |  2 +-
 samples/Ultrasonic_HCSR04/README.rst                |  6 ++----
 samples/Ultrasonic_HCSR04/app/application.cpp       |  4 ++--
 samples/WebcamServer/app/application.cpp            |  6 ++++--
 samples/WebcamServer/component.mk                   |  2 +-
 samples/Websocket_Client/app/application.cpp        |  2 +-
 68 files changed, 94 insertions(+), 108 deletions(-)
 delete mode 100644 samples/Basic_ScannerI2C/component.mk
 rename samples/Basic_Serial/{printf_test_output.txt => example.output.txt} (100%)
 rename samples/Basic_Storage/{ => files}/user0.bin (100%)
 delete mode 100644 samples/Compass_HMC5883L/example.output.txt
 delete mode 100644 samples/HttpClient_ThingSpeak/component.mk
 delete mode 100644 samples/MeteoControl/dump.bat
 delete mode 100644 samples/MeteoControl_mqtt/dump.bat
 rename samples/{Telnet_TCPServer_TCPClient => Telnet_Server}/.cproject (100%)
 rename samples/{Telnet_TCPServer_TCPClient => Telnet_Server}/.project (95%)
 rename samples/{Telnet_TCPServer_TCPClient => Telnet_Server}/Makefile (100%)
 rename samples/{Telnet_TCPServer_TCPClient => Telnet_Server}/README.rst (100%)
 rename samples/{Telnet_TCPServer_TCPClient => Telnet_Server}/app/application.cpp (100%)

diff --git a/README.md b/README.md
index 098cf7b11a..5a0f819509 100644
--- a/README.md
+++ b/README.md
@@ -67,17 +67,17 @@ Please note Version 4 documentation is at [sming.readthedocs.io](https://sming.r
     * Async TCP and UDP stack based on [LWIP](http://savannah.nongnu.org/projects/lwip/).
     * With clients supporting: HTTP, MQTT, WebSockets and SMTP.
     * And servers for: DNS, FTP, HTTP(+ WebSockets), Telnet.
-    * With [SSL support](https://sming.readthedocs.io/en/latest/framework/core/network/ssl.html) for all network clients and servers. Based on [axTLS](http://axtls.sourceforge.net/) and [BearSSL](https://www.bearssl.org/).
+    * With [SSL support](https://sming.readthedocs.io/en/latest/_inc/Sming/Components/ssl/index.html) for all network clients and servers. Based on [axTLS](http://axtls.sourceforge.net/) and [BearSSL](https://www.bearssl.org/).
     * Out of the box support for OTA over HTTPS.
 * ESP8266 specific features.
     * Integrated boot loader [rboot](https://sming.readthedocs.io/en/latest/_inc/Sming/Components/rboot/index.html) with support for 1MB ROMs, OTA firmware updating and ROM switching.
-    * [Crash handlers](https://sming.readthedocs.io/en/latest/information/debugging/index.html) for analyzing/handling system restarts due to fatal errors or WDT resets.
+    * [Crash handlers](https://sming.readthedocs.io/en/latest/information/debugging.html) for analyzing/handling system restarts due to fatal errors or WDT resets.
     * [PWM support](https://sming.readthedocs.io/en/latest/_inc/Sming/Arch/Esp8266/Components/driver/index.html) based on [Stefan Bruens PWM](https://github.com/StefanBruens/ESP8266_new_pwm.git).
     * Optional [custom heap allocation](https://sming.readthedocs.io/en/latest/_inc/Sming/Arch/Esp8266/Components/heap/index.html) based on [Umm Malloc](https://github.com/rhempel/umm_malloc.git).
     * Based on Espressif NONOS SDK. Officially suppored NON SDK version is >= 3.0.1.
     * Support for a [thin No-Wifi-SDK](https://sming.readthedocs.io/en/latest/_inc/Sming/Arch/Esp8266/Components/esp_no_wifi/index.html). Helpful when a project does not require WiFi (or networking) and reduces code size and memory usage signficantly.
 * Linux/Windows features
-    * Sming has a [host emulator](https://sming.readthedocs.io/en/latest/arch/host/host-emulator.html) that allows libraries and sample applications to be compiled on a Linux/Windows host system and be tested before uploading them to an actual microcontroller.
+    * Sming has a [host emulator](https://sming.readthedocs.io/en/latest/arch/host/index.html) that allows libraries and sample applications to be compiled on a Linux/Windows host system and be tested before uploading them to an actual microcontroller.
 
 ## Compatibility
 
@@ -136,7 +136,7 @@ git clone https://github.com/SmingHub/Sming.git
 
 ## Getting Started
 
-Sming supports multiple architectures. Choose the architecture of your choice to [install the needed development software](https://sming.readthedocs.io/en/latest/getting-started.html) and toolchain(s).
+Sming supports multiple architectures. Choose the architecture of your choice to [install the needed development software](https://sming.readthedocs.io/en/latest/getting-started) and toolchain(s).
 
 You can also try Sming without installing anything locally. We have an [interactive tutorial](https://www.katacoda.com/slaff/scenarios/sming-host-emulator) that can be run directly from your browser.
 
@@ -196,7 +196,7 @@ Serial.println("Hello Sming! Let's do smart things.");
 ### Connect to WiFi
 ```c++
 WifiStation.enable(true);
-WifiStation.config("LOCAL-NETWORK", "123456789087"); // Put you SSID and Password here
+WifiStation.config("LOCAL-NETWORK", "123456789087"); // Put your SSID and password here
 ```
 
 ### Read DHT22 sensor
diff --git a/Sming/Arch/Host/Tools/travis/build.run.sh b/Sming/Arch/Host/Tools/travis/build.run.sh
index 2bfa88cfa0..1b24170fc9 100755
--- a/Sming/Arch/Host/Tools/travis/build.run.sh
+++ b/Sming/Arch/Host/Tools/travis/build.run.sh
@@ -23,4 +23,5 @@ $MAKE_PARALLEL tests
 mv $SMING_PROJECTS_DIR/samples ..
 mv $SMING_PROJECTS_DIR/tests ..
 unset SMING_PROJECTS_DIR
+$SMING_HOME/../Tools/install.sh doc
 make docs V=1
diff --git a/docs/source/getting-started/index.rst b/docs/source/getting-started/index.rst
index 6cc85ce883..9de62a7292 100644
--- a/docs/source/getting-started/index.rst
+++ b/docs/source/getting-started/index.rst
@@ -94,7 +94,7 @@ Connect to WiFi
 ::
 
    WifiStation.enable(true);
-   WifiStation.config("LOCAL-NETWORK", "123456789087"); // Put you SSID and Password here
+   WifiStation.config("LOCAL-NETWORK", "123456789087"); // Put your SSID and password here
 
 Read DHT22 sensor
 ~~~~~~~~~~~~~~~~~
diff --git a/docs/source/getting-started/macos/index.rst b/docs/source/getting-started/macos/index.rst
index c5dcba4ea4..44acdf25a2 100644
--- a/docs/source/getting-started/macos/index.rst
+++ b/docs/source/getting-started/macos/index.rst
@@ -77,7 +77,7 @@ Clone from the `Sming <https://github.com/SmingHub/Sming>`__ repository::
    Do NOT use the --recursive option for the command above.
    Our build mechanism will take care to get the third-party sources and patch them, if needed.
 
-You will get a copy of our `develop` branch which intended for developers.
+You will get a copy of our `develop` branch which is intended for developers.
 It is the one where all new cool (unstable) features are landing.
 
 If you want to use our stable branch then use the master branch::
diff --git a/samples/Arducam/app/application.cpp b/samples/Arducam/app/application.cpp
index 333281d90a..673e08ae19 100644
--- a/samples/Arducam/app/application.cpp
+++ b/samples/Arducam/app/application.cpp
@@ -15,7 +15,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/Basic_APA102/app/application.cpp b/samples/Basic_APA102/app/application.cpp
index e4a7dd0902..463401b5f3 100644
--- a/samples/Basic_APA102/app/application.cpp
+++ b/samples/Basic_APA102/app/application.cpp
@@ -1,14 +1,14 @@
 /*
  * File: APA102 LED class demo for Sming framework
- * 
+ *
  * Original Author: https://github.com/HappyCodingRobot
  *
- * This library support the APA102 LED with integrated controller chip.
- * 
+ * This library supports the APA102 LED with integrated controller chip.
+ *
  *
  * hardware SPI: clk=GPIO14 , mosi=GPIO13
  * software SPI: user defined
- * 
+ *
  */
 #include <SmingCore.h>
 
diff --git a/samples/Basic_AWS/app/application.cpp b/samples/Basic_AWS/app/application.cpp
index eb6ad38688..a1a4ee4ac9 100644
--- a/samples/Basic_AWS/app/application.cpp
+++ b/samples/Basic_AWS/app/application.cpp
@@ -3,7 +3,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/Basic_Capsense/README.rst b/samples/Basic_Capsense/README.rst
index 9c1ef483bb..d909a0eb06 100644
--- a/samples/Basic_Capsense/README.rst
+++ b/samples/Basic_Capsense/README.rst
@@ -1,4 +1,4 @@
 Basic Capsense
 ==============
 
-Simple demonstration showing Displays raw output from a capacitive sensor.
+Simple demonstration showing raw output from a capacitive sensor.
diff --git a/samples/Basic_Capsense/app/application.cpp b/samples/Basic_Capsense/app/application.cpp
index b61f58da1f..38f07eae8e 100644
--- a/samples/Basic_Capsense/app/application.cpp
+++ b/samples/Basic_Capsense/app/application.cpp
@@ -3,8 +3,8 @@
 #include <Libraries/CapacitiveSensor/CapacitiveSensor.h>
 
 // http://playground.arduino.cc/Main/CapacitiveSensor?from=Main.CapSense
-// Im using a 250K resistor currently. Using 500K seems to timeout. Im guessing that the higher
-// Clock speed on the ESP means we need a higher charge current than arduino ??
+// I'm using a 250K resistor currently. Using 500K seems to timeout. I'm guessing that the higher
+// clock speed on the ESP means we need a higher charge current than arduino ??
 // Further investigation required.
 
 CapacitiveSensor cs_0_2 = CapacitiveSensor(0, 2); //Send pin 0, Receive Pin 2.
diff --git a/samples/Basic_IFS/app/application.cpp b/samples/Basic_IFS/app/application.cpp
index 3af196cb5b..45fbd92518 100644
--- a/samples/Basic_IFS/app/application.cpp
+++ b/samples/Basic_IFS/app/application.cpp
@@ -12,7 +12,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/Basic_Neopixel/app/application.cpp b/samples/Basic_Neopixel/app/application.cpp
index 463f09e642..c0cdccde52 100644
--- a/samples/Basic_Neopixel/app/application.cpp
+++ b/samples/Basic_Neopixel/app/application.cpp
@@ -3,7 +3,7 @@
 #include <Libraries/Adafruit_NeoPixel/Adafruit_NeoPixel.h>
 
 #ifndef WIFI_SSID
-#define WIFI_SSID "XXX" // Put you SSID and Password here
+#define WIFI_SSID "XXX" // Put your SSID and password here
 #define WIFI_PWD "XXX"
 #endif
 
@@ -160,14 +160,16 @@ void init()
 
 	Serial.print("NeoPixel demo .. start");
 
-	// Wifi could be used eg. for switching Neopixel from internet
-	// could be also dissabled if no needed
+#ifndef DISABLE_WIFI
+	// Wifi could be used eg. for switching Neopixel from internet.
+	// If not needed compile this sample with `make DISABLE_WIFI=1`
 
 	WifiStation.config(WIFI_SSID, WIFI_PWD);
 	WifiStation.enable(true);
 	WifiAccessPoint.enable(false);
 	WifiEvents.onStationDisconnect(connect_Fail);
 	WifiEvents.onStationGotIP(got_IP);
+#endif
 
 	StripDemoType = 0; //demo index to be displayed
 
diff --git a/samples/Basic_ScannerI2C/component.mk b/samples/Basic_ScannerI2C/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/samples/Basic_Serial/printf_test_output.txt b/samples/Basic_Serial/example.output.txt
similarity index 100%
rename from samples/Basic_Serial/printf_test_output.txt
rename to samples/Basic_Serial/example.output.txt
diff --git a/samples/Basic_SmartConfig/README.rst b/samples/Basic_SmartConfig/README.rst
index 72fa7ae120..bc0b64f2c7 100644
--- a/samples/Basic_SmartConfig/README.rst
+++ b/samples/Basic_SmartConfig/README.rst
@@ -11,8 +11,8 @@ a special signature. It then tries to extract data like SSID and password from i
 The App on your smart phone sends out that information.
 
 The example here shows how to use ESP_TOUCH method to do smart
-configuration on the device. It ported from the C code that
-Espressif provides in the SDK examples.
+configuration on the device. It is ported from the C code that
+Espressif provides in their SDK examples.
 
 You will need an App for your Smart Phone, such as:
 
diff --git a/samples/Basic_Ssl/README.rst b/samples/Basic_Ssl/README.rst
index 9bfdbeda7a..d82e88e76f 100644
--- a/samples/Basic_Ssl/README.rst
+++ b/samples/Basic_Ssl/README.rst
@@ -42,4 +42,4 @@ Memory usage
 SSL uses a significant amount of RAM. You can build this sample to track heap usage
 and output statistics every 5 seconds::
 
-   make ENABLE_MALLOC_COUNT = 1
+   make ENABLE_MALLOC_COUNT=1
diff --git a/samples/Basic_Ssl/app/application.cpp b/samples/Basic_Ssl/app/application.cpp
index 05ebc5623d..c91d7fec68 100644
--- a/samples/Basic_Ssl/app/application.cpp
+++ b/samples/Basic_Ssl/app/application.cpp
@@ -8,7 +8,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
@@ -141,7 +141,7 @@ void init()
 
 	// Setup the WIFI connection
 	WifiStation.enable(true);
-	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put you SSID and Password here
+	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put your SSID and password here
 
 	WifiEvents.onStationGotIP(gotIP);
 	WifiEvents.onStationDisconnect(connectFail);
diff --git a/samples/Basic_Storage/basic_storage.hw b/samples/Basic_Storage/basic_storage.hw
index aad639cc4f..8ba48a1e2e 100644
--- a/samples/Basic_Storage/basic_storage.hw
+++ b/samples/Basic_Storage/basic_storage.hw
@@ -15,7 +15,7 @@
 			"size": "16K",
 			"type": "user",
 			"subtype": 0,
-			"filename": "user0.bin"
+			"filename": "files/user0.bin"
 		},
 		"user1": {
 			"address": "0x1F4000",
diff --git a/samples/Basic_Storage/user0.bin b/samples/Basic_Storage/files/user0.bin
similarity index 100%
rename from samples/Basic_Storage/user0.bin
rename to samples/Basic_Storage/files/user0.bin
diff --git a/samples/Basic_WebSkeletonApp/app/configuration.cpp b/samples/Basic_WebSkeletonApp/app/configuration.cpp
index 32e217a361..a97aa3227a 100644
--- a/samples/Basic_WebSkeletonApp/app/configuration.cpp
+++ b/samples/Basic_WebSkeletonApp/app/configuration.cpp
@@ -3,7 +3,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/Basic_WebSkeletonApp_LTS/app/configuration.cpp b/samples/Basic_WebSkeletonApp_LTS/app/configuration.cpp
index 526ed6e7c0..b2ed541a2d 100644
--- a/samples/Basic_WebSkeletonApp_LTS/app/configuration.cpp
+++ b/samples/Basic_WebSkeletonApp_LTS/app/configuration.cpp
@@ -2,7 +2,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/Basic_WiFi/app/application.cpp b/samples/Basic_WiFi/app/application.cpp
index a8a60cf20b..cbb84013c1 100644
--- a/samples/Basic_WiFi/app/application.cpp
+++ b/samples/Basic_WiFi/app/application.cpp
@@ -2,7 +2,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/Basic_rBoot/app/application.cpp b/samples/Basic_rBoot/app/application.cpp
index 19d0a683c9..1b8c058e0f 100644
--- a/samples/Basic_rBoot/app/application.cpp
+++ b/samples/Basic_rBoot/app/application.cpp
@@ -8,7 +8,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/CommandProcessing_Debug/app/application.cpp b/samples/CommandProcessing_Debug/app/application.cpp
index 0108784efa..a06cf9d035 100644
--- a/samples/CommandProcessing_Debug/app/application.cpp
+++ b/samples/CommandProcessing_Debug/app/application.cpp
@@ -6,7 +6,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/CommandProcessing_Debug/files/index.html b/samples/CommandProcessing_Debug/files/index.html
index 1ec2d602b1..650311def8 100644
--- a/samples/CommandProcessing_Debug/files/index.html
+++ b/samples/CommandProcessing_Debug/files/index.html
@@ -6,7 +6,7 @@
 
 <script language="javascript" type="text/javascript">
 
-  var wsUri = "ws://" + location.host + "/index.html?command=true";
+  var wsUri = "ws://" + location.host + "/ws";
   var output;
 
   function init()
@@ -53,7 +53,7 @@
 
   function doSend(message)
   {
-    addCommandReply("SENT: " + message); 
+    addCommandReply("SENT: " + message);
     websocket.send(message);
   }
 
@@ -118,5 +118,5 @@ <h2>WebSocket Command Test</h2>
 
 <div id="commandReply"style="width:500px; height:500px; overflow-y: scroll;border:1px solid black;font-size:15px" >
 </div>
- 
+
 <div id="output"></div>
\ No newline at end of file
diff --git a/samples/Compass_HMC5883L/README.rst b/samples/Compass_HMC5883L/README.rst
index dba07bfdb1..53e3e34449 100644
--- a/samples/Compass_HMC5883L/README.rst
+++ b/samples/Compass_HMC5883L/README.rst
@@ -1,7 +1,7 @@
 HMC5883L Compass
 ================
 
-ESP8266 HMC5883L sensor reader.
+HMC5883L sensor reader.
 
 .. image:: hmc5883l.jpg
    :height: 192px
diff --git a/samples/Compass_HMC5883L/example.output.txt b/samples/Compass_HMC5883L/example.output.txt
deleted file mode 100644
index 011a56af6d..0000000000
--- a/samples/Compass_HMC5883L/example.output.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-LightSensor available: 1
-Reading
-Light: 75 lux
-Reading
-Light: 78 lux
diff --git a/samples/DFPlayerMini/README.rst b/samples/DFPlayerMini/README.rst
index fe435d6b9e..49617dacac 100644
--- a/samples/DFPlayerMini/README.rst
+++ b/samples/DFPlayerMini/README.rst
@@ -4,10 +4,10 @@ DFPlayer Mini
 Introduction
 ------------
 
-The DFPlayer Mini MP3 Player is a small and low price MP3 module with an
+The DFPlayer Mini MP3 Player is a small and low-cost MP3 module with a
 simplified output directly to the speaker. The module can be used as a
 stand alone module with attached battery, speaker and push buttons or
-used in combination with an ESP8266 via RX/TX.
+used in combination with an ESP8266/ESP32 via RX/TX.
 
 For more details see this link:
 https://www.dfrobot.com/wiki/index.php/DFPlayer_Mini_SKU:DFR0299
@@ -16,7 +16,7 @@ Building
 --------
 
 Steps to test this sample: \* Connect DFPlayer Mini using RX/TX pins to
-TX/RX pins respectively of ESP8266. \* Copy one or more mp3 file to an
-SD card. The example playes one file for some time and moves to next
-one. \* Insert that SD card in the slot of the DF Player module. \*
+TX/RX pins respectively of ESP8266. \* Copy one or more mp3 files to your
+SD card. The example playes one file for some time and moves to the next
+one. \* Insert your SD card in the slot of the DF Player module. \*
 Flash and run the sample code.
diff --git a/samples/DFPlayerMini/app/application.cpp b/samples/DFPlayerMini/app/application.cpp
index a32e84b915..819dbb7421 100644
--- a/samples/DFPlayerMini/app/application.cpp
+++ b/samples/DFPlayerMini/app/application.cpp
@@ -5,20 +5,21 @@
 #define GPIO_LED 2
 
 Timer timerDFPlayer;
-DFRobotDFPlayerMini player;
-void nextSong()
-{
-	player.next();
-}
-
 Timer timerLedBlink;
+DFRobotDFPlayerMini player;
 bool ledState = true;
+
 void blink()
 {
 	digitalWrite(GPIO_LED, ledState);
 	ledState = !ledState;
 }
 
+void nextSong()
+{
+	player.next();
+}
+
 void init()
 {
 	Serial.begin(9600);
diff --git a/samples/DS3232RTC_NTP_Setter/app/application.cpp b/samples/DS3232RTC_NTP_Setter/app/application.cpp
index c04ac57e32..801c90286d 100644
--- a/samples/DS3232RTC_NTP_Setter/app/application.cpp
+++ b/samples/DS3232RTC_NTP_Setter/app/application.cpp
@@ -5,7 +5,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "ENTER_YOUR_SSID" // Put you SSID and Password here
+#define WIFI_SSID "ENTER_YOUR_SSID" // Put your SSID and password here
 #define WIFI_PWD "ENTER_YOUR_PASSWORD"
 #endif
 
diff --git a/samples/Echo_Ssl/app/application.cpp b/samples/Echo_Ssl/app/application.cpp
index 76db2bef0d..348cede4e6 100644
--- a/samples/Echo_Ssl/app/application.cpp
+++ b/samples/Echo_Ssl/app/application.cpp
@@ -10,7 +10,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
@@ -66,7 +66,7 @@ void init()
 
 	// Setup the WIFI connection
 	WifiStation.enable(true);
-	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put you SSID and Password here
+	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put your SSID and password here
 
 	// Run our method when station was connected to AP (or not connected)
 	WifiEvents.onStationDisconnect(connectFail);
diff --git a/samples/FtpServer_Files/app/application.cpp b/samples/FtpServer_Files/app/application.cpp
index 62c74f7149..4bebad2d27 100644
--- a/samples/FtpServer_Files/app/application.cpp
+++ b/samples/FtpServer_Files/app/application.cpp
@@ -2,7 +2,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/HttpClient_Instapush/app/application.cpp b/samples/HttpClient_Instapush/app/application.cpp
index 68124a099d..2e9862ca6c 100644
--- a/samples/HttpClient_Instapush/app/application.cpp
+++ b/samples/HttpClient_Instapush/app/application.cpp
@@ -19,7 +19,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
@@ -100,8 +100,6 @@ void gotIP(IpAddress ip, IpAddress netmask, IpAddress gateway)
 
 void init()
 {
-	spiffs_mount(); // Mount file system, in order to work with files
-
 	Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
 	Serial.systemDebugOutput(true); // Debug output to serial
 
diff --git a/samples/HttpClient_Instapush/component.mk b/samples/HttpClient_Instapush/component.mk
index 8786c2333d..6fad8b7821 100644
--- a/samples/HttpClient_Instapush/component.mk
+++ b/samples/HttpClient_Instapush/component.mk
@@ -1,3 +1 @@
-HWCONFIG := spiffs
-SPIFF_FILES :=
 ARDUINO_LIBRARIES := ArduinoJson6
diff --git a/samples/HttpClient_ThingSpeak/README.rst b/samples/HttpClient_ThingSpeak/README.rst
index caed46fdf2..a54b5ef731 100644
--- a/samples/HttpClient_ThingSpeak/README.rst
+++ b/samples/HttpClient_ThingSpeak/README.rst
@@ -1,7 +1,7 @@
 ThingSpeak Http Client
 ======================
 
-Example of HttpClient and direct ESP8266 `ThingSpeak <https://thingspeak.com/>`__ data pushing.
+Example of a HttpClient pushing data to `ThingSpeak <https://thingspeak.com/>`__ .
 
 .. image:: thing-speak.png
    :height: 192px
diff --git a/samples/HttpClient_ThingSpeak/app/application.cpp b/samples/HttpClient_ThingSpeak/app/application.cpp
index c7fee25bd0..775373e3b4 100644
--- a/samples/HttpClient_ThingSpeak/app/application.cpp
+++ b/samples/HttpClient_ThingSpeak/app/application.cpp
@@ -2,7 +2,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
@@ -69,8 +69,6 @@ void gotIP(IpAddress ip, IpAddress netmask, IpAddress gateway)
 
 void init()
 {
-	spiffs_mount(); // Mount file system, in order to work with files
-
 	Serial.begin(SERIAL_BAUD_RATE);  // 115200 by default
 	Serial.systemDebugOutput(false); // Disable debug output to serial
 
diff --git a/samples/HttpClient_ThingSpeak/component.mk b/samples/HttpClient_ThingSpeak/component.mk
deleted file mode 100644
index ab4cb6eed9..0000000000
--- a/samples/HttpClient_ThingSpeak/component.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-HWCONFIG := spiffs
-SPIFF_FILES :=
diff --git a/samples/HttpServer_AJAX/app/application.cpp b/samples/HttpServer_AJAX/app/application.cpp
index 0f96cf9c4d..04d7cf860d 100644
--- a/samples/HttpServer_AJAX/app/application.cpp
+++ b/samples/HttpServer_AJAX/app/application.cpp
@@ -3,7 +3,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/HttpServer_Bootstrap/README.rst b/samples/HttpServer_Bootstrap/README.rst
index cdac6ba601..d5f1a3a69a 100644
--- a/samples/HttpServer_Bootstrap/README.rst
+++ b/samples/HttpServer_Bootstrap/README.rst
@@ -1,11 +1,9 @@
 Bootstrap Http Server
 =====================
 
-ESP8266 embedded web server.
+Embedded web server.
 
-At start ESP will download all requried files from remote server. All
-content, including JQuery and Bootstrap will be saved on device (and
-can work offline). Static files stored in GZIPed mode.
+This sample will download all requried files from a remote server.
 
 .. image:: esp8266-web-server.png
    :height: 192px
diff --git a/samples/HttpServer_Bootstrap/app/application.cpp b/samples/HttpServer_Bootstrap/app/application.cpp
index 1ed047e917..6a22cc7360 100644
--- a/samples/HttpServer_Bootstrap/app/application.cpp
+++ b/samples/HttpServer_Bootstrap/app/application.cpp
@@ -2,7 +2,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
@@ -20,7 +20,6 @@ void onIndex(HttpRequest& request, HttpResponse& response)
 	TemplateFileStream* tmpl = new TemplateFileStream("index.html");
 	auto& vars = tmpl->variables();
 	vars["counter"] = String(counter);
-	//vars["ledstate"] = (*portOutputRegister(digitalPinToPort(LED_PIN)) & digitalPinToBitMask(LED_PIN)) ? "checked" : "";
 	vars["IP"] = WifiStation.getIP().toString();
 	vars["MAC"] = WifiStation.getMacAddress().toString();
 	response.sendNamedStream(tmpl); // this template object will be deleted automatically
diff --git a/samples/HttpServer_WebSockets/app/application.cpp b/samples/HttpServer_WebSockets/app/application.cpp
index debead752d..02e46a89e3 100644
--- a/samples/HttpServer_WebSockets/app/application.cpp
+++ b/samples/HttpServer_WebSockets/app/application.cpp
@@ -4,7 +4,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/LED_YeelightBulb/app/application.cpp b/samples/LED_YeelightBulb/app/application.cpp
index ded1311777..734e681cfa 100644
--- a/samples/LED_YeelightBulb/app/application.cpp
+++ b/samples/LED_YeelightBulb/app/application.cpp
@@ -3,7 +3,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
@@ -40,7 +40,7 @@ void init()
 
 	// Station - WiFi client
 	WifiStation.enable(true);
-	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put you SSID and Password here
+	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put your SSID and password here
 
 	WifiEvents.onStationGotIP(gotIP);
 }
diff --git a/samples/MeteoControl/dump.bat b/samples/MeteoControl/dump.bat
deleted file mode 100644
index ca9c4ae7b6..0000000000
--- a/samples/MeteoControl/dump.bat
+++ /dev/null
@@ -1 +0,0 @@
-C:\Espressif\xtensa-lx106-elf\bin\xtensa-lx106-elf-objdump -S .\out\build\app.out > .\out\app.asm
\ No newline at end of file
diff --git a/samples/MeteoControl/include/configuration.h b/samples/MeteoControl/include/configuration.h
index 29765849ca..d39a298f39 100644
--- a/samples/MeteoControl/include/configuration.h
+++ b/samples/MeteoControl/include/configuration.h
@@ -6,7 +6,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/MeteoControl_mqtt/dump.bat b/samples/MeteoControl_mqtt/dump.bat
deleted file mode 100644
index ca9c4ae7b6..0000000000
--- a/samples/MeteoControl_mqtt/dump.bat
+++ /dev/null
@@ -1 +0,0 @@
-C:\Espressif\xtensa-lx106-elf\bin\xtensa-lx106-elf-objdump -S .\out\build\app.out > .\out\app.asm
\ No newline at end of file
diff --git a/samples/MqttClient_Hello/app/application.cpp b/samples/MqttClient_Hello/app/application.cpp
index b00bc293f7..6a2dfbddd2 100644
--- a/samples/MqttClient_Hello/app/application.cpp
+++ b/samples/MqttClient_Hello/app/application.cpp
@@ -2,7 +2,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/Nextion_Button/component.mk b/samples/Nextion_Button/component.mk
index 538e725470..7ffeff230d 100644
--- a/samples/Nextion_Button/component.mk
+++ b/samples/Nextion_Button/component.mk
@@ -1,3 +1 @@
 ARDUINO_LIBRARIES := ITEADLIB_Arduino_Nextion
-
-ENABLE_NEXTION = 1
diff --git a/samples/ScreenLCD_5110/README.rst b/samples/ScreenLCD_5110/README.rst
index 5e3d8cb7b6..5583eacace 100644
--- a/samples/ScreenLCD_5110/README.rst
+++ b/samples/ScreenLCD_5110/README.rst
@@ -1,4 +1,4 @@
 5110 LCD Screen
 ===============
 
-How to interface to Monochrome Nokia 5110 LCD Displays.
+Demonstration of how to interface to Monochrome Nokia 5110 LCD Displays.
diff --git a/samples/ScreenTFT_ILI9340-ILI9341/README.rst b/samples/ScreenTFT_ILI9340-ILI9341/README.rst
index fe38ff7bf7..48e3cbb0a2 100644
--- a/samples/ScreenTFT_ILI9340-ILI9341/README.rst
+++ b/samples/ScreenTFT_ILI9340-ILI9341/README.rst
@@ -1,5 +1,5 @@
 ILI9340 and ILI9341 TFT Screens
 ===============================
 
-How to interface with displays such as the
+Demonstration of how to interface with displays such as the
 `Adafruit 2.8� Touch Shield V2 (SPI) <https://www.adafruit.com/product/1651>`__.
diff --git a/samples/ScreenTFT_ILI9340-ILI9341/app/application.cpp b/samples/ScreenTFT_ILI9340-ILI9341/app/application.cpp
index 4212494953..0f8478c408 100644
--- a/samples/ScreenTFT_ILI9340-ILI9341/app/application.cpp
+++ b/samples/ScreenTFT_ILI9340-ILI9341/app/application.cpp
@@ -4,7 +4,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/ScreenTFT_ST7735/README.rst b/samples/ScreenTFT_ST7735/README.rst
index 6976cca1d7..41a6eb473f 100644
--- a/samples/ScreenTFT_ST7735/README.rst
+++ b/samples/ScreenTFT_ST7735/README.rst
@@ -1,4 +1,4 @@
 ST7735 TFT Screen
 =================
 
-How to interface with various SPI displays using the Adafruit ST7735 library.
+Demonstration of how to interface with various SPI displays using the Adafruit ST7735 library.
diff --git a/samples/SmtpClient/app/application.cpp b/samples/SmtpClient/app/application.cpp
index d3f5ac30a5..9890635d3a 100644
--- a/samples/SmtpClient/app/application.cpp
+++ b/samples/SmtpClient/app/application.cpp
@@ -3,7 +3,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
@@ -81,7 +81,7 @@ void init()
 
 	// Setup the WIFI connection
 	WifiStation.enable(true);
-	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put you SSID and Password here
+	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put your SSID and password here
 
 	WifiEvents.onStationGotIP(onConnected);
 }
diff --git a/samples/SystemClock_NTP/app/application.cpp b/samples/SystemClock_NTP/app/application.cpp
index 21532d0b23..56ae91dfb0 100644
--- a/samples/SystemClock_NTP/app/application.cpp
+++ b/samples/SystemClock_NTP/app/application.cpp
@@ -3,7 +3,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
@@ -87,7 +87,9 @@ void gotIP(IpAddress ip, IpAddress netmask, IpAddress gateway)
 	//  ntpClient = new NtpClient("my_ntp_server", myrefreshinterval);
 
 	//	When using Delegate Callback Option 2
-	demo = new NtpClientDemo();
+	if(demo == nullptr) {
+		demo = new NtpClientDemo();
+	}
 }
 
 // Will be called when WiFi hardware and software initialization was finished
@@ -101,7 +103,7 @@ void init()
 
 	// Station - WiFi client
 	WifiStation.enable(true);
-	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put you SSID and Password here
+	WifiStation.config(WIFI_SSID, WIFI_PWD); // Put your SSID and password here
 
 	printTimer.initializeMs<1000>(onPrintSystemTime).start();
 
diff --git a/samples/TcpClient_NarodMon/README.rst b/samples/TcpClient_NarodMon/README.rst
index b317ad9b68..689cdb6cf0 100644
--- a/samples/TcpClient_NarodMon/README.rst
+++ b/samples/TcpClient_NarodMon/README.rst
@@ -3,7 +3,7 @@ TCP Client NarodMon
 
 An example of sending data to narodmon.ru using a TCP client.
 
-https://narodmon.ru was is a geo-information project to display on the world map and control
+https://narodmon.ru is a geo-information project to display on the world map and control
 (on PCs, smartphones and other gadgets) the sensor readings of its members
 (temperature, humidity, pressure, wind speed and direction, radiation, energy consumption
 and any other values), as well as private and urban webcams for public or private viewing.
diff --git a/samples/TcpClient_NarodMon/app/application.cpp b/samples/TcpClient_NarodMon/app/application.cpp
index 1d2d8e0dbf..90a9d2437f 100644
--- a/samples/TcpClient_NarodMon/app/application.cpp
+++ b/samples/TcpClient_NarodMon/app/application.cpp
@@ -9,7 +9,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/Telnet_TCPServer_TCPClient/.cproject b/samples/Telnet_Server/.cproject
similarity index 100%
rename from samples/Telnet_TCPServer_TCPClient/.cproject
rename to samples/Telnet_Server/.cproject
diff --git a/samples/Telnet_TCPServer_TCPClient/.project b/samples/Telnet_Server/.project
similarity index 95%
rename from samples/Telnet_TCPServer_TCPClient/.project
rename to samples/Telnet_Server/.project
index c212ceedfb..aef1d14e81 100644
--- a/samples/Telnet_TCPServer_TCPClient/.project
+++ b/samples/Telnet_Server/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Telnet_TCPServer_TCPClient</name>
+	<name>Telnet_Server</name>
 	<comment></comment>
 	<projects>
 		<project>SmingFramework</project>
diff --git a/samples/Telnet_TCPServer_TCPClient/Makefile b/samples/Telnet_Server/Makefile
similarity index 100%
rename from samples/Telnet_TCPServer_TCPClient/Makefile
rename to samples/Telnet_Server/Makefile
diff --git a/samples/Telnet_TCPServer_TCPClient/README.rst b/samples/Telnet_Server/README.rst
similarity index 100%
rename from samples/Telnet_TCPServer_TCPClient/README.rst
rename to samples/Telnet_Server/README.rst
diff --git a/samples/Telnet_TCPServer_TCPClient/app/application.cpp b/samples/Telnet_Server/app/application.cpp
similarity index 100%
rename from samples/Telnet_TCPServer_TCPClient/app/application.cpp
rename to samples/Telnet_Server/app/application.cpp
diff --git a/samples/Temperature_DS1820/README.rst b/samples/Temperature_DS1820/README.rst
index a135e2fbc9..f666bae0b6 100644
--- a/samples/Temperature_DS1820/README.rst
+++ b/samples/Temperature_DS1820/README.rst
@@ -1,7 +1,7 @@
 DS1820 Temperature Sensor
 =========================
 
-ESP8266 DS1820/DS18B20 sensor reader.
+DS1820/DS18B20 sensor reader.
 
 .. image:: ds1820.jpg
    :height: 192px
diff --git a/samples/Temperature_DS1820/app/application.cpp b/samples/Temperature_DS1820/app/application.cpp
index d51b5537ef..8bc84bd224 100644
--- a/samples/Temperature_DS1820/app/application.cpp
+++ b/samples/Temperature_DS1820/app/application.cpp
@@ -9,7 +9,7 @@ Timer procTimer;
 // (At the moment 4 pcs - it depends on the definition in the library)
 // Measuring time: 1.2 seconds * number of sensors
 // The main difference with the previous version of the demo:
-//  - Do not use the Delay function () which discourages by manufacturer of ESP8266
+//  - Do not use the Delay function () which is discouraged by the manufacturer of ESP8266
 //  - We can read several sensors
 // Usage:
 //  Call Init to setup pin eg. ReadTemp.Init(2);   //pin 2 selected
diff --git a/samples/UdpServer_Echo/app/application.cpp b/samples/UdpServer_Echo/app/application.cpp
index ba48a64eee..a06e85ab6c 100644
--- a/samples/UdpServer_Echo/app/application.cpp
+++ b/samples/UdpServer_Echo/app/application.cpp
@@ -2,7 +2,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/UdpServer_mDNS/app/application.cpp b/samples/UdpServer_mDNS/app/application.cpp
index c7a69926a6..13807dd742 100644
--- a/samples/UdpServer_mDNS/app/application.cpp
+++ b/samples/UdpServer_mDNS/app/application.cpp
@@ -3,7 +3,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
diff --git a/samples/Ultrasonic_HCSR04/README.rst b/samples/Ultrasonic_HCSR04/README.rst
index 8f61f9459a..2e217567b0 100644
--- a/samples/Ultrasonic_HCSR04/README.rst
+++ b/samples/Ultrasonic_HCSR04/README.rst
@@ -6,8 +6,6 @@ Shows how to use an HCSR04 module to measure distances.
 .. warning::
 
    Ultrasonic_HCSR04 modules usually work with 5v power and TTL levels,
-   so You need voltage divider or level shifter for ECHO pin.
+   so you NEED voltage divider or level shifter for ECHO pin.
 
-Trigger pin is tolerant for 3.3v and in my case work without problems
-
-By nik.sharky http://esp8266.ru/forum/members/sharky.396/
+Trigger pin is tolerant to 3.3v and should work without problems.
diff --git a/samples/Ultrasonic_HCSR04/app/application.cpp b/samples/Ultrasonic_HCSR04/app/application.cpp
index 3c18df6255..bf3d87e8ba 100644
--- a/samples/Ultrasonic_HCSR04/app/application.cpp
+++ b/samples/Ultrasonic_HCSR04/app/application.cpp
@@ -1,9 +1,9 @@
 /**
  * WARNING !
  * Ultrasonic_HCSR04 modules usually work with 5v power and TTL levels,
- * so You need voltage divider or level shifter for ECHO pin.
+ * so you NEED voltage divider or level shifter for ECHO pin.
  *
- * Trigger pin is tolerant for 3.3v and in my case work without problems
+ * Trigger pin is tolerant to 3.3v and should work without problems
  *
  * By nik.sharky http://esp8266.ru/forum/members/sharky.396/
  */
diff --git a/samples/WebcamServer/app/application.cpp b/samples/WebcamServer/app/application.cpp
index 61109a6563..7e27c65855 100644
--- a/samples/WebcamServer/app/application.cpp
+++ b/samples/WebcamServer/app/application.cpp
@@ -6,7 +6,7 @@
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
-#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
@@ -83,9 +83,11 @@ void startWebServer()
 
 void init()
 {
-	Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
+	Serial.begin(SERIAL_BAUD_RATE); // Enable serial
 	Serial.systemDebugOutput(true); // Allow debug output to serial
 
+	spiffs_mount();
+
 	WifiStation.enable(true);
 
 	System.onReady(startWebServer);
diff --git a/samples/WebcamServer/component.mk b/samples/WebcamServer/component.mk
index f408ca2b88..5acc510571 100644
--- a/samples/WebcamServer/component.mk
+++ b/samples/WebcamServer/component.mk
@@ -1,3 +1,3 @@
 ARDUINO_LIBRARIES := WebCam
-
+HWCONFIG := spiffs
 SPIFF_FILES = web/build
diff --git a/samples/Websocket_Client/app/application.cpp b/samples/Websocket_Client/app/application.cpp
index 6f07db0bfc..4c7464f496 100644
--- a/samples/Websocket_Client/app/application.cpp
+++ b/samples/Websocket_Client/app/application.cpp
@@ -13,7 +13,7 @@
 #include <Network/WebsocketClient.h>
 
 #ifndef WIFI_SSID
-#define WIFI_SSID "PutSsidHere" // Put you SSID and Password here
+#define WIFI_SSID "PutSsidHere" // Put your SSID and password here
 #define WIFI_PWD "PutPasswordHere"
 #endif
 

From 07cdbdb009e38633a29dfdcfeed9586e087cd857 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Fri, 5 Mar 2021 07:27:09 +0000
Subject: [PATCH 45/91] IDE & install fixes (#2241)

* Install fixes

* Add missing host debug command line parameters for `ide-vscode`

* Fix memory leak in OwnedLinkedObjectListTemplate
---
 Sming/Arch/Esp8266/Tools/install.sh |  9 +--
 Sming/Core/Data/LinkedObjectList.h  |  5 ++
 Sming/project.mk                    |  3 +
 Tools/vscode/setup.py               | 95 +++++++++++++++++++----------
 4 files changed, 76 insertions(+), 36 deletions(-)
 mode change 100755 => 100644 Sming/Arch/Esp8266/Tools/install.sh

diff --git a/Sming/Arch/Esp8266/Tools/install.sh b/Sming/Arch/Esp8266/Tools/install.sh
old mode 100755
new mode 100644
index c940fcd930..039b999a6d
--- a/Sming/Arch/Esp8266/Tools/install.sh
+++ b/Sming/Arch/Esp8266/Tools/install.sh
@@ -2,14 +2,15 @@
 
 # Old toolchain
 if [ -n "$UDK_ROOT" ]; then
-    if [ -d "$EQT_ROOT" ]; then
-        printf "\n\n** Skipping Esp8266 tools installation: '$EQT_ROOT' exists\n\n"
+    if [ -d "$UDK_ROOT" ]; then
+        printf "\n\n** Skipping Esp8266 tools installation: '$UDK_ROOT' exists\n\n"
     else
         TOOLCHAIN=esp-open-sdk-linux-x86_64.tar.gz
         $WGET $SMINGTOOLS/$TOOLCHAIN -O $DOWNLOADS/$TOOLCHAIN
-        tar -zxf $DOWNLOADS/$TOOLCHAIN
         mkdir -p $UDK_ROOT
-        ln -s $(pwd)/esp-open-sdk/xtensa-lx106-elf $UDK_ROOT/.
+        tar -zxf $DOWNLOADS/$TOOLCHAIN -C $UDK_ROOT --totals
+        mv $UDK_ROOT/esp-open-sdk/* $UDK_ROOT
+        rmdir $UDK_ROOT/esp-open-sdk
     fi
 fi
 
diff --git a/Sming/Core/Data/LinkedObjectList.h b/Sming/Core/Data/LinkedObjectList.h
index 2014756ba7..6ebb5c9963 100644
--- a/Sming/Core/Data/LinkedObjectList.h
+++ b/Sming/Core/Data/LinkedObjectList.h
@@ -116,6 +116,11 @@ template <typename ObjectType> class LinkedObjectListTemplate : public LinkedObj
 template <typename ObjectType> class OwnedLinkedObjectListTemplate : public LinkedObjectListTemplate<ObjectType>
 {
 public:
+	~OwnedLinkedObjectListTemplate()
+	{
+		clear();
+	}
+
 	bool remove(ObjectType* object)
 	{
 		bool res = LinkedObjectList::remove(object);
diff --git a/Sming/project.mk b/Sming/project.mk
index 9833848499..d98f1d93c3 100644
--- a/Sming/project.mk
+++ b/Sming/project.mk
@@ -521,6 +521,9 @@ endif
 ide-vscode: checkdirs submodules ##Create/update vscode project configuration
 	$(Q) $(MAKE) --no-print-directory ide-vscode-update
 
+export CLI_TARGET_OPTIONS
+export HOST_PARAMETERS
+
 .PHONY: ide-vscode-update
 ide-vscode-update:
 	$(Q) CXX=$(CXX) \
diff --git a/Tools/vscode/setup.py b/Tools/vscode/setup.py
index b866202ad9..460fb2ac86 100644
--- a/Tools/vscode/setup.py
+++ b/Tools/vscode/setup.py
@@ -5,6 +5,47 @@
 
 import os, sys, json, shutil
 
+class Env:
+    """ Cache required environment variables"""
+
+    def __init__(self):
+        self.SMING_HOME = os.environ['SMING_HOME']
+        self.SMING_ARCH = os.environ['SMING_ARCH']
+        self.WSL_ROOT = os.environ.get('WSL_ROOT', '')
+        vars = []
+        if self.SMING_ARCH == 'Esp8266':
+            vars += ['ESP_HOME']
+        if self.SMING_ARCH == 'Esp32':
+            vars += ['IDF_PATH', 'IDF_TOOLS_PATH']
+        for name in vars:
+            value = os.environ.get(name, None)
+            if not value:
+                print("Warning: env['%s'] not found" % name)
+            setattr(env, name, value)
+
+    def replace(self, path, name, prefix):
+        value = getattr(self, name, None)
+        if value is not None:
+            s = fix_path(path)
+            value = fix_path(value)
+            if value != '' and s.startswith(value):
+                return '${%s%s}%s' % (prefix, name, s[len(value):])
+        return path
+
+    def subst_path(self, path, prefix=''):
+        path = self.replace(path, 'SMING_HOME', prefix)
+        path = self.replace(path, 'ESP_HOME', prefix)
+        path = self.replace(path, 'IDF_PATH', prefix)
+        path = self.replace(path, 'IDF_TOOLS_PATH', prefix)
+        return path
+
+    def isWsl(self):
+        return self.WSL_ROOT != ''
+
+
+env = Env()
+
+
 def fix_path(path):
     if path[1:3] == ':/':
         return '/' + path[0] + path[2:]
@@ -20,24 +61,7 @@ def find_tool(name):
             path = name
     if not os.path.exists(path):
         sys.stderr.write("Warning! '%s' doesn't exist\n" % path)
-    return env_subst_path(path, 'env:')
-
-def env_replace(path, name, prefix):
-    if name in os.environ:
-        s = fix_path(path)
-        value = fix_path(os.environ[name])
-        if value != '' and s.startswith(value):
-            return '${%s%s}%s' % (prefix, name, s[len(value):])
-    else:
-        print("env['%s'] not found" % name)
-    return path
-
-def env_subst_path(path, prefix=''):
-    path = env_replace(path, 'SMING_HOME', prefix)
-    path = env_replace(path, 'ESP_HOME', prefix)
-    path = env_replace(path, 'IDF_PATH', prefix)
-    path = env_replace(path, 'IDF_TOOLS_PATH', prefix)
-    return path
+    return env.subst_path(path, 'env:')
 
 def load_json(filename, must_exist=True):
     if must_exist or os.path.exists(filename):
@@ -72,7 +96,7 @@ def get_property(data, name, default):
 def update_intellisense():
     dirs = os.environ['COMPONENTS_EXTRA_INCDIR'].split()
     for i, d in enumerate(dirs):
-        dirs[i] = env_subst_path(d)
+        dirs[i] = env.subst_path(d)
 
     propertiesFile = '.vscode/c_cpp_properties.json'
     if os.path.exists(propertiesFile):
@@ -82,13 +106,12 @@ def update_intellisense():
 
     configurations = get_property(properties, 'configurations', [])
 
-    arch = os.environ['SMING_ARCH']
-    config = find_object(configurations, arch)
+    config = find_object(configurations, env.SMING_ARCH)
 
     if config is None:
         config = load_template('intellisense/configuration.json')
-        config['name'] = arch
-        config['defines'].append('ARCH_%s=1' % arch.upper())
+        config['name'] = env.SMING_ARCH
+        config['defines'].append('ARCH_%s=1' % env.SMING_ARCH.upper())
         configurations.append(config)
 
     config['compilerPath'] = find_tool(os.environ['CXX'])
@@ -120,17 +143,22 @@ def update_launch():
         config = template_config.copy()
         configurations.append(config)
 
-    arch = os.environ['SMING_ARCH']
-    is_wsl = (os.environ['WSL_ROOT'] != '')
-    config = find_object(configurations, "%s GDB" % arch)
+    config = find_object(configurations, "%s GDB" % env.SMING_ARCH)
     if not config is None:
         config['miDebuggerPath'] = find_tool(os.environ['GDB'])
-        args = "-x ${env:SMING_HOME}/Arch/%s/Components/gdbstub/gdbcmds" % arch
-        if arch == 'Esp8266':
-            if not is_wsl:
-                args += " -b %s" % os.environ['COM_SPEED_GDB']
+        dbgargs = "-x ${env:SMING_HOME}/Arch/%s/Components/gdbstub/gdbcmds" % env.SMING_ARCH
+        if env.SMING_ARCH == 'Esp8266':
+            if not env.isWsl():
+                dbgargs += " -b %s" % os.environ['COM_SPEED_GDB']
             config['miDebuggerServerAddress'] = os.environ['COM_PORT_GDB']
-        config['miDebuggerArgs'] = args
+        elif env.SMING_ARCH == 'Host':
+            args = []
+            args += os.environ['CLI_TARGET_OPTIONS'].split()
+            args += ["--pause"]
+            args += ["--"]
+            args += os.environ['HOST_PARAMETERS'].split()
+            config['args'] = args
+        config['miDebuggerArgs'] = dbgargs
 
     save_json(launch, filename)
 
@@ -144,8 +172,11 @@ def update_workspace():
         save_json(ws, filename)
 
 def main():
+    if not env.SMING_HOME or not env.SMING_ARCH:
+        sys.exit(1)
+
     # So we can find rjsmin.py
-    sys.path.append(os.path.join(os.environ['SMING_HOME'], 'Components/Storage/Tools/hwconfig'))
+    sys.path.append(os.path.join(env.SMING_HOME, 'Components/Storage/Tools/hwconfig'))
 
     update_intellisense()
     update_tasks()

From 10f61ff82fedafae472a3e680103676409871296 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Fri, 5 Mar 2021 14:52:45 +0000
Subject: [PATCH 46/91] Fix vscode setup bug (#2243)

---
 Tools/vscode/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/vscode/setup.py b/Tools/vscode/setup.py
index 460fb2ac86..75d16bacce 100644
--- a/Tools/vscode/setup.py
+++ b/Tools/vscode/setup.py
@@ -21,7 +21,7 @@ def __init__(self):
             value = os.environ.get(name, None)
             if not value:
                 print("Warning: env['%s'] not found" % name)
-            setattr(env, name, value)
+            setattr(self, name, value)
 
     def replace(self, path, name, prefix):
         value = getattr(self, name, None)

From a9486bfa2744fb0b854338ef8d5a0257f0a55303 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Sun, 7 Mar 2021 08:59:34 +0000
Subject: [PATCH 47/91] Fix alignment bug setting SPIFFS mtime (#2245)

---
 Sming/Components/IFS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index fbe21e8965..01056149fd 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit fbe21e8965af1955d5881b841938079e4e55855d
+Subproject commit 01056149fd8392fe0b4c9636f369e35c7f9b6dd6

From 2242d298ff732f3c831c85f275fec1a90ee00db8 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Sun, 7 Mar 2021 10:00:28 +0100
Subject: [PATCH 48/91] Updated  bearssl to its latest version. (#2240)

* Updated BearSSL to latest version.

* Make sure to clean the certs directory after creating certificate and private key.

* Keep the original certificate and private key in out/ssl/cert as recommended.

* Fix `unable to write random state` warning when running openssl under MinGW

* Fix the removal of serial number files.

Co-authored-by: mikee47 <mike@sillyhouse.net>
---
 Sming/Arch/Host/build.mk                 | 3 ---
 Sming/Components/bearssl-esp8266/bearssl | 2 +-
 Sming/Components/ssl/Tools/make_certs.sh | 2 +-
 Sming/Components/ssl/component.mk        | 5 +++--
 Sming/build.mk                           | 3 +++
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Sming/Arch/Host/build.mk b/Sming/Arch/Host/build.mk
index c2fc4c9e8b..db1582468f 100644
--- a/Sming/Arch/Host/build.mk
+++ b/Sming/Arch/Host/build.mk
@@ -34,9 +34,6 @@ CLI_TARGET_OPTIONS =
 # $1 -> Command to execute
 ifeq ($(UNAME),Windows)
 DetachCommand = start $1
-# May be required by some applications (e.g. openssl)
-HOME ?= $(USERPROFILE)
-export HOME
 else
 DetachCommand = gnome-terminal -- bash -c "sleep 1; $1"
 endif
diff --git a/Sming/Components/bearssl-esp8266/bearssl b/Sming/Components/bearssl-esp8266/bearssl
index 5c771bed8b..c0b69dfb83 160000
--- a/Sming/Components/bearssl-esp8266/bearssl
+++ b/Sming/Components/bearssl-esp8266/bearssl
@@ -1 +1 @@
-Subproject commit 5c771bed8b11b968e2f75f26b9b00de51f2e9333
+Subproject commit c0b69dfb837f0027180c72f13f7c90cfafb83c16
diff --git a/Sming/Components/ssl/Tools/make_certs.sh b/Sming/Components/ssl/Tools/make_certs.sh
index f9240bf8a1..be1adde987 100755
--- a/Sming/Components/ssl/Tools/make_certs.sh
+++ b/Sming/Components/ssl/Tools/make_certs.sh
@@ -149,7 +149,7 @@ openssl x509 -req -in x509_512.req -out x509_bad_after.pem \
 
 # some cleanup
 rm *.req
-rm srl
+rm *.srl
 rm *.conf
 
 # need this for the client tests
diff --git a/Sming/Components/ssl/component.mk b/Sming/Components/ssl/component.mk
index bd60b5182c..41ba7ae644 100644
--- a/Sming/Components/ssl/component.mk
+++ b/Sming/Components/ssl/component.mk
@@ -46,13 +46,14 @@ CUSTOM_TARGETS			+= include/ssl/private_key.h
 
 SSL_TOOLS_PATH			:= $(COMPONENT_PATH)/Tools
 SSL_INCLUDE_DIR			:= $(PROJECT_DIR)/include/ssl
-SSL_CERT_DIR			:= $(PROJECT_DIR)/cert
+OUT_SSL                         := out/ssl/
+SSL_CERT_DIR			:= $(OUT_SSL)/cert
 
 include/ssl/private_key.h:
 	$(info Generating unique certificate and key. This may take some time...)
 	$(Q) mkdir -p $(SSL_INCLUDE_DIR) $(SSL_CERT_DIR)
 	$(Q) chmod a+x $(SSL_TOOLS_PATH)/make_certs.sh
-	cd $(SSL_CERT_DIR); SSL_INCLUDE_DIR=$(SSL_INCLUDE_DIR) $(SSL_TOOLS_PATH)/make_certs.sh
+	$(Q) cd $(SSL_CERT_DIR); SSL_INCLUDE_DIR=$(SSL_INCLUDE_DIR) $(SSL_TOOLS_PATH)/make_certs.sh
 
 endif
 
diff --git a/Sming/build.mk b/Sming/build.mk
index d252d0f730..6ee11a70a9 100644
--- a/Sming/build.mk
+++ b/Sming/build.mk
@@ -27,6 +27,9 @@ UNAME		:= $(shell uname -s)
 ifneq ($(filter MINGW32_NT%,$(UNAME)),)
 	UNAME		:= Windows
 	TOOL_EXT	:= .exe
+	# May be required by some applications (e.g. openssl)
+	HOME ?= $(USERPROFILE)
+	export HOME
 else ifneq ($(filter CYGWIN%,$(UNAME)),)
 	# Cygwin Detected
 	UNAME		:= Linux

From c724627d2c64d1fec7965ae9080d90599dff803f Mon Sep 17 00:00:00 2001
From: Mateusz Zakarczemny <m.zakarczemny@gmail.com>
Date: Sun, 7 Mar 2021 10:15:14 +0100
Subject: [PATCH 49/91] Replace SimpleHTTPServer with http.server (#2244)

Python2 is not longer maintained. Most of the Linux distro switched to python3.
In python3 `SimpleHTTPServer` module was replaced with `http.server`
---
 Sming/project.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sming/project.mk b/Sming/project.mk
index d98f1d93c3..96d6b3c239 100644
--- a/Sming/project.mk
+++ b/Sming/project.mk
@@ -545,7 +545,7 @@ SERVER_OTA_PORT		?= 9999
 .PHONY: otaserver
 otaserver: all ##Launch a simple python HTTP server for testing OTA updates
 	$(info Starting OTA server for TESTING)
-	$(Q) cd $(FW_BASE) && $(PYTHON) -m SimpleHTTPServer $(SERVER_OTA_PORT)
+	$(Q) cd $(FW_BASE) && $(PYTHON) -m http.server $(SERVER_OTA_PORT)
 
 
 #

From ea49ac54fd15b2d020ec4143124e3c647fc8494b Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 8 Mar 2021 07:21:43 +0000
Subject: [PATCH 50/91] Update MDNS library with query support (#2237)

Co-authored-by: Slavey Karadzhov <slav@attachix.com>
---
 .gitmodules                                   |   4 +
 Sming/Components/mdns/.cs                     |   0
 Sming/Components/mdns/README.rst              |  53 -----
 Sming/Components/mdns/component.mk            |  14 --
 .../mdns/include/Network/Mdns/Responder.h     |  48 ----
 .../mdns/include/Network/Mdns/Service.h       |  72 ------
 Sming/Components/mdns/src/Responder.cpp       | 215 ------------------
 Sming/Core/Data/LinkedObjectList.h            |   5 +-
 Sming/Core/Data/Packet.h                      | 146 ++++++++++++
 Sming/Core/Network/UdpConnection.cpp          |  24 +-
 Sming/Libraries/MDNS                          |   1 +
 samples/UdpServer_mDNS/component.mk           |   2 +-
 12 files changed, 172 insertions(+), 412 deletions(-)
 delete mode 100644 Sming/Components/mdns/.cs
 delete mode 100644 Sming/Components/mdns/README.rst
 delete mode 100644 Sming/Components/mdns/component.mk
 delete mode 100644 Sming/Components/mdns/include/Network/Mdns/Responder.h
 delete mode 100644 Sming/Components/mdns/include/Network/Mdns/Service.h
 delete mode 100644 Sming/Components/mdns/src/Responder.cpp
 create mode 100644 Sming/Core/Data/Packet.h
 create mode 160000 Sming/Libraries/MDNS

diff --git a/.gitmodules b/.gitmodules
index e5ea539ace..d467eddfb4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -211,6 +211,10 @@
 	path = Sming/Libraries/libsodium/libsodium
 	url = https://github.com/jedisct1/libsodium.git
 	ignore = dirty
+[submodule "Libraries.MDNS"]
+	path = Sming/Libraries/MDNS
+	url = https://github.com/mikee47/Sming-MDNS
+	ignore = dirty
 [submodule "Libraries.modbusino"]
 	path = Sming/Libraries/modbusino/modbusino
 	url = https://github.com/kmihaylov/modbusino.git
diff --git a/Sming/Components/mdns/.cs b/Sming/Components/mdns/.cs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Sming/Components/mdns/README.rst b/Sming/Components/mdns/README.rst
deleted file mode 100644
index b5714dd685..0000000000
--- a/Sming/Components/mdns/README.rst
+++ /dev/null
@@ -1,53 +0,0 @@
-mDNS: Multicast Domain Name System
-==================================
-
-.. highlight:: c++
-
-https://en.wikipedia.org/wiki/Multicast_DNS
-
-Sming provides the :cpp:class:`mDNS::Responder` class to allow applications
-to advertise themselves on the local network.
-
-Issuing discovery requests is not currently supported.
-
-
-Using
------
-
-1. Add ``COMPONENT_DEPENDS += mdns`` to your application componenent.mk file.
-2. Add these lines to your application::
-
-   #include <Mdns/Responder.h>
-
-   static mDNS::Responder responder;
-   
-   // Call when IP address has been obtained
-   void startmDNS()
-   {
-      responder.begin(F("myhostname");
-   }
-
-This will advertise the device as ``myhostname.local``.
-
-To provide a custom service, implement a :cpp:class:`mDNS::Service` class
-and call :cpp:func:`mDNS::Responder::addService`.
-
-See the :sample:`UdpServer_mDNS` sample application.
-
-
-Testing
--------
-
-For linux, you can use `avahi <https://wiki.archlinux.org/index.php/Avahi>`__
-to perform mDNS queries and confirm output is as expected:
-
-.. code-block:: bash
-
-   sudo apt install avahi
-   avahi-browse --all -r
-
-
-API Documentation
------------------
-
-.. doxygennamespace:: mDNS
diff --git a/Sming/Components/mdns/component.mk b/Sming/Components/mdns/component.mk
deleted file mode 100644
index f07f849a3f..0000000000
--- a/Sming/Components/mdns/component.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-COMPONENT_SRCDIRS	:= src
-COMPONENT_INCDIRS	:= include
-
-COMPONENT_DOXYGEN_INPUT := include
-
-COMPONENT_VARS		+= ENABLE_CUSTOM_LWIP
-
-# If using Espressif LWIP...
-ifeq ($(ENABLE_CUSTOM_LWIP),0)
-ENABLE_ESPCONN		:= 1
-GLOBAL_CFLAGS		+= -DENABLE_ESPCONN
-endif
-
-GLOBAL_CFLAGS		+= -DENABLE_CUSTOM_LWIP=$(ENABLE_CUSTOM_LWIP)
diff --git a/Sming/Components/mdns/include/Network/Mdns/Responder.h b/Sming/Components/mdns/include/Network/Mdns/Responder.h
deleted file mode 100644
index c1afb8773a..0000000000
--- a/Sming/Components/mdns/include/Network/Mdns/Responder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "Service.h"
-
-namespace mDNS
-{
-class Responder
-{
-public:
-	/**
-	 * @brief Initialise the responder
-	 * @param hostname
-	 * @retval bool true on success
-	 */
-	bool begin(const String& hostname);
-
-	/**
-	 * @brief Stop the responder
-	 *
-	 * Must reinitialise the stack again to restart
-	 */
-	void end();
-
-	/**
-	 * @brief Add a service object
-	 *
-	 * Responder doesn't own the object, must remain in scope
-	 *
-	 * @param svc Service object
-	 * @retval bool true on success
-	 */
-	bool addService(Service& svc);
-
-	/**
-	 * @brief Restart a running stack
-	 *
-	 * Call when IP address changes, for example.
-	 */
-	bool restart();
-
-private:
-#if LWIP_VERSION_MAJOR == 1
-	String hostname;
-	Service* service = nullptr;
-#endif
-};
-
-} // namespace mDNS
diff --git a/Sming/Components/mdns/include/Network/Mdns/Service.h b/Sming/Components/mdns/include/Network/Mdns/Service.h
deleted file mode 100644
index baa485ed4b..0000000000
--- a/Sming/Components/mdns/include/Network/Mdns/Service.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-
-#include <user_config.h>
-#include <Data/CStringArray.h>
-#include <memory>
-
-#if ENABLE_CUSTOM_LWIP == 2
-#ifdef ARCH_ESP8266
-#define MDNS_LWIP 0x0200
-#else
-#define MDNS_LWIP 0x0202
-#endif
-#elif ENABLE_CUSTOM_LWIP == 1
-#define MDNS_LWIP 0x0101
-#else
-#define MDNS_LWIP 0x0100
-#endif
-
-namespace mDNS
-{
-class Responder;
-
-class Service
-{
-public:
-	enum class Protocol {
-		Udp /* = DNSSD_PROTO_UCP */,
-		Tcp /* = DNSSD_PROTO_TCP */,
-	};
-
-	/**
-	 * @brief Basic service information
-	 *
-	 * Defaults fine for most cases, just need to set name.
-	 */
-	struct Info {
-		String name = "Sming";
-		String type = "http";
-		Protocol protocol = Protocol::Tcp;
-		uint16_t port = 80;
-	};
-
-	/**
-	 * @brief Override to obtain service information
-	 */
-	virtual Info getInfo() = 0;
-
-	/**
-	 * @brief Override to obtain txt items
-	 *
-	 * LWIP2 calls this each time a TXT reply is created
-	 * Other implementations call it via begin().
-	 *
-	 * @retval CStringArray List of txt items, e.g. name=value pairs
-	 */
-	virtual CStringArray getTxt()
-	{
-		return nullptr;
-	}
-
-private:
-	friend class Responder;
-
-#if MDNS_LWIP >= 0x0200
-	int8_t id = -1;
-#else
-	String type;
-	CStringArray txt;
-#endif
-};
-
-} // namespace mDNS
diff --git a/Sming/Components/mdns/src/Responder.cpp b/Sming/Components/mdns/src/Responder.cpp
deleted file mode 100644
index de00cf2159..0000000000
--- a/Sming/Components/mdns/src/Responder.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-#include <Network/Mdns/Responder.h>
-#include <Platform/System.h>
-
-#if MDNS_LWIP >= 0x0200
-
-extern "C" {
-#ifndef LWIP_MDNS_RESPONDER
-#define LWIP_MDNS_RESPONDER 1
-#endif
-#include <lwip/apps/mdns.h>
-}
-
-#ifdef ARCH_ESP8266
-extern struct netif* netif_default_LWIP2;
-#define netif_default netif_default_LWIP2
-#endif
-
-#else
-
-extern "C" {
-#if MDNS_LWIP > 0x0100
-#include <lwip/mdns.h>
-#endif
-
-// Sets the service name
-void mdns_set_name(const char* name);
-}
-
-#include <Platform/Station.h>
-
-#endif
-
-#define MDNS_TTL_DEFAULT 120
-
-namespace mDNS
-{
-bool Responder::begin(const String& hostname)
-{
-#if MDNS_LWIP >= 0x0200
-
-	mdns_resp_init();
-
-#if MDNS_LWIP >= 0x0202
-	err_t err = mdns_resp_add_netif(netif_default, hostname.c_str());
-	if(err == ERR_OK) {
-		System.queueCallback(InterruptCallback([]() { mdns_resp_announce(netif_default); }));
-	}
-#else
-	err_t err = mdns_resp_add_netif(netif_default, hostname.c_str(), MDNS_TTL_DEFAULT);
-#endif
-
-	if(err != ERR_OK) {
-		debug_e("mdns_resp_add_netif failed, err = %d", err);
-		return false;
-	}
-
-#else
-
-	this->hostname = hostname;
-
-	mdns_info mi{};
-	mi.host_name = this->hostname.begin();
-	mi.server_name = const_cast<char*>("Sming");
-	mi.ipAddr = WifiStation.getIP();
-
-#ifdef ENABLE_ESPCONN
-	espconn_mdns_init(&mi);
-#else
-	mdns_init(&mi);
-#endif
-
-#endif
-
-	debug_i("MDNS initialised for '%s'", hostname.c_str());
-	return true;
-}
-
-bool Responder::addService(Service& svc)
-{
-	auto si = svc.getInfo();
-	debug_i("MDNS addService '%s'", si.name.c_str());
-
-#if MDNS_LWIP >= 0x0200
-
-	if(svc.id >= 0) {
-		debug_e("MDNS: Service already in use");
-		return false;
-	}
-
-	auto getSrvTxt = [](mdns_service* service, void* userdata) {
-		auto txt = static_cast<Service*>(userdata)->getTxt();
-		err_t res = 0;
-		for(auto s : txt) {
-			res |= mdns_resp_add_service_txtitem(service, s, strlen(s));
-		}
-		debug_i("mdns add service: res = %d", res);
-	};
-
-	String serviceType = String('_') + si.type;
-#if MDNS_LWIP >= 0x0202
-	auto id = mdns_resp_add_service(netif_default, si.name.c_str(), serviceType.c_str(), mdns_sd_proto(si.protocol),
-									si.port, getSrvTxt, &svc);
-#else
-	auto id = mdns_resp_add_service(netif_default, si.name.c_str(), serviceType.c_str(), mdns_sd_proto(si.protocol),
-									si.port, MDNS_TTL_DEFAULT, getSrvTxt, &svc);
-#endif
-	if(id < 0) {
-		debug_w("mdns_resp_add_service failed, err = %d", id);
-		return false;
-	}
-
-	debug_i("mdns_resp_add_service returned %d", id);
-
-	svc.id = id;
-
-#else
-
-	// Service already registered?
-	if(service != nullptr) {
-		debug_e("MDNS: Service already registered");
-		return false;
-	}
-
-	// Initialise text
-	auto txt = svc.getTxt();
-	if(txt.count() > ARRAY_SIZE(mdns_info::txt_data)) {
-		debug_e("Too many MDNS TXT items");
-		return false;
-	}
-
-	// Have to tear down then re-initialise
-#ifdef ENABLE_ESPCONN
-	espconn_mdns_close();
-#else
-	mdns_close();
-#endif
-
-	service = &svc;
-
-	svc.type = std::move(si.type);
-	svc.txt = std::move(txt);
-
-	mdns_info mi{};
-	mi.host_name = hostname.begin();
-	mi.server_name = svc.type.begin();
-	mi.ipAddr = WifiStation.getIP();
-	mi.server_port = si.port;
-
-	unsigned i = 0;
-	for(auto s : svc.txt) {
-		mi.txt_data[i++] = const_cast<char*>(s);
-	}
-
-#ifdef ENABLE_ESPCONN
-	espconn_mdns_init(&mi);
-#else
-	mdns_init(&mi);
-#endif
-
-	// We can now set the service name
-	mdns_set_name(si.name.c_str());
-#endif
-
-	return true;
-}
-
-void Responder::end()
-{
-#if MDNS_LWIP >= 0x0200
-
-	mdns_resp_remove_netif(netif_default);
-
-#else
-
-#ifdef ENABLE_ESPCONN
-	espconn_mdns_close();
-#else
-	mdns_close();
-#endif
-
-	if(service != nullptr) {
-		service->type = nullptr;
-		service->txt = nullptr;
-		service = nullptr;
-	}
-
-#endif
-
-	debug_i("MDNS stopped");
-}
-
-bool Responder::restart()
-{
-	debug_i("MDNS restarting...");
-
-#if MDNS_LWIP >= 0x0202
-
-	mdns_resp_restart(netif_default);
-	return true;
-
-#elif MDNS_LWIP >= 0x0200
-
-	mdns_resp_netif_settings_changed(netif_default);
-	return true;
-
-#else
-
-	auto svc = service;
-	end();
-	return svc ? addService(*svc) : begin(hostname);
-
-#endif
-}
-
-} // namespace mDNS
diff --git a/Sming/Core/Data/LinkedObjectList.h b/Sming/Core/Data/LinkedObjectList.h
index 6ebb5c9963..1d5908f10f 100644
--- a/Sming/Core/Data/LinkedObjectList.h
+++ b/Sming/Core/Data/LinkedObjectList.h
@@ -100,7 +100,10 @@ template <typename ObjectType> class LinkedObjectListTemplate : public LinkedObj
 
 	size_t count() const
 	{
-		return std::count(begin(), end(), true);
+		size_t n{0};
+		for(auto p = mHead; p != nullptr; ++n, p = p->next()) {
+		}
+		return n;
 	}
 
 	bool contains(const ObjectType& object) const
diff --git a/Sming/Core/Data/Packet.h b/Sming/Core/Data/Packet.h
new file mode 100644
index 0000000000..b37a8ada06
--- /dev/null
+++ b/Sming/Core/Data/Packet.h
@@ -0,0 +1,146 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * Packet.h
+ *
+ ****/
+
+#pragma once
+
+#include <WString.h>
+
+/**
+ * @brief Helper class for reading/writing packet content
+ */
+struct Packet {
+	uint8_t* data;
+	mutable uint16_t pos;
+
+	Packet(void* data, uint16_t pos = 0) : data(static_cast<uint8_t*>(data)), pos(pos)
+	{
+	}
+
+	const uint8_t* ptr() const
+	{
+		return data + pos;
+	}
+
+	uint8_t* ptr()
+	{
+		return data + pos;
+	}
+
+	void skip(uint16_t len) const
+	{
+		pos += len;
+	}
+
+	uint8_t peek8() const
+	{
+		return data[pos];
+	}
+
+	uint8_t read8() const
+	{
+		return data[pos++];
+	}
+
+	void read(void* buffer, uint16_t len) const
+	{
+		memcpy(buffer, ptr(), len);
+		pos += len;
+	}
+
+	String readString(uint16_t length) const
+	{
+		String s;
+		if(s.setLength(length)) {
+			read(s.begin(), length);
+		} else {
+			pos += length;
+		}
+		return s;
+	}
+
+	void write8(uint8_t value)
+	{
+		data[pos++] = value;
+	}
+
+	void write(const void* s, uint16_t len)
+	{
+		memcpy(ptr(), s, len);
+		pos += len;
+	}
+};
+
+/**
+ * @brief Helper class for reading/writing packet content in network byte-order (MSB first)
+ */
+struct NetworkPacket : public Packet {
+	using Packet::Packet;
+
+	uint16_t peek16() const
+	{
+		return (data[pos] << 8) | data[pos + 1];
+	}
+
+	uint16_t read16() const
+	{
+		return (read8() << 8) | read8();
+	}
+
+	uint32_t read32() const
+	{
+		return (read16() << 16) | read16();
+	}
+
+	void write16(uint16_t value)
+	{
+		write8(value >> 8);
+		write8(value & 0xff);
+	}
+
+	void write32(uint32_t value)
+	{
+		write16(value >> 16);
+		write16(value & 0xffff);
+	}
+};
+
+/**
+ * @brief Helper class for reading/writing packet content in host byte-order (LSB first)
+ */
+struct HostPacket : public Packet {
+	using Packet::Packet;
+
+	uint16_t peek16() const
+	{
+		return data[pos] | (data[pos + 1] << 8);
+	}
+
+	uint16_t read16() const
+	{
+		return read8() | (read8() << 8);
+	}
+
+	uint32_t read32() const
+	{
+		return read16() | (read16() << 16);
+	}
+
+	void write16(uint16_t value)
+	{
+		write8(value & 0xff);
+		write8(value >> 8);
+	}
+
+	void write32(uint32_t value)
+	{
+		write16(value & 0xffff);
+		write16(value >> 16);
+	}
+};
diff --git a/Sming/Core/Network/UdpConnection.cpp b/Sming/Core/Network/UdpConnection.cpp
index d0daf7d29b..73a4005335 100644
--- a/Sming/Core/Network/UdpConnection.cpp
+++ b/Sming/Core/Network/UdpConnection.cpp
@@ -119,19 +119,27 @@ void UdpConnection::staticOnReceive(void* arg, struct udp_pcb* pcb, struct pbuf*
 bool UdpConnection::setMulticast(IpAddress ip)
 {
 #if LWIP_MULTICAST_TX_OPTIONS
-	udp_set_multicast_netif_addr(udp, (ip4_addr_t*)ip);
-	return true;
-#else
-	return false;
+	if(udp == nullptr) {
+		initialize(nullptr);
+	}
+	if(udp != nullptr) {
+		udp_set_multicast_netif_addr(udp, (ip4_addr_t*)ip);
+		return true;
+	}
 #endif
+	return false;
 }
 
 bool UdpConnection::setMulticastTtl(size_t ttl)
 {
 #if LWIP_MULTICAST_TX_OPTIONS
-	udp_set_multicast_ttl(udp, ttl);
-	return true;
-#else
-	return false;
+	if(udp == nullptr) {
+		initialize(nullptr);
+	}
+	if(udp != nullptr) {
+		udp_set_multicast_ttl(udp, ttl);
+		return true;
+	}
 #endif
+	return false;
 }
diff --git a/Sming/Libraries/MDNS b/Sming/Libraries/MDNS
new file mode 160000
index 0000000000..6d4c9801e8
--- /dev/null
+++ b/Sming/Libraries/MDNS
@@ -0,0 +1 @@
+Subproject commit 6d4c9801e8935fac5d2a4ddb41643929683c183e
diff --git a/samples/UdpServer_mDNS/component.mk b/samples/UdpServer_mDNS/component.mk
index ed2eaeb314..331b317ed9 100644
--- a/samples/UdpServer_mDNS/component.mk
+++ b/samples/UdpServer_mDNS/component.mk
@@ -1,3 +1,3 @@
 HWCONFIG := spiffs
 SPIFF_FILES :=
-COMPONENT_DEPENDS += mdns
+COMPONENT_DEPENDS += MDNS

From d62642f56ffaeba92cffb7963e46035e30c47e12 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 8 Mar 2021 11:46:24 +0000
Subject: [PATCH 51/91] Rewrite MDNS responder (#2248)

* Rewrite MDNS Responder, and remove LWIP mDNS support.

Partial revert of "MDNS component: initial version. (#2031)"
commit 84e9a072eb9c5594f4be8af3fe5a769678cc82ab.

* Increase ESP32 system event task stack size

Get stack canary fault traced to WiFi event handler.

* Update UdpServer_mDNS sample

* Remove MAC address configuration code, update README
---
 .../esp32/project/sdkconfig.defaults.debug    |   1 +
 .../esp32/project/sdkconfig.defaults.release  |   1 +
 .../Components/esp-open-lwip/component.mk     |   6 +-
 .../esp-open-lwip/esp-open-lwip.patch         |  21 +--
 .../Arch/Esp8266/Components/lwip2/lwip2.patch |  41 ------
 .../Host/Components/lwip/Linux/CMakeLists.txt |   1 -
 .../Components/lwip/Windows/CMakeLists.txt    |   1 -
 Sming/Arch/Host/Components/lwip/lwipopts.h    |   2 -
 Sming/Libraries/MDNS                          |   2 +-
 samples/UdpServer_mDNS/README.rst             |  47 +++----
 samples/UdpServer_mDNS/app/application.cpp    | 121 ++++++++++++++++--
 11 files changed, 138 insertions(+), 106 deletions(-)

diff --git a/Sming/Arch/Esp32/Components/esp32/project/sdkconfig.defaults.debug b/Sming/Arch/Esp32/Components/esp32/project/sdkconfig.defaults.debug
index af39f856b3..758d125f83 100644
--- a/Sming/Arch/Esp32/Components/esp32/project/sdkconfig.defaults.debug
+++ b/Sming/Arch/Esp32/Components/esp32/project/sdkconfig.defaults.debug
@@ -17,6 +17,7 @@ CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=8192
 
 # Mandatory Sming framework changes
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=8192
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=8192
 
 # The bootloader logs all type of messages
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=
diff --git a/Sming/Arch/Esp32/Components/esp32/project/sdkconfig.defaults.release b/Sming/Arch/Esp32/Components/esp32/project/sdkconfig.defaults.release
index 7f2468230e..d1c7ab696f 100644
--- a/Sming/Arch/Esp32/Components/esp32/project/sdkconfig.defaults.release
+++ b/Sming/Arch/Esp32/Components/esp32/project/sdkconfig.defaults.release
@@ -17,6 +17,7 @@ CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=8192
 
 # Mandatory Sming framework changes
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=8192
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=8192
 
 # The bootloader logs only errors
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=
diff --git a/Sming/Arch/Esp8266/Components/esp-open-lwip/component.mk b/Sming/Arch/Esp8266/Components/esp-open-lwip/component.mk
index 0bc11ea6d4..e9a77126cc 100644
--- a/Sming/Arch/Esp8266/Components/esp-open-lwip/component.mk
+++ b/Sming/Arch/Esp8266/Components/esp-open-lwip/component.mk
@@ -25,12 +25,10 @@ endif
 COMPONENT_SUBMODULES	:= esp-open-lwip
 COMPONENT_SRCDIRS		:=
 COMPONENT_SRCFILES		:= \
-	lwip/api/err.c \
 	lwip/core/def.c \
 	lwip/core/dhcp.c \
 	lwip/core/dns.c \
 	lwip/core/init.c \
-	lwip/core/mdns.c \
 	lwip/core/mem.c \
 	lwip/core/memp.c \
 	lwip/core/netif.c \
@@ -63,7 +61,9 @@ ifeq ($(ENABLE_ESPCONN),1)
 			espconn.c \
 			espconn_tcp.c \
 			espconn_udp.c \
-			espconn_mdns.c)
+			espconn_mdns.c) \
+		lwip/api/err.c \
+		lwip/core/mdns.c
 else
 	COMPONENT_SRCFILES	+= espconn_dummy.c
 endif
diff --git a/Sming/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip.patch b/Sming/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip.patch
index 5f3487a9e8..410850aace 100644
--- a/Sming/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip.patch
+++ b/Sming/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip.patch
@@ -405,21 +405,10 @@ index ae9ed50..46420df 100644
  #endif
  
 diff --git a/include/lwip/mdns.h b/include/lwip/mdns.h
-index 08db68a..93ca93d 100644
+index 08db68a..b4763ec 100644
 --- a/include/lwip/mdns.h
 +++ b/include/lwip/mdns.h
-@@ -32,8 +32,8 @@
-  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#ifndef __LWIP_DNS_H__
--#define __LWIP_DNS_H__
-+#ifndef __LWIP_MDNS_H__
-+#define __LWIP_MDNS_H__
- 
- #include "lwip/opt.h"
- 
-@@ -96,19 +96,20 @@ struct mdns_info {
+@@ -96,16 +96,17 @@ struct mdns_info {
  	char *txt_data[10];
  };
  #endif
@@ -447,12 +436,6 @@ index 08db68a..93ca93d 100644
  //void           mdns_tmr(void);
  //void           Delay(unsigned long ulSeconds);
  
--#endif /* LWIP_DNS */
-+#endif /* LWIP_MDNS */
- 
--#endif /* __LWIP_DNS_H__ */
-+#endif /* __LWIP_MDNS_H__ */
-
 diff --git a/lwip/app/espconn_udp.c b/lwip/app/espconn_udp.c
 index 77ef471..0e4936a 100644
 --- a/lwip/app/espconn_udp.c
diff --git a/Sming/Arch/Esp8266/Components/lwip2/lwip2.patch b/Sming/Arch/Esp8266/Components/lwip2/lwip2.patch
index fbb74b7629..5032837ed2 100644
--- a/Sming/Arch/Esp8266/Components/lwip2/lwip2.patch
+++ b/Sming/Arch/Esp8266/Components/lwip2/lwip2.patch
@@ -162,44 +162,3 @@ index cfc10f8..8a32ef0 100644
  
  #define IP2STR(ipaddr) ip4_addr1_16(ipaddr), \
      ip4_addr2_16(ipaddr), \
-
-diff --git a/glue-lwip/lwipopts.h b/glue-lwip/lwipopts.h
-index fbb0bde..a84ac22 100644
---- a/glue-lwip/lwipopts.h
-+++ b/glue-lwip/lwipopts.h
-@@ -1503,13 +1503,13 @@
- #define LWIP_NETIF_TX_SINGLE_PBUF             1 // MANDATORY FOR ESP8266 BLOBS !! 
- #endif /* LWIP_NETIF_TX_SINGLE_PBUF */
- 
-+#define LWIP_MDNS_RESPONDER 1
-+
- /**
-  * LWIP_NUM_NETIF_CLIENT_DATA: Number of clients that may store
-  * data in client_data member array of struct netif.
-  */
--#if !defined LWIP_NUM_NETIF_CLIENT_DATA || defined __DOXYGEN__
--#define LWIP_NUM_NETIF_CLIENT_DATA            0
--#endif
-+#define LWIP_NUM_NETIF_CLIENT_DATA            2
- /**
-  * @}
-  */
-
-diff --git a/makefiles/Makefile.lwip2 b/makefiles/Makefile.lwip2
-index 560e346..f46c4ed 100644
---- a/makefiles/Makefile.lwip2
-+++ b/makefiles/Makefile.lwip2
-@@ -8,6 +8,7 @@ OBJ = \
- 	$(patsubst %.c,$(BUILD)/%.o,$(wildcard core/ipv6/*.c)) \
- 	$(patsubst %.c,$(BUILD)/%.o,$(wildcard api/*.c)) \
- 	$(patsubst %.c,$(BUILD)/%.o,$(wildcard apps/sntp/*.c)) \
-+	$(patsubst %.c,$(BUILD)/%.o,$(wildcard apps/mdns/*.c))
- 
- BUILD_INCLUDES = -I$(BUILD) -I$(SDK)/include -Iinclude -I../../glue -I../../glue-lwip
- 
-@@ -27,4 +28,5 @@ include ../../makefiles/Makefile.rules
- -include $(BUILD)/core/ipv6/*.d
- -include $(BUILD)/api/*.d
- -include $(BUILD)/apps/sntp/*.d
-+-include $(BUILD)/apps/mdns/*.d
- 
diff --git a/Sming/Arch/Host/Components/lwip/Linux/CMakeLists.txt b/Sming/Arch/Host/Components/lwip/Linux/CMakeLists.txt
index 7e24c7a386..98f0637927 100644
--- a/Sming/Arch/Host/Components/lwip/Linux/CMakeLists.txt
+++ b/Sming/Arch/Host/Components/lwip/Linux/CMakeLists.txt
@@ -31,7 +31,6 @@ add_library(lwip
     ${lwipcore4_SRCS}
     ${lwipcore6_SRCS}
     ${lwipnetif_SRCS}
-	${lwipmdns_SRCS}
     ${lwipcontribportunix_SRCS}
     ${lwipcontribportunixnetifs_SRCS}
 )
diff --git a/Sming/Arch/Host/Components/lwip/Windows/CMakeLists.txt b/Sming/Arch/Host/Components/lwip/Windows/CMakeLists.txt
index 6d4173cfac..0a9cfd1226 100644
--- a/Sming/Arch/Host/Components/lwip/Windows/CMakeLists.txt
+++ b/Sming/Arch/Host/Components/lwip/Windows/CMakeLists.txt
@@ -46,7 +46,6 @@ add_library(lwip
 	${lwipcore4_SRCS}
 	${lwipcore6_SRCS}
 	${lwipnetif_SRCS}
-	${lwipmdns_SRCS}
 )
 
 add_dependencies(lwip npcap)
diff --git a/Sming/Arch/Host/Components/lwip/lwipopts.h b/Sming/Arch/Host/Components/lwip/lwipopts.h
index b94fa08ccc..229eea94b4 100644
--- a/Sming/Arch/Host/Components/lwip/lwipopts.h
+++ b/Sming/Arch/Host/Components/lwip/lwipopts.h
@@ -322,8 +322,6 @@
  * transport.
  */
 #define LWIP_DNS                        LWIP_UDP
-#define LWIP_MDNS_RESPONDER             LWIP_UDP
-#define LWIP_NUM_NETIF_CLIENT_DATA      LWIP_MDNS_RESPONDER
 
 /*
    ---------------------------------
diff --git a/Sming/Libraries/MDNS b/Sming/Libraries/MDNS
index 6d4c9801e8..3c1370d47d 160000
--- a/Sming/Libraries/MDNS
+++ b/Sming/Libraries/MDNS
@@ -1 +1 @@
-Subproject commit 6d4c9801e8935fac5d2a4ddb41643929683c183e
+Subproject commit 3c1370d47d1deec99074bc9e6ff384998440aff4
diff --git a/samples/UdpServer_mDNS/README.rst b/samples/UdpServer_mDNS/README.rst
index 93520fca5a..f37bfab82e 100644
--- a/samples/UdpServer_mDNS/README.rst
+++ b/samples/UdpServer_mDNS/README.rst
@@ -12,45 +12,36 @@ More info on mDNS can be found at https://en.wikipedia.org/wiki/Multicast_DNS
 mDNS has two parts:
 
 1. Advertise
-2. Listen
+2. Discover
 
-This example just does Advertise.
-
-Listen implementation is still on going work and will be basically porting
-http://gkaindl.com/software/arduino-ethernet/bonjour to "Sming".
+This example just does Advertise. See :sample:`Basic_Mdns` for discovery example.
 
 In short this code will advertise other machines about its ipaddress.
 
-But you can not convert other mDNS advertiser's host name to ipaddress. (this is work of Listening)
-
 How to use mDNS:
 
-1. ADD your WIFI_SSID / Password
-2. Flash the Complied code to ESP8266
-3. According to OS of your PC / phone
+1. ADD your WIFI_SSID / WIFI_PWD
+2. Flash the Complied code to your ESP8266/ESP32 device
+3. Open a web browser and go to "http://sming.local/" to open a sample webpage.
+
+You should also be able to ping using the advertised name::
 
-   Mac OS (iphone/ipad/ mac)
-      in Safari browser type "http://test.local/" to open a sample webpage.
+   ping UDP_Server.local
 
-   Windows
-      You need Bonjour Service running. If you do not have it Install it from
-      http://download.cnet.com/Bonjour-for-Windows/3000-18507_4-93550.html.
+Linux
 
-      After installing in IE or Chrome or other browser type
-      "http://test.local/" to open a sample webpage.
+   You need to install Avahi mDNS/DNS-SD daemon.
 
-   Linux
-      You need to install Avahi mDNS/DNS-SD daemon.
+      In your browser type "http://sming.local/" to open a sample webpage.
 
-      In your browser type "http://test.local/" to open a sample webpage.
+Android
 
-   Android
-      You need to install ZeroConf Browser or Bonjour Browser.
+   You need to install ZeroConf Browser or Bonjour Browser.
 
-      In those app you would be able to see IP address of your ESP module.
+   In those app you would be able to see IP address of your ESP module.
 
-      In android Chrome "http://test.local/" does not translate to IP address,
-      so android Chrome is not supporting mDNS.
-      
-      But you can make your own app using Network Service Discovery.
-      See http://developer.android.com/training/connect-devices-wirelessly/nsd.html for details.
+   In android Chrome "http://sming.local/" does not translate to IP address,
+   so android Chrome is not supporting mDNS.
+   
+   But you can make your own app using Network Service Discovery.
+   See http://developer.android.com/training/connect-devices-wirelessly/nsd.html for details.
diff --git a/samples/UdpServer_mDNS/app/application.cpp b/samples/UdpServer_mDNS/app/application.cpp
index 13807dd742..141a8391b3 100644
--- a/samples/UdpServer_mDNS/app/application.cpp
+++ b/samples/UdpServer_mDNS/app/application.cpp
@@ -1,5 +1,7 @@
 #include <SmingCore.h>
 #include <Network/Mdns/Responder.h>
+#include <Network/Mdns/debug.h>
+#include <Platform/Timers.h>
 
 // If you want, you can define WiFi settings globally in Eclipse Environment Variables
 #ifndef WIFI_SSID
@@ -7,33 +9,132 @@
 #define WIFI_PWD "PleaseEnterPass"
 #endif
 
-DEFINE_FSTR_LOCAL(hostName, "UDP_Server");
+// Our device will be reachable via "sming.local"
+DEFINE_FSTR_LOCAL(hostName, "sming");
 
 HttpServer server;
 
-class MyService : public mDNS::Service
+class MyHttpService : public mDNS::Service
 {
 public:
-	Info getInfo() override
+	String getInstance() override
 	{
-		Info info;
-		info.name = F("Sming");
-		return info;
+		return F("UDP Server");
 	}
 
-	CStringArray getTxt() override
+	void addText(mDNS::Resource::TXT& txt) override
 	{
-		return F("version=now");
+		txt.add(F("md=Sming Device"));
+		txt.add(F("fn=My happy little HTTP service"));
 	}
 };
 
 static mDNS::Responder responder;
-static MyService service;
+static MyHttpService myHttpService;
+
+void speedTest(mDNS::Question* question)
+{
+	using namespace mDNS;
+
+	OneShotFastUs timer;
+	unsigned count{0};
+	for(unsigned i = 0; i < 10000; ++i) {
+		if(question->getName() == fstrServicesLocal) {
+			++count;
+		}
+		if(question->getName().equalsIgnoreCase("Haggis basher")) {
+			++count;
+		}
+	}
+	debug_i("(question == fstrServicesLocal): %u, %s", count, timer.elapsedTime().toString().c_str());
+
+	timer.start();
+	count = 0;
+	for(unsigned i = 0; i < 10000; ++i) {
+		if(String(question->getName()).equalsIgnoreCase(fstrServicesLocal)) {
+			++count;
+		}
+		if(String(question->getName()).equalsIgnoreCase("Haggis basher")) {
+			++count;
+		}
+	}
+	debug_i("(question == fstrServicesLocal): %u, %s", count, timer.elapsedTime().toString().c_str());
+}
+
+void test()
+{
+	using namespace mDNS;
+
+	mDNS::server.onSend([](Message& msg) {
+		printMessage(Serial, msg);
+		return false;
+	});
+
+	auto submit = [&](const String& name, ResourceType type) {
+		Query query;
+		auto question = query.addQuestion(name, type);
+		printMessage(Serial, query);
+		responder.onMessage(query);
+	};
+
+	auto checkLike = [](Question* question, const char* s, bool isLike) {
+		auto name = question->getName();
+		bool match = (name == s);
+		debug_i("(question == \"%s\"): %u", s, match);
+		// TEST_ASSERT(match == isLike);
+	};
+
+	auto checkParser = [](const char* s) {
+		Query query;
+		auto question = query.addQuestion(s);
+		auto name = question->getName();
+		debug_i("instance: '%s'", String(name).c_str());
+		debug_i("service:  '%s'", String(name.getService()).c_str());
+		debug_i("protocol: '%s'", String(name.getProtocol()).c_str());
+		debug_i("domain:   '%s'", String(name.getDomain()).c_str());
+	};
+
+	{
+		Query query;
+		auto question = query.addQuestion(fstrServicesLocal, ResourceType::PTR);
+
+		// speedTest(question);
+
+		checkLike(question, "_services._dns-sd._udp.local", true);
+		checkLike(question, "_dns-sd._udp.local", true);
+		checkLike(question, "_udp.local", true);
+		checkLike(question, "local", true);
+
+		checkParser("_some-service-or-other._http._tcp.sming.local");
+
+		// debug_i("(question == fstrServicesLocal): %u", question->getName() == fstrServicesLocal);
+		printMessage(Serial, query);
+		responder.onMessage(query);
+	}
+
+	{
+		Query query;
+		FSTR_ARRAY(bigYin, "I have instances in my name.with.dots.and.everything._dns-sd._udp.local");
+		auto question = query.addQuestion(bigYin, ResourceType::PTR);
+		checkLike(question, "everything._dns-sd._udp.local", false);
+		checkLike(question, "_dns-sd._udp.local", true);
+	}
+
+	auto inst = myHttpService.getInstanceName();
+	submit(inst, ResourceType::PTR);
+	submit(inst, ResourceType::A);
+	submit(inst, ResourceType::TXT);
+	submit(inst, ResourceType::SRV);
+
+	mDNS::server.onSend(nullptr);
+}
 
 void startmDNS()
 {
 	responder.begin(hostName);
-	responder.addService(service);
+	responder.addService(myHttpService);
+
+	test();
 }
 
 void onIndex(HttpRequest& request, HttpResponse& response)

From 06320cc9f101bf258d590efa476834283445798e Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 8 Mar 2021 16:32:03 +0000
Subject: [PATCH 52/91] Add setMacAddress() method to Station and AccessPoint
 (#2249)

---
 Sming/Arch/Esp32/Platform/AccessPointImpl.cpp   |  5 +++++
 Sming/Arch/Esp32/Platform/AccessPointImpl.h     |  1 +
 Sming/Arch/Esp32/Platform/StationImpl.cpp       |  5 +++++
 Sming/Arch/Esp32/Platform/StationImpl.h         |  1 +
 Sming/Arch/Esp8266/Platform/AccessPointImpl.cpp |  5 +++++
 Sming/Arch/Esp8266/Platform/AccessPointImpl.h   |  1 +
 Sming/Arch/Esp8266/Platform/StationImpl.cpp     |  5 +++++
 Sming/Arch/Esp8266/Platform/StationImpl.h       |  1 +
 Sming/Arch/Host/Platform/AccessPointImpl.cpp    |  6 ++++++
 Sming/Arch/Host/Platform/AccessPointImpl.h      |  1 +
 Sming/Arch/Host/Platform/StationImpl.cpp        |  6 ++++++
 Sming/Arch/Host/Platform/StationImpl.h          |  1 +
 Sming/Platform/AccessPoint.h                    | 14 ++++++++++++++
 Sming/Platform/Station.h                        | 14 ++++++++++++++
 14 files changed, 66 insertions(+)

diff --git a/Sming/Arch/Esp32/Platform/AccessPointImpl.cpp b/Sming/Arch/Esp32/Platform/AccessPointImpl.cpp
index a44cf2f6d9..8aaea9d431 100644
--- a/Sming/Arch/Esp32/Platform/AccessPointImpl.cpp
+++ b/Sming/Arch/Esp32/Platform/AccessPointImpl.cpp
@@ -143,6 +143,11 @@ MacAddress AccessPointImpl::getMacAddress() const
 	return addr;
 }
 
+bool AccessPointImpl::setMacAddress(const MacAddress& addr) const
+{
+	return esp_wifi_set_mac(ESP_IF_WIFI_AP, &const_cast<MacAddress&>(addr)[0]);
+}
+
 String AccessPointImpl::getSSID() const
 {
 	wifi_config_t config{};
diff --git a/Sming/Arch/Esp32/Platform/AccessPointImpl.h b/Sming/Arch/Esp32/Platform/AccessPointImpl.h
index a060e84760..832dfd3a1c 100644
--- a/Sming/Arch/Esp32/Platform/AccessPointImpl.h
+++ b/Sming/Arch/Esp32/Platform/AccessPointImpl.h
@@ -28,6 +28,7 @@ class AccessPointImpl : public AccessPointClass, protected ISystemReadyHandler
 	IpAddress getIP() const override;
 	bool setIP(IpAddress address) override;
 	MacAddress getMacAddress() const override;
+	bool setMacAddress(const MacAddress& addr) const override;
 	IpAddress getNetworkMask() const override;
 	IpAddress getNetworkGateway() const override;
 	IpAddress getNetworkBroadcast() const override;
diff --git a/Sming/Arch/Esp32/Platform/StationImpl.cpp b/Sming/Arch/Esp32/Platform/StationImpl.cpp
index e82ef32dea..362bd5cfc5 100644
--- a/Sming/Arch/Esp32/Platform/StationImpl.cpp
+++ b/Sming/Arch/Esp32/Platform/StationImpl.cpp
@@ -164,6 +164,11 @@ MacAddress StationImpl::getMacAddress() const
 	return addr;
 }
 
+bool StationImpl::setMacAddress(const MacAddress& addr) const
+{
+	return esp_wifi_set_mac(ESP_IF_WIFI_STA, &const_cast<MacAddress&>(addr)[0]);
+}
+
 IpAddress StationImpl::getNetworkBroadcast() const
 {
 	esp_netif_ip_info_t info;
diff --git a/Sming/Arch/Esp32/Platform/StationImpl.h b/Sming/Arch/Esp32/Platform/StationImpl.h
index e785208713..b25831542d 100644
--- a/Sming/Arch/Esp32/Platform/StationImpl.h
+++ b/Sming/Arch/Esp32/Platform/StationImpl.h
@@ -38,6 +38,7 @@ class StationImpl : public StationClass, protected ISystemReadyHandler
 	String getHostname() const override;
 	IpAddress getIP() const override;
 	MacAddress getMacAddress() const override;
+	bool setMacAddress(const MacAddress& addr) const override;
 	IpAddress getNetworkMask() const override;
 	IpAddress getNetworkGateway() const override;
 	IpAddress getNetworkBroadcast() const override;
diff --git a/Sming/Arch/Esp8266/Platform/AccessPointImpl.cpp b/Sming/Arch/Esp8266/Platform/AccessPointImpl.cpp
index 40d5484c86..93f0a266c6 100644
--- a/Sming/Arch/Esp8266/Platform/AccessPointImpl.cpp
+++ b/Sming/Arch/Esp8266/Platform/AccessPointImpl.cpp
@@ -153,6 +153,11 @@ MacAddress AccessPointImpl::getMacAddress() const
 	}
 }
 
+bool AccessPointImpl::setMacAddress(const MacAddress& addr) const
+{
+	return wifi_set_macaddr(SOFTAP_IF, &const_cast<MacAddress&>(addr)[0]);
+}
+
 String AccessPointImpl::getSSID() const
 {
 	softap_config config = {0};
diff --git a/Sming/Arch/Esp8266/Platform/AccessPointImpl.h b/Sming/Arch/Esp8266/Platform/AccessPointImpl.h
index ce285fff2f..53dce75022 100644
--- a/Sming/Arch/Esp8266/Platform/AccessPointImpl.h
+++ b/Sming/Arch/Esp8266/Platform/AccessPointImpl.h
@@ -28,6 +28,7 @@ class AccessPointImpl : public AccessPointClass, protected ISystemReadyHandler
 	IpAddress getIP() const override;
 	bool setIP(IpAddress address) override;
 	MacAddress getMacAddress() const override;
+	bool setMacAddress(const MacAddress& addr) const override;
 	IpAddress getNetworkMask() const override;
 	IpAddress getNetworkGateway() const override;
 	IpAddress getNetworkBroadcast() const override;
diff --git a/Sming/Arch/Esp8266/Platform/StationImpl.cpp b/Sming/Arch/Esp8266/Platform/StationImpl.cpp
index 627f8324b0..cbb7450312 100644
--- a/Sming/Arch/Esp8266/Platform/StationImpl.cpp
+++ b/Sming/Arch/Esp8266/Platform/StationImpl.cpp
@@ -172,6 +172,11 @@ MacAddress StationImpl::getMacAddress() const
 	}
 }
 
+bool StationImpl::setMacAddress(const MacAddress& addr) const
+{
+	return wifi_set_macaddr(STATION_IF, &const_cast<MacAddress&>(addr)[0]);
+}
+
 IpAddress StationImpl::getNetworkBroadcast() const
 {
 	struct ip_info info = {0};
diff --git a/Sming/Arch/Esp8266/Platform/StationImpl.h b/Sming/Arch/Esp8266/Platform/StationImpl.h
index 2e370d2f32..4614a6c179 100644
--- a/Sming/Arch/Esp8266/Platform/StationImpl.h
+++ b/Sming/Arch/Esp8266/Platform/StationImpl.h
@@ -38,6 +38,7 @@ class StationImpl : public StationClass, protected ISystemReadyHandler
 	String getHostname() const override;
 	IpAddress getIP() const override;
 	MacAddress getMacAddress() const override;
+	bool setMacAddress(const MacAddress& addr) const override;
 	IpAddress getNetworkMask() const override;
 	IpAddress getNetworkGateway() const override;
 	IpAddress getNetworkBroadcast() const override;
diff --git a/Sming/Arch/Host/Platform/AccessPointImpl.cpp b/Sming/Arch/Host/Platform/AccessPointImpl.cpp
index edc9c043f4..77e52c94a6 100644
--- a/Sming/Arch/Host/Platform/AccessPointImpl.cpp
+++ b/Sming/Arch/Host/Platform/AccessPointImpl.cpp
@@ -58,6 +58,12 @@ MacAddress AccessPointImpl::getMacAddress() const
 	return MACADDR_NONE;
 }
 
+bool AccessPointImpl::setMacAddress(const MacAddress& addr) const
+{
+	debug_w("[HOST] setMacAddress not implemented");
+	return false;
+}
+
 String AccessPointImpl::getSSID() const
 {
 	return nullptr;
diff --git a/Sming/Arch/Host/Platform/AccessPointImpl.h b/Sming/Arch/Host/Platform/AccessPointImpl.h
index ff2f0a315d..c45b324102 100644
--- a/Sming/Arch/Host/Platform/AccessPointImpl.h
+++ b/Sming/Arch/Host/Platform/AccessPointImpl.h
@@ -22,6 +22,7 @@ class AccessPointImpl : public AccessPointClass
 	IpAddress getIP() const override;
 	bool setIP(IpAddress address) override;
 	MacAddress getMacAddress() const override;
+	bool setMacAddress(const MacAddress& addr) const override;
 	IpAddress getNetworkMask() const override;
 	IpAddress getNetworkGateway() const override;
 	IpAddress getNetworkBroadcast() const override;
diff --git a/Sming/Arch/Host/Platform/StationImpl.cpp b/Sming/Arch/Host/Platform/StationImpl.cpp
index aff69e4352..caca7f7934 100644
--- a/Sming/Arch/Host/Platform/StationImpl.cpp
+++ b/Sming/Arch/Host/Platform/StationImpl.cpp
@@ -257,6 +257,12 @@ MacAddress StationImpl::getMacAddress() const
 	}
 }
 
+bool StationImpl::setMacAddress(const MacAddress& addr) const
+{
+	debug_w("[HOST] setMacAddress not implemented");
+	return false;
+}
+
 IpAddress StationImpl::getNetworkBroadcast() const
 {
 	return ipaddr | ~netmask;
diff --git a/Sming/Arch/Host/Platform/StationImpl.h b/Sming/Arch/Host/Platform/StationImpl.h
index 1db69b0f67..6523f4e0b0 100644
--- a/Sming/Arch/Host/Platform/StationImpl.h
+++ b/Sming/Arch/Host/Platform/StationImpl.h
@@ -46,6 +46,7 @@ class StationImpl : public StationClass
 	String getHostname() const override;
 	IpAddress getIP() const override;
 	MacAddress getMacAddress() const override;
+	bool setMacAddress(const MacAddress& addr) const override;
 	IpAddress getNetworkMask() const override;
 	IpAddress getNetworkGateway() const override;
 	IpAddress getNetworkBroadcast() const override;
diff --git a/Sming/Platform/AccessPoint.h b/Sming/Platform/AccessPoint.h
index 9a0f475dda..9fb52210f8 100644
--- a/Sming/Platform/AccessPoint.h
+++ b/Sming/Platform/AccessPoint.h
@@ -81,6 +81,20 @@ class AccessPointClass
      */
 	String getMAC(char sep = '\0') const;
 
+	/**	@brief	Set Access Point MAC address
+	 *  @param addr The new MAC address
+	 *	@retval	bool true on success
+	 *
+	 *  Must be called from `init()` before activating Access Point.
+	 *  Espressif place certain limitations on MAC addresses:
+	 *
+	 *  Bit 0 of the first byte of the MAC address can not be 1. For example:
+	 *
+	 *     OK:     "1a:XX:XX:XX:XX:XX"
+	 *     NOT OK: "15:XX:XX:XX:XX:XX"
+	 */
+	virtual bool setMacAddress(const MacAddress& addr) const = 0;
+
 	/** @brief  Get WiFi AP network mask
      *  @retval IpAddress WiFi AP network mask
      */
diff --git a/Sming/Platform/Station.h b/Sming/Platform/Station.h
index 9a3138d94e..d81549c4f2 100644
--- a/Sming/Platform/Station.h
+++ b/Sming/Platform/Station.h
@@ -185,6 +185,20 @@ class StationClass
 	 */
 	String getMAC(char sep = '\0') const;
 
+	/**	@brief	Set WiFi station MAC address
+	 *  @param addr The new MAC address
+	 *	@retval	bool true on success
+	 *
+	 *  Must be called from `init()` before activating station.
+	 *  Espressif place certain limitations on MAC addresses:
+	 *
+	 *  Bit 0 of the first byte of the MAC address can not be 1. For example:
+	 *
+	 *     OK:     "1a:XX:XX:XX:XX:XX"
+	 *     NOT OK: "15:XX:XX:XX:XX:XX"
+	 */
+	virtual bool setMacAddress(const MacAddress& addr) const = 0;
+
 	/**	@brief	Get WiFi station network mask
 	 *	@retval	IpAddress WiFi station network mask
 	 */

From 89ee6c73ad64738afa52e0530b72fc29d1ffafd4 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Tue, 9 Mar 2021 09:25:49 +0100
Subject: [PATCH 53/91] Initial code for google-cast client (#2227)

This library allows you to communicate with Chromecast dongles or smart TVs that support the Google Cast Protocol.

Co-authored-by: mikee47 <mike@sillyhouse.net>
---
 .gitmodules                             | 4 ++++
 Sming/Libraries/GoogleCast              | 1 +
 Sming/Libraries/nanopb/src/Callback.cpp | 2 +-
 Sming/Wiring/WHashMap.h                 | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 160000 Sming/Libraries/GoogleCast

diff --git a/.gitmodules b/.gitmodules
index d467eddfb4..4c6aa8dc8c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -191,6 +191,10 @@
 	path = Sming/Libraries/DHTesp
 	url = https://github.com/beegee-tokyo/DHTesp.git
 	ignore = dirty
+[submodule "Libraries.GoogleCast"]
+	path = Sming/Libraries/GoogleCast
+	url = https://github.com/slaff/Sming-GoogleCast.git
+	ignore = dirty
 [submodule "Libraries.HardwareSPI"]
 	path = Sming/Libraries/HardwareSPI
 	url = https://github.com/mikee47/HardwareSPI
diff --git a/Sming/Libraries/GoogleCast b/Sming/Libraries/GoogleCast
new file mode 160000
index 0000000000..554fc2a0f1
--- /dev/null
+++ b/Sming/Libraries/GoogleCast
@@ -0,0 +1 @@
+Subproject commit 554fc2a0f1046e5b4b88c332c14b174e3d8b531b
diff --git a/Sming/Libraries/nanopb/src/Callback.cpp b/Sming/Libraries/nanopb/src/Callback.cpp
index 9dad3d4881..76794000d0 100644
--- a/Sming/Libraries/nanopb/src/Callback.cpp
+++ b/Sming/Libraries/nanopb/src/Callback.cpp
@@ -33,7 +33,7 @@ bool InputCallback::decode(pb_istream_t* stream, const pb_field_t* field)
 		return false;
 	}
 	data = static_cast<uint8_t*>(new_buf);
-	auto old_length{length};
+	auto old_length = length;
 	length += available;
 
 	return pb_read(stream, &data[old_length], available);
diff --git a/Sming/Wiring/WHashMap.h b/Sming/Wiring/WHashMap.h
index 62366230b1..9eeb9bc6b4 100644
--- a/Sming/Wiring/WHashMap.h
+++ b/Sming/Wiring/WHashMap.h
@@ -30,6 +30,7 @@
 
 #include <cstdint>
 #include <iterator>
+#include <cstdlib>
 
 /**
  * @brief HashMap class template

From 58b48bac0500602bcc1d2a8f8d91f0ae9a2d1fcf Mon Sep 17 00:00:00 2001
From: joerg65 <joerg.wolff@gmx.de>
Date: Wed, 10 Mar 2021 09:26:41 +0100
Subject: [PATCH 54/91] Add WPS functionality for ESP32 architecture (#2247)

Co-authored-by: mikee47 <mike@sillyhouse.net>
---
 Sming/Arch/Esp32/Platform/AccessPointImpl.cpp |  11 +-
 Sming/Arch/Esp32/Platform/AccessPointImpl.h   |   5 +
 Sming/Arch/Esp32/Platform/StationImpl.cpp     | 208 +++++++++++++-----
 Sming/Arch/Esp32/Platform/StationImpl.h       |  22 +-
 Sming/Platform/Station.cpp                    |  13 +-
 Sming/Platform/Station.h                      |  21 +-
 samples/Basic_WiFi/app/application.cpp        |  15 +-
 7 files changed, 222 insertions(+), 73 deletions(-)

diff --git a/Sming/Arch/Esp32/Platform/AccessPointImpl.cpp b/Sming/Arch/Esp32/Platform/AccessPointImpl.cpp
index 8aaea9d431..33fe58ff40 100644
--- a/Sming/Arch/Esp32/Platform/AccessPointImpl.cpp
+++ b/Sming/Arch/Esp32/Platform/AccessPointImpl.cpp
@@ -16,8 +16,6 @@
 static AccessPointImpl accessPoint;
 AccessPointClass& WifiAccessPoint = accessPoint;
 
-static esp_netif_t* apNetworkInterface = nullptr;
-
 void AccessPointImpl::enable(bool enabled, bool save)
 {
 	wifi_mode_t mode;
@@ -69,7 +67,7 @@ bool AccessPointImpl::isEnabled() const
 bool AccessPointImpl::config(const String& ssid, String password, WifiAuthMode mode, bool hidden, int channel,
 							 int beaconInterval)
 {
-	wifi_config_t config;
+	wifi_config_t config{};
 
 	if(ssid.length() >= sizeof(config.ap.ssid)) {
 		return false;
@@ -78,8 +76,8 @@ bool AccessPointImpl::config(const String& ssid, String password, WifiAuthMode m
 		return false;
 	}
 
-	memcpy(&config.ap.ssid, ssid.c_str(), ssid.length());
-	memcpy(&config.ap.password, password.c_str(), password.length());
+	memcpy(config.ap.ssid, ssid.c_str(), ssid.length());
+	memcpy(config.ap.password, password.c_str(), password.length());
 	config.ap.ssid_len = ssid.length();
 	config.ap.ssid_hidden = hidden;
 	config.ap.channel = channel;
@@ -126,6 +124,9 @@ IpAddress AccessPointImpl::getNetworkGateway() const
 
 bool AccessPointImpl::setIP(IpAddress address)
 {
+	if(apNetworkInterface == nullptr) {
+		return false;
+	}
 	esp_netif_dhcps_stop(apNetworkInterface);
 	esp_netif_ip_info_t info;
 	ESP_ERROR_CHECK(esp_netif_get_ip_info(apNetworkInterface, &info));
diff --git a/Sming/Arch/Esp32/Platform/AccessPointImpl.h b/Sming/Arch/Esp32/Platform/AccessPointImpl.h
index 832dfd3a1c..00f299cab1 100644
--- a/Sming/Arch/Esp32/Platform/AccessPointImpl.h
+++ b/Sming/Arch/Esp32/Platform/AccessPointImpl.h
@@ -13,6 +13,8 @@
 #include <Platform/AccessPoint.h>
 #include <Platform/System.h>
 
+struct esp_netif_obj;
+
 class AccessPointImpl : public AccessPointClass, protected ISystemReadyHandler
 {
 public:
@@ -37,4 +39,7 @@ class AccessPointImpl : public AccessPointClass, protected ISystemReadyHandler
 
 protected:
 	void onSystemReady() override;
+
+private:
+	esp_netif_obj* apNetworkInterface{nullptr};
 };
diff --git a/Sming/Arch/Esp32/Platform/StationImpl.cpp b/Sming/Arch/Esp32/Platform/StationImpl.cpp
index 362bd5cfc5..6780762c58 100644
--- a/Sming/Arch/Esp32/Platform/StationImpl.cpp
+++ b/Sming/Arch/Esp32/Platform/StationImpl.cpp
@@ -15,11 +15,27 @@
 #include <esp_netif.h>
 #include <esp_event.h>
 
+#ifdef ENABLE_WPS
+#include <esp_wps.h>
+
+/*
+ * Information only required during WPS negotiation
+ */
+struct StationImpl::WpsConfig {
+	static constexpr unsigned timeoutMs{60000};
+	static constexpr unsigned maxRetryAttempts{5};
+	WPSConfigDelegate callback;
+	wifi_event_sta_wps_er_success_t creds;
+	uint8_t numRetries;
+	uint8_t credIndex;
+	bool ignoreDisconnects;
+};
+
+#endif
+
 static StationImpl station;
 StationClass& WifiStation = station;
 
-static esp_netif_t* stationNetworkInterface = nullptr;
-
 class BssInfoImpl : public BssInfo
 {
 public:
@@ -118,6 +134,9 @@ bool StationImpl::disconnect()
 
 bool StationImpl::isEnabledDHCP() const
 {
+	if(stationNetworkInterface == nullptr) {
+		return false;
+	}
 	esp_netif_dhcp_status_t status;
 	if(esp_netif_dhcps_get_status(stationNetworkInterface, &status) != ESP_OK) {
 		return false;
@@ -128,6 +147,9 @@ bool StationImpl::isEnabledDHCP() const
 
 void StationImpl::enableDHCP(bool enable)
 {
+	if(stationNetworkInterface == nullptr) {
+		return;
+	}
 	if(enable) {
 		esp_netif_dhcpc_start(stationNetworkInterface);
 	} else {
@@ -192,6 +214,9 @@ IpAddress StationImpl::getNetworkGateway() const
 
 bool StationImpl::setIP(IpAddress address, IpAddress netmask, IpAddress gateway)
 {
+	if(stationNetworkInterface == nullptr) {
+		return false;
+	}
 	disconnect();
 	enableDHCP(false);
 	esp_netif_ip_info_t ipinfo;
@@ -202,9 +227,9 @@ bool StationImpl::setIP(IpAddress address, IpAddress netmask, IpAddress gateway)
 	ipinfo.netmask.addr = netmask;
 	ipinfo.gw.addr = gateway;
 	if(esp_netif_set_ip_info(stationNetworkInterface, &ipinfo) == ESP_OK) {
-		debugf("Station IP successfully updated");
+		debug_i("Station IP successfully updated");
 	} else {
-		debugf("Station IP can't be updated");
+		debug_e("Station IP can't be updated");
 		enableDHCP(true);
 	}
 	connect();
@@ -215,11 +240,11 @@ String StationImpl::getSSID() const
 {
 	wifi_config_t config{};
 	if(esp_wifi_get_config(ESP_IF_WIFI_STA, &config) != ESP_OK) {
-		debugf("Can't read station configuration!");
+		debug_e("Can't read station configuration!");
 		return nullptr;
 	}
 	auto ssid = reinterpret_cast<const char*>(config.sta.ssid);
-	debugf("SSID: '%s'", ssid);
+	debug_d("SSID: '%s'", ssid);
 	return ssid;
 }
 
@@ -227,7 +252,7 @@ int8_t StationImpl::getRssi() const
 {
 	wifi_ap_record_t info;
 	ESP_ERROR_CHECK(esp_wifi_sta_get_ap_info(&info));
-	debugf("Rssi: %d dBm", info.rssi);
+	debug_d("Rssi: %d dBm", info.rssi);
 	return info.rssi;
 }
 
@@ -235,10 +260,10 @@ uint8_t StationImpl::getChannel() const
 {
 	wifi_config_t config;
 	if(esp_wifi_get_config(ESP_IF_WIFI_STA, &config) != ESP_OK) {
-		debugf("Can't read station configuration!");
+		debug_e("Can't read station configuration!");
 		return 0;
 	}
-	debugf("Channel: %d CH", config.sta.channel);
+	debug_d("Channel: %d CH", config.sta.channel);
 	return config.sta.channel;
 }
 
@@ -246,11 +271,11 @@ String StationImpl::getPassword() const
 {
 	wifi_config_t config{};
 	if(esp_wifi_get_config(ESP_IF_WIFI_STA, &config) != ESP_OK) {
-		debugf("Can't read station configuration!");
+		debug_e("Can't read station configuration!");
 		return nullptr;
 	}
 	auto pwd = reinterpret_cast<const char*>(config.sta.password);
-	debugf("Pass: '%s'", pwd);
+	debug_d("Pass: '%s'", pwd);
 	return pwd;
 }
 
@@ -279,7 +304,7 @@ bool StationImpl::startScan(ScanCompletedDelegate scanCompleted)
 
 		ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, WIFI_EVENT_STA_CONNECTED, connectHandler, NULL));
 
-		debugf("startScan failed");
+		debug_e("startScan failed");
 	}
 
 	return true;
@@ -303,9 +328,9 @@ void StationImpl::staticScanCompleted(wifi_event_sta_scan_done_t* event, uint8_t
 			station.scanCompletedCallback(true, list);
 		}
 
-		debugf("scan completed: %u found", list.count());
+		debug_i("scan completed: %u found", list.count());
 	} else {
-		debugf("scan failed %u", status);
+		debug_e("scan failed %u", status);
 		if(station.scanCompletedCallback) {
 			station.scanCompletedCallback(false, list);
 		}
@@ -429,68 +454,141 @@ void StationImpl::smartConfigStop()
 
 #ifdef ENABLE_WPS
 
-void StationImpl::internalWpsConfig(wps_cb_status status)
+void StationImpl::wpsEventHandler(esp_event_base_t event_base, int32_t event_id, void* event_data)
 {
-	bool processInternal = true;
-	if(wpsConfigCallback) {
-		processInternal = wpsConfigCallback(WpsStatus(status));
+	if(wpsConfig == nullptr) {
+		return;
 	}
-	if(processInternal) {
-		switch(status) {
-		case WPS_CB_ST_SUCCESS:
-			debugf("wifi_wps_status_cb(): WPS_CB_ST_SUCCESS\n");
-			wpsConfigStop();
-			connect();
-			break;
-		case WPS_CB_ST_FAILED:
-			debugf("wifi_wps_status_cb(): WPS_CB_ST_FAILED\n");
-			wpsConfigStop();
-			connect(); // try to reconnect with old config
+
+	switch(event_id) {
+	case WIFI_EVENT_STA_DISCONNECTED:
+		debug_w("WIFI_EVENT_STA_DISCONNECTED");
+		if(wpsConfig->ignoreDisconnects) {
 			break;
-		case WPS_CB_ST_TIMEOUT:
-			debugf("wifi_wps_status_cb(): WPS_CB_ST_TIMEOUT\n");
-			wpsConfigStop();
-			connect(); // try to reconnect with old config
+		}
+		if(wpsConfig->numRetries < WpsConfig::maxRetryAttempts) {
+			esp_wifi_connect();
+			++wpsConfig->numRetries;
 			break;
-		case WPS_CB_ST_WEP:
-			debugf("wifi_wps_status_cb(): WPS_CB_ST_WEP\n");
+		}
+
+		if(wpsConfigure(wpsConfig->credIndex + 1)) {
+			esp_wifi_connect();
 			break;
-		default:
-			debugf("wifi_wps_status_cb(): unknown wps_cb_status %d\n", status);
+		}
+
+		debug_e("[WPS] Failed to connect!");
+		if(wpsCallback(WpsStatus::Failed)) {
+			// try to reconnect with old config
 			wpsConfigStop();
-			connect(); // try to reconnect with old config
+			esp_wifi_connect();
+		}
+		break;
+
+	case WIFI_EVENT_STA_WPS_ER_SUCCESS: {
+		debug_i("WIFI_EVENT_STA_WPS_ER_SUCCESS");
+
+		if(!wpsCallback(WpsStatus::Success)) {
+			return;
+		}
+
+		if(event_data != nullptr) {
+			/* If multiple AP credentials are received from WPS, connect with first one */
+			wpsConfig->creds = *static_cast<wifi_event_sta_wps_er_success_t*>(event_data);
+			wpsConfigure(0);
 		}
+		/*
+		 * If only one AP credential is received from WPS, there will be no event data and
+		 * esp_wifi_set_config() is already called by WPS modules for backward compatibility
+		 * with legacy apps. So directly attempt connection here.
+		 */
+		wpsConfigStop();
+		esp_wifi_connect();
+		break;
+	}
+
+	case WIFI_EVENT_STA_WPS_ER_FAILED: {
+		debug_e("WIFI_EVENT_STA_WPS_ER_FAILED");
+		if(wpsCallback(WpsStatus::Failed)) {
+			// Try to reconnect with old config
+			wpsConfigStop();
+			esp_wifi_connect();
+		}
+		break;
+	}
+
+	case WIFI_EVENT_STA_WPS_ER_TIMEOUT:
+		debug_e("WIFI_EVENT_STA_WPS_ER_TIMEOUT");
+		if(wpsCallback(WpsStatus::Timeout)) {
+			// Try to reconnect with old config
+			wpsConfigStop();
+			esp_wifi_connect();
+		}
+		break;
+
+	case WIFI_EVENT_STA_WPS_ER_PIN:
+		debug_e("WIFI_EVENT_STA_WPS_ER_PIN (not implemented)");
+		break;
+
+	default:
+		break;
 	}
 }
 
-bool StationImpl::wpsConfigStart(WPSConfigDelegate callback)
+bool StationImpl::wpsConfigure(uint8_t credIndex)
 {
-	debugf("WPS start\n");
-	wpsConfigCallback = callback;
-	wifi_station_disconnect();
-	wifi_set_opmode_current(wifi_get_opmode() | STATION_MODE);
-	debugf("WPS stationmode activated\n");
-	if(!wifi_wps_enable(WPS_TYPE_PBC)) {
-		debugf("Station::wpsConfigStart() : wps enable failed\n");
-		return false;
-	}
-	if(!wifi_set_wps_cb([](int status) { station.internalWpsConfig(wps_cb_status(status)); })) {
-		debugf("Station::wpsConfigStart() : cb failed\n");
+	wpsConfig->ignoreDisconnects = false;
+	if(credIndex >= wpsConfig->creds.ap_cred_cnt) {
 		return false;
 	}
+	wpsConfig->numRetries = 0;
+	wpsConfig->credIndex = credIndex;
+	auto& cred = wpsConfig->creds.ap_cred[credIndex];
+	debug_i("Connecting to SSID: %s, Passphrase: %s", cred.ssid, cred.passphrase);
+	wifi_config_t cfg{};
+	memcpy(cfg.sta.ssid, cred.ssid, sizeof(cred.ssid));
+	memcpy(cfg.sta.password, cred.passphrase, sizeof(cred.passphrase));
+	ESP_ERROR_CHECK(esp_wifi_set_config(WIFI_IF_STA, &cfg));
+	return true;
+}
 
-	if(!wifi_wps_start()) {
-		debugf("Station::wpsConfigStart() : wifi_wps_start() failed\n");
+bool StationImpl::wpsConfigStart(WPSConfigDelegate callback)
+{
+	if(wpsConfig != nullptr) {
+		debug_e("[WPS] Already in progress");
 		return false;
 	}
+
+	wpsConfig = new WpsConfig{};
+	wpsConfig->callback = callback;
+	wpsConfig->ignoreDisconnects = true;
+
+	debug_d("[WPS] wpsConfigStart()");
+
+	ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, staticWpsEventHandler, this));
+
+	enable(true, false);
+
+	connect();
+
+	esp_wps_config_t wps_config = WPS_CONFIG_INIT_DEFAULT(WPS_TYPE_PBC);
+	ESP_ERROR_CHECK(esp_wifi_wps_enable(&wps_config));
+	ESP_ERROR_CHECK(esp_wifi_wps_start(WpsConfig::timeoutMs));
+
 	return true;
 }
 
+bool StationImpl::wpsCallback(WpsStatus status)
+{
+	return wpsConfig->callback ? wpsConfig->callback(status) : true;
+}
+
 void StationImpl::wpsConfigStop()
 {
-	if(!wifi_wps_disable()) {
-		debugf("Station::wpsConfigStop() : wifi_wps_disable() failed\n");
-	}
+	ESP_ERROR_CHECK(esp_wifi_wps_disable());
+	ESP_ERROR_CHECK(esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, staticWpsEventHandler));
+	delete wpsConfig;
+	wpsConfig = nullptr;
 }
 
 #endif // ENABLE_WPS
diff --git a/Sming/Arch/Esp32/Platform/StationImpl.h b/Sming/Arch/Esp32/Platform/StationImpl.h
index b25831542d..6aa477391a 100644
--- a/Sming/Arch/Esp32/Platform/StationImpl.h
+++ b/Sming/Arch/Esp32/Platform/StationImpl.h
@@ -18,6 +18,8 @@
 #include <esp_smartconfig.h>
 #endif
 
+struct esp_netif_obj;
+
 class StationImpl : public StationClass, protected ISystemReadyHandler
 {
 public:
@@ -64,16 +66,28 @@ class StationImpl : public StationClass, protected ISystemReadyHandler
 
 private:
 	static void staticScanCompleted(wifi_event_sta_scan_done_t* event, uint8_t status);
+#ifdef ENABLE_WPS
+	static void staticWpsEventHandler(void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data)
+	{
+		auto self = static_cast<StationImpl*>(arg);
+		self->wpsEventHandler(event_base, event_id, event_data);
+	}
+	void wpsEventHandler(esp_event_base_t event_base, int32_t event_id, void* event_data);
+	bool wpsCallback(WpsStatus status);
+	bool wpsConfigure(uint8_t credIndex);
+#endif
 #ifdef ENABLE_SMART_CONFIG
 	void internalSmartConfig(sc_status status, void* pdata);
 #endif
-#ifdef ENABLE_WPS
-	void internalWpsConfig(wps_cb_status status);
-#endif
 
 private:
-	bool runScan = false;
+	bool runScan{false};
+#ifdef ENABLE_WPS
+	struct WpsConfig;
+	WpsConfig* wpsConfig;
+#endif
 #ifdef ENABLE_SMART_CONFIG
 	std::unique_ptr<SmartConfigEventInfo> smartConfigEventInfo; ///< Set during smart handling
 #endif
+	esp_netif_obj* stationNetworkInterface{nullptr};
 };
diff --git a/Sming/Platform/Station.cpp b/Sming/Platform/Station.cpp
index c10f14f70b..350e0ad723 100644
--- a/Sming/Platform/Station.cpp
+++ b/Sming/Platform/Station.cpp
@@ -10,7 +10,18 @@
 
 #include "Station.h"
 
-/* StationClass */
+String toString(WpsStatus status)
+{
+	switch(status) {
+#define XX(name)                                                                                                       \
+	case WpsStatus::name:                                                                                              \
+		return F(#name);
+		WPS_STATUS_MAP(XX)
+#undef XX
+	default:
+		return F("Unknown_") + unsigned(status);
+	}
+}
 
 bool StationClass::isConnected() const
 {
diff --git a/Sming/Platform/Station.h b/Sming/Platform/Station.h
index d81549c4f2..19e68d40da 100644
--- a/Sming/Platform/Station.h
+++ b/Sming/Platform/Station.h
@@ -63,14 +63,25 @@ struct SmartConfigEventInfo {
 	MacAddress bssid;				 ///< AP BSSID
 };
 
+#define WPS_STATUS_MAP(XX)                                                                                             \
+	XX(Success)                                                                                                        \
+	XX(Failed)                                                                                                         \
+	XX(Timeout)                                                                                                        \
+	XX(WEP)
+
 /// WiFi WPS callback status
-enum WpsStatus {
-	eWPS_Success = 0,
-	eWPS_Failed,
-	eWPS_Timeout,
-	eWPS_WEP,
+enum class WpsStatus {
+#define XX(name) name,
+	WPS_STATUS_MAP(XX)
+#undef XX
 };
 
+#define XX(name) constexpr WpsStatus eWPS_##name{WpsStatus::name};
+WPS_STATUS_MAP(XX)
+#undef XX
+
+String toString(WpsStatus status);
+
 /**
  * @brief Scan complete handler function
  */
diff --git a/samples/Basic_WiFi/app/application.cpp b/samples/Basic_WiFi/app/application.cpp
index cbb84013c1..2ff8b3fd76 100644
--- a/samples/Basic_WiFi/app/application.cpp
+++ b/samples/Basic_WiFi/app/application.cpp
@@ -41,6 +41,18 @@ void connectFail(const String& ssid, MacAddress bssid, WifiDisconnectReason reas
 	Serial.print(ssid);
 	Serial.print(_F("\", reason: "));
 	Serial.println(WifiEvents.getDisconnectReasonDesc(reason));
+
+	/*
+	 * Print available access points
+	 * 
+	 * Note: Calling this in init() *may* work, but it also may result in an error,
+	 * "STA is connecting, scan are not allowed!" (ESP32).
+	 *
+	 * The station interface must be enabled, however, so this is a good place to make the call.
+	 * 
+	 * A real application would normally do this elsewhere, for example after a user has logged in via AP.
+	 */
+	WifiStation.startScan(listNetworks); // In Sming we can start network scan from init method without additional code
 }
 
 // Will be called when WiFi hardware and software initialization was finished
@@ -86,9 +98,6 @@ void init()
 		Serial.println(mac);
 	});
 
-	// Print available access points
-	WifiStation.startScan(listNetworks); // In Sming we can start network scan from init method without additional code
-
 	// Set callback that should be triggered when we have assigned IP
 	WifiEvents.onStationGotIP(connectOk);
 

From 2cb1bfc44df04424f2ea926059b3a1cf409e95a6 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 10 Mar 2021 08:27:39 +0000
Subject: [PATCH 55/91] vscode config generator fixes (#2255)

* Fix tool file extensions in windows

* Update `env` section in intellisense

* Fix emitted paths for Windows
---
 Tools/vscode/setup.py                         | 22 ++++++++++++++++++-
 .../template/intellisense/properties.json     |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Tools/vscode/setup.py b/Tools/vscode/setup.py
index 75d16bacce..4e59b0a0ab 100644
--- a/Tools/vscode/setup.py
+++ b/Tools/vscode/setup.py
@@ -42,16 +42,35 @@ def subst_path(self, path, prefix=''):
     def isWsl(self):
         return self.WSL_ROOT != ''
 
+    def update(self, env):
+        env['SMING_HOME'] = self.SMING_HOME
+        if self.SMING_ARCH == 'Esp8266':
+            env['ESP_HOME'] = self.ESP_HOME
+        if self.SMING_ARCH == 'Esp32':
+            env['IDF_PATH'] = self.IDF_PATH
+            env['IDF_TOOLS_PATH'] = self.IDF_PATH
+
 
 env = Env()
 
 
 def fix_path(path):
+    """Fix path so it conforms to makefile specs"""
     if path[1:3] == ':/':
         return '/' + path[0] + path[2:]
     return path
 
+def check_path(path):
+    """Fix path so it conforms to vscode specs"""
+    if sys.platform == 'win32':
+        if path[:1] == '/':
+            return path[1:2] + ':' + path[2:]
+    return path
+
 def find_tool(name):
+    if sys.platform == 'win32':
+        if os.path.splitext(name)[1] != '.exe':
+            name += '.exe'
     if os.path.isabs(name):
         path = name
     else:
@@ -96,7 +115,7 @@ def get_property(data, name, default):
 def update_intellisense():
     dirs = os.environ['COMPONENTS_EXTRA_INCDIR'].split()
     for i, d in enumerate(dirs):
-        dirs[i] = env.subst_path(d)
+        dirs[i] = check_path(env.subst_path(d))
 
     propertiesFile = '.vscode/c_cpp_properties.json'
     if os.path.exists(propertiesFile):
@@ -104,6 +123,7 @@ def update_intellisense():
     else:
         properties = load_template('intellisense/properties.json')
 
+    env.update(get_property(properties, 'env', {}))
     configurations = get_property(properties, 'configurations', [])
 
     config = find_object(configurations, env.SMING_ARCH)
diff --git a/Tools/vscode/template/intellisense/properties.json b/Tools/vscode/template/intellisense/properties.json
index 144b7d5268..70f3ce2b57 100644
--- a/Tools/vscode/template/intellisense/properties.json
+++ b/Tools/vscode/template/intellisense/properties.json
@@ -1,4 +1,5 @@
 {
+    "env": {},
     "configurations": [],
     "version": 4
-}
\ No newline at end of file
+}

From 26645ca2c77a4e102806ba0c271b2daeeb8a73f6 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 10 Mar 2021 09:29:39 +0100
Subject: [PATCH 56/91] Library support for flatbuffers (#2252)

---
 .gitmodules                                   |   4 +
 Sming/Libraries/flatbuffers/README.rst        |  59 ++
 Sming/Libraries/flatbuffers/component.mk      |   2 +
 .../flatbuffers/samples/Basic/.cproject       | 151 +++
 .../flatbuffers/samples/Basic/.project        |  28 +
 .../flatbuffers/samples/Basic/Makefile        |   9 +
 .../flatbuffers/samples/Basic/README.rst      |   5 +
 .../flatbuffers/samples/Basic/app/.cs         |   0
 .../samples/Basic/app/application.cpp         |  30 +
 .../flatbuffers/samples/Basic/component.mk    |   6 +
 .../samples/Basic/include/monster.h           | 872 ++++++++++++++++++
 Sming/Libraries/flatbuffers/src               |   1 +
 Sming/Libraries/flatbuffers/src.patch         |  17 +
 13 files changed, 1184 insertions(+)
 create mode 100644 Sming/Libraries/flatbuffers/README.rst
 create mode 100644 Sming/Libraries/flatbuffers/component.mk
 create mode 100644 Sming/Libraries/flatbuffers/samples/Basic/.cproject
 create mode 100644 Sming/Libraries/flatbuffers/samples/Basic/.project
 create mode 100644 Sming/Libraries/flatbuffers/samples/Basic/Makefile
 create mode 100644 Sming/Libraries/flatbuffers/samples/Basic/README.rst
 create mode 100644 Sming/Libraries/flatbuffers/samples/Basic/app/.cs
 create mode 100644 Sming/Libraries/flatbuffers/samples/Basic/app/application.cpp
 create mode 100644 Sming/Libraries/flatbuffers/samples/Basic/component.mk
 create mode 100644 Sming/Libraries/flatbuffers/samples/Basic/include/monster.h
 create mode 160000 Sming/Libraries/flatbuffers/src
 create mode 100644 Sming/Libraries/flatbuffers/src.patch

diff --git a/.gitmodules b/.gitmodules
index 4c6aa8dc8c..84a5e304aa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -191,6 +191,10 @@
 	path = Sming/Libraries/DHTesp
 	url = https://github.com/beegee-tokyo/DHTesp.git
 	ignore = dirty
+[submodule "Libraries.flatbuffers"]
+	path = Sming/Libraries/flatbuffers/src
+	url = https://github.com/google/flatbuffers.git
+ 	ignore = dirty       
 [submodule "Libraries.GoogleCast"]
 	path = Sming/Libraries/GoogleCast
 	url = https://github.com/slaff/Sming-GoogleCast.git
diff --git a/Sming/Libraries/flatbuffers/README.rst b/Sming/Libraries/flatbuffers/README.rst
new file mode 100644
index 0000000000..616a0f8e5f
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/README.rst
@@ -0,0 +1,59 @@
+Flatbuffers
+===========
+
+.. highlight:: c++
+
+FlatBuffers is an efficient cross platform serialization library for C++, C#, C, Go, Java, Kotlin, JavaScript, Lobster, Lua, TypeScript, PHP, Python, Rust and Swift.
+It was originally created at Google for game development and other performance-critical applications.
+
+It is available as Open Source on GitHub under the Apache license, v2 (see LICENSE.txt).
+
+Using
+-----
+
+1. Add these lines to your application componenent.mk file::
+
+       COMPONENT_DEPENDS += flatbuffers
+
+2. Add these lines to your application::
+
+      #include <flatbuffers/flatbuffers>
+
+Or directly use the header file generated from the `flatc` compiler.
+
+3. Basic example::
+
+   #include "monster.h"
+
+   using namespace MyGame::Example;
+
+   void init()
+   {
+      Serial.begin(SERIAL_BAUD_RATE);
+
+      // demonstration how to encode data into a flatbuffer
+      flatbuffers::FlatBufferBuilder builder;
+
+      auto name = builder.CreateString("Sming Monster");
+
+      MonsterBuilder monster_builder(builder);
+      monster_builder.add_name(name);
+
+      auto orc = monster_builder.Finish();
+
+      // Call `Finish()` to instruct the builder that this monster is complete.
+      // Note: Regardless of how you created the `orc`, you still need to call
+      // `Finish()` on the `FlatBufferBuilder`.
+      builder.Finish(orc);
+
+      // and then decode it
+      uint8_t *buffer = builder.GetBufferPointer();
+      auto monster = GetMonster(buffer);
+      Serial.printf("Monster name: %s\n", monster->name()->c_str());
+   }
+
+
+ Further reading
+ --------------
+ Take a look at the `official flatbuffers tutorial <https://google.github.io/flatbuffers/flatbuffers_guide_tutorial.html>`_.
+
diff --git a/Sming/Libraries/flatbuffers/component.mk b/Sming/Libraries/flatbuffers/component.mk
new file mode 100644
index 0000000000..90560f8b60
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/component.mk
@@ -0,0 +1,2 @@
+COMPONENT_INCDIRS 		:= src/include
+COMPONENT_SUBMODULES	:= src
diff --git a/Sming/Libraries/flatbuffers/samples/Basic/.cproject b/Sming/Libraries/flatbuffers/samples/Basic/.cproject
new file mode 100644
index 0000000000..67c056d24e
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/samples/Basic/.cproject
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" moduleId="org.eclipse.cdt.core.settings" name="Sming">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" name="Sming" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463" name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1164554300" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
+							<option id="cdt.managedbuild.option.gnu.cross.prefix.521205673" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
+							<option id="cdt.managedbuild.option.gnu.cross.path.393887888" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.712123812" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
+							<builder id="cdt.managedbuild.builder.gnu.cross.2110485170" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
+								<option id="gnu.c.compiler.option.include.paths.357494572" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.313321806" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
+								<option id="gnu.cpp.compiler.option.include.paths.611746109" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.65193859" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1795850540" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.364843833" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.525412186" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.assembler.587940548" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
+								<option id="gnu.both.asm.option.include.paths.1067006329" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.651581712" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="Basic_Blink.null.1347473968" name="Basic_Blink"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Sming">
+			<resource resourceType="PROJECT" workspacePath="/Basic_Blink"/>
+		</configuration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+		<buildTargets>
+			<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>all</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>clean</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flash</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashonefile" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashonefile</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashinit" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashinit</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashboot" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashboot</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="rebuild" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>rebuild</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+		</buildTargets>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2032390008;cdt.managedbuild.tool.gnu.c.compiler.input.1700912488">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903;cdt.managedbuild.tool.gnu.c.compiler.input.313321806">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015;cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.454898447;cdt.managedbuild.tool.gnu.cpp.compiler.input.501261625">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+</cproject>
diff --git a/Sming/Libraries/flatbuffers/samples/Basic/.project b/Sming/Libraries/flatbuffers/samples/Basic/.project
new file mode 100644
index 0000000000..0b15c33502
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/samples/Basic/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Basic_Flatbuffers</name>
+	<comment></comment>
+	<projects>
+		<project>SmingFramework</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/Sming/Libraries/flatbuffers/samples/Basic/Makefile b/Sming/Libraries/flatbuffers/samples/Basic/Makefile
new file mode 100644
index 0000000000..ff51b6c3a7
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/samples/Basic/Makefile
@@ -0,0 +1,9 @@
+#####################################################################
+#### Please don't change this file. Use component.mk instead ####
+#####################################################################
+
+ifndef SMING_HOME
+$(error SMING_HOME is not set: please configure it as an environment variable)
+endif
+
+include $(SMING_HOME)/project.mk
diff --git a/Sming/Libraries/flatbuffers/samples/Basic/README.rst b/Sming/Libraries/flatbuffers/samples/Basic/README.rst
new file mode 100644
index 0000000000..2a64840bda
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/samples/Basic/README.rst
@@ -0,0 +1,5 @@
+Basic FlatBuffers Sample
+========================
+
+Basic sample demonstrating encoding and decoding of data using flatbuffers.
+For more complicated examples take a look at the `official flatbuffers tutorial <https://google.github.io/flatbuffers/flatbuffers_guide_tutorial.html>`_.
diff --git a/Sming/Libraries/flatbuffers/samples/Basic/app/.cs b/Sming/Libraries/flatbuffers/samples/Basic/app/.cs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Sming/Libraries/flatbuffers/samples/Basic/app/application.cpp b/Sming/Libraries/flatbuffers/samples/Basic/app/application.cpp
new file mode 100644
index 0000000000..88c26a56a7
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/samples/Basic/app/application.cpp
@@ -0,0 +1,30 @@
+#include <SmingCore.h>
+
+#include "monster.h"
+
+using namespace MyGame::Sample;
+
+void init()
+{
+	Serial.begin(SERIAL_BAUD_RATE);
+
+	// demonstration how to encode data into a flatbuffer
+	flatbuffers::FlatBufferBuilder builder;
+
+	auto name = builder.CreateString("Sming Monster");
+
+	MonsterBuilder monster_builder(builder);
+	monster_builder.add_name(name);
+
+	auto orc = monster_builder.Finish();
+
+	// Call `Finish()` to instruct the builder that this monster is complete.
+	// Note: Regardless of how you created the `orc`, you still need to call
+	// `Finish()` on the `FlatBufferBuilder`.
+	builder.Finish(orc);
+
+	// and then decode it
+	uint8_t* buffer = builder.GetBufferPointer();
+	auto monster = GetMonster(buffer);
+	Serial.printf("Monster name: %s\n", monster->name()->c_str());
+}
diff --git a/Sming/Libraries/flatbuffers/samples/Basic/component.mk b/Sming/Libraries/flatbuffers/samples/Basic/component.mk
new file mode 100644
index 0000000000..3c388da53e
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/samples/Basic/component.mk
@@ -0,0 +1,6 @@
+COMPONENT_DEPENDS := flatbuffers
+
+CUSTOM_TARGETS	+= include/monster.h
+
+include/monster.h: ../../src/samples/monster_generated.h
+	$(Q) cp $< $@
\ No newline at end of file
diff --git a/Sming/Libraries/flatbuffers/samples/Basic/include/monster.h b/Sming/Libraries/flatbuffers/samples/Basic/include/monster.h
new file mode 100644
index 0000000000..9b70be4a7a
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/samples/Basic/include/monster.h
@@ -0,0 +1,872 @@
+// automatically generated by the FlatBuffers compiler, do not modify
+
+
+#ifndef FLATBUFFERS_GENERATED_MONSTER_MYGAME_SAMPLE_H_
+#define FLATBUFFERS_GENERATED_MONSTER_MYGAME_SAMPLE_H_
+
+#include "flatbuffers/flatbuffers.h"
+
+namespace MyGame {
+namespace Sample {
+
+struct Vec3;
+
+struct Monster;
+struct MonsterBuilder;
+struct MonsterT;
+
+struct Weapon;
+struct WeaponBuilder;
+struct WeaponT;
+
+bool operator==(const Vec3 &lhs, const Vec3 &rhs);
+bool operator!=(const Vec3 &lhs, const Vec3 &rhs);
+bool operator==(const MonsterT &lhs, const MonsterT &rhs);
+bool operator!=(const MonsterT &lhs, const MonsterT &rhs);
+bool operator==(const WeaponT &lhs, const WeaponT &rhs);
+bool operator!=(const WeaponT &lhs, const WeaponT &rhs);
+
+inline const flatbuffers::TypeTable *Vec3TypeTable();
+
+inline const flatbuffers::TypeTable *MonsterTypeTable();
+
+inline const flatbuffers::TypeTable *WeaponTypeTable();
+
+enum Color : int8_t {
+  Color_Red = 0,
+  Color_Green = 1,
+  Color_Blue = 2,
+  Color_MIN = Color_Red,
+  Color_MAX = Color_Blue
+};
+
+inline const Color (&EnumValuesColor())[3] {
+  static const Color values[] = {
+    Color_Red,
+    Color_Green,
+    Color_Blue
+  };
+  return values;
+}
+
+inline const char * const *EnumNamesColor() {
+  static const char * const names[4] = {
+    "Red",
+    "Green",
+    "Blue",
+    nullptr
+  };
+  return names;
+}
+
+inline const char *EnumNameColor(Color e) {
+  if (flatbuffers::IsOutRange(e, Color_Red, Color_Blue)) return "";
+  const size_t index = static_cast<size_t>(e);
+  return EnumNamesColor()[index];
+}
+
+enum Equipment : uint8_t {
+  Equipment_NONE = 0,
+  Equipment_Weapon = 1,
+  Equipment_MIN = Equipment_NONE,
+  Equipment_MAX = Equipment_Weapon
+};
+
+inline const Equipment (&EnumValuesEquipment())[2] {
+  static const Equipment values[] = {
+    Equipment_NONE,
+    Equipment_Weapon
+  };
+  return values;
+}
+
+inline const char * const *EnumNamesEquipment() {
+  static const char * const names[3] = {
+    "NONE",
+    "Weapon",
+    nullptr
+  };
+  return names;
+}
+
+inline const char *EnumNameEquipment(Equipment e) {
+  if (flatbuffers::IsOutRange(e, Equipment_NONE, Equipment_Weapon)) return "";
+  const size_t index = static_cast<size_t>(e);
+  return EnumNamesEquipment()[index];
+}
+
+template<typename T> struct EquipmentTraits {
+  static const Equipment enum_value = Equipment_NONE;
+};
+
+template<> struct EquipmentTraits<MyGame::Sample::Weapon> {
+  static const Equipment enum_value = Equipment_Weapon;
+};
+
+struct EquipmentUnion {
+  Equipment type;
+  void *value;
+
+  EquipmentUnion() : type(Equipment_NONE), value(nullptr) {}
+  EquipmentUnion(EquipmentUnion&& u) FLATBUFFERS_NOEXCEPT :
+    type(Equipment_NONE), value(nullptr)
+    { std::swap(type, u.type); std::swap(value, u.value); }
+  EquipmentUnion(const EquipmentUnion &);
+  EquipmentUnion &operator=(const EquipmentUnion &u)
+    { EquipmentUnion t(u); std::swap(type, t.type); std::swap(value, t.value); return *this; }
+  EquipmentUnion &operator=(EquipmentUnion &&u) FLATBUFFERS_NOEXCEPT
+    { std::swap(type, u.type); std::swap(value, u.value); return *this; }
+  ~EquipmentUnion() { Reset(); }
+
+  void Reset();
+
+#ifndef FLATBUFFERS_CPP98_STL
+  template <typename T>
+  void Set(T&& val) {
+    using RT = typename std::remove_reference<T>::type;
+    Reset();
+    type = EquipmentTraits<typename RT::TableType>::enum_value;
+    if (type != Equipment_NONE) {
+      value = new RT(std::forward<T>(val));
+    }
+  }
+#endif  // FLATBUFFERS_CPP98_STL
+
+  static void *UnPack(const void *obj, Equipment type, const flatbuffers::resolver_function_t *resolver);
+  flatbuffers::Offset<void> Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher = nullptr) const;
+
+  MyGame::Sample::WeaponT *AsWeapon() {
+    return type == Equipment_Weapon ?
+      reinterpret_cast<MyGame::Sample::WeaponT *>(value) : nullptr;
+  }
+  const MyGame::Sample::WeaponT *AsWeapon() const {
+    return type == Equipment_Weapon ?
+      reinterpret_cast<const MyGame::Sample::WeaponT *>(value) : nullptr;
+  }
+};
+
+
+inline bool operator==(const EquipmentUnion &lhs, const EquipmentUnion &rhs) {
+  if (lhs.type != rhs.type) return false;
+  switch (lhs.type) {
+    case Equipment_NONE: {
+      return true;
+    }
+    case Equipment_Weapon: {
+      return *(reinterpret_cast<const MyGame::Sample::WeaponT *>(lhs.value)) ==
+             *(reinterpret_cast<const MyGame::Sample::WeaponT *>(rhs.value));
+    }
+    default: {
+      return false;
+    }
+  }
+}
+
+inline bool operator!=(const EquipmentUnion &lhs, const EquipmentUnion &rhs) {
+    return !(lhs == rhs);
+}
+
+bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *obj, Equipment type);
+bool VerifyEquipmentVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types);
+
+FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Vec3 FLATBUFFERS_FINAL_CLASS {
+ private:
+  float x_;
+  float y_;
+  float z_;
+
+ public:
+  static const flatbuffers::TypeTable *MiniReflectTypeTable() {
+    return Vec3TypeTable();
+  }
+  Vec3()
+      : x_(0),
+        y_(0),
+        z_(0) {
+  }
+  Vec3(float _x, float _y, float _z)
+      : x_(flatbuffers::EndianScalar(_x)),
+        y_(flatbuffers::EndianScalar(_y)),
+        z_(flatbuffers::EndianScalar(_z)) {
+  }
+  float x() const {
+    return flatbuffers::EndianScalar(x_);
+  }
+  void mutate_x(float _x) {
+    flatbuffers::WriteScalar(&x_, _x);
+  }
+  float y() const {
+    return flatbuffers::EndianScalar(y_);
+  }
+  void mutate_y(float _y) {
+    flatbuffers::WriteScalar(&y_, _y);
+  }
+  float z() const {
+    return flatbuffers::EndianScalar(z_);
+  }
+  void mutate_z(float _z) {
+    flatbuffers::WriteScalar(&z_, _z);
+  }
+};
+FLATBUFFERS_STRUCT_END(Vec3, 12);
+
+inline bool operator==(const Vec3 &lhs, const Vec3 &rhs) {
+  return
+      (lhs.x() == rhs.x()) &&
+      (lhs.y() == rhs.y()) &&
+      (lhs.z() == rhs.z());
+}
+
+inline bool operator!=(const Vec3 &lhs, const Vec3 &rhs) {
+    return !(lhs == rhs);
+}
+
+
+struct MonsterT : public flatbuffers::NativeTable {
+  typedef Monster TableType;
+  flatbuffers::unique_ptr<MyGame::Sample::Vec3> pos{};
+  int16_t mana = 150;
+  int16_t hp = 100;
+  std::string name{};
+  std::vector<uint8_t> inventory{};
+  MyGame::Sample::Color color = MyGame::Sample::Color_Blue;
+  std::vector<flatbuffers::unique_ptr<MyGame::Sample::WeaponT>> weapons{};
+  MyGame::Sample::EquipmentUnion equipped{};
+  std::vector<MyGame::Sample::Vec3> path{};
+};
+
+inline bool operator==(const MonsterT &lhs, const MonsterT &rhs) {
+  return
+      (lhs.pos == rhs.pos) &&
+      (lhs.mana == rhs.mana) &&
+      (lhs.hp == rhs.hp) &&
+      (lhs.name == rhs.name) &&
+      (lhs.inventory == rhs.inventory) &&
+      (lhs.color == rhs.color) &&
+      (lhs.weapons == rhs.weapons) &&
+      (lhs.equipped == rhs.equipped) &&
+      (lhs.path == rhs.path);
+}
+
+inline bool operator!=(const MonsterT &lhs, const MonsterT &rhs) {
+    return !(lhs == rhs);
+}
+
+
+struct Monster FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  typedef MonsterT NativeTableType;
+  typedef MonsterBuilder Builder;
+  static const flatbuffers::TypeTable *MiniReflectTypeTable() {
+    return MonsterTypeTable();
+  }
+  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
+    VT_POS = 4,
+    VT_MANA = 6,
+    VT_HP = 8,
+    VT_NAME = 10,
+    VT_INVENTORY = 14,
+    VT_COLOR = 16,
+    VT_WEAPONS = 18,
+    VT_EQUIPPED_TYPE = 20,
+    VT_EQUIPPED = 22,
+    VT_PATH = 24
+  };
+  const MyGame::Sample::Vec3 *pos() const {
+    return GetStruct<const MyGame::Sample::Vec3 *>(VT_POS);
+  }
+  MyGame::Sample::Vec3 *mutable_pos() {
+    return GetStruct<MyGame::Sample::Vec3 *>(VT_POS);
+  }
+  int16_t mana() const {
+    return GetField<int16_t>(VT_MANA, 150);
+  }
+  bool mutate_mana(int16_t _mana) {
+    return SetField<int16_t>(VT_MANA, _mana, 150);
+  }
+  int16_t hp() const {
+    return GetField<int16_t>(VT_HP, 100);
+  }
+  bool mutate_hp(int16_t _hp) {
+    return SetField<int16_t>(VT_HP, _hp, 100);
+  }
+  const flatbuffers::String *name() const {
+    return GetPointer<const flatbuffers::String *>(VT_NAME);
+  }
+  flatbuffers::String *mutable_name() {
+    return GetPointer<flatbuffers::String *>(VT_NAME);
+  }
+  const flatbuffers::Vector<uint8_t> *inventory() const {
+    return GetPointer<const flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);
+  }
+  flatbuffers::Vector<uint8_t> *mutable_inventory() {
+    return GetPointer<flatbuffers::Vector<uint8_t> *>(VT_INVENTORY);
+  }
+  MyGame::Sample::Color color() const {
+    return static_cast<MyGame::Sample::Color>(GetField<int8_t>(VT_COLOR, 2));
+  }
+  bool mutate_color(MyGame::Sample::Color _color) {
+    return SetField<int8_t>(VT_COLOR, static_cast<int8_t>(_color), 2);
+  }
+  const flatbuffers::Vector<flatbuffers::Offset<MyGame::Sample::Weapon>> *weapons() const {
+    return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<MyGame::Sample::Weapon>> *>(VT_WEAPONS);
+  }
+  flatbuffers::Vector<flatbuffers::Offset<MyGame::Sample::Weapon>> *mutable_weapons() {
+    return GetPointer<flatbuffers::Vector<flatbuffers::Offset<MyGame::Sample::Weapon>> *>(VT_WEAPONS);
+  }
+  MyGame::Sample::Equipment equipped_type() const {
+    return static_cast<MyGame::Sample::Equipment>(GetField<uint8_t>(VT_EQUIPPED_TYPE, 0));
+  }
+  const void *equipped() const {
+    return GetPointer<const void *>(VT_EQUIPPED);
+  }
+  template<typename T> const T *equipped_as() const;
+  const MyGame::Sample::Weapon *equipped_as_Weapon() const {
+    return equipped_type() == MyGame::Sample::Equipment_Weapon ? static_cast<const MyGame::Sample::Weapon *>(equipped()) : nullptr;
+  }
+  void *mutable_equipped() {
+    return GetPointer<void *>(VT_EQUIPPED);
+  }
+  const flatbuffers::Vector<const MyGame::Sample::Vec3 *> *path() const {
+    return GetPointer<const flatbuffers::Vector<const MyGame::Sample::Vec3 *> *>(VT_PATH);
+  }
+  flatbuffers::Vector<const MyGame::Sample::Vec3 *> *mutable_path() {
+    return GetPointer<flatbuffers::Vector<const MyGame::Sample::Vec3 *> *>(VT_PATH);
+  }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyField<MyGame::Sample::Vec3>(verifier, VT_POS) &&
+           VerifyField<int16_t>(verifier, VT_MANA) &&
+           VerifyField<int16_t>(verifier, VT_HP) &&
+           VerifyOffset(verifier, VT_NAME) &&
+           verifier.VerifyString(name()) &&
+           VerifyOffset(verifier, VT_INVENTORY) &&
+           verifier.VerifyVector(inventory()) &&
+           VerifyField<int8_t>(verifier, VT_COLOR) &&
+           VerifyOffset(verifier, VT_WEAPONS) &&
+           verifier.VerifyVector(weapons()) &&
+           verifier.VerifyVectorOfTables(weapons()) &&
+           VerifyField<uint8_t>(verifier, VT_EQUIPPED_TYPE) &&
+           VerifyOffset(verifier, VT_EQUIPPED) &&
+           VerifyEquipment(verifier, equipped(), equipped_type()) &&
+           VerifyOffset(verifier, VT_PATH) &&
+           verifier.VerifyVector(path()) &&
+           verifier.EndTable();
+  }
+  MonsterT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
+  void UnPackTo(MonsterT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const;
+  static flatbuffers::Offset<Monster> Pack(flatbuffers::FlatBufferBuilder &_fbb, const MonsterT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
+};
+
+template<> inline const MyGame::Sample::Weapon *Monster::equipped_as<MyGame::Sample::Weapon>() const {
+  return equipped_as_Weapon();
+}
+
+struct MonsterBuilder {
+  typedef Monster Table;
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_pos(const MyGame::Sample::Vec3 *pos) {
+    fbb_.AddStruct(Monster::VT_POS, pos);
+  }
+  void add_mana(int16_t mana) {
+    fbb_.AddElement<int16_t>(Monster::VT_MANA, mana, 150);
+  }
+  void add_hp(int16_t hp) {
+    fbb_.AddElement<int16_t>(Monster::VT_HP, hp, 100);
+  }
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) {
+    fbb_.AddOffset(Monster::VT_NAME, name);
+  }
+  void add_inventory(flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory) {
+    fbb_.AddOffset(Monster::VT_INVENTORY, inventory);
+  }
+  void add_color(MyGame::Sample::Color color) {
+    fbb_.AddElement<int8_t>(Monster::VT_COLOR, static_cast<int8_t>(color), 2);
+  }
+  void add_weapons(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<MyGame::Sample::Weapon>>> weapons) {
+    fbb_.AddOffset(Monster::VT_WEAPONS, weapons);
+  }
+  void add_equipped_type(MyGame::Sample::Equipment equipped_type) {
+    fbb_.AddElement<uint8_t>(Monster::VT_EQUIPPED_TYPE, static_cast<uint8_t>(equipped_type), 0);
+  }
+  void add_equipped(flatbuffers::Offset<void> equipped) {
+    fbb_.AddOffset(Monster::VT_EQUIPPED, equipped);
+  }
+  void add_path(flatbuffers::Offset<flatbuffers::Vector<const MyGame::Sample::Vec3 *>> path) {
+    fbb_.AddOffset(Monster::VT_PATH, path);
+  }
+  explicit MonsterBuilder(flatbuffers::FlatBufferBuilder &_fbb)
+        : fbb_(_fbb) {
+    start_ = fbb_.StartTable();
+  }
+  flatbuffers::Offset<Monster> Finish() {
+    const auto end = fbb_.EndTable(start_);
+    auto o = flatbuffers::Offset<Monster>(end);
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<Monster> CreateMonster(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    const MyGame::Sample::Vec3 *pos = 0,
+    int16_t mana = 150,
+    int16_t hp = 100,
+    flatbuffers::Offset<flatbuffers::String> name = 0,
+    flatbuffers::Offset<flatbuffers::Vector<uint8_t>> inventory = 0,
+    MyGame::Sample::Color color = MyGame::Sample::Color_Blue,
+    flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<MyGame::Sample::Weapon>>> weapons = 0,
+    MyGame::Sample::Equipment equipped_type = MyGame::Sample::Equipment_NONE,
+    flatbuffers::Offset<void> equipped = 0,
+    flatbuffers::Offset<flatbuffers::Vector<const MyGame::Sample::Vec3 *>> path = 0) {
+  MonsterBuilder builder_(_fbb);
+  builder_.add_path(path);
+  builder_.add_equipped(equipped);
+  builder_.add_weapons(weapons);
+  builder_.add_inventory(inventory);
+  builder_.add_name(name);
+  builder_.add_pos(pos);
+  builder_.add_hp(hp);
+  builder_.add_mana(mana);
+  builder_.add_equipped_type(equipped_type);
+  builder_.add_color(color);
+  return builder_.Finish();
+}
+
+inline flatbuffers::Offset<Monster> CreateMonsterDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    const MyGame::Sample::Vec3 *pos = 0,
+    int16_t mana = 150,
+    int16_t hp = 100,
+    const char *name = nullptr,
+    const std::vector<uint8_t> *inventory = nullptr,
+    MyGame::Sample::Color color = MyGame::Sample::Color_Blue,
+    const std::vector<flatbuffers::Offset<MyGame::Sample::Weapon>> *weapons = nullptr,
+    MyGame::Sample::Equipment equipped_type = MyGame::Sample::Equipment_NONE,
+    flatbuffers::Offset<void> equipped = 0,
+    const std::vector<MyGame::Sample::Vec3> *path = nullptr) {
+  auto name__ = name ? _fbb.CreateString(name) : 0;
+  auto inventory__ = inventory ? _fbb.CreateVector<uint8_t>(*inventory) : 0;
+  auto weapons__ = weapons ? _fbb.CreateVector<flatbuffers::Offset<MyGame::Sample::Weapon>>(*weapons) : 0;
+  auto path__ = path ? _fbb.CreateVectorOfStructs<MyGame::Sample::Vec3>(*path) : 0;
+  return MyGame::Sample::CreateMonster(
+      _fbb,
+      pos,
+      mana,
+      hp,
+      name__,
+      inventory__,
+      color,
+      weapons__,
+      equipped_type,
+      equipped,
+      path__);
+}
+
+flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder &_fbb, const MonsterT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
+
+struct WeaponT : public flatbuffers::NativeTable {
+  typedef Weapon TableType;
+  std::string name{};
+  int16_t damage = 0;
+};
+
+inline bool operator==(const WeaponT &lhs, const WeaponT &rhs) {
+  return
+      (lhs.name == rhs.name) &&
+      (lhs.damage == rhs.damage);
+}
+
+inline bool operator!=(const WeaponT &lhs, const WeaponT &rhs) {
+    return !(lhs == rhs);
+}
+
+
+struct Weapon FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+  typedef WeaponT NativeTableType;
+  typedef WeaponBuilder Builder;
+  static const flatbuffers::TypeTable *MiniReflectTypeTable() {
+    return WeaponTypeTable();
+  }
+  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
+    VT_NAME = 4,
+    VT_DAMAGE = 6
+  };
+  const flatbuffers::String *name() const {
+    return GetPointer<const flatbuffers::String *>(VT_NAME);
+  }
+  flatbuffers::String *mutable_name() {
+    return GetPointer<flatbuffers::String *>(VT_NAME);
+  }
+  int16_t damage() const {
+    return GetField<int16_t>(VT_DAMAGE, 0);
+  }
+  bool mutate_damage(int16_t _damage) {
+    return SetField<int16_t>(VT_DAMAGE, _damage, 0);
+  }
+  bool Verify(flatbuffers::Verifier &verifier) const {
+    return VerifyTableStart(verifier) &&
+           VerifyOffset(verifier, VT_NAME) &&
+           verifier.VerifyString(name()) &&
+           VerifyField<int16_t>(verifier, VT_DAMAGE) &&
+           verifier.EndTable();
+  }
+  WeaponT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
+  void UnPackTo(WeaponT *_o, const flatbuffers::resolver_function_t *_resolver = nullptr) const;
+  static flatbuffers::Offset<Weapon> Pack(flatbuffers::FlatBufferBuilder &_fbb, const WeaponT* _o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
+};
+
+struct WeaponBuilder {
+  typedef Weapon Table;
+  flatbuffers::FlatBufferBuilder &fbb_;
+  flatbuffers::uoffset_t start_;
+  void add_name(flatbuffers::Offset<flatbuffers::String> name) {
+    fbb_.AddOffset(Weapon::VT_NAME, name);
+  }
+  void add_damage(int16_t damage) {
+    fbb_.AddElement<int16_t>(Weapon::VT_DAMAGE, damage, 0);
+  }
+  explicit WeaponBuilder(flatbuffers::FlatBufferBuilder &_fbb)
+        : fbb_(_fbb) {
+    start_ = fbb_.StartTable();
+  }
+  flatbuffers::Offset<Weapon> Finish() {
+    const auto end = fbb_.EndTable(start_);
+    auto o = flatbuffers::Offset<Weapon>(end);
+    return o;
+  }
+};
+
+inline flatbuffers::Offset<Weapon> CreateWeapon(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    flatbuffers::Offset<flatbuffers::String> name = 0,
+    int16_t damage = 0) {
+  WeaponBuilder builder_(_fbb);
+  builder_.add_name(name);
+  builder_.add_damage(damage);
+  return builder_.Finish();
+}
+
+inline flatbuffers::Offset<Weapon> CreateWeaponDirect(
+    flatbuffers::FlatBufferBuilder &_fbb,
+    const char *name = nullptr,
+    int16_t damage = 0) {
+  auto name__ = name ? _fbb.CreateString(name) : 0;
+  return MyGame::Sample::CreateWeapon(
+      _fbb,
+      name__,
+      damage);
+}
+
+flatbuffers::Offset<Weapon> CreateWeapon(flatbuffers::FlatBufferBuilder &_fbb, const WeaponT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
+
+inline MonsterT *Monster::UnPack(const flatbuffers::resolver_function_t *_resolver) const {
+  auto _o = std::unique_ptr<MonsterT>(new MonsterT());
+  UnPackTo(_o.get(), _resolver);
+  return _o.release();
+}
+
+inline void Monster::UnPackTo(MonsterT *_o, const flatbuffers::resolver_function_t *_resolver) const {
+  (void)_o;
+  (void)_resolver;
+  { auto _e = pos(); if (_e) _o->pos = flatbuffers::unique_ptr<MyGame::Sample::Vec3>(new MyGame::Sample::Vec3(*_e)); }
+  { auto _e = mana(); _o->mana = _e; }
+  { auto _e = hp(); _o->hp = _e; }
+  { auto _e = name(); if (_e) _o->name = _e->str(); }
+  { auto _e = inventory(); if (_e) { _o->inventory.resize(_e->size()); std::copy(_e->begin(), _e->end(), _o->inventory.begin()); } }
+  { auto _e = color(); _o->color = _e; }
+  { auto _e = weapons(); if (_e) { _o->weapons.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->weapons[_i] = flatbuffers::unique_ptr<MyGame::Sample::WeaponT>(_e->Get(_i)->UnPack(_resolver)); } } }
+  { auto _e = equipped_type(); _o->equipped.type = _e; }
+  { auto _e = equipped(); if (_e) _o->equipped.value = MyGame::Sample::EquipmentUnion::UnPack(_e, equipped_type(), _resolver); }
+  { auto _e = path(); if (_e) { _o->path.resize(_e->size()); for (flatbuffers::uoffset_t _i = 0; _i < _e->size(); _i++) { _o->path[_i] = *_e->Get(_i); } } }
+}
+
+inline flatbuffers::Offset<Monster> Monster::Pack(flatbuffers::FlatBufferBuilder &_fbb, const MonsterT* _o, const flatbuffers::rehasher_function_t *_rehasher) {
+  return CreateMonster(_fbb, _o, _rehasher);
+}
+
+inline flatbuffers::Offset<Monster> CreateMonster(flatbuffers::FlatBufferBuilder &_fbb, const MonsterT *_o, const flatbuffers::rehasher_function_t *_rehasher) {
+  (void)_rehasher;
+  (void)_o;
+  struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const MonsterT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
+  auto _pos = _o->pos ? _o->pos.get() : 0;
+  auto _mana = _o->mana;
+  auto _hp = _o->hp;
+  auto _name = _o->name.empty() ? 0 : _fbb.CreateString(_o->name);
+  auto _inventory = _o->inventory.size() ? _fbb.CreateVector(_o->inventory) : 0;
+  auto _color = _o->color;
+  auto _weapons = _o->weapons.size() ? _fbb.CreateVector<flatbuffers::Offset<MyGame::Sample::Weapon>> (_o->weapons.size(), [](size_t i, _VectorArgs *__va) { return CreateWeapon(*__va->__fbb, __va->__o->weapons[i].get(), __va->__rehasher); }, &_va ) : 0;
+  auto _equipped_type = _o->equipped.type;
+  auto _equipped = _o->equipped.Pack(_fbb);
+  auto _path = _o->path.size() ? _fbb.CreateVectorOfStructs(_o->path) : 0;
+  return MyGame::Sample::CreateMonster(
+      _fbb,
+      _pos,
+      _mana,
+      _hp,
+      _name,
+      _inventory,
+      _color,
+      _weapons,
+      _equipped_type,
+      _equipped,
+      _path);
+}
+
+inline WeaponT *Weapon::UnPack(const flatbuffers::resolver_function_t *_resolver) const {
+  auto _o = std::unique_ptr<WeaponT>(new WeaponT());
+  UnPackTo(_o.get(), _resolver);
+  return _o.release();
+}
+
+inline void Weapon::UnPackTo(WeaponT *_o, const flatbuffers::resolver_function_t *_resolver) const {
+  (void)_o;
+  (void)_resolver;
+  { auto _e = name(); if (_e) _o->name = _e->str(); }
+  { auto _e = damage(); _o->damage = _e; }
+}
+
+inline flatbuffers::Offset<Weapon> Weapon::Pack(flatbuffers::FlatBufferBuilder &_fbb, const WeaponT* _o, const flatbuffers::rehasher_function_t *_rehasher) {
+  return CreateWeapon(_fbb, _o, _rehasher);
+}
+
+inline flatbuffers::Offset<Weapon> CreateWeapon(flatbuffers::FlatBufferBuilder &_fbb, const WeaponT *_o, const flatbuffers::rehasher_function_t *_rehasher) {
+  (void)_rehasher;
+  (void)_o;
+  struct _VectorArgs { flatbuffers::FlatBufferBuilder *__fbb; const WeaponT* __o; const flatbuffers::rehasher_function_t *__rehasher; } _va = { &_fbb, _o, _rehasher}; (void)_va;
+  auto _name = _o->name.empty() ? 0 : _fbb.CreateString(_o->name);
+  auto _damage = _o->damage;
+  return MyGame::Sample::CreateWeapon(
+      _fbb,
+      _name,
+      _damage);
+}
+
+inline bool VerifyEquipment(flatbuffers::Verifier &verifier, const void *obj, Equipment type) {
+  switch (type) {
+    case Equipment_NONE: {
+      return true;
+    }
+    case Equipment_Weapon: {
+      auto ptr = reinterpret_cast<const MyGame::Sample::Weapon *>(obj);
+      return verifier.VerifyTable(ptr);
+    }
+    default: return true;
+  }
+}
+
+inline bool VerifyEquipmentVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types) {
+  if (!values || !types) return !values && !types;
+  if (values->size() != types->size()) return false;
+  for (flatbuffers::uoffset_t i = 0; i < values->size(); ++i) {
+    if (!VerifyEquipment(
+        verifier,  values->Get(i), types->GetEnum<Equipment>(i))) {
+      return false;
+    }
+  }
+  return true;
+}
+
+inline void *EquipmentUnion::UnPack(const void *obj, Equipment type, const flatbuffers::resolver_function_t *resolver) {
+  switch (type) {
+    case Equipment_Weapon: {
+      auto ptr = reinterpret_cast<const MyGame::Sample::Weapon *>(obj);
+      return ptr->UnPack(resolver);
+    }
+    default: return nullptr;
+  }
+}
+
+inline flatbuffers::Offset<void> EquipmentUnion::Pack(flatbuffers::FlatBufferBuilder &_fbb, const flatbuffers::rehasher_function_t *_rehasher) const {
+  switch (type) {
+    case Equipment_Weapon: {
+      auto ptr = reinterpret_cast<const MyGame::Sample::WeaponT *>(value);
+      return CreateWeapon(_fbb, ptr, _rehasher).Union();
+    }
+    default: return 0;
+  }
+}
+
+inline EquipmentUnion::EquipmentUnion(const EquipmentUnion &u) : type(u.type), value(nullptr) {
+  switch (type) {
+    case Equipment_Weapon: {
+      value = new MyGame::Sample::WeaponT(*reinterpret_cast<MyGame::Sample::WeaponT *>(u.value));
+      break;
+    }
+    default:
+      break;
+  }
+}
+
+inline void EquipmentUnion::Reset() {
+  switch (type) {
+    case Equipment_Weapon: {
+      auto ptr = reinterpret_cast<MyGame::Sample::WeaponT *>(value);
+      delete ptr;
+      break;
+    }
+    default: break;
+  }
+  value = nullptr;
+  type = Equipment_NONE;
+}
+
+inline const flatbuffers::TypeTable *ColorTypeTable() {
+  static const flatbuffers::TypeCode type_codes[] = {
+    { flatbuffers::ET_CHAR, 0, 0 },
+    { flatbuffers::ET_CHAR, 0, 0 },
+    { flatbuffers::ET_CHAR, 0, 0 }
+  };
+  static const flatbuffers::TypeFunction type_refs[] = {
+    MyGame::Sample::ColorTypeTable
+  };
+  static const char * const names[] = {
+    "Red",
+    "Green",
+    "Blue"
+  };
+  static const flatbuffers::TypeTable tt = {
+    flatbuffers::ST_ENUM, 3, type_codes, type_refs, nullptr, nullptr, names
+  };
+  return &tt;
+}
+
+inline const flatbuffers::TypeTable *EquipmentTypeTable() {
+  static const flatbuffers::TypeCode type_codes[] = {
+    { flatbuffers::ET_SEQUENCE, 0, -1 },
+    { flatbuffers::ET_SEQUENCE, 0, 0 }
+  };
+  static const flatbuffers::TypeFunction type_refs[] = {
+    MyGame::Sample::WeaponTypeTable
+  };
+  static const char * const names[] = {
+    "NONE",
+    "Weapon"
+  };
+  static const flatbuffers::TypeTable tt = {
+    flatbuffers::ST_UNION, 2, type_codes, type_refs, nullptr, nullptr, names
+  };
+  return &tt;
+}
+
+inline const flatbuffers::TypeTable *Vec3TypeTable() {
+  static const flatbuffers::TypeCode type_codes[] = {
+    { flatbuffers::ET_FLOAT, 0, -1 },
+    { flatbuffers::ET_FLOAT, 0, -1 },
+    { flatbuffers::ET_FLOAT, 0, -1 }
+  };
+  static const int64_t values[] = { 0, 4, 8, 12 };
+  static const char * const names[] = {
+    "x",
+    "y",
+    "z"
+  };
+  static const flatbuffers::TypeTable tt = {
+    flatbuffers::ST_STRUCT, 3, type_codes, nullptr, nullptr, values, names
+  };
+  return &tt;
+}
+
+inline const flatbuffers::TypeTable *MonsterTypeTable() {
+  static const flatbuffers::TypeCode type_codes[] = {
+    { flatbuffers::ET_SEQUENCE, 0, 0 },
+    { flatbuffers::ET_SHORT, 0, -1 },
+    { flatbuffers::ET_SHORT, 0, -1 },
+    { flatbuffers::ET_STRING, 0, -1 },
+    { flatbuffers::ET_BOOL, 0, -1 },
+    { flatbuffers::ET_UCHAR, 1, -1 },
+    { flatbuffers::ET_CHAR, 0, 1 },
+    { flatbuffers::ET_SEQUENCE, 1, 2 },
+    { flatbuffers::ET_UTYPE, 0, 3 },
+    { flatbuffers::ET_SEQUENCE, 0, 3 },
+    { flatbuffers::ET_SEQUENCE, 1, 0 }
+  };
+  static const flatbuffers::TypeFunction type_refs[] = {
+    MyGame::Sample::Vec3TypeTable,
+    MyGame::Sample::ColorTypeTable,
+    MyGame::Sample::WeaponTypeTable,
+    MyGame::Sample::EquipmentTypeTable
+  };
+  static const char * const names[] = {
+    "pos",
+    "mana",
+    "hp",
+    "name",
+    "friendly",
+    "inventory",
+    "color",
+    "weapons",
+    "equipped_type",
+    "equipped",
+    "path"
+  };
+  static const flatbuffers::TypeTable tt = {
+    flatbuffers::ST_TABLE, 11, type_codes, type_refs, nullptr, nullptr, names
+  };
+  return &tt;
+}
+
+inline const flatbuffers::TypeTable *WeaponTypeTable() {
+  static const flatbuffers::TypeCode type_codes[] = {
+    { flatbuffers::ET_STRING, 0, -1 },
+    { flatbuffers::ET_SHORT, 0, -1 }
+  };
+  static const char * const names[] = {
+    "name",
+    "damage"
+  };
+  static const flatbuffers::TypeTable tt = {
+    flatbuffers::ST_TABLE, 2, type_codes, nullptr, nullptr, nullptr, names
+  };
+  return &tt;
+}
+
+inline const MyGame::Sample::Monster *GetMonster(const void *buf) {
+  return flatbuffers::GetRoot<MyGame::Sample::Monster>(buf);
+}
+
+inline const MyGame::Sample::Monster *GetSizePrefixedMonster(const void *buf) {
+  return flatbuffers::GetSizePrefixedRoot<MyGame::Sample::Monster>(buf);
+}
+
+inline Monster *GetMutableMonster(void *buf) {
+  return flatbuffers::GetMutableRoot<Monster>(buf);
+}
+
+inline bool VerifyMonsterBuffer(
+    flatbuffers::Verifier &verifier) {
+  return verifier.VerifyBuffer<MyGame::Sample::Monster>(nullptr);
+}
+
+inline bool VerifySizePrefixedMonsterBuffer(
+    flatbuffers::Verifier &verifier) {
+  return verifier.VerifySizePrefixedBuffer<MyGame::Sample::Monster>(nullptr);
+}
+
+inline void FinishMonsterBuffer(
+    flatbuffers::FlatBufferBuilder &fbb,
+    flatbuffers::Offset<MyGame::Sample::Monster> root) {
+  fbb.Finish(root);
+}
+
+inline void FinishSizePrefixedMonsterBuffer(
+    flatbuffers::FlatBufferBuilder &fbb,
+    flatbuffers::Offset<MyGame::Sample::Monster> root) {
+  fbb.FinishSizePrefixed(root);
+}
+
+inline flatbuffers::unique_ptr<MyGame::Sample::MonsterT> UnPackMonster(
+    const void *buf,
+    const flatbuffers::resolver_function_t *res = nullptr) {
+  return flatbuffers::unique_ptr<MyGame::Sample::MonsterT>(GetMonster(buf)->UnPack(res));
+}
+
+inline flatbuffers::unique_ptr<MyGame::Sample::MonsterT> UnPackSizePrefixedMonster(
+    const void *buf,
+    const flatbuffers::resolver_function_t *res = nullptr) {
+  return flatbuffers::unique_ptr<MyGame::Sample::MonsterT>(GetSizePrefixedMonster(buf)->UnPack(res));
+}
+
+}  // namespace Sample
+}  // namespace MyGame
+
+#endif  // FLATBUFFERS_GENERATED_MONSTER_MYGAME_SAMPLE_H_
diff --git a/Sming/Libraries/flatbuffers/src b/Sming/Libraries/flatbuffers/src
new file mode 160000
index 0000000000..fc4fffea41
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/src
@@ -0,0 +1 @@
+Subproject commit fc4fffea41f5b682198edfc72eca536d33fd848c
diff --git a/Sming/Libraries/flatbuffers/src.patch b/Sming/Libraries/flatbuffers/src.patch
new file mode 100644
index 0000000000..e88e5e4661
--- /dev/null
+++ b/Sming/Libraries/flatbuffers/src.patch
@@ -0,0 +1,17 @@
+diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
+index 54a51aa..ffc2d7d 100644
+--- a/include/flatbuffers/base.h
++++ b/include/flatbuffers/base.h
+@@ -32,11 +32,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ 
+-#if defined(ARDUINO) && !defined(ARDUINOSTL_M_H)
+-  #include <utility.h>
+-#else
+-  #include <utility>
+-#endif
++#include <utility>
+ 
+ #include <string>
+ #include <type_traits>

From e368ccffab8277578d1d848d6d554d3b9784eda9 Mon Sep 17 00:00:00 2001
From: etmmahi <etmmahi@users.noreply.github.com>
Date: Thu, 11 Mar 2021 09:41:48 +0100
Subject: [PATCH 57/91] ScreenOLED_SSD1306 sample fails to build #2256 (#2259)

---
 .../Libraries/.patches/Adafruit_SSD1306.patch | 74 ++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/Sming/Libraries/.patches/Adafruit_SSD1306.patch b/Sming/Libraries/.patches/Adafruit_SSD1306.patch
index ed74398da7..c3077b4efa 100644
--- a/Sming/Libraries/.patches/Adafruit_SSD1306.patch
+++ b/Sming/Libraries/.patches/Adafruit_SSD1306.patch
@@ -1,5 +1,5 @@
 diff --git a/Adafruit_SSD1306.cpp b/Adafruit_SSD1306.cpp
-index 570a335..efcc3eb 100644
+index 570a335..750b750 100644
 --- a/Adafruit_SSD1306.cpp
 +++ b/Adafruit_SSD1306.cpp
 @@ -32,12 +32,38 @@ All text above, and the splash screen below must be included in any redistributi
@@ -150,6 +150,78 @@ index 570a335..efcc3eb 100644
  }
  
  // clear everything
+@@ -564,13 +632,13 @@ void Adafruit_SSD1306::drawFastHLineInternal(int16_t x, int16_t y, int16_t w, ui
+   if(w <= 0) { return; }
+ 
+   // set up the pointer for  movement through the buffer
+-  register uint8_t *pBuf = buffer;
++  uint8_t *pBuf = buffer;
+   // adjust the buffer pointer for the current row
+   pBuf += ((y/8) * SSD1306_LCDWIDTH);
+   // and offset x columns in
+   pBuf += x;
+ 
+-  register uint8_t mask = 1 << (y&7);
++  uint8_t mask = 1 << (y&7);
+ 
+   switch (color)
+   {
+@@ -638,27 +706,27 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y, int16_t __h
+   }
+ 
+   // this display doesn't need ints for coordinates, use local byte registers for faster juggling
+-  register uint8_t y = __y;
+-  register uint8_t h = __h;
++  uint8_t y = __y;
++  uint8_t h = __h;
+ 
+ 
+   // set up the pointer for fast movement through the buffer
+-  register uint8_t *pBuf = buffer;
++  uint8_t *pBuf = buffer;
+   // adjust the buffer pointer for the current row
+   pBuf += ((y/8) * SSD1306_LCDWIDTH);
+   // and offset x columns in
+   pBuf += x;
+ 
+   // do the first partial byte, if necessary - this requires some masking
+-  register uint8_t mod = (y&7);
++  uint8_t mod = (y&7);
+   if(mod) {
+     // mask off the high n bits we want to set
+     mod = 8-mod;
+ 
+     // note - lookup table results in a nearly 10% performance improvement in fill* functions
+-    // register uint8_t mask = ~(0xFF >> (mod));
++    // uint8_t mask = ~(0xFF >> (mod));
+     static uint8_t premask[8] = {0x00, 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE };
+-    register uint8_t mask = premask[mod];
++    uint8_t mask = premask[mod];
+ 
+     // adjust the mask if we're not going to reach the end of this byte
+     if( h < mod) {
+@@ -696,7 +764,7 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y, int16_t __h
+       }
+     else {
+       // store a local value to work with
+-      register uint8_t val = (color == WHITE) ? 255 : 0;
++      uint8_t val = (color == WHITE) ? 255 : 0;
+ 
+       do  {
+         // write our value in
+@@ -715,10 +783,10 @@ void Adafruit_SSD1306::drawFastVLineInternal(int16_t x, int16_t __y, int16_t __h
+   if(h) {
+     mod = h & 7;
+     // this time we want to mask the low bits of the byte, vs the high bits we did above
+-    // register uint8_t mask = (1 << mod) - 1;
++    // uint8_t mask = (1 << mod) - 1;
+     // note - lookup table results in a nearly 10% performance improvement in fill* functions
+     static uint8_t postmask[8] = {0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F };
+-    register uint8_t mask = postmask[mod];
++    uint8_t mask = postmask[mod];
+     switch (color)
+     {
+       case WHITE:   *pBuf |=  mask;  break;
 diff --git a/Adafruit_SSD1306.h b/Adafruit_SSD1306.h
 index 1162f87..28d783f 100644
 --- a/Adafruit_SSD1306.h

From 9c0c9c86ee1bccd9b1a16e35bc77323211fa33fb Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Thu, 11 Mar 2021 08:43:06 +0000
Subject: [PATCH 58/91] IFS useability improvements (#2257)

* Tag deprecated spiffs functions

* Move spiffs_mount, etc. into Core FileSystem unit, add `fwfs_mount` and `hyfs_mount`
---
 Sming/Components/IFS                          |  2 +-
 .../Storage/src/include/Storage/Partition.h   | 10 +++
 Sming/Components/spiffs/spiffs_sming.cpp      | 37 +---------
 Sming/Components/spiffs/spiffs_sming.h        | 17 +----
 Sming/Core/FileSystem.cpp                     | 74 ++++++++++++++++++-
 Sming/Core/FileSystem.h                       | 35 +++++++++
 samples/Basic_IFS/app/application.cpp         |  6 +-
 7 files changed, 128 insertions(+), 53 deletions(-)

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index 01056149fd..1592878252 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit 01056149fd8392fe0b4c9636f369e35c7f9b6dd6
+Subproject commit 15928782526be1e81b8dbcaa720f350c28cd059e
diff --git a/Sming/Components/Storage/src/include/Storage/Partition.h b/Sming/Components/Storage/src/include/Storage/Partition.h
index 6affd80cba..0c141abad0 100644
--- a/Sming/Components/Storage/src/include/Storage/Partition.h
+++ b/Sming/Components/Storage/src/include/Storage/Partition.h
@@ -375,3 +375,13 @@ class Partition
 
 String toString(Storage::Partition::Type type, uint8_t subType);
 String toLongString(Storage::Partition::Type type, uint8_t subType);
+
+template <typename E> typename std::enable_if<bool(E::partitionType), String>::type toString(E subType)
+{
+	return toString(Storage::Partition::Type(E::partitionType), uint8_t(subType));
+}
+
+template <typename E> typename std::enable_if<bool(E::partitionType), String>::type toLongString(E subType)
+{
+	return toLongString(Storage::Partition::Type(E::partitionType), uint8_t(subType));
+}
diff --git a/Sming/Components/spiffs/spiffs_sming.cpp b/Sming/Components/spiffs/spiffs_sming.cpp
index 10e99448ed..def31d36b6 100644
--- a/Sming/Components/spiffs/spiffs_sming.cpp
+++ b/Sming/Components/spiffs/spiffs_sming.cpp
@@ -13,39 +13,6 @@
 #include <FileSystem.h>
 #include <Storage.h>
 
-namespace
-{
-Storage::Partition findDefaultPartition()
-{
-	auto it = Storage::findPartition(Storage::Partition::SubType::Data::spiffs);
-	if(!it) {
-		debug_e("No SPIFFS partition found");
-	}
-	return *it;
-}
-
-} // namespace
-
-bool spiffs_mount(Storage::Partition partition)
-{
-	auto fs = new IFS::SPIFFS::FileSystem(partition);
-	int err = fs->mount();
-	if(err < 0) {
-		debug_e("SPIFFS mount failed: %s", fs->getErrorString(err).c_str());
-		delete fs;
-		return false;
-	}
-
-	fileSetFileSystem(fs);
-	return true;
-}
-
-bool spiffs_mount()
-{
-	auto part = findDefaultPartition();
-	return part ? spiffs_mount(part) : false;
-}
-
 void spiffs_unmount()
 {
 	if(fileSystemType() == IFS::IFileSystem::Type::SPIFFS) {
@@ -63,7 +30,9 @@ bool spiffs_format()
 
 bool spiffs_format(Storage::Partition& partition)
 {
-	spiffs_unmount();
+	if(fileSystemType() == IFS::IFileSystem::Type::SPIFFS) {
+		fileFreeFileSystem();
+	}
 	auto fs = new IFS::SPIFFS::FileSystem(partition);
 	int err = fs->format();
 	if(err < 0) {
diff --git a/Sming/Components/spiffs/spiffs_sming.h b/Sming/Components/spiffs/spiffs_sming.h
index 566bd91287..9480c00db1 100644
--- a/Sming/Components/spiffs/spiffs_sming.h
+++ b/Sming/Components/spiffs/spiffs_sming.h
@@ -12,31 +12,18 @@
 #include <spiffs.h>
 #include <Storage/Partition.h>
 
-/**
- * @brief Mount the SPIFFS volume using default configuration
- * @retval bool true on success
- *
- * Configuration is obtained `spiffs_get_storage_config()`.
- */
-bool spiffs_mount();
-
-/**
- * @brief Mount SPIFFS volume from a specific partition
- */
-bool spiffs_mount(Storage::Partition partition);
-
 /**
  * @brief unmount SPIFFS filesystem
  * @deprecated use fileFreeFileSystem() instead
  * @note this will do nothing if the active filesystem is not SPIFFS
  */
-void spiffs_unmount();
+void spiffs_unmount() SMING_DEPRECATED;
 
 /** @brief Format and mount a SPIFFS filesystem
  *  @deprecated use fileSystemFormat() instead
  *  @note this will fail if the active filesystem is not SPIFFS
  */
-bool spiffs_format();
+bool spiffs_format() SMING_DEPRECATED;
 
 /**
  * @brief Format and mount a SPIFFS volume using given partition
diff --git a/Sming/Core/FileSystem.cpp b/Sming/Core/FileSystem.cpp
index 72aaa01289..9d239cdaab 100644
--- a/Sming/Core/FileSystem.cpp
+++ b/Sming/Core/FileSystem.cpp
@@ -9,7 +9,7 @@
  ****/
 
 #include "FileSystem.h"
-#include <WString.h>
+#include <Storage.h>
 #include <debug_progmem.h>
 
 namespace SmingInternal
@@ -25,6 +25,78 @@ void fileSetFileSystem(IFS::IFileSystem* fileSystem)
 	}
 }
 
+namespace
+{
+template <typename T> Storage::Partition findDefaultPartition(T subType)
+{
+	auto part = *Storage::findPartition(subType);
+	if(part) {
+		debug_i("[%s] Found '%s'", part.typeString().c_str(), part.name().c_str());
+	} else {
+		debug_e("[%s] No partition found", toString(subType).c_str());
+	}
+	return part;
+}
+
+bool mount(IFS::IFileSystem* fs)
+{
+	if(fs == nullptr) {
+		debug_e("Failed to created filesystem object");
+		return false;
+	}
+
+	int res = fs->mount();
+	debug_i("mount() returned %d (%s)", res, fs->getErrorString(res).c_str());
+
+	if(res < 0) {
+		delete fs;
+		return false;
+	}
+
+	fileSetFileSystem(fs);
+
+	debug_i("File system initialised");
+	return true;
+}
+} // namespace
+
+bool spiffs_mount()
+{
+	auto part = findDefaultPartition(Storage::Partition::SubType::Data::spiffs);
+	return part ? spiffs_mount(part) : false;
+}
+
+bool spiffs_mount(Storage::Partition partition)
+{
+	auto fs = IFS::createSpiffsFilesystem(partition);
+	return mount(fs);
+}
+
+bool fwfs_mount()
+{
+	auto part = findDefaultPartition(Storage::Partition::SubType::Data::fwfs);
+	return part ? fwfs_mount(part) : false;
+}
+
+bool fwfs_mount(Storage::Partition partition)
+{
+	auto fs = IFS::createFirmwareFilesystem(partition);
+	return mount(fs);
+}
+
+bool hyfs_mount()
+{
+	auto fwfsPart = findDefaultPartition(Storage::Partition::SubType::Data::fwfs);
+	auto spiffsPart = findDefaultPartition(Storage::Partition::SubType::Data::spiffs);
+	return (fwfsPart && spiffsPart) ? hyfs_mount(fwfsPart, spiffsPart) : false;
+}
+
+bool hyfs_mount(Storage::Partition fwfsPartition, Storage::Partition spiffsPartition)
+{
+	auto fs = IFS::createHybridFilesystem(fwfsPartition, spiffsPartition);
+	return mount(fs);
+}
+
 Vector<String> fileList()
 {
 	Vector<String> result;
diff --git a/Sming/Core/FileSystem.h b/Sming/Core/FileSystem.h
index 3c1feb5e33..85d586bc21 100644
--- a/Sming/Core/FileSystem.h
+++ b/Sming/Core/FileSystem.h
@@ -117,6 +117,41 @@ inline void fileFreeFileSystem()
 	fileSetFileSystem(nullptr);
 }
 
+/**
+ * @brief Mount the first available SPIFFS volume
+ * @retval bool true on success
+ */
+bool spiffs_mount();
+
+/**
+ * @brief Mount SPIFFS volume from a specific partition
+ */
+bool spiffs_mount(Storage::Partition partition);
+
+/**
+ * @brief Mount the first available FWFS volume
+ * @retval bool true on success
+ */
+bool fwfs_mount();
+
+/**
+ * @brief Mount SPIFFS volume from a specific partition
+ * @retval bool true on success
+ */
+bool fwfs_mount(Storage::Partition partition);
+
+/**
+ * @brief Mount the first available FWFS and SPIFFS partitions as a hybrid filesystem
+ * @retval bool true on success
+ */
+bool hyfs_mount();
+
+/**
+ * @brief Mount the given FWFS and SPIFFS partitions as a hybrid filesystem
+ * @retval bool true on success
+ */
+bool hyfs_mount(Storage::Partition fwfsPartition, Storage::Partition spiffsPartition);
+
 /** @brief  Open file
  *  @param  name File name
  *  @param  flags Mode to open file
diff --git a/samples/Basic_IFS/app/application.cpp b/samples/Basic_IFS/app/application.cpp
index 45fbd92518..d692fde091 100644
--- a/samples/Basic_IFS/app/application.cpp
+++ b/samples/Basic_IFS/app/application.cpp
@@ -211,6 +211,10 @@ void init()
 			"Hello\n");
 #endif
 
+	// Various ways to initialise a filesystem: we'll use a custom approach
+	// spiffs_mount();
+	// fwfs_mount();
+	// hyfs_mount();
 	initFileSystem();
 
 	printDirectory(nullptr);
@@ -220,6 +224,4 @@ void init()
 	WifiAccessPoint.enable(false);
 
 	WifiEvents.onStationGotIP(gotIP);
-
-	//	testDirectoryStreams();
 }

From 1be9e541b2a3d1f8beda94c06c5bf51eebc499c1 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Sun, 14 Mar 2021 09:42:35 +0100
Subject: [PATCH 59/91] Minor documentation layout fixes (#2260)

* Layout fixes.

* Updated the about page.
---
 Sming/Libraries/GoogleCast             |  2 +-
 Sming/Libraries/flatbuffers/README.rst | 18 ++++++------
 docs/source/about.rst                  | 39 ++++++++++++++++++--------
 samples/Telnet_Server/README.rst       |  4 +--
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/Sming/Libraries/GoogleCast b/Sming/Libraries/GoogleCast
index 554fc2a0f1..3e6f1bea43 160000
--- a/Sming/Libraries/GoogleCast
+++ b/Sming/Libraries/GoogleCast
@@ -1 +1 @@
-Subproject commit 554fc2a0f1046e5b4b88c332c14b174e3d8b531b
+Subproject commit 3e6f1bea43b56dee27a13a7ab97ff8f3a680303c
diff --git a/Sming/Libraries/flatbuffers/README.rst b/Sming/Libraries/flatbuffers/README.rst
index 616a0f8e5f..54d97a4440 100644
--- a/Sming/Libraries/flatbuffers/README.rst
+++ b/Sming/Libraries/flatbuffers/README.rst
@@ -11,17 +11,17 @@ It is available as Open Source on GitHub under the Apache license, v2 (see LICEN
 Using
 -----
 
-1. Add these lines to your application componenent.mk file::
+Step 1. Add these lines to your application componenent.mk file::
 
-       COMPONENT_DEPENDS += flatbuffers
+   COMPONENT_DEPENDS += flatbuffers
 
-2. Add these lines to your application::
+Step 2. Add these lines to your application::
 
-      #include <flatbuffers/flatbuffers>
+   #include <flatbuffers/flatbuffers>
 
 Or directly use the header file generated from the `flatc` compiler.
 
-3. Basic example::
+Step 3. Basic example::
 
    #include "monster.h"
 
@@ -52,8 +52,6 @@ Or directly use the header file generated from the `flatc` compiler.
       Serial.printf("Monster name: %s\n", monster->name()->c_str());
    }
 
-
- Further reading
- --------------
- Take a look at the `official flatbuffers tutorial <https://google.github.io/flatbuffers/flatbuffers_guide_tutorial.html>`_.
-
+Further reading
+---------------
+Take a look at the `official flatbuffers tutorial <https://google.github.io/flatbuffers/flatbuffers_guide_tutorial.html>`_.
diff --git a/docs/source/about.rst b/docs/source/about.rst
index 6254bd6fa1..06840557e3 100644
--- a/docs/source/about.rst
+++ b/docs/source/about.rst
@@ -1,21 +1,36 @@
-About Sming
-===========
+About
+=====
 
-ESP8266
+
+Sming
+-----
+
+Sming is an asynchronous C/C++ framework with superb performance and multiple network features.
+Sming is open source and is tailored towards embedded devices. It supports multiple architectures.
+
+The project was started in 2015 and is actively developed.
+
+Arduino
 -------
+Arduino is an open-source electronics platform based on easy-to-use hardware and software.
+Sming is compatible with (most) standard `Arduino libraries <https://sming.readthedocs.io/en/latest/libraries.html>`_,
+which means that you can use any popular hardware in few lines of code.
 
-This is the documentation for the API of Sming, a C++ framework for development on the ESP8266 microcontroller platform.
 
-The `ESP8266 <https://www.espressif.com/en/products/hardware/esp8266ex/overview>`__ is a microcontroller with Wi-Fi,
+ESP8266
+-------
+
+`ESP8266 <https://www.espressif.com/en/products/hardware/esp8266ex/overview>`__ is a microcontroller with Wi-Fi,
 manufactured by `Espressif <https://espressif.com>`__ Systems.
+It is the first microcontroller that was supported from Sming.
+Sming provides access to all ESP8266 functions such as GPIO, timers, WiFi configuration, etc.
+
 
-The microcontroller is used in `modules <https://en.wikipedia.org/wiki/ESP8266>`__ from various manufacturers,
-each of which present a subset of the interface pins.
-For example, the ESP-01 only provides 2 digital GPIO whereas the ESP-12 provides 9 digital GPIO plus ADC analogue input.
+ESP32
+-----
 
-Sming provides a C++ framework that facilitates the creation of application code for the ESP8266.
-The core framework provides access to the ESP8266 functions such as GPIO, timers, WiFi configuration, etc.
-A set of libraries extend this functionality such as switch debounce, SD Card interface, etc.
+`ESP32 <https://www.espressif.com/en/products/socs/esp32#esp32-overview-wrap>`__ is the second microcontroller by `Espressif <https://espressif.com>`__ Systems.
+At the moment Sming provides partial support for ESP32 functions.
 
 Licenses
 --------
@@ -24,7 +39,7 @@ Sming Core
    LGPL v3
 
 Espressif SDK
-   ESPRSSIF MIT License (with some closed-source blobs)
+   ESPRESSIF MIT License (with some closed-source blobs)
 
 Libraries
    See each library for details of its own open source license
diff --git a/samples/Telnet_Server/README.rst b/samples/Telnet_Server/README.rst
index 5fa2099ae7..10803fd21c 100644
--- a/samples/Telnet_Server/README.rst
+++ b/samples/Telnet_Server/README.rst
@@ -1,4 +1,4 @@
-Telnet TCP Client / Server
-==========================
+Telnet Server
+=============
 
 Demonstrates a simple Telnet server application.

From ea0b7ffa1800686a9845432e589fb2080daec036 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Sun, 14 Mar 2021 08:44:07 +0000
Subject: [PATCH 60/91] Fix IFS alignment bug (#2262)

The 'fix' in #2245 just covered up the problem, which re-occured in a different statement.

Using #pragma pack() causes array of SPIFFS FileMeta[] structures to be stored misaligned.
---
 Sming/Components/IFS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index 1592878252..a6ef5f4dee 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit 15928782526be1e81b8dbcaa720f350c28cd059e
+Subproject commit a6ef5f4dee043093e7a03172521f0136e9645f5c

From 5093a51bd1f9611f4fc4290ff99404e08b38a99d Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Sun, 14 Mar 2021 11:13:14 +0000
Subject: [PATCH 61/91] Storage improvements (#2263)

Basic_rBoot

- Show ROM addresses in Hex
- Basic_rBoot use console by default instead of telnet emulation in Host


Add `Storage::Device::getID()` method

Add `spi_flash_get_id()` implementation for ESP32

Update Basic_Storage sample

- Reduce default esp32 app partition size, bit big
- QIO mode doesn't always work, remove it
- List storage devices, with ID


Add `flashconfig` target for Host

Fix inconsistent HWCONFIG path separation in Windows

- Using GNU make / mingw conventions


Remove unused header
Fix use of deprecated functions
---
 .../Esp32/Components/spi_flash/flashmem.cpp   | 10 ++++++++++
 .../spi_flash/include/esp_spi_flash.h         |  2 ++
 Sming/Arch/Esp32/standard.hw                  |  2 +-
 Sming/Arch/Host/app.mk                        |  7 +++++++
 .../Storage/Tools/hwconfig/config.py          |  2 +-
 Sming/Components/Storage/src/Iterator.cpp     |  1 -
 Sming/Components/Storage/src/SpiFlash.cpp     |  5 +++++
 .../Storage/src/include/Storage/Device.h      |  9 +++++++++
 .../Storage/src/include/Storage/SpiFlash.h    |  2 ++
 Sming/Components/rboot/component.mk           |  3 ++-
 samples/Basic_Storage/app/application.cpp     | 19 +++++++++++++++++++
 samples/Basic_Storage/basic_storage.hw        |  1 -
 samples/Basic_rBoot/app/application.cpp       |  9 +++++----
 samples/Basic_rBoot/component.mk              |  2 --
 tests/HostTests/modules/Spiffs.cpp            |  4 ++--
 15 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/Sming/Arch/Esp32/Components/spi_flash/flashmem.cpp b/Sming/Arch/Esp32/Components/spi_flash/flashmem.cpp
index 3e5f6bb3e9..43c6c19fcb 100644
--- a/Sming/Arch/Esp32/Components/spi_flash/flashmem.cpp
+++ b/Sming/Arch/Esp32/Components/spi_flash/flashmem.cpp
@@ -13,6 +13,7 @@
 #include <soc/dport_reg.h>
 #include <esp_app_format.h>
 #include <esp_flash_partitions.h>
+#include <esp_flash.h>
 
 /*
  * Physical <-> Virtual address mapping is handled in `$IDF_COMPONENTS/spi_flash/flash_mmap.c`.
@@ -115,3 +116,12 @@ uint32_t flashmem_get_sector_of_address(uint32_t addr)
 {
 	return flashmem_find_sector(addr, NULL, NULL);
 }
+
+uint32_t spi_flash_get_id(void)
+{
+	uint32_t id{0};
+	if(esp_flash_read_id(esp_flash_default_chip, &id) != ESP_OK) {
+		id = 0;
+	}
+	return id;
+}
diff --git a/Sming/Arch/Esp32/Components/spi_flash/include/esp_spi_flash.h b/Sming/Arch/Esp32/Components/spi_flash/include/esp_spi_flash.h
index 55cdd74859..aaa03d1370 100644
--- a/Sming/Arch/Esp32/Components/spi_flash/include/esp_spi_flash.h
+++ b/Sming/Arch/Esp32/Components/spi_flash/include/esp_spi_flash.h
@@ -149,6 +149,8 @@ uint32_t flashmem_get_sector_of_address(uint32_t addr);
 
 /** @} */
 
+uint32_t spi_flash_get_id(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Sming/Arch/Esp32/standard.hw b/Sming/Arch/Esp32/standard.hw
index 1f70b3ca4d..96fd083214 100644
--- a/Sming/Arch/Esp32/standard.hw
+++ b/Sming/Arch/Esp32/standard.hw
@@ -26,7 +26,7 @@
 		},
 		"factory": {
 			"address": "0x010000",
-			"size": "0x1f0000",
+			"size": "0x180000",
 			"type": "app",
 			"subtype": "factory",
 			"filename": "$(TARGET_BIN)"
diff --git a/Sming/Arch/Host/app.mk b/Sming/Arch/Host/app.mk
index f94ae254cf..3d895d08ff 100644
--- a/Sming/Arch/Host/app.mk
+++ b/Sming/Arch/Host/app.mk
@@ -43,3 +43,10 @@ $(RUN_SCRIPT)::
 	$(foreach id,$(ENABLE_HOST_UARTID),echo '$(call RunHostTerminal,$(id))' >> $@;) \
 	echo '$(TARGET_OUT_0) $(CLI_TARGET_OPTIONS) -- $(HOST_PARAMETERS)' >> $@; \
 	chmod a+x $@
+
+##@Flashing
+
+.PHONY: flashconfig
+flashconfig: kill_term ##Erase the rBoot config sector
+	$(info Erasing rBoot config sector)
+	$(call WriteFlash,$(FLASH_RBOOT_ERASE_CONFIG_CHUNKS))
diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
index e8cc943156..219e9c636a 100644
--- a/Sming/Components/Storage/Tools/hwconfig/config.py
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -10,7 +10,7 @@
 def findConfig(name):
     dirs = os.environ['HWCONFIG_DIRS'].split(' ')
     for d in dirs:
-        path = os.path.join(fixpath(d), name + '.hw')
+        path = fixpath(d) + '/' + name + '.hw'
         if os.path.exists(path):
             return path
     raise InputError("Config '%s' not found" % name)
diff --git a/Sming/Components/Storage/src/Iterator.cpp b/Sming/Components/Storage/src/Iterator.cpp
index a082b4778d..e7a4e2a2ab 100644
--- a/Sming/Components/Storage/src/Iterator.cpp
+++ b/Sming/Components/Storage/src/Iterator.cpp
@@ -10,7 +10,6 @@
 
 #include "include/Storage/Iterator.h"
 #include "include/Storage/SpiFlash.h"
-#include <debug_progmem.h>
 
 namespace Storage
 {
diff --git a/Sming/Components/Storage/src/SpiFlash.cpp b/Sming/Components/Storage/src/SpiFlash.cpp
index a308d65c49..ee62586b80 100644
--- a/Sming/Components/Storage/src/SpiFlash.cpp
+++ b/Sming/Components/Storage/src/SpiFlash.cpp
@@ -22,6 +22,11 @@ String SpiFlash::getName() const
 	return FS_SPIFLASH;
 }
 
+uint32_t SpiFlash::getId() const
+{
+	return spi_flash_get_id();
+}
+
 size_t SpiFlash::getBlockSize() const
 {
 	return SPI_FLASH_SEC_SIZE;
diff --git a/Sming/Components/Storage/src/include/Storage/Device.h b/Sming/Components/Storage/src/include/Storage/Device.h
index b680b960a3..3b7ca0bb89 100644
--- a/Sming/Components/Storage/src/include/Storage/Device.h
+++ b/Sming/Components/Storage/src/include/Storage/Device.h
@@ -88,6 +88,15 @@ class Device : public LinkedObjectTemplate<Device>
 	 */
 	virtual String getName() const = 0;
 
+	/**
+	 * @brief Obtain device ID
+	 * @retval uint32_t typically flash chip ID
+	 */
+	virtual uint32_t getId() const
+	{
+		return 0;
+	}
+
 	/**
 	 * @brief Obtain smallest allocation unit for erase operations
 	 */
diff --git a/Sming/Components/Storage/src/include/Storage/SpiFlash.h b/Sming/Components/Storage/src/include/Storage/SpiFlash.h
index a5f0319362..c6ac39119a 100644
--- a/Sming/Components/Storage/src/include/Storage/SpiFlash.h
+++ b/Sming/Components/Storage/src/include/Storage/SpiFlash.h
@@ -30,6 +30,8 @@ class SpiFlash : public Device
 		return Type::flash;
 	}
 
+	uint32_t getId() const;
+
 	bool read(uint32_t address, void* dst, size_t size) override;
 	bool write(uint32_t address, const void* src, size_t size) override;
 	bool erase_range(uint32_t address, size_t size) override;
diff --git a/Sming/Components/rboot/component.mk b/Sming/Components/rboot/component.mk
index 0d7617b94e..814296d7d5 100644
--- a/Sming/Components/rboot/component.mk
+++ b/Sming/Components/rboot/component.mk
@@ -129,6 +129,7 @@ COMPONENT_CXXFLAGS += \
 
 ifdef RBOOT_EMULATION
 FLASH_BOOT_CHUNKS		= 0x00000=$(BLANK_BIN)
+FLASH_RBOOT_ERASE_CONFIG_CHUNKS	:= 0x01000=$(BLANK_BIN)
 else
 export RBOOT_ROM0_ADDR
 export RBOOT_ROM1_ADDR
@@ -151,7 +152,7 @@ endif
 
 # Define our flash chunks
 FLASH_BOOT_CHUNKS				:= 0x00000=$(RBOOT_BIN)
-FLASH_RBOOT_ERASE_CONFIG_CHUNKS	:= 0x01000=$(SDK_BASE)/bin/blank.bin
+FLASH_RBOOT_ERASE_CONFIG_CHUNKS	:= 0x01000=$(BLANK_BIN)
 
 # => Automatic linker script generation from template
 # $1 -> application target
diff --git a/samples/Basic_Storage/app/application.cpp b/samples/Basic_Storage/app/application.cpp
index 97c40d6eb4..966401a391 100644
--- a/samples/Basic_Storage/app/application.cpp
+++ b/samples/Basic_Storage/app/application.cpp
@@ -5,6 +5,23 @@
 
 IMPORT_FSTR(FS_app, PROJECT_DIR "/app/application.cpp")
 
+void listDevices()
+{
+	Serial.println();
+	Serial.println(_F("Registered storage devices:"));
+	for(auto& dev : Storage::getDevices()) {
+		Serial.print("  name = '");
+		Serial.print(dev.getName());
+		Serial.print(_F("', type = "));
+		Serial.print(toString(dev.getType()));
+		Serial.print(_F(", size = 0x"));
+		Serial.print(dev.getSize(), HEX);
+		Serial.print(_F(", ID = 0x"));
+		Serial.println(dev.getId), HEX);
+	}
+	Serial.println();
+}
+
 void listSpiffsPartitions()
 {
 	Serial.println(_F("** Enumerate registered SPIFFS partitions"));
@@ -63,6 +80,8 @@ void init()
 	Serial.begin(SERIAL_BAUD_RATE);
 	Serial.systemDebugOutput(true);
 
+	listDevices();
+
 	listSpiffsPartitions();
 
 	printPart(F("user0"));
diff --git a/samples/Basic_Storage/basic_storage.hw b/samples/Basic_Storage/basic_storage.hw
index 8ba48a1e2e..90da02eb6d 100644
--- a/samples/Basic_Storage/basic_storage.hw
+++ b/samples/Basic_Storage/basic_storage.hw
@@ -4,7 +4,6 @@
 	"devices": {
 		// Override default (conservative) flash settings for maximum performance
 		"spiFlash": {
-			"mode": "qio",
 			"speed": 80
 		}
 	},
diff --git a/samples/Basic_rBoot/app/application.cpp b/samples/Basic_rBoot/app/application.cpp
index 1b8c058e0f..b8e7397a30 100644
--- a/samples/Basic_rBoot/app/application.cpp
+++ b/samples/Basic_rBoot/app/application.cpp
@@ -1,5 +1,6 @@
 #include <SmingCore.h>
 #include <Network/RbootHttpUpdater.h>
+#include <Storage/SpiFlash.h>
 
 // download urls, set appropriately
 #define ROM_0_URL "http://192.168.7.5:80/rom0.bin"
@@ -114,16 +115,16 @@ void ShowInfo()
 	Serial.printf("Free Heap: %d\r\n", system_get_free_heap_size());
 	Serial.printf("CPU Frequency: %d MHz\r\n", system_get_cpu_freq());
 	Serial.printf("System Chip ID: %x\r\n", system_get_chip_id());
-	Serial.printf("SPI Flash ID: %x\r\n", spi_flash_get_id());
+	Serial.printf("SPI Flash ID: %x\r\n", Storage::spiFlash->getId());
 	//Serial.printf("SPI Flash Size: %d\r\n", (1 << ((spi_flash_get_id() >> 16) & 0xff)));
 
 	rboot_config conf;
 	conf = rboot_get_config();
 
 	debugf("Count: %d", conf.count);
-	debugf("ROM 0: %d", conf.roms[0]);
-	debugf("ROM 1: %d", conf.roms[1]);
-	debugf("ROM 2: %d", conf.roms[2]);
+	debugf("ROM 0: 0x%08x", conf.roms[0]);
+	debugf("ROM 1: 0x%08x", conf.roms[1]);
+	debugf("ROM 2: 0x%08x", conf.roms[2]);
 	debugf("GPIO ROM: %d", conf.gpio_rom);
 }
 
diff --git a/samples/Basic_rBoot/component.mk b/samples/Basic_rBoot/component.mk
index d77a3c8c2f..df007c2dfe 100644
--- a/samples/Basic_rBoot/component.mk
+++ b/samples/Basic_rBoot/component.mk
@@ -8,6 +8,4 @@ ifeq ($(SMING_ARCH),Esp8266)
 HWCONFIG := basic_rboot
 else
 HWCONFIG := spiffs
-# Emulate UART 0
-ENABLE_HOST_UARTID := 0
 endif
diff --git a/tests/HostTests/modules/Spiffs.cpp b/tests/HostTests/modules/Spiffs.cpp
index 75fd9e6eb1..9853e098ea 100644
--- a/tests/HostTests/modules/Spiffs.cpp
+++ b/tests/HostTests/modules/Spiffs.cpp
@@ -36,7 +36,7 @@ class SpiffsTest : public TestGroup
 	 */
 	void cycleFlash()
 	{
-		spiffs_unmount();
+		fileFreeFileSystem();
 		if(!spiffs_mount()) {
 			debug_e("SPIFFS mount failed");
 			return;
@@ -68,7 +68,7 @@ class SpiffsTest : public TestGroup
 		debug_i("Sector #0 erased after %u writes", writeCount);
 
 		// Re-mount file system and confirm test file is still present
-		spiffs_unmount();
+		fileFreeFileSystem();
 		spiffs_mount();
 		auto content = fileGetContent(testFile);
 		REQUIRE(testContent == content);

From 53d733f462421f34a04b586bc5e4aa7a6da87378 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Sun, 14 Mar 2021 11:38:06 +0000
Subject: [PATCH 62/91] Fix Basic_Storage sample (#2265)

---
 samples/Basic_Storage/app/application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/Basic_Storage/app/application.cpp b/samples/Basic_Storage/app/application.cpp
index 966401a391..d0b7f2bbd0 100644
--- a/samples/Basic_Storage/app/application.cpp
+++ b/samples/Basic_Storage/app/application.cpp
@@ -17,7 +17,7 @@ void listDevices()
 		Serial.print(_F(", size = 0x"));
 		Serial.print(dev.getSize(), HEX);
 		Serial.print(_F(", ID = 0x"));
-		Serial.println(dev.getId), HEX);
+		Serial.println(dev.getId(), HEX);
 	}
 	Serial.println();
 }

From bae6f1137bed2db6b17a852a029044604b93cc54 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 15 Mar 2021 08:27:16 +0000
Subject: [PATCH 63/91] Add hardware configuration option support (#2266)

This PR aims to simplify use of hardware configurations via option settings. This allows common bits of configuration to be pulled in by name.
---
 Sming/Arch/Esp8266/options.json               | 10 ++
 Sming/Components/Storage/README.rst           | 28 +++++-
 .../Storage/Tools/hwconfig/config.py          | 66 ++++++++++---
 .../Storage/Tools/hwconfig/hwconfig.py        | 92 ++++++++++---------
 .../Storage/Tools/hwconfig/partition.py       | 17 ++--
 Sming/Components/Storage/component.mk         | 14 ++-
 Sming/Components/Storage/schema.json          | 10 +-
 Sming/options.json                            | 26 ++++++
 Sming/spiffs.hw                               | 16 +---
 Sming/standard-4m.hw                          | 10 +-
 docs/source/upgrading/4.2-4.3.rst             |  2 +
 11 files changed, 202 insertions(+), 89 deletions(-)
 create mode 100644 Sming/Arch/Esp8266/options.json
 create mode 100644 Sming/options.json

diff --git a/Sming/Arch/Esp8266/options.json b/Sming/Arch/Esp8266/options.json
new file mode 100644
index 0000000000..7e3d545649
--- /dev/null
+++ b/Sming/Arch/Esp8266/options.json
@@ -0,0 +1,10 @@
+{
+    "vdd": {
+        "description": "Modify PHY configuration to support `system_get_vdd33()` function",
+        "partitions": {
+            "phy_init": {
+                "filename": "$(FLASH_INIT_DATA_VCC)"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Sming/Components/Storage/README.rst b/Sming/Components/Storage/README.rst
index 5b3f4f8bcf..8b609fee02 100644
--- a/Sming/Components/Storage/README.rst
+++ b/Sming/Components/Storage/README.rst
@@ -65,6 +65,25 @@ or, to show the partition map::
 
    Then either run ``make HWCONFIG=standard-4m`` or ``make config-clean``.
 
+.. _hwconfig_options:
+
+Hardware configuration options
+------------------------------
+
+Commonly used settings can be stored in an option library for easier use.
+The library files are named ``options.json`` and located in the place as .hw files.
+
+For example, we can do this::
+
+   make HWCONFIG=standard HWCONFIG_OPTS=4m,spiffs
+
+This loads the 'standard' profile then merges the fragments found in the option library with the given names.
+This is how the ``standard-4m`` profile is constructed.
+
+If using this approach, remember to updated your project's ``component.mk`` with the desired settings,
+and verify the layout is correct using ``make map``.
+
+
 
 Custom configurations
 ---------------------
@@ -77,10 +96,12 @@ To customise the hardware configuration for a project, for example 'my_project':
 
       {
          "name": "My project config",
-         "base_config": "spiffs"
+         "base_config": "spiffs",
+         "options": ["vdd"]
       }
 
    You can use any available configuration as the base_config.
+   Option fragments can be pulled in as shown. See :ref:`hwconfig_options`.
 
 
 2. If required, modify any inherited settings:
@@ -255,6 +276,11 @@ Configuration
    (or ``make config-clean`` to reset everything).
 
 
+.. envvar:: HWCONFIG_OPTS
+
+   Set this to adjust the hardware profile using option fragments. See :ref:`hwconfig_options`.
+
+
 Binary partition table
 ----------------------
 
diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
index 219e9c636a..a3e1584a15 100644
--- a/Sming/Components/Storage/Tools/hwconfig/config.py
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -2,11 +2,22 @@
 # Configuration object
 #
 
-import os, partition, storage
+import os, partition, storage, copy
 from rjsmin import jsmin
 from common import *
 from builtins import classmethod
 
+def load_option_library():
+    library = {}
+    dirs = os.environ['HWCONFIG_DIRS'].split(' ')
+    for d in dirs:
+        filename = fixpath(d) + '/options.json'
+        if os.path.exists(filename):
+            with open(filename) as f:
+                data = json.loads(jsmin(f.read()))
+                library.update(data)
+    return library
+
 def findConfig(name):
     dirs = os.environ['HWCONFIG_DIRS'].split(' ')
     for d in dirs:
@@ -20,28 +31,54 @@ def __init__(self):
         self.partitions = partition.Table()
         self.devices = storage.List()
         self.depends = []
+        self.options = []
+        self.option_library = load_option_library()
 
     def __str__(self):
         return "'%s' for %s" % (self.name, self.arch)
 
     @classmethod
     def from_name(cls, name):
+        """Create configuration given its name and resolve options
+        """
         config = Config()
-        config.load(name)
+        options = os.environ.get('HWCONFIG_OPTS', '').replace(' ', '')
+        config.load(name, [] if options == '' else options.split(','))
         return config
 
-    def load(self, name):
+    def load(self, name, options=[]):
+        """Load a configuration recursively
+        """
         filename = findConfig(name)
         self.depends.append(filename)
-        din = open(filename).read()
-        data = json.loads(jsmin(din))
-        self.parse_dict(data)
-
-    def parse_dict(self, data):
-        base_config = data.get('base_config')
+        with open(filename) as f:
+            data = json.loads(jsmin(f.read()))
+        self.parse_dict(data, options)
+
+    def parse_options(self, options):
+        """Apply any specified options, each option is applied only once
+        """
+        for option in options:
+            if option in self.options:
+                continue
+            self.options.append(option)
+            data = self.option_library.get(option)
+            if data is None:
+                raise InputError("Option '%s' undefined" % option)
+            # Don't modify library entries
+            temp = copy.deepcopy(data)
+            temp.pop('description', None)
+            self.parse_dict(temp)
+
+    def parse_dict(self, data, options = []):
+        base_config = data.pop('base_config', None)
         if base_config is not None:
             self.load(base_config)
-            del data['base_config']
+
+        self.parse_options(options)
+
+        # We'll process partitions after other settings
+        partitions = data.pop('partitions', None)
 
         for k, v in data.items():
             if k == 'name':
@@ -54,12 +91,13 @@ def parse_dict(self, data):
                 self.devices.parse_dict(v)
             elif k == 'comment':
                 self.comment = v
-            elif k != 'partitions':
+            elif k == 'options':
+                self.parse_options(v)
+            else:
                 raise InputError("Unknown config key '%s'" % k)
 
-        v = data.get('partitions')
-        if not v is None:
-            self.partitions.parse_dict(v, self.devices)
+        if not partitions is None:
+            self.partitions.parse_dict(partitions, self.devices)
 
     def dict(self):
         res = {}
diff --git a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
index a117ff87ff..7c388ff726 100644
--- a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
+++ b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
@@ -20,6 +20,53 @@ def openOutput(path):
     return open(path, 'wb')
 
 
+def handle_validate(args, config, part):
+    # Validate resulting hardware configuration against schema
+    try:
+        from jsonschema import Draft7Validator
+        inst = json.loads(config.to_json())
+        schema = json.load(open(args.expr))
+        v = Draft7Validator(schema)
+        errors = sorted(v.iter_errors(inst), key=lambda e: e.path)
+        if errors != []:
+            for e in errors:
+                critical("%s @ %s" % (e.message, e.path))
+            sys.exit(3)
+    except ImportError as err:
+        critical("\n** WARNING! %s: Cannot validate '%s', please run `make python-requirements **\n\n" % (str(err), args.input))
+
+
+def handle_flashcheck(args, config, part):
+    # Expect list of chunks, such as "0x100000=/out/Esp8266/debug/firmware/spiff_rom.bin 0x200000=custom.bin"
+    list = args.expr.split()
+    if len(list) == 0:
+        raise InputError("No chunks to flash!")
+    for e in list:
+        addr, filename = e.split('=')
+        addr = int(addr, 0)
+        part = config.partitions.find_by_address(addr)
+        if part is None:
+            raise InputError("No partition contains address 0x%08x" % addr)
+        if part.address != addr:
+            raise InputError("Address 0x%08x is within partition '%s', not at start (0x%08x)" % (addr, part.name, part.address))
+        filesize = os.path.getsize(filename)
+        if filesize > part.size:
+            raise InputError("File '%s' is 0x%08x bytes, too big for partition '%s' (0x%08x bytes)" % (os.path.basename(filename), filesize, part.name, part.size))
+
+
+def handle_partgen(args, config, part):
+    # Generate partition table binary
+    if not args.no_verify:
+        status("Verifying partition table...")
+        config.verify(args.secure)
+    return config.partitions.to_binary(config.devices)
+
+
+def handle_expr(args, config, part):
+    # Evaluate expression against configuration data
+    return str(eval(args.expr)).encode()
+
+
 def main():
     parser = argparse.ArgumentParser(description='Sming hardware configuration utility')
 
@@ -49,53 +96,14 @@ def main():
         config = Config.from_name(args.input)
         partitions = config.partitions
 
-    # Define local so it's available for eval()
+    # Locate any supplied partition by name
+    part = None
     if args.part is not None:
         part = partitions.find_by_name(args.part)
         if part is None:
             return
 
-    if args.command == 'validate':
-        # Validate resulting hardware configuration against schema
-        try:
-            from jsonschema import Draft7Validator
-            inst = json.loads(config.to_json())
-            schema = json.load(open(args.expr))
-            v = Draft7Validator(schema)
-            errors = sorted(v.iter_errors(inst), key=lambda e: e.path)
-            if errors != []:
-                for e in errors:
-                    critical("%s @ %s" % (e.message, e.path))
-                sys.exit(3)
-        except ImportError as err:
-            critical("\n** WARNING! %s: Cannot validate '%s', please run `make python-requirements **\n\n" % (str(err), args.input))
-    elif args.command == 'flashcheck':
-        # Expect list of chunks, such as "0x100000=/out/Esp8266/debug/firmware/spiff_rom.bin 0x200000=custom.bin"
-        list = args.expr.split()
-        if len(list) == 0:
-            raise InputError("No chunks to flash!")
-        for e in list:
-            addr, filename = e.split('=')
-            addr = int(addr, 0)
-            part = config.partitions.find_by_address(addr)
-            if part is None:
-                raise InputError("No partition contains address 0x%08x" % addr)
-            if part.address != addr:
-                raise InputError("Address 0x%08x is within partition '%s', not at start (0x%08x)" % (addr, part.name, part.address))
-            filesize = os.path.getsize(filename)
-            if filesize > part.size:
-                raise InputError("File '%s' is 0x%08x bytes, too big for partition '%s' (0x%08x bytes)" % (os.path.basename(filename), filesize, part.name, part.size))
-    elif args.command == 'partgen':
-        # Generate partition table binary
-        if not args.no_verify:
-            status("Verifying partition table...")
-            config.verify(args.secure)
-        output = config.partitions.to_binary(config.devices)
-    elif args.command == 'expr':
-        # Evaluate expression against configuration data
-        output = str(eval(args.expr)).encode()
-    else:
-        raise InputError('Unknown command: %s' % args.command)
+    output = globals()['handle_' + args.command](args, config, part)
 
     if output is not None:
         openOutput(args.output).write(output)
diff --git a/Sming/Components/Storage/Tools/hwconfig/partition.py b/Sming/Components/Storage/Tools/hwconfig/partition.py
index fcd6d67d5b..d5e98ba495 100644
--- a/Sming/Components/Storage/Tools/hwconfig/partition.py
+++ b/Sming/Components/Storage/Tools/hwconfig/partition.py
@@ -332,12 +332,15 @@ def parse_dict(self, data, devices):
         """Construct a partition object from JSON definition
         """
         try:
-            v = data.get('type')
+            # Sort out type information first
+            v = data.pop('type', None)
             if not v is None:
                 self.type = parse_type(v)
-            v = data.get('subtype')
+            v = data.pop('subtype', None)
             if not v is None:
                 self.subtype = parse_subtype(self.type, v)
+            if self.type is None or self.subtype is None:
+                raise InputError("type/subtype missing")
 
             for k, v in data.items():
                 if k == 'device':
@@ -353,11 +356,9 @@ def parse_dict(self, data, devices):
                         self.build = v
                     else:
                         self.build.update(v)
-                elif k != 'type' and k != 'subtype':
+                else:
                     setattr(self, k, v)
 
-            if self.type is None or self.subtype is None:
-                raise InputError("type/subtype missing")
             if self.address is None or self.size is None:
                 raise InputError("address/size missing")
             if self.end() >= self.device.size:
@@ -520,7 +521,8 @@ def add(name, address, size):
             return entry
 
         def add_unused(address, last_end):
-            return add('(unused)', last_end + 1, address - last_end - 1)
+            if address > last_end + 1:
+                add('(unused)', last_end + 1, address - last_end - 1)
 
         if table.offset == 0:
             last = None
@@ -538,5 +540,4 @@ def add_unused(address, last_end):
             self.append(p)
             last = p
 
-        if last.end() + 1 < device.size:
-            add_unused(device.size, last.end())
+        add_unused(device.size, last.end())
diff --git a/Sming/Components/Storage/component.mk b/Sming/Components/Storage/component.mk
index af0307ec78..a6627c056a 100644
--- a/Sming/Components/Storage/component.mk
+++ b/Sming/Components/Storage/component.mk
@@ -2,7 +2,7 @@ COMPONENT_INCDIRS	:= src/include
 COMPONENT_SRCDIRS	:= src
 COMPONENT_DOXYGEN_INPUT := src/include
 
-CONFIG_VARS			+= HWCONFIG
+CONFIG_VARS			+= HWCONFIG HWCONFIG_OPTS
 ifndef HWCONFIG
 override HWCONFIG	:= standard
 $(info Using configuration '$(HWCONFIG)')
@@ -31,6 +31,7 @@ PARTITION_PATH		:= $(COMPONENT_PATH)
 PARTITION_TOOLS		:= $(PARTITION_PATH)/Tools
 HWCONFIG_TOOL := \
 	HWCONFIG_DIRS="$(HWCONFIG_DIRS)" \
+	HWCONFIG_OPTS="$(HWCONFIG_OPTS)" \
 	BUILD_BASE=$(BUILD_BASE) \
 	$(PYTHON) $(PARTITION_TOOLS)/hwconfig/hwconfig.py
 
@@ -59,8 +60,8 @@ endef
 
 .PHONY: map
 map: $(HWCONFIG_PATH) ##Show partition map
-	@echo "Partition map:"
-	$(Q) $(HWEXPR) "config.map().to_csv()"
+	@echo "Partition map: $(HWCONFIG)"
+	$(Q) $(HWEXPR) "'options: %s\n%s' % (', '.join(config.options), config.map().to_csv())"
 	@echo
 
 .PHONY: hwexpr
@@ -81,6 +82,13 @@ hwconfig-list: ##List available hardware configurations
 	@echo "Available configurations: $(foreach c,$(ALL_HWCONFIG),\n $(if $(subst $c,,$(HWCONFIG)), ,*) $(shell printf "%-25s" "$c") $(filter %/$c.hw,$(ALL_HWCONFIG_PATHS)))"
 	@echo
 
+.PHONY: hwconfig-options
+hwconfig-options: ##List available hardware configuration options
+	@echo
+	@echo "Available options (use with HWCONFIG_OPTS or in custom profile):"
+	$(Q) $(HWEXPR) "''.join(('  %-10s %s\n' % (k, v['description']) for k, v in config.option_library.items()))"
+	@echo
+
 .PHONY: hwconfig-validate
 hwconfig-validate: $(HWCONFIG_PATH) ##Validate current hardware configuration
 	@echo "Validating hardware config '$(HWCONFIG)'"
diff --git a/Sming/Components/Storage/schema.json b/Sming/Components/Storage/schema.json
index df887e75e2..ca72edc2cd 100644
--- a/Sming/Components/Storage/schema.json
+++ b/Sming/Components/Storage/schema.json
@@ -16,6 +16,11 @@
 					"title": "Base configuration",
 					"description": "Inherit a previously-defined configuration"
 				},
+				"options": {
+					"type": "array",
+					"title": "List of option fragments",
+					"description": "Import additional settings from option libraries"
+				},
 				"comment": {
 					"type": "string"
 				},
@@ -26,7 +31,7 @@
 				},
 				"partition_table_offset": {
 					"type": "string",
-					"description": "Location of partition table in spiFlash"
+					"description": "Location of partition table in spiFlash. Simple address or python expression to be evaluated."
 				},
 				"devices": {
 					"$ref": "#/definitions/Devices"
@@ -116,7 +121,8 @@
 					"type": [
 						"string",
 						"integer"
-					]
+					],
+					"description": "Starting address for partition. Simple address or python expression to be evaluated."
 				},
 				"size": {
 					"type": [
diff --git a/Sming/options.json b/Sming/options.json
new file mode 100644
index 0000000000..a713d4bc65
--- /dev/null
+++ b/Sming/options.json
@@ -0,0 +1,26 @@
+{
+    "4m": {
+        "description": "Set Flash size to 4MByte",
+        "devices": {
+            "spiFlash": {
+                "size": "4M"
+            }
+        }
+    },
+    "spiffs": {
+        "description": "Add standard SPIFFS partition",
+        "partitions": {
+            "spiffs0": {
+                "address": "0x200000",
+                "size": "512K",
+                "type": "data",
+                "subtype": "spiffs",
+                "filename": "$(SPIFF_BIN_OUT)",
+                "build": {
+                    "target": "spiffsgen",
+                    "files": "$(SPIFF_FILES)"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Sming/spiffs.hw b/Sming/spiffs.hw
index f3c0ee4e93..fff0598752 100644
--- a/Sming/spiffs.hw
+++ b/Sming/spiffs.hw
@@ -1,17 +1,7 @@
 {
 	"name": "Single SPIFFS partition",
 	"base_config": "standard-4m",
-	"partitions": {
-		"spiffs0": {
-			"address": "0x200000",
-			"size": "512K",
-			"type": "data",
-			"subtype": "spiffs",
-			"filename": "$(SPIFF_BIN_OUT)",
-			"build": {
-				"target": "spiffsgen",
-				"files": "$(SPIFF_FILES)"
-			}
-		}
-	}
+	"options": [
+		"spiffs"
+	]
 }
\ No newline at end of file
diff --git a/Sming/standard-4m.hw b/Sming/standard-4m.hw
index c259654b19..1aa31486df 100644
--- a/Sming/standard-4m.hw
+++ b/Sming/standard-4m.hw
@@ -1,9 +1,7 @@
 {
 	"name": "Standard config with 4M flash",
 	"base_config": "standard",
-	"devices": {
-		"spiFlash": {
-			"size": "4M"
-		}
-	}
-}
+	"options": [
+		"4m"
+	]
+}
\ No newline at end of file
diff --git a/docs/source/upgrading/4.2-4.3.rst b/docs/source/upgrading/4.2-4.3.rst
index ff7822422d..69fb0498e4 100644
--- a/docs/source/upgrading/4.2-4.3.rst
+++ b/docs/source/upgrading/4.2-4.3.rst
@@ -22,6 +22,8 @@ New and updated build targets
         Displays the current configuration in JSON format
     hwconfig-list
         Show available hardware configs
+    hwconfig-options
+        Show available hardware configuration options
     map
         Display the current flash memory map
     readmap

From 89e8089e1cd70ff30347e094ee4259bc182a37df Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 15 Mar 2021 11:36:44 +0000
Subject: [PATCH 64/91] Fix handling of `HWCONFIG_OPTS` (#2267)

---
 Sming/Components/Storage/Tools/hwconfig/config.py | 15 ++++++++-------
 .../Storage/Tools/hwconfig/partition.py           |  1 -
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
index a3e1584a15..19bad09f79 100644
--- a/Sming/Components/Storage/Tools/hwconfig/config.py
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -43,17 +43,20 @@ def from_name(cls, name):
         """
         config = Config()
         options = os.environ.get('HWCONFIG_OPTS', '').replace(' ', '')
-        config.load(name, [] if options == '' else options.split(','))
+        config.load(name)
+        if options != '':
+            config.parse_options(options.split(','))
+        config.partitions.sort()
         return config
 
-    def load(self, name, options=[]):
+    def load(self, name):
         """Load a configuration recursively
         """
         filename = findConfig(name)
         self.depends.append(filename)
         with open(filename) as f:
             data = json.loads(jsmin(f.read()))
-        self.parse_dict(data, options)
+        self.parse_dict(data)
 
     def parse_options(self, options):
         """Apply any specified options, each option is applied only once
@@ -70,12 +73,12 @@ def parse_options(self, options):
             temp.pop('description', None)
             self.parse_dict(temp)
 
-    def parse_dict(self, data, options = []):
+    def parse_dict(self, data):
         base_config = data.pop('base_config', None)
         if base_config is not None:
             self.load(base_config)
 
-        self.parse_options(options)
+        self.parse_options(data.pop('options', []))
 
         # We'll process partitions after other settings
         partitions = data.pop('partitions', None)
@@ -91,8 +94,6 @@ def parse_dict(self, data, options = []):
                 self.devices.parse_dict(v)
             elif k == 'comment':
                 self.comment = v
-            elif k == 'options':
-                self.parse_options(v)
             else:
                 raise InputError("Unknown config key '%s'" % k)
 
diff --git a/Sming/Components/Storage/Tools/hwconfig/partition.py b/Sming/Components/Storage/Tools/hwconfig/partition.py
index d5e98ba495..d0a0e07f1e 100644
--- a/Sming/Components/Storage/Tools/hwconfig/partition.py
+++ b/Sming/Components/Storage/Tools/hwconfig/partition.py
@@ -127,7 +127,6 @@ def parse_dict(self, data, devices):
                 part = Entry(devices[0], name)
                 self.append(part)
             part.parse_dict(entry, devices)
-        self.sort()
 
     def sort(self):
         super(Table, self).sort(key=lambda p: p.device.name + p.address_str())

From 8218fe70781e30113997dd7dbb82b01cd490100c Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Mon, 15 Mar 2021 14:45:17 +0100
Subject: [PATCH 65/91] Easier voltage reading for ESP8266. (#2264)

---
 .../Components/esp8266/Tools/patch-phy-bin.py | 25 +++++++++++++++++
 .../Esp8266/Components/esp8266/component.mk   |  9 +++++-
 docs/source/information/index.rst             |  2 +-
 .../{hot-tips.rst => tips-n-tricks.rst}       | 28 +++++++++++++++++--
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 Sming/Arch/Esp8266/Components/esp8266/Tools/patch-phy-bin.py
 rename docs/source/information/{hot-tips.rst => tips-n-tricks.rst} (81%)

diff --git a/Sming/Arch/Esp8266/Components/esp8266/Tools/patch-phy-bin.py b/Sming/Arch/Esp8266/Components/esp8266/Tools/patch-phy-bin.py
new file mode 100644
index 0000000000..8f38ce38aa
--- /dev/null
+++ b/Sming/Arch/Esp8266/Components/esp8266/Tools/patch-phy-bin.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+########################################################
+#
+#  Simple PHY binary patcher
+#  Author: Slavey Karadzhov <slav@attachix.com>
+#
+########################################################
+import os
+import sys
+
+def usage():
+    print("Usage: \n\t%s <file.bin> [offset]" % sys.argv[0])
+
+if __name__ == "__main__":
+    if len(sys.argv)  not in list(range(2,4)):
+        usage()
+        sys.exit(1)
+
+    offset = 107
+    if len(sys.argv) > 2:
+        offset = int(sys.argv[2])
+
+    with os.fdopen(os.open(sys.argv[1], os.O_RDWR | os.O_CREAT), 'rb+') as f:
+        f.seek(offset)
+        f.write(bytearray(b'\xff'));
diff --git a/Sming/Arch/Esp8266/Components/esp8266/component.mk b/Sming/Arch/Esp8266/Components/esp8266/component.mk
index 789d7aa24f..3b9e3a672f 100644
--- a/Sming/Arch/Esp8266/Components/esp8266/component.mk
+++ b/Sming/Arch/Esp8266/Components/esp8266/component.mk
@@ -5,8 +5,9 @@ SDK_BASE ?= $(COMPONENT_PATH)/ESP8266_NONOS_SDK
 
 SDK_BASE				:= $(call FixPath,$(SDK_BASE))
 FLASH_INIT_DATA			= $(SDK_BASE)/bin/esp_init_data_default.bin
+FLASH_INIT_DATA_VCC = $(SDK_BASE)/bin/esp_init_data_vdd_default.bin
 
-CUSTOM_TARGETS			+= $(FLASH_INIT_DATA)
+CUSTOM_TARGETS			+= $(FLASH_INIT_DATA) $(FLASH_INIT_DATA_VCC)
 
 # => 'Internal' SDK - for SDK Version 3+ as submodule in Sming repository
 # SDK_BASE just needs to point into our repo as it's overridden with the correct submodule path
@@ -24,6 +25,12 @@ else
 SDK_INTERNAL			:= 0
 endif
 
+PHY_TOOL := $(COMPONENT_PATH)/Tools/patch-phy-bin.py
+
+$(FLASH_INIT_DATA_VCC): $(FLASH_INIT_DATA)
+	$(Q) cp $< $@
+	$(Q) $(PYTHON) $(PHY_TOOL) $@
+
 DEBUG_VARS				+= SDK_LIBDIR SDK_INCDIR
 SDK_LIBDIR				:= $(SDK_BASE)/lib
 SDK_INCDIR				:= $(SDK_BASE)/include
diff --git a/docs/source/information/index.rst b/docs/source/information/index.rst
index dbda9c0df4..58620c197e 100644
--- a/docs/source/information/index.rst
+++ b/docs/source/information/index.rst
@@ -15,4 +15,4 @@ Information
    debugging
    rboot-ota
    command-handler
-   hot-tips
+   tips-n-tricks
diff --git a/docs/source/information/hot-tips.rst b/docs/source/information/tips-n-tricks.rst
similarity index 81%
rename from docs/source/information/hot-tips.rst
rename to docs/source/information/tips-n-tricks.rst
index b12c49be1d..a987befe1d 100644
--- a/docs/source/information/hot-tips.rst
+++ b/docs/source/information/tips-n-tricks.rst
@@ -1,8 +1,30 @@
-Hot Tips!
-=========
+Tips and Tricks
+===============
 
 .. highlight:: c++
 
+Reading VCC on ESP8266
+----------------------
+If you are running on a battery operated device then function `system_get_vdd33()` from
+the official ESP8266 NONOS SDK can help you read the power voltage.
+For the latter to work properly you should make a small change in your application `component.mk`
+file and add `vdd` to the `HWCONFIG_OPTS` configuration variable.
+
+If you cannot see such a variable in your `component.mk` file then append the following line to it::
+
+   HWCONFIG := vdd
+
+You can have multiple options selected. They should be separated by comma.
+For example the command below will add 4MB flash, spiffs and vdd support::
+
+   HWCONFIG := 4m,spiffs,vdd
+
+You can check the final hardware configuration using the command below::
+
+   make hwconfig
+
+If a custom hardware configuration is needed then read :component:`Storage`.
+
 Minimising Memory Usage
 -----------------------
 
@@ -37,7 +59,7 @@ version::
 See :component:`FlashString` for further details.
 
 Webpages Performance
-====================
+--------------------
 
 HTML markup can get quite large and the bigger the file the slower the
 page loads. One way to deal with that is to remove the white space, this

From fec464b23ff0b751bb3a100c9dad3bec2543d593 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 17 Mar 2021 08:41:34 +0000
Subject: [PATCH 66/91] Add rBoot partition support (#2258)

This PR adds partition table support to the ESP8266 bootloader (rBoot). See #2254 #2251.

The ESP8266 flash layout has been reverted to the original Sming 4.2 layout, with the addition of the partition table in the sector before the RF calibration data at end of flash.

Update rBoot

Update bootloader to read ROM addresses from partition table on boot. These overwrite whatever values have been set in its own configuration, thus avoiding inconsistencies. rBoot has been forked to simplify management.

An additional partition subtype has been added for RF calibration data, so existing applications running off the develop branch will need re-building and re-flashing.

The partition table may now be freely relocated for the Esp8266 (+ Host) to allow compatibility with existing devices which must be upgrade OTA.

Methods have been added to OTA classes to allow update regions to be set using partitions; this is safer than working with raw flash addresses but the underlying mechanism hasn't changed.
---
 .gitmodules                                   |   2 +-
 .../Esp8266/Components/esp8266/startup.cpp    |  13 +-
 Sming/Arch/Esp8266/options.json               |  18 +
 Sming/Arch/Esp8266/spiffs-two-roms.hw         |   5 +-
 Sming/Arch/Esp8266/standard.hw                |  30 +-
 Sming/Arch/Esp8266/two-rom-mode.hw            |   5 +-
 Sming/Components/Storage/README.rst           |  25 +-
 .../Storage/Tools/hwconfig/config.py          |   8 +-
 .../Storage/Tools/hwconfig/hwconfig.py        |   4 +-
 .../Storage/Tools/hwconfig/partition.py       |  40 +-
 Sming/Components/Storage/component.mk         |  33 +-
 .../Storage/src/include/Storage/Partition.h   |   1 +
 .../src/include/Storage/PartitionTable.h      |  22 +-
 Sming/Components/rboot/.patches/rboot.patch   | 402 ------------------
 .../rboot/.patches/rboot/README.rst           | 349 ---------------
 Sming/Components/rboot/README.rst             |  16 +-
 Sming/Components/rboot/component.mk           |   8 +-
 .../include/Data/Stream/RbootOutputStream.h   |  21 +-
 .../rboot/include/Network/RbootHttpUpdater.h  | 150 +++++--
 Sming/Components/rboot/rboot                  |   2 +-
 .../Components/rboot/src/Arch/Host/rboot.cpp  |  40 +-
 .../Components/rboot/src/RbootHttpUpdater.cpp |  54 +--
 Sming/Components/spiffs/component.mk          |  10 -
 .../OtaUpgrade/OtaUpgrade/BasicStream.cpp     |  41 +-
 .../OtaUpgrade/OtaUpgrade/BasicStream.h       |  29 +-
 .../OtaUpgrade/OtaUpgrade/EncryptedStream.cpp |  15 +-
 .../OtaUpgrade/OtaUpgrade/EncryptedStream.h   |  15 +-
 Sming/component.mk                            |   3 +-
 Tools/vscode/setup.py                         |  22 +-
 Tools/vscode/template/workspace.json          |   4 +-
 docs/source/upgrading/4.2-4.3.rst             |  22 +-
 samples/Basic_Storage/basic_storage.hw        |   9 +-
 samples/Basic_rBoot/app/application.cpp       |  25 +-
 samples/Basic_rBoot/basic_rboot.hw            |   7 +-
 samples/Basic_rBoot/component.mk              |   4 -
 .../app/application.cpp                       |   2 +-
 36 files changed, 449 insertions(+), 1007 deletions(-)
 delete mode 100644 Sming/Components/rboot/.patches/rboot.patch
 delete mode 100644 Sming/Components/rboot/.patches/rboot/README.rst

diff --git a/.gitmodules b/.gitmodules
index 84a5e304aa..85003018ee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -63,7 +63,7 @@
 	ignore = dirty
 [submodule "rboot"]
 	path = Sming/Components/rboot/rboot
-	url = https://github.com/raburton/rboot.git
+	url = https://github.com/mikee47/rboot
 	ignore = dirty
 [submodule "spiffs"]
 	path = Sming/Components/spiffs/spiffs
diff --git a/Sming/Arch/Esp8266/Components/esp8266/startup.cpp b/Sming/Arch/Esp8266/Components/esp8266/startup.cpp
index ef6d1d07d3..ff62f084d2 100644
--- a/Sming/Arch/Esp8266/Components/esp8266/startup.cpp
+++ b/Sming/Arch/Esp8266/Components/esp8266/startup.cpp
@@ -55,9 +55,8 @@ extern "C" void WEAK_ATTR user_rf_pre_init(void)
 
 extern "C" uint32 ICACHE_FLASH_ATTR  WEAK_ATTR user_rf_cal_sector_set(void)
 {
-	// RF calibration stored in last sector of sysParam
-	auto sysParam = *Storage::findPartition(Storage::Partition::SubType::Data::sysParam);
-	return ((sysParam.address() + sysParam.size()) / SPI_FLASH_SEC_SIZE) - 1;
+	auto rfCal = *Storage::findPartition(Storage::Partition::SubType::Data::rfCal);
+	return rfCal.address();
 }
 
 #ifdef SDK_INTERNAL
@@ -71,16 +70,14 @@ extern "C" void ICACHE_FLASH_ATTR WEAK_ATTR user_pre_init(void)
 	Storage::initialize();
 
 	auto sysParam = *Storage::findPartition(Storage::Partition::SubType::Data::sysParam);
+	auto rfCal = *Storage::findPartition(Storage::Partition::SubType::Data::rfCal);
 	auto phy = *Storage::findPartition(Storage::Partition::SubType::Data::phy);
 
-	// RF calibration stored in last sector of sysParam
-	auto sysParamSize = sysParam.size() - SPI_FLASH_SEC_SIZE;
-
 	static const partition_item_t partitions[] = {
 			{SYSTEM_PARTITION_BOOTLOADER,		0,						SPI_FLASH_SEC_SIZE},
 			{SYSTEM_PARTITION_PHY_DATA,			phy.address(),			phy.size()},
-			{SYSTEM_PARTITION_SYSTEM_PARAMETER,	sysParam.address(),		sysParamSize},
-			{SYSTEM_PARTITION_RF_CAL,			sysParam.address() + sysParamSize,	SPI_FLASH_SEC_SIZE},
+			{SYSTEM_PARTITION_SYSTEM_PARAMETER,	sysParam.address(),		sysParam.size()},
+			{SYSTEM_PARTITION_RF_CAL,			rfCal.address(),		rfCal.size()},
 	};
 
 	enum flash_size_map sizeMap = system_get_flash_size_map();
diff --git a/Sming/Arch/Esp8266/options.json b/Sming/Arch/Esp8266/options.json
index 7e3d545649..dfa35550eb 100644
--- a/Sming/Arch/Esp8266/options.json
+++ b/Sming/Arch/Esp8266/options.json
@@ -6,5 +6,23 @@
                 "filename": "$(FLASH_INIT_DATA_VCC)"
             }
         }
+    },
+    "alternate": {
+        "description": "ESP8266 layout with critical partitions at start of flash",
+        "partition_table_offset": "0x2000",
+        "partitions": {
+            "rf_cal": {
+                "address": "0x3000"
+            },
+            "phy_init": {
+                "address": "0x4000"
+            },
+            "sys_param": {
+                "address": "0x5000"
+            },
+            "rom0": {
+                "address": "0x8000"
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Sming/Arch/Esp8266/spiffs-two-roms.hw b/Sming/Arch/Esp8266/spiffs-two-roms.hw
index 9503891e2a..93e4605b47 100644
--- a/Sming/Arch/Esp8266/spiffs-two-roms.hw
+++ b/Sming/Arch/Esp8266/spiffs-two-roms.hw
@@ -2,11 +2,14 @@
 	"name": "Two ROM slots with single SPIFFS",
 	"base_config": "spiffs",
 	"partitions": {
+		"rom0": {
+			"subtype": "ota_0"
+		},
 		"rom1": {
 			"address": "0x108000",
 			"size": "992K",
 			"type": "app",
-			"subtype": "ota_0",
+			"subtype": "ota_1",
 			"filename": "$(RBOOT_ROM_1_BIN)"
 		}
 	}
diff --git a/Sming/Arch/Esp8266/standard.hw b/Sming/Arch/Esp8266/standard.hw
index 240e56f679..37d6bd7d68 100644
--- a/Sming/Arch/Esp8266/standard.hw
+++ b/Sming/Arch/Esp8266/standard.hw
@@ -2,7 +2,7 @@
 	"name": "Standard config with single ROM",
 	"comment": "Should work with any Esp8266 variant",
 	"arch": "Esp8266",
-	"partition_table_offset": "0x2000",
+	"partition_table_offset": "self.devices[0].size - 0x6000",
 	"devices": {
 		"spiFlash": {
 			"type": "flash",
@@ -12,25 +12,31 @@
 		}
 	},
 	"partitions": {
+		"rom0": {
+			"address": "0x002000",
+			"size": "992K",
+			"type": "app",
+			"subtype": "factory",
+			"filename": "$(RBOOT_ROM_0_BIN)"
+		},
+		"rf_cal": {
+			"address": "self.device.size - 0x5000",
+			"size": "4K",
+			"type": "data",
+			"subtype": "rfcal"
+		},
 		"phy_init": {
-			"address": "0x003000",
+			"address": "self.device.size - 0x4000",
 			"size": "4K",
 			"type": "data",
 			"subtype": "phy",
 			"filename": "$(FLASH_INIT_DATA)"
 		},
 		"sys_param": {
-			"address": "0x004000",
-			"size": "16K",
+			"address": "self.device.size - 0x3000",
+			"size": "12K",
 			"type": "data",
 			"subtype": "sysparam"
-		},
-		"rom0": {
-			"address": "0x008000",
-			"size": "992K",
-			"type": "app",
-			"subtype": "factory",
-			"filename": "$(RBOOT_ROM_0_BIN)"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/Sming/Arch/Esp8266/two-rom-mode.hw b/Sming/Arch/Esp8266/two-rom-mode.hw
index 9d6399179f..2be8a10eca 100644
--- a/Sming/Arch/Esp8266/two-rom-mode.hw
+++ b/Sming/Arch/Esp8266/two-rom-mode.hw
@@ -3,13 +3,14 @@
 	"base_config": "standard",
 	"partitions": {
 		"rom0": {
+			"subtype": "ota_0",
 			"size": "480K"
 		},
 		"rom1": {
 			"address": "0x80000",
-			"size": "512K",
+			"size": "488K",
 			"type": "app",
-			"subtype": "ota_0",
+			"subtype": "ota_1",
 			"filename": "$(RBOOT_ROM_1_BIN)"
 		}
 	}
diff --git a/Sming/Components/Storage/README.rst b/Sming/Components/Storage/README.rst
index 8b609fee02..0ab3666e67 100644
--- a/Sming/Components/Storage/README.rst
+++ b/Sming/Components/Storage/README.rst
@@ -84,6 +84,16 @@ If using this approach, remember to updated your project's ``component.mk`` with
 and verify the layout is correct using ``make map``.
 
 
+OTA updates
+-----------
+
+When planning OTA updates please check that the displayed partition map corresponds to your project.
+For example, the partition table requires a free sector so must not overlap other partitions.
+
+Your OTA update process must include a step to write the partition table to the correct location.
+
+It is not necessary to update the bootloader. See :component:`rboot` for further information.
+
 
 Custom configurations
 ---------------------
@@ -173,6 +183,19 @@ To customise the hardware configuration for a project, for example 'my_project':
    This will flash everything: bootloader, partition table and all defined partitions (those with a ``filename`` entry).
 
 
+.. note::
+
+   The build system isn't smart enough to track dependencies for partition build targets.
+
+   To rebuild these manually type::
+
+      make partbuild
+
+   These will be removed when ``make clean`` is run, but you can also clean them separately thus::
+
+      make part-clean
+
+
 Partition maps
 --------------
 
@@ -356,7 +379,7 @@ you can take advantage of the partition API to manage them as follows:
 -  Create an instance of your custom device and make a call to :cpp:func:`Storage::registerDevice`
    in your ``init()`` function (or elsewhere if more appropriate).
 
- 
+
 API
 ---
 
diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
index 19bad09f79..67a465bd0c 100644
--- a/Sming/Components/Storage/Tools/hwconfig/config.py
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -46,6 +46,7 @@ def from_name(cls, name):
         config.load(name)
         if options != '':
             config.parse_options(options.split(','))
+        config.resolve_expressions()
         config.partitions.sort()
         return config
 
@@ -73,6 +74,9 @@ def parse_options(self, options):
             temp.pop('description', None)
             self.parse_dict(temp)
 
+    def resolve_expressions(self):
+        self.partitions.offset = eval(str(self.partitions.offset))
+
     def parse_dict(self, data):
         base_config = data.pop('base_config', None)
         if base_config is not None:
@@ -89,7 +93,7 @@ def parse_dict(self, data):
             elif k == 'arch':
                 self.arch = v
             elif k == 'partition_table_offset':
-                self.partitions.offset = parse_int(v)
+                self.partitions.offset = v
             elif k == 'devices':
                 self.devices.parse_dict(v)
             elif k == 'comment':
@@ -132,7 +136,7 @@ def buildVars(self):
         return res
 
     def verify(self, secure):
-        self.partitions.verify(self.arch, secure)
+        self.partitions.verify(self.arch, self.devices[0], secure)
 
     def map(self):
         return partition.Map(self.partitions, self.devices)
diff --git a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
index 7c388ff726..e2b3d90ddb 100644
--- a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
+++ b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
@@ -44,7 +44,7 @@ def handle_flashcheck(args, config, part):
     for e in list:
         addr, filename = e.split('=')
         addr = int(addr, 0)
-        part = config.partitions.find_by_address(addr)
+        part = config.partitions.find_by_address(config.devices[0], addr)
         if part is None:
             raise InputError("No partition contains address 0x%08x" % addr)
         if part.address != addr:
@@ -113,5 +113,5 @@ def main():
     try:
         main()
     except InputError as e:
-        print(e, file=sys.stderr)
+        print("** ERROR! %s" % e, file=sys.stderr)
         sys.exit(2)
diff --git a/Sming/Components/Storage/Tools/hwconfig/partition.py b/Sming/Components/Storage/Tools/hwconfig/partition.py
index d0a0e07f1e..18e78435d5 100644
--- a/Sming/Components/Storage/Tools/hwconfig/partition.py
+++ b/Sming/Components/Storage/Tools/hwconfig/partition.py
@@ -16,11 +16,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import struct, hashlib, storage, binascii
+import struct, hashlib, storage, binascii, copy
 from common import *
 
 MAX_PARTITION_LENGTH = 0xC00  # 3K for partition data (96 entries) leaves 1K in a 4K sector for signature
 MD5_PARTITION_BEGIN = b"\xEB\xEB" + b"\xFF" * 14  # The first 2 bytes are like magic numbers for MD5 sum
+FLASH_SECTOR_SIZE = 0x1000
 PARTITION_TABLE_SIZE = 0x1000  # Size of partition table
 PARTITION_ENTRY_SIZE = 32
 
@@ -84,6 +85,7 @@
         "nvs_keys": 0x04,
         "efuse": 0x05,
         "sysparam": 0x40,
+        "rfcal": 0x41,
         "esphttpd": 0x80,
         "fat": 0x81,
         "spiffs": 0x82,
@@ -154,6 +156,10 @@ def offset_str(self):
     def buildVars(self):
         dict = {}
         dict['PARTITION_NAMES'] = " ".join(p.name for p in self)
+        buildparts = [p for p in self if p.build is not None]
+        dict['PARTITIONS_WITH_TARGETS'] = " ".join(p.name for p in buildparts)
+        dict['PARTITION_BUILD_TARGETS'] = " ".join(p.filename for p in buildparts)
+
         for p in self:
             dict.update(p.buildVars())
         return dict
@@ -198,19 +204,28 @@ def find_by_name(self, name):
                 return p
         return None
 
-    def find_by_address(self, addr):
+    def find_by_address(self, device, addr):
         for p in self:
-            if p.contains(addr):
+            if p.device == device and p.contains(addr):
                 return p
         return None
 
-    def verify(self, arch, secure):
+    def verify(self, arch, spiFlash, secure):
         """Verify partition layout
         """
         # verify each partition individually
         for p in self:
             p.verify(arch, secure)
 
+        if self.offset % FLASH_SECTOR_SIZE != 0:
+            raise InputError("Partition table offset not aligned to flash sector")
+
+        p = self.find_by_address(spiFlash, self.offset)
+        if p is None:
+            p = self.find_by_address(spiFlash, self.offset + PARTITION_TABLE_SIZE - 1)
+        if not p is None:
+            raise InputError("Partition table conflict with '%s'" % p.name)
+
         # check on duplicate name
         names = [p.name for p in self]
         duplicates = set(n for n in names if names.count(n) > 1)
@@ -224,7 +239,10 @@ def verify(self, arch, secure):
             raise InputError("Partition names must be unique")
 
         # check for overlaps
-        minPartitionAddress = self.offset + PARTITION_TABLE_SIZE
+        if arch == 'Esp32':
+            minPartitionAddress = self.offset + PARTITION_TABLE_SIZE
+        else:
+            minPartitionAddress = 0x00002000
         dev = ''
         last = None
         for p in self:
@@ -345,7 +363,7 @@ def parse_dict(self, data, devices):
                 if k == 'device':
                     self.device = devices.find_by_name(v)
                 elif k == 'address':
-                    self.address = parse_int(v)
+                    self.address = eval(str(v))
                 elif k == 'size':
                     self.size = parse_int(v)
                 elif k == 'filename':
@@ -523,13 +541,17 @@ def add_unused(address, last_end):
             if address > last_end + 1:
                 add('(unused)', last_end + 1, address - last_end - 1)
 
+        partitions = copy.copy(table)
+
         if table.offset == 0:
             last = None
         else:
-            add("Boot Sector", 0, table.offset)
-            last = add("Partition Table", table.offset, PARTITION_TABLE_SIZE)
+            last = add('Boot Sector', 0, min(table.offset, partitions[0].address))
+            p = Entry(device, 'Partition Table', table.offset, PARTITION_TABLE_SIZE, 0xff, 0xff)
+            partitions.append(p)
+            partitions.sort()
 
-        for p in table:
+        for p in partitions:
             if last is not None:
                 if p.device != last.device:
                     add_unused(last.device.size, last.end())
diff --git a/Sming/Components/Storage/component.mk b/Sming/Components/Storage/component.mk
index a6627c056a..986d7fe0d0 100644
--- a/Sming/Components/Storage/component.mk
+++ b/Sming/Components/Storage/component.mk
@@ -35,10 +35,11 @@ HWCONFIG_TOOL := \
 	BUILD_BASE=$(BUILD_BASE) \
 	$(PYTHON) $(PARTITION_TOOLS)/hwconfig/hwconfig.py
 
-ifeq (,$(MAKE_DOCS)$(MAKE_CLEAN))
-
-# Generate build variables from hardware configuration
 HWCONFIG_MK := $(PROJECT_DIR)/$(OUT_BASE)/hwconfig.mk
+ifneq (,$(MAKE_DOCS)$(MAKE_CLEAN))
+-include $(HWCONFIG_MK)
+else
+# Generate build variables from hardware configuration
 $(shell $(HWCONFIG_TOOL) --quiet expr $(HWCONFIG) $(HWCONFIG_MK) "config.buildVars()")
 include $(HWCONFIG_MK)
 ifeq ($(SMING_ARCH_HW),)
@@ -47,6 +48,7 @@ else ifneq ($(SMING_ARCH),$(SMING_ARCH_HW))
 $(error Hardware configuration is for arch $(SMING_ARCH_HW), does not match SMING_ARCH ($(SMING_ARCH)))
 endif
 COMPONENT_CXXFLAGS := -DPARTITION_TABLE_OFFSET=$(PARTITION_TABLE_OFFSET)
+COMPONENT_CPPFLAGS := -DPARTITION_TABLE_OFFSET=$(PARTITION_TABLE_OFFSET)
 
 # Function to evaluate expression against config
 HWEXPR := $(HWCONFIG_TOOL) $(if $(PART),--part "$(PART)") expr $(HWCONFIG) -
@@ -109,22 +111,25 @@ $(PARTITIONS_BIN): $(HWCONFIG_DEPENDS)
 # Create build target for a partition
 # $1 -> Partition name
 define PartitionTarget
-PTARG := $(shell $(HWCONFIG_TOOL) --part $1 expr $(HWCONFIG) - part.filename)
-$$(PTARG):
+$(PARTITION_$1_FILENAME):
 	$$(Q) $$(MAKE) --no-print-directory $$(shell $$(HWCONFIG_TOOL) --part $1 expr $$(HWCONFIG) - "part.build['target']") PART=$1
-CUSTOM_TARGETS += $$(PTARG)
+CUSTOM_TARGETS += $(PARTITION_$1_FILENAME)
 endef
 
-# Create build targets for all partitions with 'build' property
-DEBUG_VARS += PARTITIONS_WITH_TARGETS
-PARTITIONS_WITH_TARGETS := $(call HwExpr,(' '.join([part.name for part in filter(lambda part: part.build is not None, config.partitions)])))
-
 # Must be invoked from project.mk after all Components have been processed
 # This allows partition definitions to include variables which may not yet be defined
 define PartitionCreateTargets
 $(foreach p,$(PARTITIONS_WITH_TARGETS),$(eval $(call PartitionTarget,$p)))
 endef
 
+.PHONY: buildpart
+buildpart: ##Rebuild all partition targets
+ifeq (,$(PARTITION_BUILD_TARGETS))
+	@echo "No partitions have build targets"
+else
+	$(Q) rm -f $(PARTITION_BUILD_TARGETS)
+	$(MAKE) $(PARTITION_BUILD_TARGETS)
+endif
 
 ##@Flashing
 
@@ -192,3 +197,11 @@ flashmap: $(PARTITIONS_BIN) kill_term ##Write partition table to device
 
 
 endif # MAKE_DOCS
+
+##@Cleaning
+
+clean: part-clean
+
+.PHONY: part-clean
+part-clean: ##Clean partition targets
+	$(Q) rm -f $(PARTITION_BUILD_TARGETS)
diff --git a/Sming/Components/Storage/src/include/Storage/Partition.h b/Sming/Components/Storage/src/include/Storage/Partition.h
index 0c141abad0..9b5badeee1 100644
--- a/Sming/Components/Storage/src/include/Storage/Partition.h
+++ b/Sming/Components/Storage/src/include/Storage/Partition.h
@@ -59,6 +59,7 @@
 	XX(nvsKeys, 0x04, "NVS key information")                                                                           \
 	XX(eFuseEm, 0x05, "eFuse emulation")                                                                               \
 	XX(sysParam, 0x40, "System Parameters")                                                                            \
+	XX(rfCal, 0x41, "RF Calibration")                                                                                  \
 	XX(espHttpd, 0x80, "ESPHTTPD")                                                                                     \
 	XX(fat, 0x81, "FAT")                                                                                               \
 	XX(spiffs, 0x82, "SPIFFS")                                                                                         \
diff --git a/Sming/Components/Storage/src/include/Storage/PartitionTable.h b/Sming/Components/Storage/src/include/Storage/PartitionTable.h
index 1dd4ee7b16..5acfc135bd 100644
--- a/Sming/Components/Storage/src/include/Storage/PartitionTable.h
+++ b/Sming/Components/Storage/src/include/Storage/PartitionTable.h
@@ -45,7 +45,7 @@ class PartitionTable
 
 	/**
 	 * @brief Find partition by name
-	 * @param Name to search for, case-sensitive
+	 * @param Name Name to search for, case-sensitive
 	 * @retval Partition
 	 *
 	 * Names are unique so at most only one match
@@ -55,6 +55,26 @@ class PartitionTable
 		return *std::find(begin(), end(), name);
 	}
 
+	/**
+	 * @brief Find partition containing the given address
+	 * @param address Address to search for
+	 * @retval Partition
+	 */
+	Partition find(uint32_t address) const
+	{
+		return *std::find_if(begin(), end(), [address](Partition part) { return part.contains(address); });
+	}
+
+	/**
+	 * @brief Find the n'th OTA partition
+	 */
+	Partition findOta(uint8_t index)
+	{
+		using App = Partition::SubType::App;
+		auto subtype = App(uint8_t(App::ota0) + index);
+		return (subtype >= App::ota_min && subtype <= App::ota_max) ? *find(subtype) : Partition{};
+	}
+
 	Iterator begin() const
 	{
 		return Iterator(mDevice, 0);
diff --git a/Sming/Components/rboot/.patches/rboot.patch b/Sming/Components/rboot/.patches/rboot.patch
deleted file mode 100644
index b8cd1ce078..0000000000
--- a/Sming/Components/rboot/.patches/rboot.patch
+++ /dev/null
@@ -1,402 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 638a8f7..5176f8f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,6 +58,19 @@ endif
- ifeq ($(RBOOT_IROM_CHKSUM),1)
- 	CFLAGS += -DBOOT_IROM_CHKSUM
- endif
-+ifneq ($(RBOOT_ROM0_ADDR),)
-+	CFLAGS += -DBOOT_ROM0_ADDR=$(RBOOT_ROM0_ADDR)
-+endif
-+ifneq ($(RBOOT_ROM1_ADDR),)
-+	CFLAGS += -DBOOT_ROM1_ADDR=$(RBOOT_ROM1_ADDR)
-+endif
-+ifneq ($(RBOOT_ROM2_ADDR),)
-+	CFLAGS += -DBOOT_ROM2_ADDR=$(RBOOT_ROM2_ADDR)
-+endif
-+ifeq ($(RBOOT_SILENT),1)
-+	CFLAGS += -DBOOT_SILENT=$(RBOOT_SILENT)
-+endif
-+
- ifneq ($(RBOOT_EXTRA_INCDIR),)
- 	CFLAGS += $(addprefix -I,$(RBOOT_EXTRA_INCDIR))
- endif
-
-diff --git a/rboot.c b/rboot.c
-index d622f97..5e254fa 100644
---- a/rboot.c
-+++ b/rboot.c
-@@ -13,6 +13,12 @@
- #define UART_CLK_FREQ	(26000000 * 2)
- #endif
- 
-+#ifndef BOOT_SILENT
-+#define echof(fmt, ...) ets_printf(fmt, ##__VA_ARGS__)
-+#else
-+#define echof(fmt, ...)
-+#endif
-+
- static uint32_t check_image(uint32_t readpos) {
- 
- 	uint8_t buffer[BUFFER_SIZE];
-@@ -257,8 +263,30 @@ static uint8_t calc_chksum(uint8_t *start, uint8_t *end) {
- // created on first boot or in case of corruption
- static uint8_t default_config(rboot_config *romconf, uint32_t flashsize) {
- 	romconf->count = 2;
-+#ifdef BOOT_ROM0_ADDR
-+    romconf->roms[0] = BOOT_ROM0_ADDR;
-+#else
- 	romconf->roms[0] = SECTOR_SIZE * (BOOT_CONFIG_SECTOR + 1);
-+#endif
-+
-+#ifdef BOOT_ROM1_ADDR
-+	romconf->roms[1] = BOOT_ROM1_ADDR;
-+#else
- 	romconf->roms[1] = (flashsize / 2) + (SECTOR_SIZE * (BOOT_CONFIG_SECTOR + 1));
-+#endif
-+
-+#if defined(BOOT_BIG_FLASH) && defined(BOOT_GPIO_ENABLED)
-+	if(flashsize > 0x200000) {
-+		romconf->count += 1;
-+#ifdef BOOT_ROM2_ADDR
-+	romconf->roms[2] = BOOT_ROM2_ADDR;
-+#else
-+	romconf->roms[2] = 0x310000;
-+#endif
-+	romconf->gpio_rom = 2;
-+}
-+#endif
-+
- #ifdef BOOT_GPIO_ENABLED
- 	romconf->mode = MODE_GPIO_ROM;
- #endif
-@@ -306,100 +334,100 @@ uint32_t NOINLINE find_image(void) {
- 	ets_delay_us(BOOT_DELAY_MICROS);
- #endif
- 
--	ets_printf("\r\nrBoot v1.4.2 - richardaburton@gmail.com\r\n");
-+	echof("\r\nrBoot v1.4.2 - richardaburton@gmail.com\r\n");
- 
- 	// read rom header
- 	SPIRead(0, header, sizeof(rom_header));
- 
- 	// print and get flash size
--	ets_printf("Flash Size:   ");
-+	echof("Flash Size:   ");
- 	flag = header->flags2 >> 4;
- 	if (flag == 0) {
--		ets_printf("4 Mbit\r\n");
-+		echof("4 Mbit\r\n");
- 		flashsize = 0x80000;
- 	} else if (flag == 1) {
--		ets_printf("2 Mbit\r\n");
-+		echof("2 Mbit\r\n");
- 		flashsize = 0x40000;
- 	} else if (flag == 2) {
--		ets_printf("8 Mbit\r\n");
-+		echof("8 Mbit\r\n");
- 		flashsize = 0x100000;
- 	} else if (flag == 3 || flag == 5) {
--		ets_printf("16 Mbit\r\n");
-+		echof("16 Mbit\r\n");
- #ifdef BOOT_BIG_FLASH
- 		flashsize = 0x200000;
- #else
- 		flashsize = 0x100000; // limit to 8Mbit
- #endif
- 	} else if (flag == 4 || flag == 6) {
--		ets_printf("32 Mbit\r\n");
-+		echof("32 Mbit\r\n");
- #ifdef BOOT_BIG_FLASH
- 		flashsize = 0x400000;
- #else
- 		flashsize = 0x100000; // limit to 8Mbit
- #endif
- 	} else if (flag == 8) {
--		ets_printf("64 Mbit\r\n");
-+		echof("64 Mbit\r\n");
- #ifdef BOOT_BIG_FLASH
- 		flashsize = 0x800000;
- #else
- 		flashsize = 0x100000; // limit to 8Mbit
- #endif
- 	} else if (flag == 9) {
--		ets_printf("128 Mbit\r\n");
-+		echof("128 Mbit\r\n");
- #ifdef BOOT_BIG_FLASH
- 		flashsize = 0x1000000;
- #else
- 		flashsize = 0x100000; // limit to 8Mbit
- #endif
- 	} else {
--		ets_printf("unknown\r\n");
-+		echof("unknown\r\n");
- 		// assume at least 4mbit
- 		flashsize = 0x80000;
- 	}
- 
- 	// print spi mode
--	ets_printf("Flash Mode:   ");
-+	echof("Flash Mode:   ");
- 	if (header->flags1 == 0) {
--		ets_printf("QIO\r\n");
-+		echof("QIO\r\n");
- 	} else if (header->flags1 == 1) {
--		ets_printf("QOUT\r\n");
-+		echof("QOUT\r\n");
- 	} else if (header->flags1 == 2) {
--		ets_printf("DIO\r\n");
-+		echof("DIO\r\n");
- 	} else if (header->flags1 == 3) {
--		ets_printf("DOUT\r\n");
-+		echof("DOUT\r\n");
- 	} else {
--		ets_printf("unknown\r\n");
-+		echof("unknown\r\n");
- 	}
- 
- 	// print spi speed
--	ets_printf("Flash Speed:  ");
-+	echof("Flash Speed:  ");
- 	flag = header->flags2 & 0x0f;
--	if (flag == 0) ets_printf("40 MHz\r\n");
--	else if (flag == 1) ets_printf("26.7 MHz\r\n");
--	else if (flag == 2) ets_printf("20 MHz\r\n");
--	else if (flag == 0x0f) ets_printf("80 MHz\r\n");
--	else ets_printf("unknown\r\n");
-+	if (flag == 0) echof("40 MHz\r\n");
-+	else if (flag == 1) echof("26.7 MHz\r\n");
-+	else if (flag == 2) echof("20 MHz\r\n");
-+	else if (flag == 0x0f) echof("80 MHz\r\n");
-+	else echof("unknown\r\n");
- 
- 	// print enabled options
- #ifdef BOOT_BIG_FLASH
--	ets_printf("rBoot Option: Big flash\r\n");
-+	echof("rBoot Option: Big flash\r\n");
- #endif
- #ifdef BOOT_CONFIG_CHKSUM
--	ets_printf("rBoot Option: Config chksum\r\n");
-+	echof("rBoot Option: Config chksum\r\n");
- #endif
- #ifdef BOOT_GPIO_ENABLED
--	ets_printf("rBoot Option: GPIO rom mode (%d)\r\n", BOOT_GPIO_NUM);
-+	echof("rBoot Option: GPIO rom mode (%d)\r\n", BOOT_GPIO_NUM);
- #endif
- #ifdef BOOT_GPIO_SKIP_ENABLED
--	ets_printf("rBoot Option: GPIO skip mode (%d)\r\n", BOOT_GPIO_NUM);
-+	echof("rBoot Option: GPIO skip mode (%d)\r\n", BOOT_GPIO_NUM);
- #endif
- #ifdef BOOT_RTC_ENABLED
--	ets_printf("rBoot Option: RTC data\r\n");
-+	echof("rBoot Option: RTC data\r\n");
- #endif
- #ifdef BOOT_IROM_CHKSUM
--	ets_printf("rBoot Option: irom chksum\r\n");
-+	echof("rBoot Option: irom chksum\r\n");
- #endif
--	ets_printf("\r\n");
-+	echof("\r\n");
- 
- 	// read boot config
- 	SPIRead(BOOT_CONFIG_SECTOR * SECTOR_SIZE, buffer, SECTOR_SIZE);
-@@ -410,7 +438,7 @@ uint32_t NOINLINE find_image(void) {
- #endif
- 		) {
- 		// create a default config for a standard 2 rom setup
--		ets_printf("Writing default boot config.\r\n");
-+		echof("Writing default boot config.\r\n");
- 		ets_memset(romconf, 0x00, sizeof(rboot_config));
- 		romconf->magic = BOOT_CONFIG_MAGIC;
- 		romconf->version = BOOT_CONFIG_VERSION;
-@@ -433,10 +461,10 @@ uint32_t NOINLINE find_image(void) {
- 
- 		if (rtc.next_mode & MODE_TEMP_ROM) {
- 			if (rtc.temp_rom >= romconf->count) {
--				ets_printf("Invalid temp rom selected.\r\n");
-+				echof("Invalid temp rom selected.\r\n");
- 				return 0;
- 			}
--			ets_printf("Booting temp rom.\r\n");
-+			echof("Booting temp rom.\r\n");
- 			temp_boot = 1;
- 			romToBoot = rtc.temp_rom;
- 		}
-@@ -447,10 +475,10 @@ uint32_t NOINLINE find_image(void) {
- 	if (perform_gpio_boot(romconf)) {
- #if defined(BOOT_GPIO_ENABLED)
- 		if (romconf->gpio_rom >= romconf->count) {
--			ets_printf("Invalid GPIO rom selected.\r\n");
-+			echof("Invalid GPIO rom selected.\r\n");
- 			return 0;
- 		}
--		ets_printf("Booting GPIO-selected rom.\r\n");
-+		echof("Booting GPIO-selected rom.\r\n");
- 		romToBoot = romconf->gpio_rom;
- 		gpio_boot = 1;
- #elif defined(BOOT_GPIO_SKIP_ENABLED)
-@@ -462,7 +490,7 @@ uint32_t NOINLINE find_image(void) {
- #endif
- 		updateConfig = 1;
- 		if (romconf->mode & MODE_GPIO_ERASES_SDKCONFIG) {
--			ets_printf("Erasing SDK config sectors before booting.\r\n");
-+			echof("Erasing SDK config sectors before booting.\r\n");
- 			for (sec = 1; sec < 5; sec++) {
- 				SPIEraseSector((flashsize / SECTOR_SIZE) - sec);
- 			}
-@@ -474,7 +502,7 @@ uint32_t NOINLINE find_image(void) {
- 	// gpio/temp boots will have already validated this
- 	if (romconf->current_rom >= romconf->count) {
- 		// if invalid rom selected try rom 0
--		ets_printf("Invalid rom selected, defaulting to 0.\r\n");
-+		echof("Invalid rom selected, defaulting to 0.\r\n");
- 		romToBoot = 0;
- 		romconf->current_rom = 0;
- 		updateConfig = 1;
-@@ -486,14 +514,14 @@ uint32_t NOINLINE find_image(void) {
- #ifdef BOOT_GPIO_ENABLED
- 	if (gpio_boot && loadAddr == 0) {
- 		// don't switch to backup for gpio-selected rom
--		ets_printf("GPIO boot rom (%d) is bad.\r\n", romToBoot);
-+		echof("GPIO boot rom (%d) is bad.\r\n", romToBoot);
- 		return 0;
- 	}
- #endif
- #ifdef BOOT_RTC_ENABLED
- 	if (temp_boot && loadAddr == 0) {
- 		// don't switch to backup for temp rom
--		ets_printf("Temp boot rom (%d) is bad.\r\n", romToBoot);
-+		echof("Temp boot rom (%d) is bad.\r\n", romToBoot);
- 		// make sure rtc temp boot mode doesn't persist
- 		rtc.next_mode = MODE_STANDARD;
- 		rtc.chksum = calc_chksum((uint8_t*)&rtc, (uint8_t*)&rtc.chksum);
-@@ -504,7 +532,7 @@ uint32_t NOINLINE find_image(void) {
- 
- 	// check we have a good rom
- 	while (loadAddr == 0) {
--		ets_printf("Rom %d at %x is bad.\r\n", romToBoot, romconf->roms[romToBoot]);
-+		echof("Rom %d at %x is bad.\r\n", romToBoot, romconf->roms[romToBoot]);
- 		// for normal mode try each previous rom
- 		// until we find a good one or run out
- 		updateConfig = 1;
-@@ -512,7 +540,7 @@ uint32_t NOINLINE find_image(void) {
- 		if (romToBoot < 0) romToBoot = romconf->count - 1;
- 		if (romToBoot == romconf->current_rom) {
- 			// tried them all and all are bad!
--			ets_printf("No good rom available.\r\n");
-+			echof("No good rom available.\r\n");
- 			return 0;
- 		}
- 		loadAddr = check_image(romconf->roms[romToBoot]);
-@@ -543,7 +571,7 @@ uint32_t NOINLINE find_image(void) {
- 	system_rtc_mem(RBOOT_RTC_ADDR, &rtc, sizeof(rboot_rtc_data), RBOOT_RTC_WRITE);
- #endif
- 
--	ets_printf("Booting rom %d at %x, load addr %x.\r\n", romToBoot, romconf->roms[romToBoot], loadAddr);
-+	echof("Booting rom %d at %x, load addr %x.\r\n", romToBoot, romconf->roms[romToBoot], loadAddr);
- 	// copy the loader to top of iram
- 	ets_memcpy((void*)_text_addr, _text_data, _text_len);
- 	// return address to load from
-diff --git a/appcode/rboot-api.c b/appcode/rboot-api.c
-index eb4d028..bf276a7 100644
---- a/appcode/rboot-api.c
-+++ b/appcode/rboot-api.c
-@@ -9,7 +9,7 @@
- #include <string.h>
- // c_types.h needed for spi_flash.h
- #include <c_types.h>
--#include <spi_flash.h>
-+#include <esp_spi_flash.h>
- 
- #include "rboot-api.h"
- 
-@@ -33,7 +33,7 @@ static uint8_t calc_chksum(uint8_t *start, uint8_t *end) {
- // get the rboot config
- rboot_config ICACHE_FLASH_ATTR rboot_get_config(void) {
- 	rboot_config conf;
--	spi_flash_read(BOOT_CONFIG_SECTOR * SECTOR_SIZE, (uint32_t*)&conf, sizeof(rboot_config));
-+	flashmem_read(&conf, BOOT_CONFIG_SECTOR * SECTOR_SIZE, sizeof(rboot_config));
- 	return conf;
- }
- 
-@@ -43,7 +43,7 @@ rboot_config ICACHE_FLASH_ATTR rboot_get_config(void) {
- // updates checksum automatically (if enabled)
- bool ICACHE_FLASH_ATTR rboot_set_config(rboot_config *conf) {
- 	uint8_t *buffer;
--	buffer = (uint8_t*)pvPortMalloc(SECTOR_SIZE, 0, 0);
-+	buffer = (uint8_t*)os_malloc(SECTOR_SIZE);
- 	if (!buffer) {
- 		//os_printf("No ram!\r\n");
- 		return false;
-@@ -53,12 +53,12 @@ bool ICACHE_FLASH_ATTR rboot_set_config(rboot_config *conf) {
- 	conf->chksum = calc_chksum((uint8_t*)conf, (uint8_t*)&conf->chksum);
- #endif
- 	
--	spi_flash_read(BOOT_CONFIG_SECTOR * SECTOR_SIZE, (uint32_t*)((void*)buffer), SECTOR_SIZE);
-+	flashmem_read(buffer, BOOT_CONFIG_SECTOR * SECTOR_SIZE, SECTOR_SIZE);
- 	memcpy(buffer, conf, sizeof(rboot_config));
--	spi_flash_erase_sector(BOOT_CONFIG_SECTOR);
--	spi_flash_write(BOOT_CONFIG_SECTOR * SECTOR_SIZE, (uint32_t*)((void*)buffer), SECTOR_SIZE);
-+	flashmem_erase_sector(BOOT_CONFIG_SECTOR);
-+	flashmem_write(buffer, BOOT_CONFIG_SECTOR * SECTOR_SIZE, SECTOR_SIZE);
- 	
--	vPortFree(buffer, 0, 0);
-+	os_free(buffer);
- 	return true;
- }
- 
-@@ -103,7 +103,7 @@ bool ICACHE_FLASH_ATTR rboot_write_end(rboot_write_status *status) {
- 
- // function to do the actual writing to flash
- // call repeatedly with more data (max len per write is the flash sector size (4k))
--bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, uint8_t *data, uint16_t len) {
-+bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, const uint8_t *data, uint16_t len) {
- 	
- 	bool ret = false;
- 	uint8_t *buffer;
-@@ -114,7 +114,7 @@ bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, uint8_t *da
- 	}
- 	
- 	// get a buffer
--	buffer = (uint8_t *)pvPortMalloc(len + status->extra_count, 0, 0);
-+	buffer = (uint8_t *)os_malloc(len + status->extra_count);
- 	if (!buffer) {
- 		//os_printf("No ram!\r\n");
- 		return false;
-@@ -141,18 +141,18 @@ bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, uint8_t *da
- 		lastsect = ((status->start_addr + len) - 1) / SECTOR_SIZE;
- 		while (lastsect > status->last_sector_erased) {
- 			status->last_sector_erased++;
--			spi_flash_erase_sector(status->last_sector_erased);
-+			flashmem_erase_sector(status->last_sector_erased);
- 		}
- 
- 		// write current chunk
- 		//os_printf("write addr: 0x%08x, len: 0x%04x\r\n", status->start_addr, len);
--		if (spi_flash_write(status->start_addr, (uint32_t *)((void*)buffer), len) == SPI_FLASH_RESULT_OK) {
-+		if (flashmem_write(buffer, status->start_addr, len) == len) {
- 			ret = true;
- 			status->start_addr += len;
- 		}
- 	//}
- 
--	vPortFree(buffer, 0, 0);
-+	os_free(buffer);
- 	return ret;
- }
- 
-diff --git a/appcode/rboot-api.h b/appcode/rboot-api.h
-index a98c209..ec4f0e5 100644
---- a/appcode/rboot-api.h
-+++ b/appcode/rboot-api.h
-@@ -93,7 +93,7 @@ bool ICACHE_FLASH_ATTR rboot_write_end(rboot_write_status *status);
-  *  of OTA data is received over the network.
-  *  @note   Call rboot_write_init before calling this function to get the rboot_write_status structure
- */
--bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, uint8_t *data, uint16_t len);
-+bool ICACHE_FLASH_ATTR rboot_write_flash(rboot_write_status *status, const uint8_t *data, uint16_t len);
- 
- #ifdef BOOT_RTC_ENABLED
- /** @brief  Get rBoot status/control data from RTC data area
-
diff --git a/Sming/Components/rboot/.patches/rboot/README.rst b/Sming/Components/rboot/.patches/rboot/README.rst
deleted file mode 100644
index e365cdb1f0..0000000000
--- a/Sming/Components/rboot/.patches/rboot/README.rst
+++ /dev/null
@@ -1,349 +0,0 @@
-==================================================
-rBoot - An open source boot loader for the ESP8266
-==================================================
-
-by Richard A Burton, richardaburton@gmail.com
-http://richard.burtons.org/
-
-rBoot is designed to be a flexible open source boot loader, a
-replacement for the binary blob supplied with the SDK. It has the
-following advantages over the Espressif loader:
-
--  Open source (written in C).
--  Supports up to 256 roms.
--  Roms can be variable size.
--  Able to test multiple roms to find a valid backup (without
-   resetting).
--  Flash layout can be changed on the fly (with care and appropriately
-   linked rom images).
--  GPIO support for rom selection.
--  Wastes no stack space (SDK boot loader uses 144 bytes).
--  Documented config structure to allow easy editing from user code.
--  Can validate .irom0.text section with checksum.
--  Temporary next-boot rom selection.
-
-Limitations
-===========
-
-The ESP8266 can only map 8Mbits (1MB) of flash to memory, but which
-8Mbits to map is selectable. This allows individual roms to be up to 1MB
-in size, so long as they do not straddle an 8Mbit boundary on the flash.
-This means you could have four 1MB roms or 8 512KB roms on a 32Mbit
-flash (such as on the ESP-12), or a combination. Note, however, that you
-could not have, for example, a 512KB rom followed immediately by a 1MB
-rom because the 2nd rom would then straddle an 8MBit boundary. By
-default support for using more than the first 8Mbit of the flash is
-disabled, because it requires several steps to get it working. See below
-for instructions.
-
-Building
-========
-
-A Makefile is included, which should work with the gcc xtensa cross
-compiler. There are two source files, the first is compiled and included
-as data in the second. When run this code is copied to memory and
-executed (there is a good reason for this, see my blog for an
-explanation). The make file will handle this for you, but you’ll need my
-esptool2 (see github).
-
-To use the Makefile set ``SDK_BASE`` to point to the root of the
-Espressif SDK and either set ``XTENSA_BINDIR`` to the gcc xtensa bin
-directory or include it in your ``PATH``. These can be set as
-environment variables or by editing the Makefile.
-
-Two small assembler stub functions allow the bootloader to launch the
-user code without reserving any space on the stack (while the SDK boot
-loader uses 144 bytes). This compiles fine with GCC, but if you use
-another compiler and it will not compile/work for you then uncomment the
-``#define BOOT_NO_ASM`` in ``rboot.h`` to use a C version of these
-functions (this uses 32 bytes).
-
-Tested with SDK v2.2 and GCC v4.8.5.
-
-Installation
-============
-
-Simply write rboot.bin to the first sector of the flash. Remember to set
-your flash size correctly with your chosen flash tool (e.g. for
-esptool.py use the ``-fs`` option). When run rBoot will create it’s own
-config at the start of sector two for a simple two rom system. You can
-can then write your two roms to flash addresses ``0x2000`` and (half
-chip size + ``0x2000``). E.g. for 8Mbit flash:
-``esptool.py write_flash -fs 8m 0x0000 rboot.bin 0x2000 user1.bin 0x82000 user2.bin``
-
-Note: your device may need other options specified. E.g. The nodemcu
-devkit v1.0 (commonly, but incorrectly, sold as v2) also needs the
-``-fm dio`` option.
-
-For more interesting rom layouts you’ll need to write an rBoot config
-sector manually, see next step.
-
-The two testload bin files can be flashed in place of normal user roms
-for testing rBoot. You do not need these for normal use.
-
-rBoot Config
-============
-
-::
-
-   typedef struct {
-       uint8_t magic;           // our magic
-       uint8_t version;         // config struct version
-       uint8_t mode;            // boot loader mode
-       uint8_t current_rom;     // currently selected rom
-       uint8_t gpio_rom;        // rom to use for gpio boot
-       uint8_t count;           // number of roms in use
-       uint8_t unused[2];       // padding
-       uint32_t roms[MAX_ROMS]; // flash addresses of the roms
-   #ifdef BOOT_CONFIG_CHKSUM
-       uint8_t chksum;          // boot config chksum
-   #endif
-   } rboot_config;
-
-Write a config structure as above to address ``0x1000`` on the flash. If
-you want more than 4 roms (default) just increase MAX_ROMS when you
-compile rBoot. Think about how you intend to layout your flash before
-you start! Rom addresses must be sector aligned i.e start on a multiple
-of 4096.
-
--  ``magic`` should have value ``0xe1`` (defined as
-   ``BOOT_CONFIG_MAGIC``).
--  ``version`` is used in case the config structure changes after
-   deployment. It is defined as ``0x01`` (``BOOT_CONFIG_VERSION``). I
-   don’t intend to increase this, but you should if you choose to
-   reflash the bootloader after deployment and the config structure has
-   changed.
--  ``mode`` can be ``0x00`` (``MODE_STANDARD``) or ``0x01``
-   (``MODE_GPIO_ROM``). See below for an explanation of
-   ``MODE_GPIO_ROM``. There is also an optional extra mode flag ``0x04``
-   (``MODE_GPIO_ERASES_SDKCONFIG``), see below for details.
--  ``current_rom`` is the rom to boot, numbered ``0`` to ``count-1``.
--  ``gpio_rom`` is the rom to boot when the GPIO is triggered at boot.
--  ``count`` is the number of roms available (may be less than
-   ``MAX_ROMS``, but not more).
--  ``unused[2]`` is padding so the ``uint32_t`` rom addresses are 4
-   bytes aligned.
--  ``roms`` is the array of flash address for the roms. The default
-   generated config will contain two entries: ``0x00002000`` and
-   ``0x00082000``.
--  ``chksum`` (if enabled, not by deafult) should be the xor of ``0xef``
-   followed by each of the bytes of the config structure up to (but
-   obviously not including) the chksum byte itself.
-
-Default config
-==============
-
-A default config sector will be created on boot if one does not exists,
-or if an existing config is corrupted, and the default rom will be set
-to rom 0. If you want to have a very customised config for which the
-default would not be suitable, you can override the implementation in
-the ``rboot.h`` header file. See the comments and example code in
-``rboot.h`` for more information.
-
-GPIO boot mode
-==============
-
-.. envvar:: RBOOT_GPIO_ENABLED
-
-If rBoot is compiled with ``BOOT_GPIO_ENABLED`` set in ``rboot.h`` (or
-``RBOOT_GPIO_ENABLED`` set in the Makefile), then GPIO boot
-functionality will be included in the rBoot binary. The feature can then
-be enabled by setting the rboot_config ``mode`` field to
-``MODE_GPIO_ROM``. You must also set ``gpio_rom`` in the config to
-indicate which rom to boot when the GPIO is activated at boot.
-
-If the GPIO input pin reads high at boot then rBoot will start the
-currently selected normal or temp rom (as appropriate). However if the
-GPIO is pulled low then the rom indicated in config option ``gpio_rom``
-is started instead.
-
-The default GPIO is 16, but this can be overriden in the Makefile
-(``RBOOT_GPIO_NUMBER``) or ``rboot.h`` (``BOOT_GPIO_NUM``). If GPIOs
-other than 16 are used, the internal pullup resistor is enabled before
-the pin is read and disabled immediately afterwards. For pins that
-default on reset to configuration other than GPIO input, the pin mode is
-changed to input when reading but changed back before rboot continues.
-
-After a GPIO boot the ``current_rom`` field will be updated in the
-config, so the GPIO booted rom should change this again if required.
-
-GPIO boot skip mode
-===================
-
-.. envvar:: RBOOT_GPIO_SKIP_ENABLED
-
-If rBoot is compiled with ``BOOT_GPIO_SKIP_ENABLED`` set in ``rboot.h``
-(or ``RBOOT_GPIO_SKIP_ENABLED`` set in the Makefile), then a GPIO can be
-used to skip to the next rom at boot. The feature must then be enabled
-by setting the rboot_config ‘mode’ field to ``MODE_GPIO_SKIP``. This
-means you do not need to have a dedicated GPIO boot rom. If you have a
-rom that is technically good (valid checksum, etc.) but has operational
-problems, e.g. wifi doesn’t work or it crashes on boot, rBoot will not
-be able to detect that and switch rom automatically. In this scenario
-rebooting the device while pulling the GPIO low will force rBoot to skip
-this rom and try the next one instead. In a simple two rom setup this
-simply toggles booting of the other rom.
-
-``RBOOT_GPIO_SKIP_ENABLED`` and ``RBOOT_GPIO_ENABLED`` cannot be used at
-the same time. ``BOOT_GPIO_NUM`` is used to select the GPIO pin, as with
-``RBOOT_GPIO_ENABLED``.
-
-Erasing SDK configuration on GPIO boot (rom or skip mode)
-=========================================================
-
-If you set the ``MODE_GPIO_ERASES_SDKCONFIG`` flag in the configuration
-like this: ``conf.mode = MODE_GPIO_ROM|MODE_GPIO_ERASES_SDKCONFIG``;
-then a GPIO boot will also the erase the Espressif SDK persistent
-settings store in the final 16KB of flash. This includes removing
-calibration constants, saved SSIDs, etc.
-
-Note that ``MODE_GPIO_ERASES_SDKCONFIG`` is a flag, so it has to be set
-as well as ``MODE_GPIO_ROM`` to take effect.
-
-Linking user code
-=================
-
-Each rom will need to be linked with an appropriate linker file,
-specifying where it will reside on the flash. If you are only flashing
-one rom to multiple places on the flash it must be linked multiple times
-to produce the set of rom images. This is the same as with the SDK
-loader.
-
-Because there are endless possibilities for layout with this loader I
-don’t supply sample linker files. Instead I’ll tell you how to make
-them.
-
-For each rom slot on the flash take a copy of the ``eagle.app.v6.ld``
-linker script from the sdk. You then need to modify just one line in it
-for each rom:
-``irom0_0_seg :                         org = 0x40240000, len = 0x3C000``
-
-Change the org address to be ``0x40200000`` (base memory mapped location
-of the flash) + flash address + ``0x10`` (offset of data after the
-header). The logical place for your first rom is the third sector,
-address ``0x2000``. ``0x40200000 + 0x2000 + 0x10 = 0x40202010`` If you
-use the default generated config the loader will expect to find the
-second rom at flash address half-chip-size + ``0x2000``
-(e.g. ``0x82000`` on an 8MBit flash) so the ``irom0_0_seg`` should be:
-``0x40200000 + 0x82000 + 0x10 = 0x40282010`` Due to the limitation of
-mapped flash (max 8MBit) if you use a larger chip and do not have big
-flash support enabled the second rom in the default config will still be
-placed at ``0x082000``, not truly half-chip-size + ``0x2000``. Ideally
-you should also adjust the len to help detect over sized sections at
-link time, but more important is the overall size of the rom which you
-need to ensure fits in the space you have allocated for it in your flash
-layout plan.
-
-Then simply compile and link as you would normally for OTA updates with
-the SDK boot loader, except using the linker scripts you’ve just
-prepared rather than the ones supplied with the SDK. Remember when
-building roms to create them as ‘new’ type roms (for use with SDK boot
-loader v1.2+). Or if using my esptool2 use the ``-boot2`` option. Note:
-the test loads included with rBoot are built with ``-boot0`` because
-they do not contain a ``.irom0.text`` section (and so the value of
-``irom0_0_seg`` in the linker file is irrelevant to them) but ‘normal’
-user apps always do.
-
-irom checksum
-=============
-
-The SDK boot loader checksum only covers sections loaded into ram (data
-and some code). Most of the SDK and user code remains on the flash and
-that is not included in the checksum. This means you could attempt to
-boot a corrupt rom and, because it looks ok to the boot loader, there
-will be no attempt to switch to a backup rom. rBoot improves on this by
-allowing the ``.irom0.text`` section to be included in the checksum. To
-enable this uncomment ``#define BOOT_IROM_CHKSUM`` in ``rboot.h`` and
-build your roms with esptool2 using the ``-iromchksum`` option.
-
-.. _big_flash_support:
-
-Big flash support
-=================
-
-This only needs to be enabled if you wish to be able to memory map more
-than the first 8MBit of the flash. Note you can still only map 8Mbit at
-a time. Use this if you want to have multiple 1MB roms, or more smaller
-roms than will fit in 8Mbits. If you have a large flash but only need,
-for example, two 512KB roms you do not need to enable this mode.
-
-Support in rBoot is enabled by uncommenting the
-``#define BOOT_BIG_FLASH`` in ``rboot.h``.
-
-Thinking about your linker files is either simpler or more complicated,
-depending on your usage of the flash. If you intend to use multiple 1MB
-roms you will only need one linker file and you only need to link once
-for OTA updates. Although when you perform an OTA update the rom will be
-written to a different position on the flash, each 8Mbit of flash is
-mapped (separately) to ``0x40200000``. So when any given rom is run the
-code will appear at the same place in memory regardless of where it is
-on the flash. Your base address for the linker would be ``0x40202010``.
-(Actually all but the first rom could base at ``0x40200010`` (because
-they don’t need to leave space for rBoot and config) but then you’re
-just making it more complicated again!)
-
-If you wanted eight 512KB roms you would need two linker files - one for
-the first half of any given 8Mbits of flash and another for the second
-half. Just remember you are really laying out within a single 8MBit
-area, which can then be replicated multiple times on the flash.
-
-Now the clever bit - rBoot needs to hijack the memory mapping code to
-select which 8Mbits gets mapped. There is no API for this, but we can
-override the SDK function. First we need to slightly modify the SDK
-library ``libmain.a``, like so:
-
-::
-
-   xtensa-lx106-elf-objcopy -W Cache_Read_Enable_New libmain.a libmain2.a
-
-This produces a version of libmain with a ‘weakened’
-``Cache_Read_Enable_New`` function, which we can then override with our
-own. Modify your Makefile to link against the library ``main2`` instead
-of ``main``.
-
-Next add ``rboot-bigflash.c`` (from the ``appcode`` directory) &
-``rboot.h`` to your project - this adds the replacement
-``Cache_Read_Enable_New`` to your code.
-
-Getting gcc to apply the override correctly can be slightly tricky (I’m
-not sure why, it shouldn’t be). One option is to add
-``-u Cache_Read_Enable_New`` to your ``LD_FLAGS`` and change the order
-of objects on the LD command so your ``objects/.a`` file is before the
-libraries. Another way that seems easier was to
-``#include rboot-bigflash.c`` into the main .c file, rather than
-compiling it to a separate object file. I can’t make any sense of that,
-but I suggest you uncomment the message in the ``Cache_Read_Enable_New``
-function when you first build with it, to make sure you are getting your
-version into the rom.
-
-Now when rBoot starts your rom, the SDK code linked in it that normally
-performs the memory mapping will delegate part of that task to rBoot
-code (linked in your rom, not in rBoot itself) to choose which part of
-the flash to map.
-
-Temporary boot option and rBoot<–>app communication
-===================================================
-
-.. envvar:: RBOOT_RTC_ENABLED
-
-To enable communication between rBoot and your app you should enable the
-``BOOT_RTC_ENABLED`` option in ``rboot.h``. rBoot will then use the RTC
-data area to pass a structure with boot information which can be read by
-the app. This will allow the app to determine the boot mode (normal,
-temporary or GPIO) and the booted rom (even if it is a tempoary boot).
-Your app can also update this structure to communicate with rBoot when
-the device is next rebooted, e.g. to instruct it to temporarily boot a
-different rom to the one saved in the config. See the api documentation
-and/or the rBoot sample project for more details. Note: the message
-“don’t use rtc mem data�, commonly seen on startup, comes from the sdk
-and is not related to this rBoot feature.
-
-Integration into other frameworks
-=================================
-
-If you wish to integrate rBoot into a development framework (e.g. Sming)
-you can set the define ``RBOOT_INTEGRATION`` and at compile time the
-file ``rboot-integration.h`` will be included into the source. This
-should allow you to set some platform specific options without having to
-modify the source of rBoot which makes it easier to integrate and
-maintain.
diff --git a/Sming/Components/rboot/README.rst b/Sming/Components/rboot/README.rst
index 50cd239c2a..95ddeb0203 100644
--- a/Sming/Components/rboot/README.rst
+++ b/Sming/Components/rboot/README.rst
@@ -10,10 +10,24 @@ pre-configured flash memory addresses, called "slots". Sming supports up to thre
 .. note::
 
    With Sming 4.3 partitions are used to manage flash storage.
-   A "slot" refers to a specific application partition, namely ``rom0``, ``rom1`` or ``rom2``.
+   A "slot" refers to a specific application partition, typically ``rom0``, ``rom1`` or ``rom2``.
 
    The location or size of these partitions is determined by the :ref:`hardware_config`.
 
+   The bootloader has been modified to use the partition table as reference, identifying slots
+   by the partition sub-type.
+
+   Where systems are to be updated Over the Air (OTA) at least two application partitions are required.
+   The bootloader identifies these by their partition subtype: ``slot #0`` -> ``App/Ota_0``, ``slot #1`` -> ``App/Ota_1``, etc.
+
+   Fixed applications without OTA capability use a single application image.
+   This must be the ``App/Factory`` partition type, and corresponds to ``slot #0``.
+
+   At startup, the bootloader will use the partition table to locate the application image.
+   It will also ensure that the ROM slot information in the boot configuration is consistent,
+   and update it if necessary.
+
+
 .. attention::
 
    Make sure that your slots do not extend beyond a 1MB boundary and 
diff --git a/Sming/Components/rboot/component.mk b/Sming/Components/rboot/component.mk
index 814296d7d5..96f9441e53 100644
--- a/Sming/Components/rboot/component.mk
+++ b/Sming/Components/rboot/component.mk
@@ -125,7 +125,11 @@ endif
 
 COMPONENT_CXXFLAGS += \
 		-DRBOOT_ROM0_ADDR=$(RBOOT_ROM0_ADDR) \
-		-DRBOOT_ROM1_ADDR=$(RBOOT_ROM1_ADDR)
+		-DRBOOT_ROM1_ADDR=$(RBOOT_ROM1_ADDR) \
+		-DPARTITION_TABLE_OFFSET=$(PARTITION_TABLE_OFFSET)
+
+COMPONENT_CFLAGS += \
+		-DPARTITION_TABLE_OFFSET=$(PARTITION_TABLE_OFFSET)
 
 ifdef RBOOT_EMULATION
 FLASH_BOOT_CHUNKS		= 0x00000=$(BLANK_BIN)
@@ -136,7 +140,7 @@ export RBOOT_ROM1_ADDR
 RBOOT_BIN				:= $(FW_BASE)/rboot.bin
 CUSTOM_TARGETS			+= $(RBOOT_BIN)
 $(RBOOT_BIN):
-	$(Q) $(MAKE) -C $(RBOOT_DIR)/rboot $(RBOOT_CFLAGS)
+	$(Q) $(MAKE) -C $(RBOOT_DIR)/rboot PARTITION_TABLE_OFFSET=$(PARTITION_TABLE_OFFSET) $(RBOOT_CFLAGS)
 
 EXTRA_LDFLAGS			:= -u Cache_Read_Enable_New
 
diff --git a/Sming/Components/rboot/include/Data/Stream/RbootOutputStream.h b/Sming/Components/rboot/include/Data/Stream/RbootOutputStream.h
index 30c8b85db8..1873d01885 100644
--- a/Sming/Components/rboot/include/Data/Stream/RbootOutputStream.h
+++ b/Sming/Components/rboot/include/Data/Stream/RbootOutputStream.h
@@ -17,6 +17,7 @@
 
 #include <Data/Stream/ReadWriteStream.h>
 #include <rboot-api.h>
+#include <Storage/Partition.h>
 
 /**
  * @brief Write-only stream type used during rBoot firmware updates
@@ -25,13 +26,23 @@ class RbootOutputStream : public ReadWriteStream
 {
 public:
 	/**
+	 * @brief Construct a stream using raw flash address/size
 	 * @param startAddress the start address on the storage media
 	 * @param maxLength the maximum allowed length of the rom. Use 0 if unlimited.
+	 * @note This should be avoided, use partition where possible
 	 */
 	RbootOutputStream(uint32_t startAddress, size_t maxLength = 0) : startAddress(startAddress), maxLength(maxLength)
 	{
 	}
 
+	/**
+	 * @brief Construct a stream for the given partition
+	 * @param partition
+	 */
+	RbootOutputStream(Storage::Partition partition) : startAddress(partition.address()), maxLength(partition.size())
+	{
+	}
+
 	virtual ~RbootOutputStream()
 	{
 		close();
@@ -77,11 +88,11 @@ class RbootOutputStream : public ReadWriteStream
 	}
 
 protected:
-	bool initialized = false;
-	rboot_write_status rBootWriteStatus = {};
-	size_t written = 0;		   // << the number of written bytes
-	uint32_t startAddress = 0; // << the start address on the storage
-	size_t maxLength = 0;	  // << maximum allowed length
+	bool initialized{false};
+	rboot_write_status rBootWriteStatus{};
+	size_t written{0};		  // << the number of written bytes
+	uint32_t startAddress{0}; // << the start address on the storage
+	size_t maxLength{0};	  // << maximum allowed length
 
 protected:
 	virtual bool init();
diff --git a/Sming/Components/rboot/include/Network/RbootHttpUpdater.h b/Sming/Components/rboot/include/Network/RbootHttpUpdater.h
index c7ed16a43c..f8328ed764 100644
--- a/Sming/Components/rboot/include/Network/RbootHttpUpdater.h
+++ b/Sming/Components/rboot/include/Network/RbootHttpUpdater.h
@@ -18,32 +18,101 @@
 #include <Network/HttpClient.h>
 #include "../Data/Stream/RbootOutputStream.h"
 
-#define NO_ROM_SWITCH 0xff
+/**
+ * @brief Magic value for ROM slot indicating slot won't change after successful OTA
+ */
+constexpr uint8_t NO_ROM_SWITCH{0xff};
 
 class RbootHttpUpdater;
 
-typedef Delegate<void(RbootHttpUpdater& client, bool result)> OtaUpdateDelegate;
-
-struct RbootHttpUpdaterItem {
-	String url;
-	uint32_t targetOffset;
-	size_t size;						 // << max allowed size
-	RbootOutputStream* stream = nullptr; // (optional) output stream to use.
-};
+using OtaUpdateDelegate = Delegate<void(RbootHttpUpdater& client, bool result)>;
 
 class RbootHttpUpdater : protected HttpClient
 {
 public:
-	virtual ~RbootHttpUpdater()
+	struct Item {
+		String url;
+		uint32_t targetOffset;
+		size_t size;						// << max allowed size
+		RbootOutputStream* stream{nullptr}; // (optional) output stream to use.
+
+		Item(String url, uint32_t targetOffset, size_t size, RbootOutputStream* stream)
+			: url(url), targetOffset(targetOffset), size(size), stream(stream)
+		{
+		}
+
+		~Item()
+		{
+			delete stream;
+		}
+
+		RbootOutputStream* getStream()
+		{
+			if(stream == nullptr) {
+				stream = new RbootOutputStream(targetOffset, size);
+			}
+			return stream;
+		}
+	};
+
+	class ItemList : public Vector<Item>
 	{
-		cleanup();
+	public:
+		bool addNew(Item* it)
+		{
+			if(addElement(it)) {
+				return true;
+			}
+			delete it;
+			return false;
+		}
+	};
+
+	/**
+	 * @brief Add an item to update
+	 * @param offset
+	 * @param firmwareFileUrl
+	 * @param maxSize
+	 * @retval bool
+	 * @note Use the `Partition` overload where possible
+	 */
+	bool addItem(uint32_t offset, const String& firmwareFileUrl, size_t maxSize = 0)
+	{
+		return items.addNew(new Item{firmwareFileUrl, offset, maxSize, nullptr});
+	}
+
+	/**
+	 * @brief Add an item to update
+	 * @param firmwareFileUrl
+	 * @param partition Target partition to write
+	 * @retval bool
+	 */
+	bool addItem(const String& firmwareFileUrl, Storage::Partition partition)
+	{
+		return addItem(partition.address(), firmwareFileUrl, partition.size());
 	}
 
-	bool addItem(uint32_t offset, const String& firmwareFileUrl, size_t maxSize = 0);
-	bool addItem(const String& firmwareFileUrl, RbootOutputStream* stream = nullptr);
+	/**
+	 * @brief Add an item to update use a pre-constructed stream
+	 * @param firmwareFileUrl
+	 * @param stream
+	 * @retval bool
+	 */
+	bool addItem(const String& firmwareFileUrl, RbootOutputStream* stream)
+	{
+		if(stream == nullptr) {
+			return false;
+		}
+
+		return items.addNew(new Item{firmwareFileUrl, stream->getStartAddress(), stream->getMaxLength(), stream});
+	}
 
 	void start();
 
+	/**
+	 * @brief On completion, switch to the given ROM slot
+	 * @param romSlot specify NO_ROM_SWITCH (the default) to cancel any previously set switch
+	 */
 	void switchToRom(uint8_t romSlot)
 	{
 		this->romSlot = romSlot;
@@ -59,11 +128,13 @@ class RbootHttpUpdater : protected HttpClient
 		this->updateDelegate = reqUpdateDelegate;
 	}
 
-	/* Sets the base request that can be used to pass
-	 * - default request parameters, like request headers...
-	 * - default SSL options
-	 * - default SSL fingeprints
-	 * - default SSL client certificates
+	/**
+	 *  @brief Sets the base request that can be used to pass
+	 * 
+	 * 		- default request parameters, like request headers...
+	 * 		- default SSL options
+	 * 		- default SSL fingeprints
+	 * 		- default SSL client certificates
 	 *
 	 * @param request
 	 */
@@ -72,10 +143,21 @@ class RbootHttpUpdater : protected HttpClient
 		baseRequest = request;
 	}
 
-	// Allow reading items
-	RbootHttpUpdaterItem getItem(unsigned int index)
+	/**
+	 * @brief Allow reading items
+	 * @deprecated Access list directly using `getItems()`
+	 */
+	const Item& getItem(unsigned int index) const SMING_DEPRECATED
+	{
+		return items[index];
+	}
+
+	/**
+	 * @brief Allow read access to item list
+	 */
+	const ItemList& getItems() const
 	{
-		return items.elementAt(index);
+		return items;
 	}
 
 protected:
@@ -86,24 +168,16 @@ class RbootHttpUpdater : protected HttpClient
 	virtual int updateComplete(HttpConnection& client, bool success);
 
 protected:
-	Vector<RbootHttpUpdaterItem> items;
-	int currentItem = 0;
-	rboot_write_status rbootWriteStatus;
-	uint8_t romSlot = NO_ROM_SWITCH;
-	OtaUpdateDelegate updateDelegate = nullptr;
-
-	HttpRequest* baseRequest = nullptr;
-
-private:
-	void cleanup()
-	{
-		for(unsigned i = 0; i < items.count(); i++) {
-			delete items[i].stream;
-			items[i].stream = nullptr;
-		}
-		items.clear();
-	}
+	ItemList items;
+	OtaUpdateDelegate updateDelegate;
+	HttpRequest* baseRequest{nullptr};
+	uint8_t romSlot{NO_ROM_SWITCH};
+	uint8_t currentItem{0};
+	rboot_write_status rbootWriteStatus{};
 };
 
 /** @deprecated Use `RbootHttpUpdater` */
 typedef RbootHttpUpdater rBootHttpUpdate SMING_DEPRECATED;
+
+/** @deprecated Use 'auto' in expressions or `RbootHttpUpdater::Item` */
+typedef RbootHttpUpdater::Item RBootHttpUpdaterItem SMING_DEPRECATED;
diff --git a/Sming/Components/rboot/rboot b/Sming/Components/rboot/rboot
index 614f33685d..4ad3ba2a8f 160000
--- a/Sming/Components/rboot/rboot
+++ b/Sming/Components/rboot/rboot
@@ -1 +1 @@
-Subproject commit 614f33685d0dd990fc4202f2409b0d2365eeaef3
+Subproject commit 4ad3ba2a8f6d48d8ab90e0e7c67d42cac49f4da3
diff --git a/Sming/Components/rboot/src/Arch/Host/rboot.cpp b/Sming/Components/rboot/src/Arch/Host/rboot.cpp
index 96c5719d88..3eec026938 100644
--- a/Sming/Components/rboot/src/Arch/Host/rboot.cpp
+++ b/Sming/Components/rboot/src/Arch/Host/rboot.cpp
@@ -13,6 +13,16 @@
 #include <hostlib/hostmsg.h>
 #include <WString.h>
 
+static uint32_t SPIRead(uint32_t addr, void* outptr, uint32_t len)
+{
+	return (flashmem_read(outptr, addr, len) == len) ? 0 : 1;
+}
+
+#define SPIEraseSector(sector) flashmem_erase_sector(sector)
+#define echof(fmt, ...) host_printf(fmt, ##__VA_ARGS__)
+
+#include <partition.h>
+
 /*
  * Called from emulator startup code after flash has been initialised.
  */
@@ -20,18 +30,14 @@ void host_init_bootloader()
 {
 	rboot_config romconf = rboot_get_config();
 
-	bool init;
-
 	// fresh install or old version?
+	bool init = false;
 	if(romconf.magic != BOOT_CONFIG_MAGIC) {
 		hostmsg("MAGIC mismatch");
 		init = true;
 	} else if(romconf.version != BOOT_CONFIG_VERSION) {
 		hostmsg("VERSION mismatch: %u found, current %u", romconf.version, BOOT_CONFIG_VERSION);
 		init = true;
-	} else {
-		// OK
-		init = false;
 	}
 
 	if(init) {
@@ -39,16 +45,22 @@ void host_init_bootloader()
 		memset(&romconf, 0, sizeof(romconf));
 		romconf.magic = BOOT_CONFIG_MAGIC;
 		romconf.version = BOOT_CONFIG_VERSION;
-		romconf.count = 2;
-		romconf.roms[0] = RBOOT_ROM0_ADDR;
-#ifdef BOOT_ROM1_ADDR
-		romconf.roms[1] = RBOOT_ROM1_ADDR;
-#else
-		size_t flashsize = flashmem_get_size_bytes();
-		romconf.roms[1] = RBOOT_ROM0_ADDR + (flashsize / 2);
-#endif
+	}
+
+	// Read ROM locations from partition table
+	bool config_changed = false;
+	if(scan_partitions(&romconf)) {
+		config_changed = true;
+	}
+
+	if(romconf.count == 0) {
+		hostmsg("ERROR! No App partitions found\r\n");
+		return;
+	}
+
+	if(init || config_changed) {
 		bool ok = rboot_set_config(&romconf);
-		hostmsg("Write default config: %s", ok ? "OK" : "FAIL");
+		hostmsg("Update rBoot config: %s", ok ? "OK" : "FAIL");
 	}
 
 	String addr;
diff --git a/Sming/Components/rboot/src/RbootHttpUpdater.cpp b/Sming/Components/rboot/src/RbootHttpUpdater.cpp
index 07d28bf31d..78ed79e27a 100644
--- a/Sming/Components/rboot/src/RbootHttpUpdater.cpp
+++ b/Sming/Components/rboot/src/RbootHttpUpdater.cpp
@@ -15,36 +15,13 @@
 
 #include <Network/RbootHttpUpdater.h>
 
-bool RbootHttpUpdater::addItem(uint32_t offset, const String& firmwareFileUrl, size_t maxSize)
-{
-	RbootHttpUpdaterItem add;
-	add.targetOffset = offset;
-	add.url = firmwareFileUrl;
-	add.size = maxSize;
-	add.stream = nullptr;
-	return items.add(add);
-}
-
-bool RbootHttpUpdater::addItem(const String& firmwareFileUrl, RbootOutputStream* stream)
-{
-	if(stream == nullptr) {
-		return false;
-	}
-
-	RbootHttpUpdaterItem add;
-	add.targetOffset = stream->getStartAddress();
-	add.url = firmwareFileUrl;
-	add.size = stream->getMaxLength();
-	add.stream = stream;
-
-	return items.add(add);
-}
-
 void RbootHttpUpdater::start()
 {
 	for(unsigned i = 0; i < items.count(); i++) {
-		RbootHttpUpdaterItem& it = items[i];
-		debug_d("Download file:\r\n    (%d) %s -> %X", currentItem, it.url.c_str(), it.targetOffset);
+		auto& it = items[i];
+		debug_d("Download file:\r\n"
+				"    (%u) %s -> %X",
+				currentItem, it.url.c_str(), it.targetOffset);
 
 		HttpRequest* request;
 		if(baseRequest != nullptr) {
@@ -55,12 +32,7 @@ void RbootHttpUpdater::start()
 		}
 
 		request->setMethod(HTTP_GET);
-
-		if(it.stream == nullptr) {
-			it.stream = new RbootOutputStream(it.targetOffset, it.size);
-		}
-
-		request->setResponseStream(it.stream);
+		request->setResponseStream(it.getStream());
 
 		if(i == items.count() - 1) {
 			request->onRequestComplete(RequestCompletedDelegate(&RbootHttpUpdater::updateComplete, this));
@@ -82,8 +54,8 @@ int RbootHttpUpdater::itemComplete(HttpConnection& client, bool success)
 		return -1;
 	}
 
-	RbootHttpUpdaterItem& it = items[currentItem];
-	debug_d("Finished: URL: %s, Offset: %d, Length: %d", it.url.c_str(), it.stream->getStartAddress(),
+	auto& it = items[currentItem];
+	debug_d("Finished: URL: %s, Offset: 0x%X, Length: %u", it.url.c_str(), it.stream->getStartAddress(),
 			it.stream->available());
 
 	it.stream = nullptr; // the actual deletion will happen outside of this class
@@ -94,14 +66,14 @@ int RbootHttpUpdater::itemComplete(HttpConnection& client, bool success)
 
 int RbootHttpUpdater::updateComplete(HttpConnection& client, bool success)
 {
-	auto hasError = itemComplete(client, success);
-	if(hasError) {
+	int hasError = itemComplete(client, success);
+	if(hasError != 0) {
 		return hasError;
 	}
 
 	debug_d("\r\nFirmware download finished!");
 	for(unsigned i = 0; i < items.count(); i++) {
-		debug_d(" - item: %d, addr: %X, url: %s", i, items[i].targetOffset, items[i].url.c_str());
+		debug_d(" - item: %u, addr: 0x%X, url: %s", i, items[i].targetOffset, items[i].url.c_str());
 	}
 
 	if(!success) {
@@ -124,19 +96,19 @@ void RbootHttpUpdater::updateFailed()
 	if(updateDelegate) {
 		updateDelegate(*this, false);
 	}
-	cleanup();
+	items.clear();
 }
 
 void RbootHttpUpdater::applyUpdate()
 {
-	cleanup();
+	items.clear();
 	if(romSlot == NO_ROM_SWITCH) {
 		debug_d("Firmware updated.");
 		return;
 	}
 
 	// set to boot new rom and then reboot
-	debug_d("Firmware updated, rebooting to rom %d...\r\n", romSlot);
+	debug_d("Firmware updated, rebooting to rom %u...\r\n", romSlot);
 	rboot_set_current_rom(romSlot);
 	System.restart();
 }
diff --git a/Sming/Components/spiffs/component.mk b/Sming/Components/spiffs/component.mk
index e82a68d993..77064eb4a3 100644
--- a/Sming/Components/spiffs/component.mk
+++ b/Sming/Components/spiffs/component.mk
@@ -25,22 +25,12 @@ COMPONENT_RELINK_VARS += SPIFFS_OBJ_META_LEN
 SPIFFS_OBJ_META_LEN ?= 16
 COMPONENT_CFLAGS += -DSPIFFS_OBJ_META_LEN=$(SPIFFS_OBJ_META_LEN)
 
-##@Cleaning
-
-.PHONY: spiffs-image-clean
-spiffs-image-clean: ##Remove SPIFFS image file
-	$(info Cleaning $(SPIFF_BIN_OUT))
-	$(Q) rm -f $(SPIFF_BIN_OUT)
-
 ##@Building
 
 # Spiffs image generation tool
 SPIFFSGEN := $(PYTHON) $(COMPONENT_PATH)/spiffsgen.py
 SPIFFSGEN_SMING = $(SPIFFSGEN) --meta-len=$(SPIFFS_OBJ_META_LEN) --block-size=8192
 
-.PHONY: spiffs-image-update
-spiffs-image-update: spiffs-image-clean $(SPIFF_BIN_OUT) ##Rebuild the SPIFFS filesystem image
-
 # Target invoked via partition table
 ifneq (,$(filter spiffsgen,$(MAKECMDGOALS)))
 PART_TARGET := $(PARTITION_$(PART)_FILENAME)
diff --git a/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.cpp b/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.cpp
index c1ac6be9e4..af28c04518 100644
--- a/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.cpp
+++ b/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.cpp
@@ -13,6 +13,7 @@
 #include <esp_spi_flash.h>
 #include <Data/HexString.h>
 #include <FlashString/Array.hpp>
+#include <Storage/SpiFlash.h>
 
 extern "C" uint32 user_rf_cal_sector_set(void);
 
@@ -27,29 +28,13 @@ DECLARE_FSTR_ARRAY(AppFlashRegionOffsets, uint32_t);
 BasicStream::Slot::Slot()
 {
 	// Get parameters of the slot where the firmware image should be stored.
-	const rboot_config bootConfig = rboot_get_config();
-	uint8_t currentSlot = bootConfig.current_rom;
-	index = (currentSlot == 0 ? 1 : 0);
-	address = bootConfig.roms[index];
-	size = 0x100000 - (address & 0xFFFFF);
+	uint8_t currentSlot = rboot_get_current_rom();
+	index = (currentSlot == 0) ? 1 : 0;
 
-	const auto limitSize = [&](uint32_t otherAddress) {
-		if(otherAddress > address) {
-			size = std::min(size, otherAddress - address);
-		}
-	};
-
-	limitSize(flashmem_get_size_bytes());
-	limitSize(user_rf_cal_sector_set() * INTERNAL_FLASH_SECTOR_SIZE);
-	for(uint8_t i = 0; i < bootConfig.count; ++i) {
-		if(i != currentSlot) {
-			limitSize(bootConfig.roms[i]);
-		}
-	}
-
-	for(auto offset : AppFlashRegionOffsets) {
-		limitSize(offset);
-	}
+	// Lookup slot details from partition table
+	auto part = Storage::spiFlash->partitions().findOta(index);
+	address = part.address();
+	size = part.size();
 }
 
 BasicStream::BasicStream()
@@ -83,7 +68,7 @@ bool BasicStream::consume(const uint8_t*& data, size_t& size)
 void BasicStream::setError(Error code)
 {
 	assert(code != Error::None);
-	debug_e("Error: %s", errorToString(code).c_str());
+	debug_e("Error: %s", toString(code).c_str());
 	errorCode = code;
 	state = State::Error;
 }
@@ -225,6 +210,14 @@ size_t BasicStream::write(const uint8_t* data, size_t size)
 
 String BasicStream::errorToString(Error code)
 {
+	return toString(code);
+}
+
+} // namespace OtaUpgrade
+
+String toString(OtaUpgrade::BasicStream::Error code)
+{
+	using Error = OtaUpgrade::BasicStream::Error;
 	switch(code) {
 	case Error::None:
 		return nullptr;
@@ -254,5 +247,3 @@ String BasicStream::errorToString(Error code)
 		return F("<unknown error>");
 	}
 }
-
-} // namespace OtaUpgrade
diff --git a/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.h b/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.h
index 995c57034d..303431caae 100644
--- a/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.h
+++ b/Sming/Libraries/OtaUpgrade/OtaUpgrade/BasicStream.h
@@ -48,7 +48,7 @@ class BasicStream : public ReadWriteStream
 	/**
 	 * @brief Error code values
 	 */
-	enum Error {
+	enum class Error {
 		None,			  ///< No error occured thus far (default value of \c #errorCode if `hasError()` returns false)
 		InvalidFormat,	///< Invalid/unsupported upgrade file format
 		UnsupportedData,  ///< Some content of the upgrade file is not supported by this version of OtaUpgradeStream.
@@ -67,8 +67,9 @@ class BasicStream : public ReadWriteStream
 
 	/** @brief Convert error code to string.
 	 * @see #errorCode
+	 * @deprecated Use `toString()` global function
 	 */
-	static String errorToString(Error code);
+	static String errorToString(Error code) SMING_DEPRECATED;
 
 	/** @brief Process chunk of upgrade file.
 	 * @param data Pointer to chunk of data.
@@ -113,11 +114,12 @@ class BasicStream : public ReadWriteStream
 		uint32_t address;
 		uint32_t size;
 		uint8_t index;
-		bool updated = false;
-	} slot;
+		bool updated{false};
+	};
+	Slot slot;
 
 	// Instead of RbootOutputStream, the rboot write API is used directly because in a future extension the OTA file may contain data for multiple FLASH regions.
-	rboot_write_status rbootWriteStatus = {};
+	rboot_write_status rbootWriteStatus{};
 
 	enum class State {
 		Error,
@@ -128,14 +130,14 @@ class BasicStream : public ReadWriteStream
 		VerifyRoms,
 		RomsComplete,
 	};
-	State state = State::Header;
+	State state{State::Header};
 
 #ifdef ENABLE_OTA_SIGNING
 	using Verifier = SignatureVerifier;
-	static const uint32_t expectedHeaderMagic = OTA_HEADER_MAGIC_SIGNED;
+	static const uint32_t expectedHeaderMagic{OTA_HEADER_MAGIC_SIGNED};
 #else
 	using Verifier = ChecksumVerifier;
-	static const uint32_t expectedHeaderMagic = OTA_HEADER_MAGIC_NOT_SIGNED;
+	static const uint32_t expectedHeaderMagic{OTA_HEADER_MAGIC_NOT_SIGNED};
 #endif
 	Verifier verifier;
 
@@ -144,9 +146,9 @@ class BasicStream : public ReadWriteStream
 
 	Verifier::VerificationData verificationData;
 
-	size_t remainingBytes = 0;
-	uint8_t* destinationPtr = nullptr;
-	uint8_t romIndex = 0;
+	size_t remainingBytes{0};
+	uint8_t* destinationPtr{nullptr};
+	uint8_t romIndex{0};
 
 	void setupChunk(State nextState, size_t size, void* destination = nullptr)
 	{
@@ -183,3 +185,8 @@ class BasicStream : public ReadWriteStream
 };
 
 } // namespace OtaUpgrade
+
+/** @brief Convert error code to string.
+ * @see #errorCode
+ */
+String toString(OtaUpgrade::BasicStream::Error code);
diff --git a/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.cpp b/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.cpp
index 80a88457af..fa1c09a0f8 100644
--- a/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.cpp
+++ b/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.cpp
@@ -46,16 +46,15 @@ size_t EncryptedStream::write(const uint8_t* data, size_t size)
 
 			case Fragment::ChunkSize:
 				remainingBytes = 1 + chunkSizeMinusOne;
-				if(buffer == nullptr || bufferSize < remainingBytes) {
-					free(buffer);
-					buffer = (uint8_t*)malloc(remainingBytes);
-					if(buffer == nullptr) {
+				if(!buffer || bufferSize < remainingBytes) {
+					buffer.reset(new uint8_t[remainingBytes]);
+					if(!buffer) {
 						setError(Error::OutOfMemory);
 						break;
 					}
 					bufferSize = remainingBytes;
 				}
-				fragmentPtr = buffer;
+				fragmentPtr = buffer.get();
 				fragment = Fragment::Chunk;
 				break;
 
@@ -63,8 +62,8 @@ size_t EncryptedStream::write(const uint8_t* data, size_t size)
 				unsigned char tag;
 				size_t chiperTextLength = 1 + chunkSizeMinusOne;
 				unsigned long long messageLength = 0;
-				bool ok = (crypto_secretstream_xchacha20poly1305_pull(&state, buffer, &messageLength, &tag, buffer,
-																	  chiperTextLength, nullptr, 0) == 0);
+				bool ok = (crypto_secretstream_xchacha20poly1305_pull(&state, buffer.get(), &messageLength, &tag,
+																	  buffer.get(), chiperTextLength, nullptr, 0) == 0);
 				if(!ok || messageLength > bufferSize) {
 					setError(Error::DecryptionFailed);
 					break;
@@ -77,7 +76,7 @@ size_t EncryptedStream::write(const uint8_t* data, size_t size)
 					fragment = Fragment::None;
 				}
 
-				BasicStream::write(buffer, static_cast<size_t>(messageLength));
+				BasicStream::write(buffer.get(), size_t(messageLength));
 			} break;
 
 			case Fragment::None:
diff --git a/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.h b/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.h
index 3557c56f82..7b34375a33 100644
--- a/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.h
+++ b/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.h
@@ -28,11 +28,6 @@ class EncryptedStream : public BasicStream
 public:
 	EncryptedStream() = default;
 
-	~EncryptedStream()
-	{
-		free(buffer);
-	}
-
 	/** @brief Process an arbitrarily sized chunk of an encrypted OTA upgrade file.
 	 * @param data Pointer to chunk of data.
 	 * @param size Size of chunk pointed to by \a data in bytes.
@@ -55,12 +50,12 @@ class EncryptedStream : public BasicStream
 		Chunk,
 		None,
 	};
-	Fragment fragment = Fragment::Header;
 
-	size_t remainingBytes = sizeof(header);
-	uint8_t* fragmentPtr = header;
-	uint8_t* buffer = nullptr;
-	size_t bufferSize = 0;
+	Fragment fragment{Fragment::Header};
+	size_t remainingBytes{sizeof header};
+	uint8_t* fragmentPtr{header};
+	std::unique_ptr<uint8_t[]> buffer;
+	size_t bufferSize{0};
 };
 
 } // namespace OtaUpgrade
diff --git a/Sming/component.mk b/Sming/component.mk
index 8f3471a83c..4d3ba173fa 100644
--- a/Sming/component.mk
+++ b/Sming/component.mk
@@ -149,10 +149,9 @@ GLOBAL_CFLAGS		+= -DSTRING_OBJECT_SIZE=$(STRING_OBJECT_SIZE)
 ##@Flashing
 
 .PHONY: flashinit
-flashinit: $(ESPTOOL) $(FLASH_INIT_DATA) | $(FW_BASE) ##Erase your device's flash memory
+flashinit: $(ESPTOOL) | $(FW_BASE) ##Erase your device's flash memory
 	$(info Flash init data default and blank data)
 	$(Q) $(EraseFlash)
-	$(call WriteFlash,$(FLASH_INIT_CHUNKS))
 
 .PHONY: flashboot
 flashboot: $(FLASH_BOOT_LOADER) kill_term ##Write just the Bootloader
diff --git a/Tools/vscode/setup.py b/Tools/vscode/setup.py
index 4e59b0a0ab..8363406a23 100644
--- a/Tools/vscode/setup.py
+++ b/Tools/vscode/setup.py
@@ -32,6 +32,11 @@ def replace(self, path, name, prefix):
                 return '${%s%s}%s' % (prefix, name, s[len(value):])
         return path
 
+    def resolve(self, path):
+        """Convert any embedded environment variables into real paths
+        """
+        return os.path.expandvars(path)
+
     def subst_path(self, path, prefix=''):
         path = self.replace(path, 'SMING_HOME', prefix)
         path = self.replace(path, 'ESP_HOME', prefix)
@@ -113,9 +118,10 @@ def get_property(data, name, default):
     return data[name]
 
 def update_intellisense():
-    dirs = os.environ['COMPONENTS_EXTRA_INCDIR'].split()
-    for i, d in enumerate(dirs):
-        dirs[i] = check_path(env.subst_path(d))
+    dirs = []
+    for d in os.environ['COMPONENTS_EXTRA_INCDIR'].split():
+        if os.path.exists(d):
+            dirs += [check_path(env.subst_path(d))]
 
     propertiesFile = '.vscode/c_cpp_properties.json'
     if os.path.exists(propertiesFile):
@@ -185,11 +191,15 @@ def update_launch():
 def update_workspace():
     filename = 'sming.code-workspace'
     ws = load_json(filename, False)
+    template = load_template('workspace.json')
     if ws is None:
-        template = load_template('workspace.json')
         ws = template.copy()
-        # TODO: Make any required changes to generated
-        save_json(ws, filename)
+    schemas = ws['settings']['json.schemas'] = []
+    # ws['settings']['json.schemas']
+    for schema in template['settings']['json.schemas']:
+        schema['url'] = env.resolve(schema['url'])
+        schemas += [schema]
+    save_json(ws, filename)
 
 def main():
     if not env.SMING_HOME or not env.SMING_ARCH:
diff --git a/Tools/vscode/template/workspace.json b/Tools/vscode/template/workspace.json
index f5d5823978..a79cc17307 100644
--- a/Tools/vscode/template/workspace.json
+++ b/Tools/vscode/template/workspace.json
@@ -15,13 +15,13 @@
                 "fileMatch": [
                     "*.hw"
                 ],
-                "url": "{$SMING_HOME}/Components/Storage/schema.json"
+                "url": "file://${SMING_HOME}/Components/Storage/schema.json"
             },
             {
                 "fileMatch": [
                     "*.fwfs"
                 ],
-                "url": "${SMING_HOME}/Components/IFS/fsbuild/schema.json"
+                "url": "file://${SMING_HOME}/Components/IFS/fsbuild/schema.json"
             }
         ]
     }
diff --git a/docs/source/upgrading/4.2-4.3.rst b/docs/source/upgrading/4.2-4.3.rst
index 69fb0498e4..6698e12634 100644
--- a/docs/source/upgrading/4.2-4.3.rst
+++ b/docs/source/upgrading/4.2-4.3.rst
@@ -17,6 +17,12 @@ the :envvar:`HWCONFIG` setting.
 You can find full details in the :component:`Storage` library.
 See also background on :doc:`/information/flash`.
 
+Removed build targets
+    spiffs-image-update
+        Use the new `buildpart` target instead
+    spiffs-image-clean
+        Use the new `part-clean` target instead
+
 New and updated build targets
     hwconfig
         Displays the current configuration in JSON format
@@ -36,22 +42,18 @@ New and updated build targets
         ``make flashinit`` to write system parameter information. Failure to do this
         was a common problem and should now be a thing of the past.
     flashinit
-        This now just erases the flash memory, and is no longer a pre-requisite for ``make flash``.
-
-        The ESP8266 system parameter information has been moved into registered
-        partitions (phy_init and sys_param) near the beginning of flash memory.
-        It now gets written when running ``make flash``.
-
-        Previously, this information was kept right at the end of the flash memory,
-        so the location would vary depending on the setting of ``SPI_SIZE``.
-        This was a frequent cause of problems as the system would fail to start if this
-        was set incorrectly.
+        This now just erases the flash memory.
+        The ESP8266 initialisation data gets written when running ``make flash``.
     flashmap
         Flash just the partition map
     flashpart
         Flash a single partition, e.g. ``make flashpart PART=spiffs0``
     erasepart
         Erase a partition, e.g. ``make erasepart PART=spiffs0``
+    buildpart
+        Re-builds images associated with partitions, such as SPIFFS or other filesystem images.
+    part-clean
+        Removes any partition images with build information. This is done as part of a normal project `clean`.
 
 Configuration variables
     A number of configuration variables have been removed or made read-only, as these are now
diff --git a/samples/Basic_Storage/basic_storage.hw b/samples/Basic_Storage/basic_storage.hw
index 90da02eb6d..44caa91626 100644
--- a/samples/Basic_Storage/basic_storage.hw
+++ b/samples/Basic_Storage/basic_storage.hw
@@ -2,8 +2,15 @@
 	"name": "Basic Storage sample",
 	"base_config": "spiffs",
 	"devices": {
-		// Override default (conservative) flash settings for maximum performance
+		// If required, override default (conservative) flash settings
 		"spiFlash": {
+			/*
+			 * The default mode (dio) should work with all flash devices.
+			 * Make sure to set the mode according to your flash chip.
+			 * Allowed SPI modes are listed here:
+			 * https://sming.readthedocs.io/en/latest/_inc/Sming/Components/esptool/index.html#envvar-SPI_MODE.
+			*/
+			// "mode": "qio",
 			"speed": 80
 		}
 	},
diff --git a/samples/Basic_rBoot/app/application.cpp b/samples/Basic_rBoot/app/application.cpp
index b8e7397a30..cfb3f85655 100644
--- a/samples/Basic_rBoot/app/application.cpp
+++ b/samples/Basic_rBoot/app/application.cpp
@@ -96,17 +96,16 @@ void OtaUpdate()
 
 void Switch()
 {
-	uint8 before, after;
-	before = rboot_get_current_rom();
-	if(before == 0) {
-		after = 1;
+	uint8_t before = rboot_get_current_rom();
+	uint8_t after = (before == 0) ? 1 : 0;
+
+	Serial.printf(_F("Swapping from rom %u to rom %u.\r\n"), before, after);
+	if(rboot_set_current_rom(after)) {
+		Serial.println(F("Restarting...\r\n"));
+		System.restart();
 	} else {
-		after = 0;
+		Serial.println(F("Switch failed."));
 	}
-	Serial.printf("Swapping from rom %d to rom %d.\r\n", before, after);
-	rboot_set_current_rom(after);
-	Serial.println("Restarting...\r\n");
-	System.restart();
 }
 
 void ShowInfo()
@@ -116,15 +115,15 @@ void ShowInfo()
 	Serial.printf("CPU Frequency: %d MHz\r\n", system_get_cpu_freq());
 	Serial.printf("System Chip ID: %x\r\n", system_get_chip_id());
 	Serial.printf("SPI Flash ID: %x\r\n", Storage::spiFlash->getId());
-	//Serial.printf("SPI Flash Size: %d\r\n", (1 << ((spi_flash_get_id() >> 16) & 0xff)));
+	Serial.printf("SPI Flash Size: %x\r\n", Storage::spiFlash->getSize());
 
 	rboot_config conf;
 	conf = rboot_get_config();
 
 	debugf("Count: %d", conf.count);
-	debugf("ROM 0: 0x%08x", conf.roms[0]);
-	debugf("ROM 1: 0x%08x", conf.roms[1]);
-	debugf("ROM 2: 0x%08x", conf.roms[2]);
+	for(unsigned i = 0; i < MAX_ROMS; ++i) {
+		debugf("ROM %u: 0x%08x", i, conf.roms[i]);
+	}
 	debugf("GPIO ROM: %d", conf.gpio_rom);
 }
 
diff --git a/samples/Basic_rBoot/basic_rboot.hw b/samples/Basic_rBoot/basic_rboot.hw
index 64465e1b3a..27332cb161 100644
--- a/samples/Basic_rBoot/basic_rboot.hw
+++ b/samples/Basic_rBoot/basic_rboot.hw
@@ -2,11 +2,14 @@
 	"name": "Two ROM slots, two SPIFFS",
 	"base_config": "spiffs",
 	"partitions": {
+		"rom0": {
+			"subtype": "ota_0"
+		},
 		"rom1": {
 			"address": "0x108000",
 			"size": "992K",
 			"type": "app",
-			"subtype": "ota_0",
+			"subtype": "ota_1",
 			"filename": "$(RBOOT_ROM_1_BIN)"
 		},
 		"spiffs1": {
@@ -16,4 +19,4 @@
 			"subtype": "spiffs"
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/samples/Basic_rBoot/component.mk b/samples/Basic_rBoot/component.mk
index df007c2dfe..9555e50099 100644
--- a/samples/Basic_rBoot/component.mk
+++ b/samples/Basic_rBoot/component.mk
@@ -4,8 +4,4 @@
 RBOOT_ENABLED := 1
 
 ## Use standard hardware config with two ROM slots and two SPIFFS partitions
-ifeq ($(SMING_ARCH),Esp8266)
 HWCONFIG := basic_rboot
-else
-HWCONFIG := spiffs
-endif
diff --git a/samples/HttpServer_FirmwareUpload/app/application.cpp b/samples/HttpServer_FirmwareUpload/app/application.cpp
index 6c97838a30..2dbfe83325 100644
--- a/samples/HttpServer_FirmwareUpload/app/application.cpp
+++ b/samples/HttpServer_FirmwareUpload/app/application.cpp
@@ -38,7 +38,7 @@ int onUpload(HttpServerConnection& connection, HttpRequest& request, HttpRespons
 
 	response.code = HTTP_STATUS_BAD_REQUEST;
 	response.setContentType(MIME_HTML);
-	String html = "<H2 color='#444'>" + OtaUpgradeStream::errorToString(otaStream->errorCode) + "</H2>";
+	String html = "<H2 color='#444'>" + toString(otaStream->errorCode) + "</H2>";
 	response.headers[HTTP_HEADER_CONTENT_LENGTH] = html.length();
 	response.sendString(html);
 

From a17be7912dd4782da064c07e408d7437ebfd1be2 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 17 Mar 2021 10:20:54 +0100
Subject: [PATCH 67/91] Fixed small typo. (#2270)

---
 Sming/Components/rboot/include/Network/RbootHttpUpdater.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sming/Components/rboot/include/Network/RbootHttpUpdater.h b/Sming/Components/rboot/include/Network/RbootHttpUpdater.h
index f8328ed764..2100626770 100644
--- a/Sming/Components/rboot/include/Network/RbootHttpUpdater.h
+++ b/Sming/Components/rboot/include/Network/RbootHttpUpdater.h
@@ -180,4 +180,4 @@ class RbootHttpUpdater : protected HttpClient
 typedef RbootHttpUpdater rBootHttpUpdate SMING_DEPRECATED;
 
 /** @deprecated Use 'auto' in expressions or `RbootHttpUpdater::Item` */
-typedef RbootHttpUpdater::Item RBootHttpUpdaterItem SMING_DEPRECATED;
+typedef RbootHttpUpdater::Item RbootHttpUpdaterItem SMING_DEPRECATED;

From 082675d79f27c27d7c4ff2995e330dae610948d6 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Thu, 18 Mar 2021 09:21:33 +0000
Subject: [PATCH 68/91] Recreate partition table binary before flashing it
 (#2272)

---
 Sming/Components/Storage/component.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Sming/Components/Storage/component.mk b/Sming/Components/Storage/component.mk
index 986d7fe0d0..d83be1de7f 100644
--- a/Sming/Components/Storage/component.mk
+++ b/Sming/Components/Storage/component.mk
@@ -101,11 +101,12 @@ hwconfig-validate: $(HWCONFIG_PATH) ##Validate current hardware configuration
 
 # The partition table
 PARTITIONS_BIN := $(FW_BASE)/partitions.bin
-CUSTOM_TARGETS += $(PARTITIONS_BIN)
+CUSTOM_TARGETS += partmap-build
 
-$(PARTITIONS_BIN): $(HWCONFIG_DEPENDS)
+.PHONY: partmap-build
+partmap-build:
 	$(Q) $(MAKE) --no-print-directory hwconfig-validate
-	$(Q) $(HWCONFIG_TOOL) partgen $(HWCONFIG) $@
+	$(Q) $(HWCONFIG_TOOL) partgen $(HWCONFIG) $(PARTITIONS_BIN)
 
 
 # Create build target for a partition
@@ -192,7 +193,7 @@ readpart: kill_term ##Read partition from device, set PART=name
 	$(call ReadFlash,$(FLASH_PART_REGION),$(OUT_BASE)/$(PART).read.bin)
 
 .PHONY: flashmap
-flashmap: $(PARTITIONS_BIN) kill_term ##Write partition table to device
+flashmap: partmap-build kill_term ##Write partition table to device
 	$(call WriteFlash,$(FLASH_MAP_CHUNK))
 
 

From be370cb356c9d43a876f773cee8527b66f1caebd Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Thu, 18 Mar 2021 16:32:07 +0000
Subject: [PATCH 69/91] Update directory enumeration and FTP server (#2271)

This PR deals with directory listings in the framework.
Using a Vector<String> is inefficient, `Directory` object is almost as simple and more flexible.

The FTP framework and sample have been updated accordingly, with improvements to demonstrate use of
IFS file permissions.

Fully deprecate `fileList` and update framework using `Directory` object instead

Fix command handler in Host mode - requires different EOL character

Various minor updates and fixes to IFS component.

**Revise FTP Server**

Fix bad TcpConnection write calls
Simplify operation - some logic involving `canTransfer` doesn't seem to be necessary
Re-structure command handling, add login and file access checks.
More commands available if user isn't logged in, permissions handled by filesystem
Note: Default file permissions for new files written to SPIFFS are read/write for Admin only.
Extended directory listings: displayed 'w' value combines READ attribute with user permissions
Add HELP, NLST, CDUP, XCWD and XPWD commands
Base `FtpServer` on `CustomFtpServer` class, user may choose to manage users differently
FTP server can use separate filesystem if required

**Update FtpServer_Files sample**

Add FWFS and mount together with SPIFFS as a hybrid volume (makes things a bit more interesting)
Add another two user accounts with different roles
---
 Sming/Components/IFS                          |   2 +-
 Sming/Core/FileSystem.h                       |   4 +-
 Sming/Core/Network/Ftp/FtpDataFileList.h      |  78 ++-
 Sming/Core/Network/Ftp/FtpDataStream.h        |  64 ++-
 .../Core/Network/Ftp/FtpServerConnection.cpp  | 484 +++++++++++-------
 Sming/Core/Network/Ftp/FtpServerConnection.h  |  63 ++-
 Sming/Core/Network/FtpServer.cpp              |  27 +-
 Sming/Core/Network/FtpServer.h                |  69 ++-
 Sming/Core/Network/NetUtils.cpp               |  24 +-
 Sming/Core/Network/NetUtils.h                 |  43 +-
 .../CommandProcessing/CommandHandler.h        |   4 +
 samples/Basic_Storage/app/application.cpp     |  12 +-
 samples/Basic_rBoot/app/application.cpp       |  23 +-
 .../include/ExampleCommand.h                  |   5 +-
 samples/FtpServer_Files/README.rst            |  19 +-
 samples/FtpServer_Files/app/application.cpp   |  33 +-
 samples/FtpServer_Files/component.mk          |   2 +-
 samples/FtpServer_Files/fsimage.fwfs          |  39 ++
 samples/FtpServer_Files/ftpserver.hw          |  26 +
 19 files changed, 690 insertions(+), 331 deletions(-)
 create mode 100644 samples/FtpServer_Files/fsimage.fwfs
 create mode 100644 samples/FtpServer_Files/ftpserver.hw

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index a6ef5f4dee..330eea7867 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit a6ef5f4dee043093e7a03172521f0136e9645f5c
+Subproject commit 330eea786758f44b665ba4a62426d51326221e0d
diff --git a/Sming/Core/FileSystem.h b/Sming/Core/FileSystem.h
index 85d586bc21..0a33216790 100644
--- a/Sming/Core/FileSystem.h
+++ b/Sming/Core/FileSystem.h
@@ -357,9 +357,9 @@ inline int fileRename(const String& oldName, const String& newName)
 /** @brief  Get list of files on file system
  *  @retval Vector<String> Vector of strings.
             Each string element contains the name of a file on the file system
-    @deprecated use fileOpenDir / fileReadDir / fileCloseDir
+    @deprecated use `Directory` object (or fileOpenDir / fileReadDir / fileCloseDir)
  */
-Vector<String> fileList();
+Vector<String> fileList() SMING_DEPRECATED;
 
 /** @brief  Read content of a file
  *  @param  fileName Name of file to read from
diff --git a/Sming/Core/Network/Ftp/FtpDataFileList.h b/Sming/Core/Network/Ftp/FtpDataFileList.h
index 6e9808fe7b..582ed1d7bb 100644
--- a/Sming/Core/Network/Ftp/FtpDataFileList.h
+++ b/Sming/Core/Network/Ftp/FtpDataFileList.h
@@ -11,13 +11,36 @@
 #pragma once
 
 #include "FtpDataStream.h"
-#include "FileSystem.h"
+#include <DateTime.h>
+#include <SystemClock.h>
 
 class FtpDataFileList : public FtpDataStream
 {
 public:
-	explicit FtpDataFileList(FtpServerConnection& connection) : FtpDataStream(connection)
+	explicit FtpDataFileList(FtpServerConnection& connection, const String& path, bool namesOnly = false)
+		: FtpDataStream(connection), dir(connection.getFileSystem()), namesOnly(namesOnly)
 	{
+		auto fs = dir.getFileSystem();
+		assert(fs != nullptr);
+		auto& stat = const_cast<FileStat&>(dir.stat());
+		auto err = fs->stat(path, stat);
+		if(err != FS_OK) {
+			completed = true;
+			return;
+		}
+
+		if(stat.attr[FileAttribute::Directory]) {
+			dir.open(path);
+			statValid = dir.next();
+		} else {
+			statValid = true;
+		}
+
+		if(SystemClock.isSet()) {
+			year = DateTime(SystemClock.now()).Year;
+		} else {
+			debug_w("[FTP] Warning: system clock hasn't been set!");
+		}
 	}
 
 	void transferData(TcpConnectionEvent sourceEvent) override
@@ -25,17 +48,50 @@ class FtpDataFileList : public FtpDataStream
 		if(completed) {
 			return;
 		}
-		Vector<String> list = fileList();
-		debug_d("send file list: %d", list.count());
-		for(unsigned i = 0; i < list.count(); i++) {
-			String s = F("01-01-15  01:00AM               ");
-			s += fileGetSize(list[i]);
-			s += ' ';
-			s += list[i];
-			s += "\r\n";
-			writeString(s);
+
+		String line;
+		while(statValid) {
+			getStatLine(dir.stat(), line);
+			line += "\r\n";
+			if(line.length() > getAvailableWriteSize()) {
+				return;
+			}
+			int written = writeString(line);
+			if(written < 0) {
+				return;
+			}
+			statValid = dir.next();
 		}
+
+		debug_d("sent file list: %u", dir.count());
 		completed = true;
 		finishTransfer();
 	}
+
+	void getStatLine(const FileStat& stat, String& line)
+	{
+		line.setLength(0);
+		if(!namesOnly) {
+			auto& user = control.getUser();
+			DateTime dt{stat.mtime};
+			String timestr = dt.format((dt.Year == year) ? _F("%b %e %H:%M") : _F("%b %e  %Y"));
+			char buf[128];
+			PSTR_ARRAY(fmt, "--- %-6u %s ");
+			m_snprintf(buf, sizeof(buf), fmt, stat.size, timestr.c_str());
+			buf[0] = stat.attr[FileAttribute::Directory] ? 'd' : '-';
+			buf[1] = (user.role >= stat.acl.readAccess) ? 'r' : '-';
+			buf[2] = stat.attr[FileAttribute::ReadOnly] && (user.role >= stat.acl.writeAccess) ? 'w' : '-';
+			line = buf;
+		}
+		line.concat(stat.name, stat.name.length);
+		if(stat.attr[FileAttribute::Directory]) {
+			line += '/';
+		}
+	}
+
+private:
+	IFS::Directory dir;
+	uint16_t year;
+	bool namesOnly;
+	bool statValid;
 };
diff --git a/Sming/Core/Network/Ftp/FtpDataStream.h b/Sming/Core/Network/Ftp/FtpDataStream.h
index 499a69083a..13f2018c59 100644
--- a/Sming/Core/Network/Ftp/FtpDataStream.h
+++ b/Sming/Core/Network/Ftp/FtpDataStream.h
@@ -13,56 +13,66 @@
 #include "FtpServerConnection.h"
 #include "Network/TcpConnection.h"
 
+/*
+	RFC959:
+
+	User-DTP listens on data port when required.
+
+	Server is responsible for creating the data connection.
+
+	The server MUST close the data connection under the following conditions:
+
+		1. The server has completed sending data in a transfer mode
+		that requires a close to indicate EOF.
+
+		2. The server receives an ABORT command from the user.
+
+		3. The port specification is changed by a command from the user.
+
+		4. The control connection is closed legally or otherwise.
+
+		5. An irrecoverable error condition occurs.
+
+	Otherwise the close is a server option, the exercise of which the
+	server must indicate to the user-process by either a 250 or 226
+	reply only.
+*/
 class FtpDataStream : public TcpConnection
 {
 public:
-	explicit FtpDataStream(FtpServerConnection& connection) : TcpConnection(true), parent(connection)
+	explicit FtpDataStream(FtpServerConnection& control) : TcpConnection(true), control(control)
 	{
 	}
 
-	err_t onConnected(err_t err) override
+	~FtpDataStream()
 	{
-		//response(125, "Connected");
-		setTimeOut(300); // Update timeout
-		return TcpConnection::onConnected(err);
+		control.dataStreamDestroyed(this);
 	}
 
-	err_t onSent(uint16_t len) override
+	err_t onConnected(err_t err) override
 	{
-		sent += len;
-		if(written < sent || !completed) {
-			return TcpConnection::onSent(len);
-		}
-		finishTransfer();
-		return TcpConnection::onSent(len);
+		setTimeOut(300);
+		return TcpConnection::onConnected(err);
 	}
 
 	void finishTransfer()
 	{
 		close();
-		parent.dataTransferFinished(this);
+		control.dataTransferFinished(this);
 	}
 
 	void response(int code, String text = nullptr)
 	{
-		parent.response(code, text);
-	}
-
-	int write(const char* data, int len, uint8_t apiflags = 0) override
-	{
-		written += len;
-		return TcpConnection::write(data, len, apiflags);
+		control.response(code, text);
 	}
 
 	void onReadyToSendData(TcpConnectionEvent sourceEvent) override
 	{
-		if(!parent.isCanTransfer()) {
-			return;
-		}
-		if(completed && written == 0) {
+		if(completed) {
 			finishTransfer();
+		} else {
+			transferData(sourceEvent);
 		}
-		transferData(sourceEvent);
 	}
 
 	virtual void transferData(TcpConnectionEvent sourceEvent)
@@ -70,8 +80,6 @@ class FtpDataStream : public TcpConnection
 	}
 
 protected:
-	FtpServerConnection& parent;
+	FtpServerConnection& control;
 	bool completed{false};
-	unsigned written{0};
-	unsigned sent{0};
 };
diff --git a/Sming/Core/Network/Ftp/FtpServerConnection.cpp b/Sming/Core/Network/Ftp/FtpServerConnection.cpp
index 2fe610a7a3..863bb33026 100644
--- a/Sming/Core/Network/Ftp/FtpServerConnection.cpp
+++ b/Sming/Core/Network/Ftp/FtpServerConnection.cpp
@@ -14,9 +14,53 @@
 #include "FtpDataFileList.h"
 #include "../FtpServer.h"
 #include "Network/NetUtils.h"
+#include <Data/CStringArray.h>
+
+// Name, Comment
+#define FTP_COMMAND_MAP(XX)                                                                                            \
+	XX(ACCT, "Identifies user's account")                                                                              \
+	XX(CWD, "Change working directory")                                                                                \
+	XX(CDUP, "Change to parent working directory")                                                                     \
+	XX(DELE, "Delete file")                                                                                            \
+	XX(HELP, "List recognised commands")                                                                               \
+	XX(LIST, "List file or directory information")                                                                     \
+	XX(NLST, "List file or directory names")                                                                           \
+	XX(NOOP, "")                                                                                                       \
+	XX(PWD, "Get current working directory")                                                                           \
+	XX(PASS, "Must follow user")                                                                                       \
+	XX(PASV, "")                                                                                                       \
+	XX(PORT, "")                                                                                                       \
+	XX(QUIT, "")                                                                                                       \
+	XX(RNFR, "Rename file: FROM")                                                                                      \
+	XX(RNTO, "Rename file: TO")                                                                                        \
+	XX(RETR, "Retrieve file content")                                                                                  \
+	XX(SIZE, "Get file size")                                                                                          \
+	XX(STOR, "Store file data")                                                                                        \
+	XX(SYST, "Get system information")                                                                                 \
+	XX(TYPE, "")                                                                                                       \
+	XX(USER, "Start login sequence, flushing any current account information")                                         \
+	XX(XCWD, "Deprecated alias for CWD")                                                                               \
+	XX(XPWD, "Deprecated alias for PWD")
 
 namespace
 {
+#define XX(name, comment) #name "\0"
+DEFINE_FSTR(fstrCommandList, FTP_COMMAND_MAP(XX))
+#undef XX
+
+enum class Command {
+	UNKNOWN,
+#define XX(name, comment) name,
+	FTP_COMMAND_MAP(XX)
+#undef XX
+};
+
+Command parseCommand(const String& data)
+{
+	int i = CStringArray(fstrCommandList).indexOf(data);
+	return Command(i + 1);
+}
+
 int getSplitterPos(const String& data, char splitter, uint8_t number)
 {
 	uint8_t k = 0;
@@ -33,27 +77,26 @@ int getSplitterPos(const String& data, char splitter, uint8_t number)
 	return -1;
 }
 
-String makeFileName(String name, bool shortIt)
+String dirname(const char* path)
 {
-	if(name[0] == '/') {
-		name.remove(0, 1);
+	if(path == nullptr) {
+		return nullptr;
 	}
-
-	if(shortIt && name.length() > 20) {
-		String ext;
-		int dotPos = name.lastIndexOf('.');
-		if(dotPos >= 0) {
-			ext = name.substring(dotPos);
-		}
-
-		return name.substring(0, 16) + ext;
+	auto c = strrchr(path, '/');
+	if(c == nullptr) {
+		return nullptr;
 	}
-
-	return name;
+	return String(path, c - path);
 }
 
 } // namespace
 
+FtpServerConnection::FtpServerConnection(CustomFtpServer& parentServer, tcp_pcb* clientTcp)
+	: TcpConnection(clientTcp, true), server(parentServer)
+{
+	writeString(_F("220 Welcome to Sming FTP\r\n"));
+}
+
 err_t FtpServerConnection::onReceive(pbuf* buf)
 {
 	if(buf == nullptr) {
@@ -62,6 +105,7 @@ err_t FtpServerConnection::onReceive(pbuf* buf)
 	int prev = 0;
 
 	while(true) {
+		debug_hex(DBG, "CTRL < ", buf->payload, buf->len);
 		int p = NetUtils::pbufFindStr(buf, "\r\n", prev);
 		if(p < 0 || size_t(p - prev) > MAX_FTP_CMD) {
 			break;
@@ -103,234 +147,316 @@ void FtpServerConnection::cmdPort(const String& data)
 	response(200);
 }
 
-void FtpServerConnection::onCommand(String cmd, String data)
+IFS::FileSystem* FtpServerConnection::getFileSystem()
+{
+	auto fs = server.getFileSystem();
+	if(fs == nullptr) {
+		response(550, F("No active file system"));
+	}
+	return fs;
+}
+
+String FtpServerConnection::resolvePath(const char* name)
+{
+	if(name != nullptr && name[0] == '/') {
+		return &name[1];
+	}
+
+	String path;
+	path += cwd.c_str();
+	if(name != nullptr && *name != '\0') {
+		if(path.length() != 0) {
+			path += '/';
+		}
+		path += name;
+		// Remove any trailing path separator
+		auto len = path.length();
+		if(path[len - 1] == '/') {
+			path.setLength(len - 1);
+		}
+	}
+	return path;
+}
+
+bool FtpServerConnection::checkFileAccess(const char* filename, IFS::OpenFlags flags)
 {
-	cmd.toUpperCase();
+	auto fs = getFileSystem();
+	if(fs == nullptr) {
+		return false;
+	}
 
-	/* Use macros to make code easier to read */
-#define SWITCH while(true)
-#define CASE(s) if(cmd == _F(s))
-#define DEFAULT
+	FileStat stat;
+	int err = fs->stat(filename, stat);
+	if(err == IFS::Error::NotFound && flags[IFS::OpenFlag::Write]) {
+		// File doesn't exist - check permissions on parent directory
+		String path = dirname(filename);
+		err = fs->stat(path, stat);
+	}
+	if(err != FS_OK) {
+		response(550, fileGetErrorString(err)); // Not found / no access
+		return false;
+	}
+	if(flags[IFS::OpenFlag::Write]) {
+		if(stat.attr[FileAttribute::ReadOnly]) {
+			response(550, fileGetErrorString(IFS::Error::ReadOnly));
+		}
+		if(user.role < stat.acl.writeAccess) {
+			response(550, _F("Write access denied")); // Not found / no access
+			return false;
+		}
+	}
+	if(user.role < stat.acl.readAccess) {
+		response(550, _F("Read access denied")); // Not found / no access
+		return false;
+	}
+	return true;
+}
 
+void FtpServerConnection::onCommand(String cmd, String data)
+{
+	auto command = parseCommand(cmd);
+	switch(command) {
 	// We ready to quit always :)
-	CASE("QUIT")
-	{
-		response(221);
+	case Command::QUIT:
+		response(221); // Service closing control connection
 		close();
-		return;
-	}
+		break;
 
 	// Strong security check :)
-	switch(state) {
-	case State::Authorization:
-		SWITCH
-		{
-			CASE("USER")
-			{
-				userName = data;
-				response(331);
-				break;
-			}
-
-			CASE("PASS")
-			{
-				if(server.checkUser(userName, data)) {
-					userName = "";
-					state = State::Active;
-					response(230);
-				} else {
-					response(430);
-				}
-				break;
-			}
+	case Command::USER:
+		// Authenticate or re-authenticate, wiping existing credentials
+		user = User{};
+		user.name = data;
+		response(331); // User name OK, need password
+		break;
 
-			DEFAULT
-			{
-				response(530);
-				break;
-			}
-		} // SWITCH
+	case Command::PASS: {
+		if(!user.name) {
+			response(332); // Need account for login
+		} else {
+			user.role = server.validateUser(user.name.c_str(), data.c_str());
+			response(user.isValid() ? 230 : 430);
+		}
+		user.name = nullptr;
 		break;
+	}
 
-	case State::Active:
-		SWITCH
-		{
-			CASE("SYST")
-			{
-				response(215, F("Windows_NT: Sming Framework")); // Why not? It's look like Windows :)
-				break;
-			}
+	case Command::SYST:
+		response(215, F("Windows_NT: Sming Framework")); // Why not? It's look like Windows :)
+		break;
 
-			CASE("PWD")
-			{
-				response(257, F("\"/\""));
-				break;
-			}
+	case Command::PWD:
+	case Command::XPWD: {
+		String s;
+		s += "\"/";
+		s += cwd.c_str();
+		s += '"';
+		response(257, s);
+		break;
+	}
 
-			CASE("PORT")
-			{
-				cmdPort(data);
-				break;
-			}
+	case Command::PORT:
+		cmdPort(data);
+		break;
 
-			CASE("CWD")
-			{
-				if(data == "/") {
-					response(250);
-				} else {
-					response(550);
-				}
-				break;
-			}
+	case Command::CWD:
+	case Command::XCWD: {
+		String path = resolvePath(data.c_str());
+		if(!checkFileAccess(path.c_str(), IFS::OpenFlag::Read)) {
+			break;
+		}
+		debug_i("CWD: '%s'", path.c_str());
+		FileStat stat;
+		if(getFileSystem()->stat(path, stat) == FS_OK && stat.attr[FileAttribute::Directory]) {
+			cwd = path;
+			response(250, F("directory changed to /") + cwd.c_str()); // OK
+		} else {
+			response(550); // Not found / no access
+		}
+		break;
+	}
 
-			CASE("TYPE")
-			{
-				response(250);
-				break;
-			}
+	case Command::CDUP: {
+		cwd = dirname(cwd.c_str());
+		response(250); // OK
+		break;
+	}
 
-			CASE("SIZE")
-			{
-				auto fileName = makeFileName(data, false);
-				if(fileExist(fileName)) {
-					auto fileSize = fileGetSize(fileName);
-					response(213, String(fileSize));
-				} else {
-					response(550);
-				}
-				break;
-			}
+	case Command::TYPE:
+		response(250); // OK
+		break;
 
-			CASE("DELE")
-			{
-				String name = makeFileName(data, false);
-				if(fileExist(name)) {
-					fileDelete(name);
-					response(250);
-				} else {
-					response(550);
-				}
-				break;
-			}
+	case Command::SIZE: {
+		auto path = resolvePath(data.c_str());
+		if(!checkFileAccess(cwd.c_str(), IFS::OpenFlag::Read)) {
+			break;
+		}
+		auto fs = getFileSystem();
+		FileStat stat;
+		int err = fs->stat(path, stat);
+		if(err == FS_OK) {
+			response(213, String(stat.size)); // File status
+		} else {
+			response(550, fs->getErrorString(err)); // Not found / no access
+		}
+		break;
+	}
 
-			CASE("RNFR")
-			{
-				renameFrom = data;
-				response(350);
-				break;
-			}
+	case Command::DELE: {
+		String path = resolvePath(data.c_str());
+		if(!checkFileAccess(cwd.c_str(), IFS::OpenFlag::Write | IFS::OpenFlag::Truncate)) {
+			break;
+		}
+		auto fs = getFileSystem();
+		int err = fs->remove(path);
+		if(err == FS_OK) {
+			response(250);
+		} else {
+			response(550, getFileSystem()->getErrorString(err));
+		}
+		break;
+	}
 
-			CASE("RNTO")
-			{
-				if(fileExist(renameFrom)) {
-					fileRename(renameFrom, data);
-					response(250);
-				} else {
-					response(550);
-				}
-				break;
-			}
+	case Command::RNFR: {
+		renameFrom = data;
+		response(350); // Pending further information
+		break;
+	}
 
-			CASE("RETR")
-			{
-				createDataConnection(new FtpDataRetrieve(*this, makeFileName(data, false)));
-				break;
-			}
+	case Command::RNTO: {
+		if(!renameFrom) {
+			response(550, F("Rename FROM unspecified"));
+			break;
+		}
+		String pathFrom = resolvePath(renameFrom.c_str());
+		if(!checkFileAccess(pathFrom.c_str(), IFS::OpenFlag::Write)) {
+			break;
+		}
+		String pathTo = resolvePath(data.c_str());
+		if(!checkFileAccess(pathTo.c_str(), IFS::OpenFlag::Write)) {
+			break;
+		}
+		auto fs = getFileSystem();
+		int err = fs->rename(pathFrom, pathTo);
+		if(err == FS_OK) {
+			response(250);
+		} else {
+			response(550, fs->getErrorString(err));
+		}
+		break;
+	}
 
-			CASE("STOR")
-			{
-				createDataConnection(new FtpDataStore(*this, makeFileName(data, true)));
-				break;
-			}
+	case Command::RETR: {
+		String path = resolvePath(data.c_str());
+		if(checkFileAccess(path.c_str(), IFS::OpenFlag::Read)) {
+			setDataConnection(new FtpDataRetrieve(*this, path));
+		}
+		break;
+	}
 
-			CASE("LIST")
-			{
-				createDataConnection(new FtpDataFileList(*this));
-				break;
-			}
+	case Command::STOR: {
+		String path = resolvePath(data.c_str());
+		if(checkFileAccess(path.c_str(), IFS::OpenFlag::Write)) {
+			setDataConnection(new FtpDataStore(*this, path));
+		}
+		break;
+	}
 
-			CASE("PASV")
-			{
-				response(500, F("Passive mode not supported"));
-				break;
-			}
+	case Command::LIST:
+	case Command::NLST: {
+		String path = resolvePath(data.c_str());
+		if(checkFileAccess(path.c_str(), IFS::OpenFlag::Read)) {
+			setDataConnection(new FtpDataFileList(*this, path, command == Command::NLST));
+		}
+		break;
+	}
 
-			CASE("NOOP")
-			{
-				response(200);
-				break;
-			}
+	case Command::PASV: {
+		response(500, F("Passive mode not supported"));
+		break;
+	}
 
-			DEFAULT
-			{
-				if(!server.onCommand(cmd, data, *this)) {
-					response(502, F("Not supported"));
-				}
-				break;
-			}
-		} // SWITCH
+	case Command::NOOP: {
+		response(200);
+		break;
+	}
 
+	case Command::HELP: {
+		response(214, _F("The following commands are recognized."), '-');
+		String s(fstrCommandList);
+		s.replace('\0', ' ');
+		writeString("  ");
+		writeString(s);
+		writeString("\r\n");
+		response(214, _F("Help OK."));
 		break;
+	}
 
+	case Command::UNKNOWN:
 	default:
-		debug_e("Invalid state");
-		assert(false);
+		cmd.toUpperCase();
+		if(!server.onCommand(cmd, data, *this)) {
+			response(502, F("Not supported"));
+		}
 	}
 }
 
 err_t FtpServerConnection::onSent(uint16_t len)
 {
-	canTransfer = true;
+	if(dataConnection != nullptr) {
+		dataConnection->onReadyToSendData(eTCE_Poll);
+	}
 
 	return ERR_OK;
 }
 
-void FtpServerConnection::createDataConnection(TcpConnection* connection)
+void FtpServerConnection::setDataConnection(FtpDataStream* connection)
 {
+	if(dataConnection != nullptr) {
+		SYSTEM_ERROR("[FTP] Data connection already exists!");
+	}
 	dataConnection = connection;
 	dataConnection->connect(ip, port);
 	response(150, F("Connecting"));
 }
 
-void FtpServerConnection::dataTransferFinished(TcpConnection* connection)
+void FtpServerConnection::dataStreamDestroyed(TcpConnection* connection)
 {
 	if(connection != dataConnection) {
 		SYSTEM_ERROR("FTP Wrong state: connection != dataConnection");
 	}
 
 	dataConnection = nullptr;
+}
+
+void FtpServerConnection::dataTransferFinished(TcpConnection* connection)
+{
+	if(dataConnection != nullptr) {
+		if(connection != dataConnection) {
+			SYSTEM_ERROR("FTP Wrong state: connection != dataConnection");
+		}
+		dataConnection = nullptr;
+	}
+
 	response(226, F("Transfer Complete."));
 }
 
-void FtpServerConnection::response(int code, String text)
+void FtpServerConnection::response(int code, String text, char sep)
 {
 	String response = String(code, DEC);
+	response += sep;
 	if(text.length() == 0) {
 		if(code >= 200 && code <= 399) { // Just for simplify
-			response += _F(" OK");
+			response += _F("OK");
 		} else {
-			response += _F(" FAIL");
+			response += _F("FAIL");
 		}
 	} else {
-		response += ' ';
 		response += text;
 	}
 	response += "\r\n";
 
 	debug_d("> %s", response.c_str());
-	writeString(response, TCP_WRITE_FLAG_COPY); // Dynamic memory, should copy
-	canTransfer = false;
+	writeString(response);
 	flush();
 }
-
-void FtpServerConnection::onReadyToSendData(TcpConnectionEvent sourceEvent)
-{
-	switch(state) {
-	case State::Ready:
-		writeString(_F("220 Welcome to Sming FTP\r\n"), 0);
-		state = State::Authorization;
-		break;
-
-	default:; // Do nothing
-	}
-}
diff --git a/Sming/Core/Network/Ftp/FtpServerConnection.h b/Sming/Core/Network/Ftp/FtpServerConnection.h
index 901834db6c..b0f9a7c69e 100644
--- a/Sming/Core/Network/Ftp/FtpServerConnection.h
+++ b/Sming/Core/Network/Ftp/FtpServerConnection.h
@@ -13,6 +13,7 @@
 #include "Network/TcpConnection.h"
 #include "IpAddress.h"
 #include "WString.h"
+#include <IFS/FileSystem.h>
 
 /**
  * @defgroup ftp FTP
@@ -20,55 +21,63 @@
  * @{
  */
 
-class FtpServer;
+class CustomFtpServer;
+class FtpDataStream;
 
 class FtpServerConnection : public TcpConnection
 {
 	friend class FtpDataStream;
-	friend class FtpServer;
+	friend class CustomFtpServer;
 
 public:
+	struct User {
+		CString name;
+		IFS::UserRole role{};
+
+		bool isValid() const
+		{
+			return role != IFS::UserRole::None;
+		}
+	};
+
 	static constexpr size_t MAX_FTP_CMD{255};
 
-	FtpServerConnection(FtpServer& parentServer, tcp_pcb* clientTcp)
-		: TcpConnection(clientTcp, true), server(parentServer)
-	{
-	}
+	FtpServerConnection(CustomFtpServer& parentServer, tcp_pcb* clientTcp);
 
 	err_t onReceive(pbuf* buf) override;
 	err_t onSent(uint16_t len) override;
-	void onReadyToSendData(TcpConnectionEvent sourceEvent) override;
 
 	void dataTransferFinished(TcpConnection* connection);
+	void dataStreamDestroyed(TcpConnection* connection);
+
+	const User& getUser() const
+	{
+		return user;
+	}
+
+	// Get the active filesystem, send an error response if undefined
+	IFS::FileSystem* getFileSystem();
+
+	virtual void response(int code, String text = nullptr, char sep = ' ');
 
 protected:
 	virtual void onCommand(String cmd, String data);
-	virtual void response(int code, String text = "");
 
 	void cmdPort(const String& data);
-	void createDataConnection(TcpConnection* connection);
-
-	bool isCanTransfer()
-	{
-		return canTransfer;
-	}
+	void setDataConnection(FtpDataStream* connection);
+	String resolvePath(const char* name);
+	bool checkFileAccess(const char* filename, IFS::OpenFlags flags);
 
 private:
-	enum class State {
-		Ready,
-		Authorization,
-		Active,
-	};
-
-	FtpServer& server;
-	State state{State::Ready};
-	String userName;
-	String renameFrom;
+	CustomFtpServer& server;
+	User user{};
+	CString renameFrom;
 
 	IpAddress ip;
-	int port{0};
-	TcpConnection* dataConnection{nullptr};
-	bool canTransfer{true};
+	uint16_t port{20};
+	bool readyForData{false};
+	CString cwd;
+	FtpDataStream* dataConnection{nullptr};
 };
 
 typedef FtpServerConnection FTPServerConnection SMING_DEPRECATED; // @deprecated Use `FtpServerConnection` instead
diff --git a/Sming/Core/Network/FtpServer.cpp b/Sming/Core/Network/FtpServer.cpp
index efb0a75918..985fa77aeb 100644
--- a/Sming/Core/Network/FtpServer.cpp
+++ b/Sming/Core/Network/FtpServer.cpp
@@ -10,34 +10,33 @@
 
 #include "FtpServer.h"
 #include "Ftp/FtpServerConnection.h"
-#include "FileSystem.h"
 
-TcpConnection* FtpServer::createClient(tcp_pcb* clientTcp)
+TcpConnection* CustomFtpServer::createClient(tcp_pcb* clientTcp)
 {
 	return new FtpServerConnection(*this, clientTcp);
 }
 
-void FtpServer::addUser(const String& login, const String& pass)
+void FtpServer::addUser(const String& login, const String& pass, IFS::UserRole role)
 {
-	debug_d("addUser: %s %s", login.c_str(), pass.c_str());
-	users[login] = pass;
+	debug_d("addUser: %s %s (%s)", login.c_str(), pass.c_str(), toString(role).c_str());
+	users[login] = User{pass, role};
 }
 
-bool FtpServer::checkUser(const String& login, const String& pass)
+IFS::UserRole FtpServer::validateUser(const char* login, const char* pass)
 {
-	debug_d("checkUser: %s %s", login.c_str(), pass.c_str());
-	if(!users.contains(login)) {
-		return false;
-	}
-
-	return users[login] == pass;
+	debug_d("validateUser: %s %s", login, pass);
+	auto& user = static_cast<const UserList&>(users)[login];
+	return (user.password == pass) ? user.role : IFS::UserRole::None;
 }
 
 bool FtpServer::onCommand(String cmd, String data, FtpServerConnection& connection)
 {
 	if(cmd == _F("FSFORMAT")) {
-		fileSystemFormat();
-		connection.response(200, F("File system successfully formatted"));
+		auto fs = connection.getFileSystem();
+		if(fs != nullptr) {
+			int err = fs->format();
+			connection.response(200, F("File system format: ") + fileGetErrorString(err));
+		}
 		return true;
 	}
 	return false;
diff --git a/Sming/Core/Network/FtpServer.h b/Sming/Core/Network/FtpServer.h
index 5bf1df7da1..15be35353a 100644
--- a/Sming/Core/Network/FtpServer.h
+++ b/Sming/Core/Network/FtpServer.h
@@ -12,34 +12,85 @@
 
 #include "TcpServer.h"
 #include "WHashMap.h"
-#include "WString.h"
+#include <FileSystem.h>
 
 class FtpServerConnection;
 
 /** @defgroup   ftpserver FTP server
  *  @ingroup    tcpserver
- *  @brief      Provides FTP server
+ *  @brief      Base implementation for FTP server
  */
-class FtpServer : public TcpServer
+class CustomFtpServer : public TcpServer
 {
 	friend class FtpServerConnection;
 
 public:
-	FtpServer()
+	CustomFtpServer(IFS::IFileSystem* fileSystem = nullptr) : fileSystem(fileSystem)
 	{
-		setTimeOut(900); // Update timeout
+		setTimeOut(900);
 	}
 
-	void addUser(const String& login, const String& pass);
-	bool checkUser(const String& login, const String& pass);
+	/**
+	 * @brief Validate user
+	 * @param login User name
+	 * @param pass User password
+	 * @retval IFS::UserRole Returns assigned user role, None if user not validated
+	 */
+	virtual IFS::UserRole validateUser(const char* login, const char* pass) = 0;
 
 protected:
 	TcpConnection* createClient(tcp_pcb* clientTcp) override;
 
-	virtual bool onCommand(String cmd, String data, FtpServerConnection& connection);
+	/**
+	 * @brief Handle an incomding command
+	 * @param cmd The command identifier, e.g. LIST
+	 * @param data Any command arguments
+	 * @param connection The associated TCP connection to receive any response
+	 * @retval bool true if command handled and response sent
+	 */
+	virtual bool onCommand(String cmd, String data, FtpServerConnection& connection)
+	{
+		return false;
+	}
+
+	IFS::FileSystem* getFileSystem() const
+	{
+		return fileSystem ? IFS::FileSystem::cast(fileSystem) : ::getFileSystem();
+	}
+
+private:
+	IFS::IFileSystem* fileSystem;
+};
+
+/** @defgroup   ftpserver FTP server
+ *  @ingroup    tcpserver
+ *  @brief      Provides FTP server
+ */
+class FtpServer : public CustomFtpServer
+{
+public:
+	void addUser(const String& login, const String& pass, IFS::UserRole userRole = IFS::UserRole::Admin);
+	IFS::UserRole validateUser(const char* login, const char* pass) override;
+
+	/**
+	 * @brief Legacy user validation
+	 * @deprecated Use `validateUser()` instead
+	 */
+	bool checkUser(const String& login, const String& pass) SMING_DEPRECATED
+	{
+		return validateUser(login.c_str(), pass.c_str()) != IFS::UserRole::None;
+	}
+
+protected:
+	bool onCommand(String cmd, String data, FtpServerConnection& connection) override;
 
 private:
-	HashMap<String, String> users;
+	struct User {
+		String password;
+		IFS::UserRole role;
+	};
+	using UserList = HashMap<String, User>;
+	UserList users;
 };
 
 /**
diff --git a/Sming/Core/Network/NetUtils.cpp b/Sming/Core/Network/NetUtils.cpp
index b3c01fe854..f8aed2765a 100644
--- a/Sming/Core/Network/NetUtils.cpp
+++ b/Sming/Core/Network/NetUtils.cpp
@@ -13,13 +13,17 @@
 #include <Data/CStringArray.h>
 #include <WString.h>
 
+namespace
+{
 #ifdef FIX_NETWORK_ROUTING
-bool NetUtils::ipClientRoutingFixed = false;
+bool ipClientRoutingFixed{false};
 #endif
 
-/// HELPERS ///
+} // namespace
 
-int NetUtils::pbufFindChar(const pbuf* buf, char wtf, unsigned startPos)
+namespace NetUtils
+{
+int pbufFindChar(const pbuf* buf, char wtf, unsigned startPos)
 {
 	unsigned ofs = 0;
 
@@ -48,7 +52,7 @@ int NetUtils::pbufFindChar(const pbuf* buf, char wtf, unsigned startPos)
 	return -1;
 }
 
-bool NetUtils::pbufIsStrEqual(const pbuf* buf, const char* compared, unsigned startPos)
+bool pbufIsStrEqual(const pbuf* buf, const char* compared, unsigned startPos)
 {
 	unsigned cur = startPos;
 
@@ -78,7 +82,7 @@ bool NetUtils::pbufIsStrEqual(const pbuf* buf, const char* compared, unsigned st
 	return true;
 }
 
-int NetUtils::pbufFindStr(const pbuf* buf, const char* wtf, unsigned startPos)
+int pbufFindStr(const pbuf* buf, const char* wtf, unsigned startPos)
 {
 	if(wtf == nullptr) {
 		return -1;
@@ -100,7 +104,7 @@ int NetUtils::pbufFindStr(const pbuf* buf, const char* wtf, unsigned startPos)
 	return -1;
 }
 
-char* NetUtils::pbufAllocateStrCopy(const pbuf* buf, unsigned startPos, unsigned length)
+char* pbufAllocateStrCopy(const pbuf* buf, unsigned startPos, unsigned length)
 {
 	char* stringPtr = new char[length + 1];
 	if(stringPtr == nullptr) {
@@ -111,7 +115,7 @@ char* NetUtils::pbufAllocateStrCopy(const pbuf* buf, unsigned startPos, unsigned
 	return stringPtr;
 }
 
-String NetUtils::pbufStrCopy(const pbuf* buf, unsigned startPos, unsigned length)
+String pbufStrCopy(const pbuf* buf, unsigned startPos, unsigned length)
 {
 	char* stringPtr = new char[length + 1];
 	if(stringPtr == nullptr) {
@@ -125,7 +129,7 @@ String NetUtils::pbufStrCopy(const pbuf* buf, unsigned startPos, unsigned length
 }
 
 #ifdef FIX_NETWORK_ROUTING
-bool NetUtils::FixNetworkRouting()
+bool FixNetworkRouting()
 {
 	if(ipClientRoutingFixed) {
 		return true;
@@ -187,9 +191,11 @@ static void debugPrintTcp(const char* type, const struct tcp_pcb* pcb)
 	}
 }
 
-void NetUtils::debugPrintTcpList()
+void debugPrintTcpList()
 {
 	debugPrintTcp(_F("Active"), tcp_active_pcbs);
 	debugPrintTcp(_F("Listen"), tcp_listen_pcbs.pcbs);
 	debugPrintTcp(_F("TIME-WAIT"), tcp_tw_pcbs);
 }
+
+} // namespace NetUtils
diff --git a/Sming/Core/Network/NetUtils.h b/Sming/Core/Network/NetUtils.h
index a5e6e665f4..46e5192dc0 100644
--- a/Sming/Core/Network/NetUtils.h
+++ b/Sming/Core/Network/NetUtils.h
@@ -8,10 +8,6 @@
  *
  ****/
 
-/** @defgroup   networking Networking
- *  @{
- */
-
 #pragma once
 
 #ifdef ARCH_ESP8266
@@ -23,32 +19,31 @@
 struct pbuf;
 class String;
 
-class NetUtils
+/** @defgroup   networking Networking
+ *  @{
+ */
+
+namespace NetUtils
 {
-public:
-	// Helpers
-	static bool pbufIsStrEqual(const pbuf* buf, const char* compared, unsigned startPos);
-	static int pbufFindChar(const pbuf* buf, char wtf, unsigned startPos = 0);
-	static int pbufFindStr(const pbuf* buf, const char* wtf, unsigned startPos = 0);
-	static char* pbufAllocateStrCopy(const pbuf* buf, unsigned startPos, unsigned length);
-	static String pbufStrCopy(const pbuf* buf, unsigned startPos, unsigned length);
+// Helpers
+bool pbufIsStrEqual(const pbuf* buf, const char* compared, unsigned startPos);
+int pbufFindChar(const pbuf* buf, char wtf, unsigned startPos = 0);
+int pbufFindStr(const pbuf* buf, const char* wtf, unsigned startPos = 0);
+char* pbufAllocateStrCopy(const pbuf* buf, unsigned startPos, unsigned length);
+String pbufStrCopy(const pbuf* buf, unsigned startPos, unsigned length);
 
 #ifdef FIX_NETWORK_ROUTING
-	static bool FixNetworkRouting();
+bool FixNetworkRouting();
 #else
-	static bool FixNetworkRouting()
-	{
-		return true; // Should work on standard lwip
-	}
+inline bool FixNetworkRouting()
+{
+	return true; // Should work on standard lwip
+}
 #endif
 
-	// Debug
-	static void debugPrintTcpList();
+// Debug
+void debugPrintTcpList();
 
-private:
-#ifdef FIX_NETWORK_ROUTING
-	static bool ipClientRoutingFixed;
-#endif
-};
+}; // namespace NetUtils
 
 /** @} */
diff --git a/Sming/Services/CommandProcessing/CommandHandler.h b/Sming/Services/CommandProcessing/CommandHandler.h
index eac66a7950..03c4419981 100644
--- a/Sming/Services/CommandProcessing/CommandHandler.h
+++ b/Sming/Services/CommandProcessing/CommandHandler.h
@@ -162,7 +162,11 @@ class CommandHandler
 
 	VerboseMode verboseMode = VERBOSE;
 	String currentPrompt;
+#ifdef ARCH_HOST
+	char currentEOL = '\n';
+#else
 	char currentEOL = '\r';
+#endif
 	String currentWelcomeMessage;
 };
 
diff --git a/samples/Basic_Storage/app/application.cpp b/samples/Basic_Storage/app/application.cpp
index d0b7f2bbd0..55d2bb63a2 100644
--- a/samples/Basic_Storage/app/application.cpp
+++ b/samples/Basic_Storage/app/application.cpp
@@ -32,12 +32,14 @@ void listSpiffsPartitions()
 		bool ok = spiffs_mount(*it);
 		Serial.println(ok ? "OK, listing files:" : "Mount failed!");
 		if(ok) {
-			auto list = fileList();
-			for(auto& f : fileList()) {
-				Serial.print("  ");
-				Serial.println(f);
+			Directory dir;
+			if(dir.open()) {
+				while(dir.next()) {
+					Serial.print("  ");
+					Serial.println(dir.stat().name);
+				}
 			}
-			Serial.print(list.count());
+			Serial.print(dir.count());
 			Serial.println(F(" files found"));
 			Serial.println();
 		}
diff --git a/samples/Basic_rBoot/app/application.cpp b/samples/Basic_rBoot/app/application.cpp
index cfb3f85655..11a6d7c9d5 100644
--- a/samples/Basic_rBoot/app/application.cpp
+++ b/samples/Basic_rBoot/app/application.cpp
@@ -156,16 +156,23 @@ void serialCallBack(Stream& stream, char arrivedChar, unsigned short availableCh
 		} else if(!strcmp(str, "restart")) {
 			System.restart();
 		} else if(!strcmp(str, "ls")) {
-			Vector<String> files = fileList();
-			Serial.printf("filecount %d\r\n", files.count());
-			for(unsigned int i = 0; i < files.count(); i++) {
-				Serial.println(files[i]);
+			Directory dir;
+			if(dir.open()) {
+				while(dir.next()) {
+					Serial.print("  ");
+					Serial.println(dir.stat().name);
+				}
 			}
+			Serial.printf("filecount %d\r\n", dir.count());
 		} else if(!strcmp(str, "cat")) {
-			Vector<String> files = fileList();
-			if(files.count() > 0) {
-				Serial.printf("dumping file %s:\r\n", files[0].c_str());
-				Serial.println(fileGetContent(files[0]));
+			Directory dir;
+			if(dir.open() && dir.next()) {
+				Serial.printf("dumping file %s:\r\n", dir.stat().name.c_str());
+				// We don't know how big the is, so streaming it is safest
+				FileStream fs;
+				fs.open(dir.stat());
+				Serial.copyFrom(&fs);
+				Serial.println();
 			} else {
 				Serial.println("Empty spiffs!");
 			}
diff --git a/samples/CommandProcessing_Debug/include/ExampleCommand.h b/samples/CommandProcessing_Debug/include/ExampleCommand.h
index 9f0a8d1e02..f16501af40 100644
--- a/samples/CommandProcessing_Debug/include/ExampleCommand.h
+++ b/samples/CommandProcessing_Debug/include/ExampleCommand.h
@@ -3,8 +3,7 @@
  *
  */
 
-#ifndef SMINGCORE_EXAMPLE_COMMAND_H_
-#define SMINGCORE_EXAMPLE_COMMAND_H_
+#pragma once
 
 #include "WString.h"
 #include <Services/CommandProcessing/CommandProcessingIncludes.h>
@@ -20,5 +19,3 @@ class ExampleCommand
 	bool status = true;
 	void processExampleCommands(String commandLine, CommandOutput* commandOutput);
 };
-
-#endif /* SMINGCORE_DEBUG_H_ */
diff --git a/samples/FtpServer_Files/README.rst b/samples/FtpServer_Files/README.rst
index dc96428410..3a4ef91bee 100644
--- a/samples/FtpServer_Files/README.rst
+++ b/samples/FtpServer_Files/README.rst
@@ -3,7 +3,18 @@ FTP Server Files
 
 .. highlight:: bash
 
-This example sets up a simple FTP server with a couple of files stored in SPIFFS.
+This example sets up an FTP server with a couple of files stored in SPIFFS.
+It mounts this on top of an FWFS volume (a hybrid filesystem).
+
+The sample creates three users with different roles (guest, user and administrator).
+
+======  ========  =======
+User    Password  Role
+------  --------  -------
+guest   (none)    Guest
+me      "123"     User
+admin   "1234"    Admin
+======  ========  =======
 
 You'll need to have WiFi configured. You can set this information when building like this::
 
@@ -11,12 +22,12 @@ You'll need to have WiFi configured. You can set this information when building
 
 substituting your actual Access Point details for *ssid* and *password*.
 
-After flashing::
+Flash to your device::
 
-   make flashapp
+   make flash
 
 You should be able to connect using an FTP client:
 
    ftp ipaddress
 
-The default user is ``me``, password ``123``.
+and when prompted log in with one of the above usernames.
diff --git a/samples/FtpServer_Files/app/application.cpp b/samples/FtpServer_Files/app/application.cpp
index 4bebad2d27..3c19689ca7 100644
--- a/samples/FtpServer_Files/app/application.cpp
+++ b/samples/FtpServer_Files/app/application.cpp
@@ -14,7 +14,10 @@ void gotIP(IpAddress ip, IpAddress netmask, IpAddress gateway)
 	Serial.println(ip);
 	// Start FTP server
 	ftp.listen(21);
-	ftp.addUser("me", "123"); // FTP account
+	// Add user accounts
+	ftp.addUser("guest", nullptr, IFS::UserRole::Guest);
+	ftp.addUser("me", "123", IFS::UserRole::User);
+	ftp.addUser("admin", "1234", IFS::UserRole::Admin);
 	// You can also use special FTP comand: "fsformat" for clearing file system (for example from TotalCMD)
 }
 
@@ -22,17 +25,37 @@ void gotIP(IpAddress ip, IpAddress netmask, IpAddress gateway)
 void connectFail(const String& ssid, MacAddress bssid, WifiDisconnectReason reason)
 {
 	Serial.println("I'm NOT CONNECTED. Need help!!! :(");
-
-	// .. some you code for configuration ..
 }
 
 void init()
 {
-	spiffs_mount(); // Mount file system, in order to work with files
-
 	Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
 	Serial.systemDebugOutput(true); // Enable debug output to serial
 
+	/*
+	 * Mount file system, in order to work with files.
+	 *
+	 * This sample uses an FWFS (Firmware FileSystem) partition to store
+	 * files which don't change. This considerably reduces the amount of data
+	 * which might be erased in the event of write failure, etc.
+	 */
+
+	// This option mounts just the SPIFFS partition
+	// spiffs_mount();
+
+	// Mount only the FWFS partition
+	// fwfs_mount();
+
+	/*
+	 * Use the 'Hybrid' filesystem, with SPIFFS layered over FWFS.
+	 * 
+	 * When a file is opened for writing it is transparently copied to the SPIFFS partition so it can be updated.
+	 * Wiping the SPIFFS partition reverts the filesystem to its original state.
+	 *
+	 * Note that files marked as ‘read-only’ may not be written in this manner.
+	 */
+	hyfs_mount();
+
 	fileSetContent("example.txt", "hello world!");
 	fileSetContent("data.bin", "\1\2\3\4\5");
 
diff --git a/samples/FtpServer_Files/component.mk b/samples/FtpServer_Files/component.mk
index ab4cb6eed9..ceb9beac2b 100644
--- a/samples/FtpServer_Files/component.mk
+++ b/samples/FtpServer_Files/component.mk
@@ -1,2 +1,2 @@
-HWCONFIG := spiffs
+HWCONFIG := ftpserver
 SPIFF_FILES :=
diff --git a/samples/FtpServer_Files/fsimage.fwfs b/samples/FtpServer_Files/fsimage.fwfs
new file mode 100644
index 0000000000..8cfe051a20
--- /dev/null
+++ b/samples/FtpServer_Files/fsimage.fwfs
@@ -0,0 +1,39 @@
+{
+    "name": "FTP Server Demo Volume",
+    "id": "0x12345678",
+    "source": {
+        "/": "${SMING_HOME}/../docs/source/framework/core/network",
+        "Network": "${SMING_HOME}/Core/Network"
+    },
+    "mountpoints": {},
+    "rules": [
+        {
+            // By default, all files require at least User role and only Admins can write
+            "mask": "*",
+            "read": "user",
+            "write": "admin"
+        },
+        {
+            // In general, anything starting with . is considered a system file so restrict to admin
+            "mask": ".*",
+            "read": "admin"
+        },
+        {
+            "mask": "*.rst",
+            "readonly": true
+        },
+        {
+            // These files won't be readable locally, the client will have to un-compress them
+            "mask": "/Network/Mqtt/*",
+            "compress": "gzip"
+        },
+        {
+            // If no user is logged in, permit listing of root directory and reading of one file
+            "mask": [
+                "/",
+                "index.rst"
+            ],
+            "read": "any"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/samples/FtpServer_Files/ftpserver.hw b/samples/FtpServer_Files/ftpserver.hw
new file mode 100644
index 0000000000..eeeb4898f3
--- /dev/null
+++ b/samples/FtpServer_Files/ftpserver.hw
@@ -0,0 +1,26 @@
+{
+    "name": "FTP Server sample",
+    "base_config": "standard",
+    "partitions": {
+        "rom0": {
+            "size": "480K"
+        },
+        "spiffs0": {
+            "type": "data",
+            "subtype": "spiffs",
+            "address": "0x80000",
+            "size": "0x20000"
+        },
+        "fwfs1": {
+            "address": "0xA0000",
+            "size": "330K",
+            "type": "data",
+            "subtype": "fwfs",
+            "filename": "out/fwfs1.bin",
+            "build": {
+                "target": "fwfs-build",
+                "config": "fsimage.fwfs"
+            }
+        }
+    }
+}

From 2705310fa6db56500815a6a6843f27d429ecff5f Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Sun, 21 Mar 2021 10:07:48 +0000
Subject: [PATCH 70/91] Improve SPIFFS directory handling (#2273)

The SPIFFS IFS wrapper has limited directory emulation, so that `opendir`, `readdir`, etc. work consistently across filesystems.

This PR fixes `readdir` so that 'directories' are included in the output. (This requires de-duplication so if there are multiple files such as `/dir/file.txt`, `/dir/file2.txt` then 'dir' is reported only once.)

Also add a `rewinddir` implementation.

Note: If there is a file called `/dir` in addition to the above files, then readdir() will report two entries, one as a directory and the other as the file.
---
 Sming/Components/IFS                                 |  2 +-
 Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp |  2 +-
 Sming/Core/FileSystem.h                              | 11 +++++++++++
 Sming/Core/Network/Ftp/FtpDataFileList.h             |  6 +++---
 Sming/Core/Network/Ftp/FtpServerConnection.cpp       |  2 +-
 samples/Basic_IFS/app/application.cpp                |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index 330eea7867..7e58a78cf2 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit 330eea786758f44b665ba4a62426d51326221e0d
+Subproject commit 7e58a78cf2820dd93c514d9ddb88f2077f55b242
diff --git a/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp b/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp
index 579e709f9e..256f270037 100644
--- a/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp
+++ b/Sming/Core/Data/Stream/IFS/HtmlDirectoryTemplate.cpp
@@ -27,7 +27,7 @@ String HtmlDirectoryTemplate::getValue(const char* name)
 		auto& stat = dir().stat();
 
 		if(FS("icon") == name) {
-			if(stat.attr[FileAttribute::Directory]) {
+			if(stat.isDir()) {
 				return F("&#128193;");
 			}
 
diff --git a/Sming/Core/FileSystem.h b/Sming/Core/FileSystem.h
index 0a33216790..750ea338e7 100644
--- a/Sming/Core/FileSystem.h
+++ b/Sming/Core/FileSystem.h
@@ -510,6 +510,7 @@ inline int fileCloseDir(DirHandle dir)
 /** @brief Read a directory entry
  *  @param dir The directory object returned by fileOpenDir()
  *  @param stat The returned information, owned by DirHandle object
+ *  @retval int Error code
  */
 inline int fileReadDir(DirHandle dir, FileStat& stat)
 {
@@ -517,6 +518,16 @@ inline int fileReadDir(DirHandle dir, FileStat& stat)
 	return fileSystem->readdir(dir, stat);
 }
 
+/** @brief Rewind to start of directory entries
+ *  @param dir The directory object returned by fileOpenDir()
+ *  @retval int Error code
+ */
+inline int fileRewindDir(DirHandle dir)
+{
+	CHECK_FS(rewinddir)
+	return fileSystem->rewinddir(dir);
+}
+
 /** @brief Get basic file system information
  *  @retval int Error code
  */
diff --git a/Sming/Core/Network/Ftp/FtpDataFileList.h b/Sming/Core/Network/Ftp/FtpDataFileList.h
index 582ed1d7bb..637804ddf7 100644
--- a/Sming/Core/Network/Ftp/FtpDataFileList.h
+++ b/Sming/Core/Network/Ftp/FtpDataFileList.h
@@ -29,7 +29,7 @@ class FtpDataFileList : public FtpDataStream
 			return;
 		}
 
-		if(stat.attr[FileAttribute::Directory]) {
+		if(stat.isDir()) {
 			dir.open(path);
 			statValid = dir.next();
 		} else {
@@ -78,13 +78,13 @@ class FtpDataFileList : public FtpDataStream
 			char buf[128];
 			PSTR_ARRAY(fmt, "--- %-6u %s ");
 			m_snprintf(buf, sizeof(buf), fmt, stat.size, timestr.c_str());
-			buf[0] = stat.attr[FileAttribute::Directory] ? 'd' : '-';
+			buf[0] = stat.isDir() ? 'd' : '-';
 			buf[1] = (user.role >= stat.acl.readAccess) ? 'r' : '-';
 			buf[2] = stat.attr[FileAttribute::ReadOnly] && (user.role >= stat.acl.writeAccess) ? 'w' : '-';
 			line = buf;
 		}
 		line.concat(stat.name, stat.name.length);
-		if(stat.attr[FileAttribute::Directory]) {
+		if(stat.isDir()) {
 			line += '/';
 		}
 	}
diff --git a/Sming/Core/Network/Ftp/FtpServerConnection.cpp b/Sming/Core/Network/Ftp/FtpServerConnection.cpp
index 863bb33026..ce37fae343 100644
--- a/Sming/Core/Network/Ftp/FtpServerConnection.cpp
+++ b/Sming/Core/Network/Ftp/FtpServerConnection.cpp
@@ -267,7 +267,7 @@ void FtpServerConnection::onCommand(String cmd, String data)
 		}
 		debug_i("CWD: '%s'", path.c_str());
 		FileStat stat;
-		if(getFileSystem()->stat(path, stat) == FS_OK && stat.attr[FileAttribute::Directory]) {
+		if(getFileSystem()->stat(path, stat) == FS_OK && stat.isDir()) {
 			cwd = path;
 			response(250, F("directory changed to /") + cwd.c_str()); // OK
 		} else {
diff --git a/samples/Basic_IFS/app/application.cpp b/samples/Basic_IFS/app/application.cpp
index d692fde091..346681e76c 100644
--- a/samples/Basic_IFS/app/application.cpp
+++ b/samples/Basic_IFS/app/application.cpp
@@ -58,7 +58,7 @@ void onFile(HttpRequest& request, HttpResponse& response)
 		return;
 	}
 
-	if(stat.attr[FileAttribute::Directory]) {
+	if(stat.isDir()) {
 		auto dir = new Directory;
 		IFS::DirectoryTemplate* tmpl;
 		String fmt = request.uri.Query["format"];

From f42ae4629906e873381ff004ec383f157bb9324a Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 22 Mar 2021 09:50:50 +0000
Subject: [PATCH 71/91] Added graphical hardware profile editor (#2274)

Basic but hopefully useful.

Enter make hwconfig-edit from project directory.
---
 .../Esp8266/Components/esp8266/component.mk   |   6 +-
 .../Storage/Tools/hwconfig/common.py          |  18 +-
 .../Storage/Tools/hwconfig/config.py          |  44 +-
 .../Storage/Tools/hwconfig/editor.py          | 584 ++++++++++++++++++
 .../Storage/Tools/hwconfig/hwconfig.py        |   3 +-
 .../Storage/Tools/hwconfig/partition.py       | 113 ++--
 .../Storage/Tools/hwconfig/storage.py         |  18 +-
 Sming/Components/Storage/component.mk         |  33 +-
 Sming/Components/rboot/component.mk           |   1 +
 Sming/Components/spiffs/component.mk          |   2 +
 Sming/building.rst                            |   2 +-
 Sming/project.mk                              |   4 +
 12 files changed, 765 insertions(+), 63 deletions(-)
 create mode 100644 Sming/Components/Storage/Tools/hwconfig/editor.py

diff --git a/Sming/Arch/Esp8266/Components/esp8266/component.mk b/Sming/Arch/Esp8266/Components/esp8266/component.mk
index 3b9e3a672f..e3843a245f 100644
--- a/Sming/Arch/Esp8266/Components/esp8266/component.mk
+++ b/Sming/Arch/Esp8266/Components/esp8266/component.mk
@@ -4,15 +4,17 @@ COMPONENT_VARS			:= SDK_BASE
 SDK_BASE ?= $(COMPONENT_PATH)/ESP8266_NONOS_SDK
 
 SDK_BASE				:= $(call FixPath,$(SDK_BASE))
+
+DEBUG_VARS				+= FLASH_INIT_DATA FLASH_INIT_DATA_VCC
 FLASH_INIT_DATA			= $(SDK_BASE)/bin/esp_init_data_default.bin
-FLASH_INIT_DATA_VCC = $(SDK_BASE)/bin/esp_init_data_vdd_default.bin
+FLASH_INIT_DATA_VCC		= $(SDK_BASE)/bin/esp_init_data_vdd_default.bin
 
 CUSTOM_TARGETS			+= $(FLASH_INIT_DATA) $(FLASH_INIT_DATA_VCC)
 
 # => 'Internal' SDK - for SDK Version 3+ as submodule in Sming repository
 # SDK_BASE just needs to point into our repo as it's overridden with the correct submodule path
 # This provides backward-compatiblity, so $(SMING)/third-party/ESP8266_NONOS_SDK) still works
-DEBUG_VARS				+= SDK_INTERNAL
+DEBUG_VARS				+= SDK_INTERNAL SDK_BASE
 ifneq (,$(findstring $(SMING_HOME),$(SDK_BASE)))
 GLOBAL_CFLAGS			+= -DSDK_INTERNAL=1
 SDK_INTERNAL			:= 1
diff --git a/Sming/Components/Storage/Tools/hwconfig/common.py b/Sming/Components/Storage/Tools/hwconfig/common.py
index 8c28db32bb..47c6e2bfce 100644
--- a/Sming/Components/Storage/Tools/hwconfig/common.py
+++ b/Sming/Components/Storage/Tools/hwconfig/common.py
@@ -56,10 +56,11 @@ def addr_format(a):
 
 
 def size_format(a):
-    if a != 0:
-        for (val, suffix) in [(0x40000000, "G"), (0x100000, "M"), (0x400, "K")]:
-            if a % val == 0:
-                return "%d%s" % (a // val, suffix)
+    if a == 0:
+        return '0'
+    for (val, suffix) in [(0x40000000, "G"), (0x100000, "M"), (0x400, "K")]:
+        if a % val == 0:
+            return "%d%s" % (a // val, suffix)
     return "0x%08x" % a
 
 
@@ -83,14 +84,11 @@ def lookup_keyword(t, keywords):
 
 
 class InputError(RuntimeError):
-
     def __init__(self, e):
         super(InputError, self).__init__(e)
 
 
 class ValidationError(InputError):
-
-    def __init__(self, partition, message):
-        super(ValidationError, self).__init__(
-            "Partition %s invalid: %s" % (partition.name, message))
-
+    def __init__(self, obj, message):
+        super(ValidationError, self).__init__("%s.%s '%s' invalid: %s" % (type(obj).__module__, type(obj).__name__, obj.name, message))
+        self.obj = obj
diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
index 67a465bd0c..1e0c3ae29f 100644
--- a/Sming/Components/Storage/Tools/hwconfig/config.py
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -7,9 +7,16 @@
 from common import *
 from builtins import classmethod
 
+HW_EXT = '.hw'
+
+def get_config_dirs():
+    s = os.environ['HWCONFIG_DIRS']
+    dirs = s.replace('  ', ' ').split(' ')
+    return dirs
+
 def load_option_library():
     library = {}
-    dirs = os.environ['HWCONFIG_DIRS'].split(' ')
+    dirs = get_config_dirs()
     for d in dirs:
         filename = fixpath(d) + '/options.json'
         if os.path.exists(filename):
@@ -18,10 +25,20 @@ def load_option_library():
                 library.update(data)
     return library
 
-def findConfig(name):
-    dirs = os.environ['HWCONFIG_DIRS'].split(' ')
+def get_config_list():
+    list = {}
+    dirs = get_config_dirs()
+    for d in reversed(dirs):
+        for f in os.listdir(d):
+            if f.endswith(HW_EXT):
+                n = os.path.splitext(f)[0]
+                list[n] = d + '/' + f
+    return list
+
+def find_config(name):
+    dirs = get_config_dirs()
     for d in dirs:
-        path = fixpath(d) + '/' + name + '.hw'
+        path = fixpath(d) + '/' + name + HW_EXT
         if os.path.exists(path):
             return path
     raise InputError("Config '%s' not found" % name)
@@ -33,6 +50,7 @@ def __init__(self):
         self.depends = []
         self.options = []
         self.option_library = load_option_library()
+        self.base_config = None
 
     def __str__(self):
         return "'%s' for %s" % (self.name, self.arch)
@@ -42,18 +60,27 @@ def from_name(cls, name):
         """Create configuration given its name and resolve options
         """
         config = Config()
-        options = os.environ.get('HWCONFIG_OPTS', '').replace(' ', '')
         config.load(name)
+        options = os.environ.get('HWCONFIG_OPTS', '').replace(' ', '')
         if options != '':
             config.parse_options(options.split(','))
         config.resolve_expressions()
         config.partitions.sort()
         return config
 
+    @classmethod
+    def from_json(cls, json, options = []):
+        config = Config()
+        config.parse_dict(copy.deepcopy(json))
+        config.parse_options(options)
+        config.resolve_expressions()
+        config.partitions.sort()
+        return config
+
     def load(self, name):
         """Load a configuration recursively
         """
-        filename = findConfig(name)
+        filename = find_config(name)
         self.depends.append(filename)
         with open(filename) as f:
             data = json.loads(jsmin(f.read()))
@@ -76,9 +103,13 @@ def parse_options(self, options):
 
     def resolve_expressions(self):
         self.partitions.offset = eval(str(self.partitions.offset))
+        for p in self.partitions:
+            p.resolve_expressions()
 
     def parse_dict(self, data):
         base_config = data.pop('base_config', None)
+        if self.base_config is None:
+            self.base_config = base_config
         if base_config is not None:
             self.load(base_config)
 
@@ -136,6 +167,7 @@ def buildVars(self):
         return res
 
     def verify(self, secure):
+        self.devices.verify()
         self.partitions.verify(self.arch, self.devices[0], secure)
 
     def map(self):
diff --git a/Sming/Components/Storage/Tools/hwconfig/editor.py b/Sming/Components/Storage/Tools/hwconfig/editor.py
new file mode 100644
index 0000000000..c2f93d2fae
--- /dev/null
+++ b/Sming/Components/Storage/Tools/hwconfig/editor.py
@@ -0,0 +1,584 @@
+import argparse, os, partition, configparser, string
+from common import *
+from config import *
+import tkinter as tk
+from tkinter import ttk, filedialog, messagebox
+
+app_name = 'Sming Hardware Profile Editor'
+
+def read_property(obj, name):
+    """Read an object property, preferring string representation
+    """
+    value = getattr(obj, name + '_str', None)
+    return getattr(obj, name, '') if value is None else value()
+
+
+def get_dict_value(dict, key, default):
+    """Read dictionary value, creating one if it doesn't exist
+    """
+    if not key in dict:
+        dict[key] = default
+    return dict[key]
+
+
+def load_config_vars(filename):
+    out_base = os.environ['OUT_BASE']
+    path = out_base + '/' + filename
+    if not os.path.exists(path):
+        return {}
+    parser = configparser.ConfigParser()
+    parser.optionxform = str # preserve case
+    with open(path) as f:
+        data = "[config]\n" + f.read()
+    parser.read_string(data)
+    return parser['config']
+
+
+def to_KB(value):
+    """Round value up to whole KB
+    """
+    return (value + 1023) & ~0x3ff
+
+
+def percent_used(used, total):
+    """Get string showing size and percent of total
+    """
+    s = size_format(to_KB(used))
+    if total != 0:
+        s += " (%u%%)" % round(100 * used / total)
+    return s
+
+
+def checkProfilePath(filename):
+    filename = os.path.realpath(filename)
+    if filename.startswith(os.getcwd()):
+        return True
+
+    messagebox.showerror(
+        'Invalid profile path',
+        'Must be in working project directory where `make hwedit-config` was run')
+    return False
+
+
+class Field:
+    """Manages widget and associated variable
+    """
+    def __init__(self, var, widget):
+        self.var = var
+        self.widget = widget
+
+    def get_value(self):
+        return str(self.var.get())
+
+    def is_disabled(self):
+        return str(self.widget.cget('state')) == 'disabled'
+
+
+class EditState(dict):
+    """Manage details of device/partition editing using dictionary of Field objects
+    """
+    def __init__(self, editor, objectType, dictName, obj, enumDict):
+        super().__init__(self)
+        self.editor = editor
+        self.objectType = objectType
+        self.dictName = dictName
+        if objectType == 'Partition' and obj.is_unused():
+            self.name = 'New Partition'
+        else:
+            self.name = obj.name
+        self.schema = editor.schema['definitions'][objectType]
+        self.obj = obj
+        self.row = 0
+
+        self.addControl('name')
+        for k in self.schema['properties'].keys():
+            self.addControl(k, enumDict)
+        btn = ttk.Button(editor.editFrame, text="Apply", command=self.apply)
+        btn.grid(row=100, column=0, columnspan=2)
+
+    def addControl(self, fieldName, enumDict = {}):
+        frame = self.editor.editFrame
+        schema = self.get_property(fieldName)
+        disabled = False
+        value = read_property(self.obj, fieldName)
+        if hasattr(value, 'name'):
+            value = value.name
+            disabled = True
+        elif value and schema['type'] == 'object':
+            value = json.dumps(value)
+        var = tk.StringVar(value=value)
+        if schema['type'] == 'boolean':
+            c = ttk.Checkbutton(frame, text=fieldName, variable=var)
+        else:
+            l = tk.Label(frame, text=fieldName)
+            l.grid(row=self.row, column=0, sticky=tk.W)
+            values = enumDict.get(fieldName, schema.get('enum'))
+            if values is not None:
+                c = ttk.Combobox(frame, values=values)
+                if fieldName == 'subtype':
+                    def set_subtype_values():
+                        t = self['type'].get_value()
+                        t = partition.TYPES[t]
+                        values = partition.SUBTYPES.get(t, [])
+                        critical("t = %s, %s" % (t, values))
+                        c.configure(values=list(values))
+                    c.configure(postcommand=set_subtype_values)
+            else:
+                c = tk.Entry(frame, width=64)
+            c.configure(textvariable=var)
+        self[fieldName] = Field(var, c)
+
+        if fieldName == 'name':
+            # Name is read-only for inherited devices/partitions
+            objlist = getattr(self.editor.getBaseConfig(), self.dictName)
+            disabled = objlist.find_by_name(self.name) is not None
+            var.set(self.name)
+        # Internal 'partitions' are generally not editable, but make an exception to allow
+        # creation of new partitions (on an 'unused' type) or changing the partition table offset
+        if self.objectType == 'Partition':
+            if self.obj.is_internal() and not self.obj.is_unused():
+                if not (self.obj.is_internal(partition.INTERNAL_PARTITION_TABLE) and fieldName == 'address'):
+                    disabled = True
+        if disabled:
+            c.configure(state='disabled')
+        c.grid(row=self.row, column=1, sticky=tk.EW)
+        self.row += 1
+        return c
+
+    def apply(self, *args):
+        # Fetch base JSON for comparison
+        baseConfig = self.editor.getBaseConfig()
+        base = getattr(baseConfig, self.dictName).find_by_name(self.name)
+        if base is None:
+            base = {}
+        else:
+            base = base.dict()
+        json_config = copy.deepcopy(self.editor.json)
+        json_object = get_dict_value(json_config, self.dictName, {})
+        new_name = None
+        try:
+            obj = get_dict_value(json_object, self.name, {})
+            if self.objectType == 'Partition' and self.obj.is_unused():
+                obj['device'] = self.obj.device.name
+            for k, f in self.items():
+                if f.is_disabled():
+                    continue
+                value = f.get_value()
+                schema = self.get_property(k)
+                if k == 'name':
+                    value = value.strip()
+                    if value != self.name:
+                        if value in self.editor.config.map():
+                            self.editor.status.set("Name '%s' already used" % value)
+                            return
+                        old = json_object.pop(self.name)
+                        obj = json_object[value] = old
+                        new_name = value
+                        # If renaming a device, then all partitions must be updated
+                        if self.objectType == 'Device':
+                            for n, p in json_config.get('partitions', {}).items():
+                                if p['device'] == self.name:
+                                    p['device'] = new_name
+                elif k == 'address' and self.objectType == 'Partition' and self.obj.is_internal(partition.INTERNAL_PARTITION_TABLE):
+                    if parse_int(value) == baseConfig.partitions.offset:
+                        if 'partition_table_offset' in json_config:
+                            del json_config['partition_table_offset']
+                    else:
+                        json_config['partition_table_offset'] = value
+                elif value == '' and k != 'filename': # TODO mark 'allow empty' values in schema somehow
+                    if k in obj:
+                        del obj[k]
+                elif schema['type'] == 'object':
+                    obj[k] = {} if value == '' else json.loads(value)
+                elif schema['type'] == 'boolean':
+                    obj[k] = (value != '0')
+                elif value.isdigit() and 'integer' in schema['type']:
+                    obj[k] = int(value)
+                else:
+                    obj[k] = value
+                if k in base and obj[k] == base[k]:
+                    del obj[k]
+            if len(obj) == 0:
+                del json_object[self.name]
+            Config.from_json(json_config).verify(False)
+            self.editor.json = json_config
+            if new_name is not None:
+                self.name = new_name
+                self.editor.updateEditTitle()
+            self.editor.reload()
+        except InputError as err:
+            self.editor.user_error(err)
+        except AttributeError as err:
+            self.editor.user_error(err)
+        except ValueError as err:
+            self.editor.user_error(err)
+
+
+    def get_property(self, name):
+        if name == 'name':
+            return {'type': 'text'}
+        else:
+            return self.schema['properties'][name]
+
+    def nameChanged(self):
+        return self.name != self['name'].get_value()
+
+
+class Editor:
+    def __init__(self, root):
+        root.title(app_name)
+        self.main = root
+        self.edit = None
+        self.config_vars = load_config_vars('config.mk')
+        self.config_vars.update(load_config_vars('debug.mk'))
+        self.initialise()
+
+    def initialise(self):
+        # Window resizing is focused around treeview @ (0, 0)
+        self.main.columnconfigure(0, weight=1)
+        self.main.rowconfigure(1, weight=1)
+        self.main.rowconfigure(2, weight=3)
+        self.main.option_add('*tearOff', False)
+        s = ttk.Style()
+        s.configure('Treeview', font='TkFixedFont')
+        s.configure('Treeview.Heading', font='TkFixedFont')
+
+        with open(os.environ['HWCONFIG_SCHEMA']) as f:
+            self.schema = json.load(f)
+
+        hwFilter = [('Hardware Profiles', '*' + HW_EXT)]
+
+        # Menus
+        def fileNew(*args):
+            self.reset()
+            self.reload()
+
+        def fileOpen(*args):
+            filename = filedialog.askopenfilename(
+                title='Select profile ' + HW_EXT + ' file',
+                filetypes=hwFilter,
+                initialdir=os.getcwd())
+            if filename != '' and checkProfilePath(filename):
+                self.loadConfig(filename)
+
+        def fileSave(*args):
+            filename = self.json['name']
+            filename = filedialog.asksaveasfilename(
+                title='Save profile to file',
+                filetypes=hwFilter,
+                initialfile=filename,
+                initialdir=os.getcwd())
+            if filename != '' and checkProfilePath(filename):
+                ext = os.path.splitext(filename)[1]
+                if ext != HW_EXT:
+                    filename += HW_EXT
+                with open(filename, "w") as f:
+                    json.dump(self.json, f, indent=4)
+
+        def editAddDevice(*args):
+            dev = storage.Device('New device')
+            self.editDevice(dev)
+
+        menubar = tk.Menu(self.main)
+        self.main['menu'] = menubar
+        menu_file = tk.Menu(menubar)
+        menubar.add_cascade(menu=menu_file, label='File')
+        menu_file.add_command(label='New...', command=fileNew)
+        menu_file.add_command(label='Open...', command=fileOpen)
+        menu_file.add_command(label='Save...', command=fileSave)
+        menu_edit = tk.Menu(menubar)
+        menubar.add_cascade(menu=menu_edit, label='Edit')
+        menu_edit.add_command(label='Add Device', command=editAddDevice)
+
+        # Toolbar
+        toolbar = ttk.Frame(self.main)
+        toolbar.grid(row=0, column=0, columnspan=4, sticky=tk.W)
+        btnNew = ttk.Button(toolbar, text="New", command=fileNew)
+        btnNew.grid(row=0, column=1)
+        btnOpen = ttk.Button(toolbar, text="Open...", command=fileOpen)
+        btnOpen.grid(row=0, column=2)
+        btnSave = ttk.Button(toolbar, text="Save...", command=fileSave)
+        btnSave.grid(row=0, column=3)
+
+        # Treeview for devices and partitions
+
+        tree = ttk.Treeview(self.main, columns=['start', 'end', 'size', 'used', 'type', 'subtype', 'filename'])
+        tree.grid(row=1, column=0, columnspan=3, sticky=tk.NSEW)
+        self.tree = tree
+
+        s = ttk.Scrollbar(self.main, orient=tk.VERTICAL, command=tree.yview)
+        s.grid(row=1, column=4, sticky=tk.NS)
+        tree['yscrollcommand'] = s.set
+
+        tree.heading('start', text='Start', anchor=tk.W)
+        tree.heading('end', text='End', anchor=tk.W)
+        tree.heading('size', text='Size', anchor=tk.W)
+        tree.heading('used', text='Used', anchor=tk.W)
+        tree.heading('type', text='Type', anchor=tk.W)
+        tree.heading('subtype', text='Sub-Type', anchor=tk.W)
+        tree.heading('filename', text='Image filename', anchor=tk.W)
+
+        # Base configurations
+        f = ttk.LabelFrame(self.main, text = 'Base Configuration')
+        f.grid(row=2, column=0, sticky=tk.SW)
+
+        def base_config_changed(*args):
+            self.json['base_config'] = self.base_config.get()
+            self.reload()
+
+        self.base_config = tk.StringVar(value = 'standard')
+        config_list = ttk.Combobox(f,
+            textvariable = self.base_config,
+            values = list(get_config_list().keys()))
+        config_list.bind('<<ComboboxSelected>>', base_config_changed)
+        config_list.grid()
+
+        # Option checkboxes
+
+        f = ttk.LabelFrame(self.main, text = 'Options')
+        f.grid(row=3, column=0, sticky=tk.NW)
+
+        def options_changed(*args):
+            self.json['options'] = []
+            for k, v in self.options.items():
+                if v.get():
+                    self.json['options'].append(k)
+            self.reload()
+
+        self.options = {}
+        for k, v in load_option_library().items():
+            self.options[k] = tk.BooleanVar()
+            btn = tk.Checkbutton(f, text = k + ': ' + v['description'],
+                command=options_changed, variable=self.options[k])
+            btn.grid(sticky=tk.W)
+
+        # Selection handling
+        def select(*args):
+            id = tree.focus()
+            if id == '':
+                return
+            item = tree.item(id)
+            if 'device' in item['tags']:
+                dev = self.device_from_id(id)
+                self.editDevice(dev)
+            else:
+                part = self.config.map().find_by_name(id)
+                if part is None:
+                    dev = self.device_from_id(tree.parent(id))
+                    addr = item['values'][0]
+                    part = self.config.map().find_by_address(dev, addr)
+                self.editPartition(part)
+        tree.bind('<<TreeviewSelect>>', select)
+
+        # Edit frame
+        self.editFrame = ttk.LabelFrame(self.main, text='Edit Object')
+        self.editFrame.grid(row=2, column=1, rowspan=2, sticky=tk.SW)
+
+        # JSON editor
+        jsonFrame = ttk.LabelFrame(self.main, text='JSON Configuration')
+        jsonFrame.grid(row=2, column=2, rowspan=2, sticky=tk.NS)
+        def apply(*args):
+            try:
+                json_config = json.loads(self.jsonEditor.get('1.0', 'end'))
+                Config.from_json(json_config).verify(False)
+                self.json = json_config
+                self.updateWindowTitle()
+                self.reload()
+            except InputError as err:
+                self.user_error(err)
+            except AttributeError as err:
+                self.user_error(err)
+            except ValueError as err:
+                self.user_error(err)
+        btn = ttk.Button(jsonFrame, text="Apply", command=apply)
+        btn.pack(anchor=tk.S, side=tk.BOTTOM)
+        self.jsonEditor = tk.Text(jsonFrame, height=14)
+        self.jsonEditor.pack(anchor=tk.N, side=tk.LEFT, fill=tk.BOTH)
+        s = ttk.Scrollbar(jsonFrame, orient=tk.VERTICAL, command=self.jsonEditor.yview)
+        s.pack(anchor=tk.N, side=tk.RIGHT, fill=tk.Y)
+        self.jsonEditor['yscrollcommand'] = s.set
+
+        # Status box
+        self.status = tk.StringVar()
+        status = ttk.Label(self.main, textvariable=self.status)
+        status.grid(row=4, column=0, columnspan=3, sticky=tk.EW)
+
+        self.reset()
+
+    def user_error(self, err):
+        self.status.set(err)
+        messagebox.showerror(type(err).__name__, err)
+
+    def getBaseConfig(self):
+        """Load the base configuration with currently selected options applied
+        """
+        return Config.from_json(self.json_base_config, self.json['options'])
+ 
+    def loadConfig(self, filename):
+        self.reset()
+        # If this is a core profile, don't edit it but create a new profile based on it
+        if filename.startswith(os.environ['SMING_HOME']):
+            self.json = {}
+            self.json['name'] = 'New profile'
+            config_name = os.path.splitext(os.path.basename(filename))[0]
+            self.json['base_config'] = config_name
+        else:
+            with open(filename) as f:
+                self.json = json.loads(jsmin(f.read()))
+
+        with open(find_config(self.json['base_config'])) as f:
+            self.json_base_config = json.loads(jsmin(f.read()))
+
+        options = get_dict_value(self.json, 'options', [])
+        for opt in os.environ.get('HWCONFIG_OPTS', '').replace(' ', '').split():
+            if not opt in options:
+                options.append(opt)
+
+        self.reload()
+        self.updateWindowTitle()
+
+    def updateWindowTitle(self):
+        name = self.json.get('name', None)
+        if name is None:
+            name = '(new)'
+        else:
+            name = '"' + name + '"'
+        self.main.title(self.config.arch + ' ' + name + ' - ' + app_name)
+
+    def clear(self):
+        # TODO: Prompt to save changes
+
+        # Clear the tree, etc.
+        for c in self.tree.get_children():
+            self.tree.delete(c)
+        self.status.set('')
+
+    def reset(self):
+        self.clear()
+        self.resetEditor()
+        self.json = {"name": "New Profile"}
+        self.json['base_config'] = 'standard'
+        self.base_config.set('standard')
+        for k, v in self.options.items():
+            v.set(False)
+        self.reload()
+        self.updateWindowTitle()
+
+    def resolve_path(self, path):
+        tmp = str(path)
+        while True:
+            tmp = tmp.replace('(', '{')
+            tmp = tmp.replace(')', '}')
+            new_path = string.Template(tmp).substitute(self.config_vars)
+            if new_path == tmp:
+                return new_path
+            tmp = new_path
+
+    def reload(self):
+        self.clear()
+        self.jsonEditor.replace('1.0', 'end', to_json(self.json))
+        try:
+            config = self.config = Config.from_json(self.json)
+        except InputError as err:
+            self.status.set(str(err))
+            return
+
+        # Devices are our root nodes
+        for dev in config.devices:
+            used = 0
+            for p in config.map():
+                if p.device == dev and not p.is_unused():
+                    used += p.size
+            self.tree.insert('', 'end', dev.name, text=dev.name, open=True,
+                tags = ['device'],
+                values=[addr_format(0), addr_format(dev.size - 1), dev.size_str(), percent_used(used, dev.size), dev.type_str()])
+
+        # Partitions are children
+        for p in config.map():
+            if p.is_unused():
+                id = p.device.name + '/' + p.address_str()
+            else:
+                id = p.name
+
+            def get_used():
+                if p.filename == '':
+                    return ''
+                try:
+                    path = self.resolve_path(p.filename)
+                except KeyError as err:
+                    return str(err) + ' undefined'
+                if not os.path.exists(path):
+                    return '(not found)'
+                return percent_used(os.path.getsize(path), p.size)
+
+            self.tree.insert(p.device.name, 'end', id, text=p.name,
+                values=[p.address_str(), p.end_str(), p.size_str(), get_used(), p.type_str(), p.subtype_str(), p.filename])
+
+        # Base configuration
+        self.base_config.set(config.base_config)
+
+        # Options
+        for k, v in self.options.items():
+            v.set(k in config.options)
+
+        if self.edit is not None:
+            id = self.edit.name
+            if self.tree.exists(id):
+                self.tree.focus(id)
+                self.tree.selection_set(id)
+
+
+    def device_from_id(self, id):
+        item = self.tree.item(id)
+        if 'device' in item['tags']:
+            return self.config.devices.find_by_name(item['text'])
+        else:
+            return None
+
+    def updateEditTitle(self):
+        self.editFrame.configure(text="Edit %s '%s'" % (self.edit.objectType, self.edit.name))
+
+    def resetEditor(self):
+        self.edit = None
+        f = self.editFrame
+        for c in f.winfo_children():
+            c.destroy()
+        self.editFrame.configure(text='')
+        return f
+
+    def editDevice(self, dev):
+        enumDict = {}
+        enumDict['type'] = list((storage.TYPES).keys())
+        self.resetEditor()
+        self.edit = EditState(self, 'Device', 'devices', dev, enumDict)
+        self.updateEditTitle()
+
+
+    def editPartition(self, part):
+        enumDict = {}
+        enumDict['device'] = [dev.name for dev in self.config.devices]
+        enumDict['type'] = list((partition.TYPES).keys() - ['storage', 'internal'])
+        enumDict['subtype'] = []
+        self.resetEditor()
+        self.edit = EditState(self, 'Partition', 'partitions', part, enumDict)
+        self.updateEditTitle()
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Sming hardware profile editor')
+    parser.add_argument('input', help='Name of existing hardware profile')
+    args = parser.parse_args()
+
+    root = tk.Tk()
+    editor = Editor(root)
+    editor.loadConfig(find_config(args.input))
+    root.mainloop()
+
+
+if __name__ == '__main__':
+    try:
+        print("TCL version %s" % tk.TclVersion)
+        main()
+    except InputError as e:
+        print(e, file=sys.stderr)
+        sys.exit(2)
diff --git a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
index e2b3d90ddb..1aff6773af 100644
--- a/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
+++ b/Sming/Components/Storage/Tools/hwconfig/hwconfig.py
@@ -25,7 +25,8 @@ def handle_validate(args, config, part):
     try:
         from jsonschema import Draft7Validator
         inst = json.loads(config.to_json())
-        schema = json.load(open(args.expr))
+        with open(os.environ['HWCONFIG_SCHEMA']) as f:
+            schema = json.load(f)
         v = Draft7Validator(schema)
         errors = sorted(v.iter_errors(inst), key=lambda e: e.path)
         if errors != []:
diff --git a/Sming/Components/Storage/Tools/hwconfig/partition.py b/Sming/Components/Storage/Tools/hwconfig/partition.py
index 18e78435d5..d04f143801 100644
--- a/Sming/Components/Storage/Tools/hwconfig/partition.py
+++ b/Sming/Components/Storage/Tools/hwconfig/partition.py
@@ -24,6 +24,7 @@
 FLASH_SECTOR_SIZE = 0x1000
 PARTITION_TABLE_SIZE = 0x1000  # Size of partition table
 PARTITION_ENTRY_SIZE = 32
+PARTITION_NAME_SIZE = 16
 
 MIN_PARTITION_SUBTYPE_APP_OTA = 0x10
 NUM_PARTITION_SUBTYPE_APP_OTA = 16
@@ -35,7 +36,13 @@
 STORAGE_TYPE = 0x02 # Reference to storage device
 USER_TYPE = 0x40 # First user-defined type
 
-# Default is 4
+# Used for internal management, e.g. in maps
+INTERNAL_TYPE = 0xff
+INTERNAL_BOOT_SECTOR = 0x00
+INTERNAL_PARTITION_TABLE = 0x01
+INTERNAL_UNUSED = 0x02
+
+# Partition start alignment
 ALIGNMENT = {
     "Esp32": {
         APP_TYPE: 0x10000,
@@ -53,6 +60,7 @@
     "data": DATA_TYPE,
     "storage": STORAGE_TYPE,
     "user": USER_TYPE,
+    "internal": INTERNAL_TYPE,
 }
 
 # Keep this map in sync with esp_partition_subtype_t enum in esp_partition.h
@@ -76,6 +84,7 @@
         "ota_14": 0x1e,
         "ota_15": 0x1f,
         "test": 0x20,
+        "internal": 0xff,
     },
     DATA_TYPE: {
         "ota": 0x00,
@@ -91,7 +100,12 @@
         "spiffs": 0x82,
         "fwfs": 0xf1,
     },
-    STORAGE_TYPE: storage.TYPES
+    STORAGE_TYPE: storage.TYPES,
+    INTERNAL_TYPE: {
+        "boot": INTERNAL_BOOT_SECTOR,
+        "pt": INTERNAL_PARTITION_TABLE,
+        "unused": INTERNAL_UNUSED,
+    }
 }
 
 
@@ -114,7 +128,7 @@ def parse_subtype(ptype, value):
 class Table(list):
 
     def __init__(self):
-        super(Table, self).__init__(self)
+        super().__init__(self)
 
     def parse_dict(self, data, devices):
         partnames = []
@@ -131,7 +145,13 @@ def parse_dict(self, data, devices):
             part.parse_dict(entry, devices)
 
     def sort(self):
-        super(Table, self).sort(key=lambda p: p.device.name + p.address_str())
+        # Ensure spiFlash partitions are first in the list
+        def get_key(p):
+            key = p.device.name + p.address_str()
+            if p.device.name == 'spiFlash':
+                key = ' ' + key
+            return key
+        super().sort(key=get_key)
 
     def dict(self):
         res = {}
@@ -172,7 +192,7 @@ def __getitem__(self, item):
             if p is None:
                 raise ValueError("No partition entry named '%s'" % item)
             return p
-        return super(Table, self).__getitem__(item)
+        return super().__getitem__(item)
 
     def find_by_type(self, ptype, subtype):
         """Return a partition by type & subtype, returns None if not found
@@ -205,6 +225,8 @@ def find_by_name(self, name):
         return None
 
     def find_by_address(self, device, addr):
+        if isinstance(addr, str):
+            addr = eval(addr)
         for p in self:
             if p.device == device and p.contains(addr):
                 return p
@@ -243,12 +265,14 @@ def verify(self, arch, spiFlash, secure):
             minPartitionAddress = self.offset + PARTITION_TABLE_SIZE
         else:
             minPartitionAddress = 0x00002000
-        dev = ''
+        dev = None
         last = None
         for p in self:
             if p.device != dev:
                 last = None
                 dev = p.device
+                if dev != spiFlash:
+                    minPartitionAddress = 0
             if dev == self[0].device and p.address < minPartitionAddress:
                 raise InputError("Partition '%s' @ %s-%s must be located after @ %s" \
                                  % (p.name, p.address_str(), p.end_str(), addr_format(minPartitionAddress)))
@@ -363,7 +387,7 @@ def parse_dict(self, data, devices):
                 if k == 'device':
                     self.device = devices.find_by_name(v)
                 elif k == 'address':
-                    self.address = eval(str(v))
+                    self.address = v
                 elif k == 'size':
                     self.size = parse_int(v)
                 elif k == 'filename':
@@ -378,12 +402,11 @@ def parse_dict(self, data, devices):
 
             if self.address is None or self.size is None:
                 raise InputError("address/size missing")
-            if self.end() >= self.device.size:
-                raise InputError("Partition '%s' %s-%s too big for %s size %s" \
-                                 % (self.name, self.address_str(), self.end_str(), self.device.name, self.device.size_str()))
         except InputError as e:
             raise InputError("Error in partition entry '%s': %s" % (self.name, e))
 
+    def resolve_expressions(self):
+        self.address = eval(str(self.address))
 
     def dict(self):
         res = {}
@@ -433,17 +456,23 @@ def contains(self, addr):
         return addr >= self.address and addr <= self.end()
 
     def type_str(self):
-        return "" if self.type == 0xff else lookup_keyword(self.type, TYPES)
+        return "" if self.type == INTERNAL_TYPE else lookup_keyword(self.type, TYPES)
 
     def type_is(self, t):
         return self.type_str() == t if isinstance(t, str) else self.type == t
 
     def subtype_str(self):
-        return "" if self.subtype == 0xff else lookup_keyword(self.subtype, SUBTYPES.get(self.type, {}))
+        return "" if self.type == INTERNAL_TYPE else lookup_keyword(self.subtype, SUBTYPES.get(self.type, {}))
 
     def subtype_is(self, subtype):
         return self.subtype_str() == subtype if isinstance(subtype, str) else self.subtype == subtype
 
+    def is_internal(self, subtype = None):
+        return (self.type == INTERNAL_TYPE) and (subtype is None or self.subtype == subtype)
+
+    def is_unused(self):
+        return self.is_internal(INTERNAL_UNUSED)
+
     def __eq__(self, other):
         if isinstance(other, str):
             return self.name == other
@@ -478,18 +507,28 @@ def verify(self, arch, secure):
             raise ValidationError(self, "Offset 0x%x is not aligned to 0x%x" % (self.address, align))
         if self.size % align and secure:
             raise ValidationError(self, "Size 0x%x is not aligned to 0x%x" % (self.size, align))
-        if self.size is None:
+        if self.size is None or self.size == 0:
             raise ValidationError(self, "Size field is not set")
-
+        if self.address >= self.device.size:
+            raise ValidationError(self, "Offset 0x%x exceeds device size 0x%x" % (self.address, self.device.size))
+        if self.end() >= self.device.size:
+            raise ValidationError(self, "End 0x%x exceeds device size 0x%x" % (self.end(), self.device.size))
+
+        if self.name == '':
+            raise ValidationError(self, "Name not specified")
+        if len(self.name) > PARTITION_NAME_SIZE:
+            raise ValidationError(self, "Name too long, max. %u chars" % PARTITION_NAME_SIZE)
+        for c in self.name:
+            if c.isspace():
+                raise ValidationError(self, "Name may not contain whitespace")
         if self.name in TYPES and TYPES.get(self.name, "") != self.type:
-            critical("WARNING: Partition has name '%s' which is a partition type, but does not match this partition's "
-                     "type (0x%x). Mistake in partition table?" % (self.name, self.type))
+            raise ValidationError(self, "Name is a partition type, but does not match this partition's type (%s)" % (self.type))
         all_subtype_names = []
         for names in (t.keys() for t in SUBTYPES.values()):
             all_subtype_names += names
         if self.name in all_subtype_names and SUBTYPES.get(self.type, {}).get(self.name, "") != self.subtype:
-            critical("WARNING: Partition has name '%s' which is a partition subtype, but this partition has "
-                     "non-matching type 0x%x and subtype 0x%x. Mistake in partition table?" % (self.name, self.type, self.subtype))
+            raise ValidationError(self, "Name is a partition subtype, but does not match this partition's type/subtype (%s/%s)" % (self.type_str(), self.subtype_str()))
+
 
     STRUCT_FORMAT = b"<2sBBLL16sL"
 
@@ -530,35 +569,39 @@ class Map(Table):
     """Contiguous map of flash memory
     """
     def __init__(self, table, devices):
-        device = devices[0]
-
-        def add(name, address, size):
-            entry = Entry(device, name, address, size, 0xff, 0xff)
-            self.append(entry)
+        def add(table, device, name, address, size, subtype):
+            entry = Entry(device, name, address, size, INTERNAL_TYPE, subtype)
+            table.append(entry)
             return entry
 
-        def add_unused(address, last_end):
+        def add_unused(table, device, address, last_end):
             if address > last_end + 1:
-                add('(unused)', last_end + 1, address - last_end - 1)
+                add(table, device, '(unused)', last_end + 1, address - last_end - 1, INTERNAL_UNUSED)
+
+        device = devices[0]
 
+        # Take copy of source partitions and add internal ones to appear in the map
         partitions = copy.copy(table)
+        if table.offset != 0:
+            add(partitions, device, 'Boot Sector', 0, min(table.offset, partitions[0].address), INTERNAL_BOOT_SECTOR)
+            add(partitions, device, 'Partition Table', table.offset, PARTITION_TABLE_SIZE, INTERNAL_PARTITION_TABLE)
 
-        if table.offset == 0:
-            last = None
-        else:
-            last = add('Boot Sector', 0, min(table.offset, partitions[0].address))
-            p = Entry(device, 'Partition Table', table.offset, PARTITION_TABLE_SIZE, 0xff, 0xff)
-            partitions.append(p)
-            partitions.sort()
+        # Devices with no defined partitions
+        for dev in devices:
+            if partitions.find_by_address(dev, 0) is None:
+                add_unused(partitions, dev, dev.size, -1)
+
+        partitions.sort()
 
+        last = None
         for p in partitions:
             if last is not None:
                 if p.device != last.device:
-                    add_unused(last.device.size, last.end())
+                    add_unused(self, device, last.device.size, last.end())
                     device = p.device
                 elif p.address > last.end() + 1:
-                    add_unused(p.address, last.end())
+                    add_unused(self, device, p.address, last.end())
             self.append(p)
             last = p
 
-        add_unused(device.size, last.end())
+        add_unused(self, device, device.size, last.end())
diff --git a/Sming/Components/Storage/Tools/hwconfig/storage.py b/Sming/Components/Storage/Tools/hwconfig/storage.py
index 719f8393dc..c72c0fddda 100644
--- a/Sming/Components/Storage/Tools/hwconfig/storage.py
+++ b/Sming/Components/Storage/Tools/hwconfig/storage.py
@@ -3,6 +3,7 @@
 #
 
 from common import *
+import partition
 
 TYPES = {
     "unknown": 0x00,
@@ -53,7 +54,7 @@ def __getitem__(self, item):
             if d is None:
                 raise ValueError("No device named '%s'" % item)
             return d
-        return super(List, self).__getitem__(item)
+        return super().__getitem__(item)
 
     def find_by_name(self, name):
         for d in self:
@@ -61,6 +62,9 @@ def find_by_name(self, name):
                 return d
         return None
 
+    def verify(self):
+        for dev in self:
+            dev.verify()
 
 class Device(object):
     def __init__(self, name, stype = 0, size = 0):
@@ -110,7 +114,17 @@ def buildVars(self):
         return res
 
     def type_str(self):
-        return "" if self.type == 0 else lookup_keyword(self.type, TYPES)
+        return lookup_keyword(self.type, TYPES)
 
     def size_str(self):
         return size_format(self.size)
+
+    def verify(self):
+        if self.size == 0:
+            raise ValidationError(self, "Size field is not set")
+        if self.type is None:
+            raise ValidationError(self, "Type field is not set")
+        if self.name == '':
+            raise ValidationError(self, "Name not specified")
+        if len(self.name) > partition.PARTITION_NAME_SIZE:
+            raise ValidationError(self, "Name too long, max. %u chars" % partition.PARTITION_NAME_SIZE)
diff --git a/Sming/Components/Storage/component.mk b/Sming/Components/Storage/component.mk
index d83be1de7f..05fa6e17a6 100644
--- a/Sming/Components/Storage/component.mk
+++ b/Sming/Components/Storage/component.mk
@@ -29,11 +29,28 @@ endif
 
 PARTITION_PATH		:= $(COMPONENT_PATH)
 PARTITION_TOOLS		:= $(PARTITION_PATH)/Tools
-HWCONFIG_TOOL := \
-	HWCONFIG_DIRS="$(HWCONFIG_DIRS)" \
-	HWCONFIG_OPTS="$(HWCONFIG_OPTS)" \
-	BUILD_BASE=$(BUILD_BASE) \
-	$(PYTHON) $(PARTITION_TOOLS)/hwconfig/hwconfig.py
+HWCONFIG_SCHEMA		:= $(PARTITION_PATH)/schema.json
+HWCONFIG_VARS := \
+	SMING_HOME \
+	OUT_BASE \
+	HWCONFIG_DIRS \
+	HWCONFIG_OPTS \
+	HWCONFIG_SCHEMA
+HWCONFIG_EXPORTS	:= $(foreach v,$(HWCONFIG_VARS),$v="$($v)")
+HWCONFIG_CMDLINE	:= $(PYTHON) $(PARTITION_TOOLS)/hwconfig
+HWCONFIG_TOOL		:= $(HWCONFIG_EXPORTS) $(HWCONFIG_CMDLINE)/hwconfig.py
+
+HWCONFIG_EDITOR		:= $(HWCONFIG_EXPORTS) $(HWCONFIG_CMDLINE)/editor.py $(HWCONFIG)
+
+# When using WSL without an X server available, use native Windows python
+ifdef WSL_ROOT
+ifndef DISPLAY
+space :=
+space +=
+WSLENV := $(WSLENV)$(subst $(space),,$(foreach v,$(HWCONFIG_VARS),::$v))
+HWCONFIG_EDITOR		:= $(HWCONFIG_EXPORTS) powershell.exe -Command "$(HWCONFIG_CMDLINE)/editor.py $(HWCONFIG)"
+endif
+endif
 
 HWCONFIG_MK := $(PROJECT_DIR)/$(OUT_BASE)/hwconfig.mk
 ifneq (,$(MAKE_DOCS)$(MAKE_CLEAN))
@@ -94,8 +111,11 @@ hwconfig-options: ##List available hardware configuration options
 .PHONY: hwconfig-validate
 hwconfig-validate: $(HWCONFIG_PATH) ##Validate current hardware configuration
 	@echo "Validating hardware config '$(HWCONFIG)'"
-	$(Q) $(HWCONFIG_TOOL) validate $(HWCONFIG) - $(PARTITION_PATH)/schema.json
+	$(Q) $(HWCONFIG_TOOL) validate $(HWCONFIG) -
 
+.PHONY: hwconfig-edit
+hwconfig-edit: $(HWCONFIG_PATH) ##Open profile editor
+	$(Q) $(HWCONFIG_EDITOR)
 
 ##@Building
 
@@ -147,6 +167,7 @@ $(foreach p,$1,$(PARTITION_$p_ADDRESS),$(PARTITION_$p_SIZE_BYTES))
 endef
 
 # One flash sector of 0xFF
+DEBUG_VARS += BLANK_BIN
 BLANK_BIN := $(PARTITION_PATH)/blank.bin
 
 # Just the application chunks
diff --git a/Sming/Components/rboot/component.mk b/Sming/Components/rboot/component.mk
index 96f9441e53..b5ab0f3771 100644
--- a/Sming/Components/rboot/component.mk
+++ b/Sming/Components/rboot/component.mk
@@ -89,6 +89,7 @@ RBOOT_LD_1				:= $(BUILD_BASE)/$(RBOOT_ROM_1).ld
 RBOOT_E2_SECTS			?= .text .text1 .data .rodata
 RBOOT_E2_USER_ARGS		?= -quiet -bin -boot2
 
+DEBUG_VARS				+= RBOOT_ROM_0_BIN RBOOT_ROM_1_BIN
 RBOOT_ROM_0_BIN			:= $(FW_BASE)/$(RBOOT_ROM_0).bin
 RBOOT_ROM_1_BIN			:= $(FW_BASE)/$(RBOOT_ROM_1).bin
 
diff --git a/Sming/Components/spiffs/component.mk b/Sming/Components/spiffs/component.mk
index 77064eb4a3..68954b98b2 100644
--- a/Sming/Components/spiffs/component.mk
+++ b/Sming/Components/spiffs/component.mk
@@ -13,6 +13,8 @@ endif
 CACHE_VARS			+= SPIFF_FILES SPIFF_BIN
 SPIFF_FILES			?= files
 SPIFF_BIN			?= spiff_rom
+
+DEBUG_VARS			+= SPIFF_BIN_OUT
 SPIFF_BIN_OUT		:= $(FW_BASE)/$(SPIFF_BIN).bin
 
 COMPONENT_RELINK_VARS	+= SPIFF_FILEDESC_COUNT
diff --git a/Sming/building.rst b/Sming/building.rst
index 397d553f0a..d6557b053d 100644
--- a/Sming/building.rst
+++ b/Sming/building.rst
@@ -156,7 +156,7 @@ sessions, and will override any values set in your project’s
 A separate cache is maintained for each build type (arch +
 release/debug). For example:
 
--  Type ``make SMING_RELASE=1 list-config`` to switch to release build
+-  Type ``make SMING_RELEASE=1 list-config`` to switch to release build
    and display the active configuration
 
 Type ``make config-clean`` to clear all caches and revert to defaults.
diff --git a/Sming/project.mk b/Sming/project.mk
index 96d6b3c239..7cf647de90 100644
--- a/Sming/project.mk
+++ b/Sming/project.mk
@@ -235,6 +235,9 @@ ifndef MAKE_CLEAN
 -include $(CONFIG_CACHE_FILE)
 endif
 
+# Also export debug variables here for access by external tools (e.g. python)
+CONFIG_DEBUG_FILE	:= $(OUT_BASE)/debug.mk
+
 # Append standard search directories to any defined by the application
 ALL_SEARCH_DIRS			:= $(call FixPath,$(abspath $(COMPONENT_SEARCH_DIRS)))
 COMPONENTS_EXTRA_INCDIR	+= $(ALL_SEARCH_DIRS)
@@ -665,4 +668,5 @@ endef
 ifndef MAKE_CLEAN
 CACHED_VAR_NAMES := $(sort $(CACHED_VAR_NAMES) $(CONFIG_VARS) $(RELINK_VARS) $(CACHE_VARS))
 $(eval $(call WriteConfigCache,$(CONFIG_CACHE_FILE),CACHED_VAR_NAMES))
+$(eval $(call WriteCacheValues,$(CONFIG_DEBUG_FILE),$(sort $(DEBUG_VARS))))
 endif

From 6206878c5e16dd78273e07f7cb758d7ffa01d19e Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Tue, 23 Mar 2021 12:51:54 +0000
Subject: [PATCH 72/91] Add alternate 'map' view to profile editor (#2277)

---
 .../Storage/Tools/hwconfig/editor.py          | 267 +++++++++++++++---
 1 file changed, 228 insertions(+), 39 deletions(-)

diff --git a/Sming/Components/Storage/Tools/hwconfig/editor.py b/Sming/Components/Storage/Tools/hwconfig/editor.py
index c2f93d2fae..5d2a03b5cc 100644
--- a/Sming/Components/Storage/Tools/hwconfig/editor.py
+++ b/Sming/Components/Storage/Tools/hwconfig/editor.py
@@ -2,7 +2,7 @@
 from common import *
 from config import *
 import tkinter as tk
-from tkinter import ttk, filedialog, messagebox
+from tkinter import ttk, filedialog, messagebox, font
 
 app_name = 'Sming Hardware Profile Editor'
 
@@ -224,6 +224,177 @@ def nameChanged(self):
         return self.name != self['name'].get_value()
 
 
+class Rect:
+    def __init__(self, x=0, y=0, width=0, height=0):
+        self.x = x
+        self.y = y
+        self.x2 = x + width
+        self.y2 = y + height
+
+    def inflate(self, x, y):
+        self.x -= x
+        self.y -= y
+        self.x2 += x
+        self.y2 += y
+
+    def getWidth(self):
+        return self.x2 - self.x
+
+    def setWidth(self, w):
+        self.x2 = self.x + w
+
+    def getHeight(self):
+        return self.y2 - self.y
+
+    def setHeight(self, h):
+        self.y2 = self.y + h
+
+    def pos(self):
+        return (self.x, self.y)
+
+    def bounds(self):
+        return (self.x, self.y, self.x2, self.y2)
+
+
+class TkMap(tk.Frame):
+    def __init__(self, parent, editor):
+        super().__init__(parent, width=200, height=200)
+        self.pack(fill=tk.BOTH)
+        self.editor = editor
+        canvas = self.canvas = tk.Canvas(self, width=200, height=200)
+        canvas.pack(side=tk.TOP, expand=True, fill=tk.BOTH)
+        s = ttk.Scrollbar(self, orient=tk.HORIZONTAL, command=canvas.xview)
+        s.pack(side=tk.BOTTOM, fill=tk.X)
+        canvas['xscrollcommand'] = s.set
+
+    def update(self, device):
+        canvas = self.canvas
+        canvas.delete('all')
+
+        labelFont = font.Font(family='fixed', size=8)
+        labelFontBold = font.Font(family='fixed', size=8, weight='bold')
+
+        # Margins to separate drawn rectangular regions
+        M = 5
+        M_OUTER = 20
+
+        # Pixels to draw map row
+        ROW_HEIGHT = 160
+        # Text line spacing
+        LINE_SPACE = 16
+        # How far ticks extend below map
+        TICK_LENGTH = 10
+        # Linear scaling for view
+        BYTES_PER_PIXEL = 32
+        def xs(x):
+            return round(x / BYTES_PER_PIXEL)
+
+        # Drawing the map linearly would make navigation very difficult, too spread-out
+        # Instead, fix a limit for the drawn size of each partition (in bytes)
+        # Marker ticks will be drawn according to this scale
+        MAX_DRAWSIZE = 16 * 1024
+        drawsize = 0      # Equivalent size (in bytes) for the partition
+        x_device_end = 0  # Determines final x co-ordinate for end of device memory
+
+        def draw_tick(x, addr):
+            canvas.create_line(x, r.y, x, r.y2 + 10, fill='black', width=3)
+            canvas.create_text(x, r.y + ROW_HEIGHT + TICK_LENGTH,
+                anchor=tk.N,
+                text=str(addr / 1024 / 1024) + 'MB',
+                state='disabled',
+                font=labelFontBold)
+
+        # Track current partition area
+        r_prev = Rect()
+        r_prev.y = M_OUTER
+        r_prev.x = M_OUTER
+        part_prev = None
+
+        class Used:
+            def __init__(self):
+                self.text = ''
+                self.size = 0
+                self.path = ''
+
+        for p in self.editor.config.map():
+            if p.device != device:
+                continue
+
+            used = Used()
+            if p.filename != '':
+                try:
+                    used.path = self.editor.resolve_path(p.filename)
+                    if os.path.exists(used.path):
+                        used.size = os.path.getsize(used.path)
+                        used.text = percent_used(used.size, p.size)
+                    else:
+                        used.text = '(not found)'
+                except KeyError as err:
+                    used.text = str(err) + ' undefined'
+
+            # Starting x co-ordinate for this partition depends on scale of previous partition
+            r = copy.copy(r_prev)
+            r.setHeight(ROW_HEIGHT)
+            if part_prev is not None:
+                r.x += xs(drawsize * (p.address - part_prev.address) / part_prev.size)
+
+            # Determine actual size to draw this partition (in bytes)
+            drawsize = min(MAX_DRAWSIZE, p.size)
+            r.setWidth(xs(drawsize))
+            # Identify where end of device memory actually is in case partitions exceed this boundary
+            if x_device_end == 0 and p.end() >= device.size - 1:
+                sz = device.size - p.address
+                x_device_end = r.x + xs(drawsize * sz / p.size)
+
+            # Draw tick marks
+            div = 256 * 1024
+            addr = p.address - (p.address % div)
+            while addr <= p.end():
+                if addr >= p.address:
+                    x = r.x + xs(drawsize * (addr - p.address) / p.size)
+                    draw_tick(x, addr)
+                addr += div
+
+            r2 = copy.copy(r)
+            r2.inflate(-M, -M)
+            id = canvas.create_rectangle(r2.bounds(), fill='lightgray' if p.is_unused() else 'gray', activefill='white', outline='red')
+            canvas.tag_bind(id, "<Button-1>", lambda event, part=p: self.editor.editPartition(part))
+            r2.inflate(-M, -M)
+            canvas.create_text(r2.pos(), anchor=tk.NW, text=p.address_str(), state='disabled', font=labelFont)
+            r2.y += LINE_SPACE
+            canvas.create_text(r2.pos(), anchor=tk.NW, text=p.name, state='disabled', font=labelFontBold)
+            r2.y += LINE_SPACE
+            canvas.create_text(r2.pos(), anchor=tk.NW, text=p.size_str(), state='disabled', font=labelFontBold)
+            if not p.is_internal():
+                r2.y += LINE_SPACE
+                canvas.create_text(r2.pos(), anchor=tk.NW, text=p.type_str() + ' / ' + p.subtype_str(), state='disabled', font=labelFont)
+            r2.y += LINE_SPACE
+            if used.size != 0:
+                r2.setWidth(used.size * r2.getWidth() / p.size)
+                canvas.create_rectangle(r2.bounds(), fill='lightblue', outline='lightblue', state='disabled')
+            r2.x += M
+            r2.y += LINE_SPACE
+            canvas.create_text(r2.pos(), anchor=tk.NW, text=used.text, state='disabled', font=labelFont)
+            if p.filename != '':
+                r2.y += LINE_SPACE
+                canvas.create_text(r2.pos(), anchor=tk.NW, text=p.filename, state='disabled', font=labelFont)
+                if used.path != p.filename:
+                    r2.y += LINE_SPACE
+                    canvas.create_text(r2.pos(), anchor=tk.NW, text=used.path, state='disabled', font=labelFont)
+
+            part_prev = p
+            r_prev = r
+
+        r2 = Rect(M_OUTER, M_OUTER)
+        r2.x2 = x_device_end
+        r2.y2 = r.y2
+        canvas.create_rectangle(r2.bounds(), outline='black', width=3, state='disabled')
+        if x_device_end >= r.x:
+            draw_tick(x_device_end, device.size)
+        canvas.config(scrollregion=(0, 0, r.x2 + 100, 0))
+
+
+
 class Editor:
     def __init__(self, root):
         root.title(app_name)
@@ -234,10 +405,6 @@ def __init__(self, root):
         self.initialise()
 
     def initialise(self):
-        # Window resizing is focused around treeview @ (0, 0)
-        self.main.columnconfigure(0, weight=1)
-        self.main.rowconfigure(1, weight=1)
-        self.main.rowconfigure(2, weight=3)
         self.main.option_add('*tearOff', False)
         s = ttk.Style()
         s.configure('Treeview', font='TkFixedFont')
@@ -292,7 +459,7 @@ def editAddDevice(*args):
 
         # Toolbar
         toolbar = ttk.Frame(self.main)
-        toolbar.grid(row=0, column=0, columnspan=4, sticky=tk.W)
+        toolbar.pack(side=tk.TOP, fill=tk.X)
         btnNew = ttk.Button(toolbar, text="New", command=fileNew)
         btnNew.grid(row=0, column=1)
         btnOpen = ttk.Button(toolbar, text="Open...", command=fileOpen)
@@ -300,14 +467,23 @@ def editAddDevice(*args):
         btnSave = ttk.Button(toolbar, text="Save...", command=fileSave)
         btnSave.grid(row=0, column=3)
 
+        # Group controls into two areas (top and bottom) which are sizeable by the user
+        pwin = ttk.PanedWindow(self.main, orient=tk.VERTICAL)
+        pwin.pack(side=tk.TOP, expand=True, fill=tk.BOTH)
+
+        # Place alternate views in a tabbed area
+        self.notebook = ttk.Notebook(pwin)
+        pwin.add(self.notebook)
+
         # Treeview for devices and partitions
 
-        tree = ttk.Treeview(self.main, columns=['start', 'end', 'size', 'used', 'type', 'subtype', 'filename'])
-        tree.grid(row=1, column=0, columnspan=3, sticky=tk.NSEW)
-        self.tree = tree
+        f = ttk.Frame(self.notebook)
+        self.notebook.add(f, text="Tree")
+        tree = self.tree = ttk.Treeview(f, columns=['start', 'end', 'size', 'used', 'type', 'subtype', 'filename'])
+        tree.pack(side=tk.LEFT, expand=True, fill=tk.BOTH)
 
-        s = ttk.Scrollbar(self.main, orient=tk.VERTICAL, command=tree.yview)
-        s.grid(row=1, column=4, sticky=tk.NS)
+        s = ttk.Scrollbar(f, orient=tk.VERTICAL, command=tree.yview)
+        s.pack(side=tk.RIGHT, fill=tk.Y)
         tree['yscrollcommand'] = s.set
 
         tree.heading('start', text='Start', anchor=tk.W)
@@ -318,9 +494,38 @@ def editAddDevice(*args):
         tree.heading('subtype', text='Sub-Type', anchor=tk.W)
         tree.heading('filename', text='Image filename', anchor=tk.W)
 
+        def select(*args):
+            id = tree.focus()
+            if id == '':
+                return
+            item = tree.item(id)
+            if 'device' in item['tags']:
+                dev = self.device_from_id(id)
+                self.editDevice(dev)
+            else:
+                part = self.config.map().find_by_name(id)
+                if part is None:
+                    dev = self.device_from_id(tree.parent(id))
+                    addr = item['values'][0]
+                    part = self.config.map().find_by_address(dev, addr)
+                self.editPartition(part)
+        tree.bind('<<TreeviewSelect>>', select)
+
+        # map of spiFlash device
+        self.map = TkMap(self.notebook, self)
+        self.notebook.add(self.map, text = 'map')
+
+        # Lower frame
+        frame = ttk.Frame(pwin)
+        frame.pack(expand=True, fill=tk.BOTH)
+        pwin.add(frame)
+
+        frame.rowconfigure(0, weight=1)
+        frame.columnconfigure(0, weight=1)
+
         # Base configurations
-        f = ttk.LabelFrame(self.main, text = 'Base Configuration')
-        f.grid(row=2, column=0, sticky=tk.SW)
+        f = ttk.LabelFrame(frame, text = 'Base Configuration')
+        f.grid(row=0, column=0, sticky=tk.SW)
 
         def base_config_changed(*args):
             self.json['base_config'] = self.base_config.get()
@@ -335,8 +540,8 @@ def base_config_changed(*args):
 
         # Option checkboxes
 
-        f = ttk.LabelFrame(self.main, text = 'Options')
-        f.grid(row=3, column=0, sticky=tk.NW)
+        f = ttk.LabelFrame(frame, text = 'Options')
+        f.grid(row=1, column=0, sticky=tk.NW)
 
         def options_changed(*args):
             self.json['options'] = []
@@ -352,31 +557,13 @@ def options_changed(*args):
                 command=options_changed, variable=self.options[k])
             btn.grid(sticky=tk.W)
 
-        # Selection handling
-        def select(*args):
-            id = tree.focus()
-            if id == '':
-                return
-            item = tree.item(id)
-            if 'device' in item['tags']:
-                dev = self.device_from_id(id)
-                self.editDevice(dev)
-            else:
-                part = self.config.map().find_by_name(id)
-                if part is None:
-                    dev = self.device_from_id(tree.parent(id))
-                    addr = item['values'][0]
-                    part = self.config.map().find_by_address(dev, addr)
-                self.editPartition(part)
-        tree.bind('<<TreeviewSelect>>', select)
-
         # Edit frame
-        self.editFrame = ttk.LabelFrame(self.main, text='Edit Object')
-        self.editFrame.grid(row=2, column=1, rowspan=2, sticky=tk.SW)
+        self.editFrame = ttk.LabelFrame(frame, text='Edit Object')
+        self.editFrame.grid(row=0, column=1, rowspan=2, sticky=tk.SW)
 
         # JSON editor
-        jsonFrame = ttk.LabelFrame(self.main, text='JSON Configuration')
-        jsonFrame.grid(row=2, column=2, rowspan=2, sticky=tk.NS)
+        jsonFrame = ttk.LabelFrame(frame, text='JSON Configuration')
+        jsonFrame.grid(row=0, column=2, rowspan=2, sticky=tk.NS)
         def apply(*args):
             try:
                 json_config = json.loads(self.jsonEditor.get('1.0', 'end'))
@@ -401,7 +588,7 @@ def apply(*args):
         # Status box
         self.status = tk.StringVar()
         status = ttk.Label(self.main, textvariable=self.status)
-        status.grid(row=4, column=0, columnspan=3, sticky=tk.EW)
+        status.pack(side=tk.BOTTOM, fill=tk.X)
 
         self.reset()
 
@@ -412,7 +599,7 @@ def user_error(self, err):
     def getBaseConfig(self):
         """Load the base configuration with currently selected options applied
         """
-        return Config.from_json(self.json_base_config, self.json['options'])
+        return Config.from_json(self.json_base_config, self.json.get('options', []))
  
     def loadConfig(self, filename):
         self.reset()
@@ -483,6 +670,8 @@ def reload(self):
             self.status.set(str(err))
             return
 
+        self.map.update(config.devices[0])
+
         # Devices are our root nodes
         for dev in config.devices:
             used = 0

From 8a1fd69ce07d81d81d9d7a7a7ca7277ea7673ddd Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 24 Mar 2021 12:34:47 +0000
Subject: [PATCH 73/91] Fix `buildpart` target (#2282)

---
 Sming/Components/Storage/component.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Sming/Components/Storage/component.mk b/Sming/Components/Storage/component.mk
index 05fa6e17a6..dd7680fb48 100644
--- a/Sming/Components/Storage/component.mk
+++ b/Sming/Components/Storage/component.mk
@@ -145,12 +145,12 @@ endef
 
 .PHONY: buildpart
 buildpart: ##Rebuild all partition targets
-ifeq (,$(PARTITION_BUILD_TARGETS))
-	@echo "No partitions have build targets"
-else
-	$(Q) rm -f $(PARTITION_BUILD_TARGETS)
-	$(MAKE) $(PARTITION_BUILD_TARGETS)
-endif
+	$(Q) if [ "$(PARTITION_BUILD_TARGETS)" -eq "" ]; then \
+		echo "No partitions have build targets"; \
+	else \
+		rm -f $(PARTITION_BUILD_TARGETS); \
+		$(MAKE) $(PARTITION_BUILD_TARGETS); \
+	fi
 
 ##@Flashing
 

From 5a479b1f6792146bd5d8768ffee90d62a4c28702 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 24 Mar 2021 13:41:11 +0100
Subject: [PATCH 74/91] Use BYTE_ORDER for LWIP if already defined in SDK.
 (#2281)

---
 .../esp-open-lwip/esp-open-lwip.patch           | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Sming/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip.patch b/Sming/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip.patch
index 410850aace..b5dc45183b 100644
--- a/Sming/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip.patch
+++ b/Sming/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip.patch
@@ -76,10 +76,10 @@ index 1bc584f..e4af916 100644
  $(LIB): $(OBJS)
  	$(AR) rcs $@ $^
 diff --git a/include/arch/cc.h b/include/arch/cc.h
-index ff03b30..5efcf13 100644
+index ff03b30..4a2b4d9 100644
 --- a/include/arch/cc.h
 +++ b/include/arch/cc.h
-@@ -38,8 +38,27 @@
+@@ -38,14 +38,31 @@
  #include "c_types.h"
  #include "ets_sys.h"
  #include "osapi.h"
@@ -106,8 +106,15 @@ index ff03b30..5efcf13 100644
 +
  //#define LWIP_PROVIDE_ERRNO
  
- #if (1)
-@@ -56,6 +75,7 @@ typedef signed     short   s16_t;
+-#if (1)
++#ifndef BYTE_ORDER
+ #define BYTE_ORDER LITTLE_ENDIAN
+-#else
+-#define BYTE_ORDER BIG_ENDIAN
+ #endif
+ 
+ 
+@@ -56,6 +73,7 @@ typedef signed     short   s16_t;
  typedef unsigned   long    u32_t;
  typedef signed     long    s32_t;
  typedef unsigned long   mem_ptr_t;
@@ -115,7 +122,7 @@ index ff03b30..5efcf13 100644
  
  #define S16_F "d"
  #define U16_F "d"
-@@ -73,11 +93,12 @@ typedef unsigned long   mem_ptr_t;
+@@ -73,11 +91,12 @@ typedef unsigned long   mem_ptr_t;
  #define PACK_STRUCT_BEGIN
  #define PACK_STRUCT_END
  

From 1f00c184d283d642897db9d9d6e2a7d35236eb75 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 24 Mar 2021 12:42:07 +0000
Subject: [PATCH 75/91] Bugfix: FileStream doesn't track position correctly in
 readMemoryBlock() (#2284)

---
 Sming/Core/Data/Stream/IFS/FileStream.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sming/Core/Data/Stream/IFS/FileStream.cpp b/Sming/Core/Data/Stream/IFS/FileStream.cpp
index ef4ebd06a4..e491353c86 100644
--- a/Sming/Core/Data/Stream/IFS/FileStream.cpp
+++ b/Sming/Core/Data/Stream/IFS/FileStream.cpp
@@ -124,6 +124,7 @@ uint16_t FileStream::readMemoryBlock(char* data, int bufSize)
 
 	// Move cursor back to start position
 	(void)fs->lseek(handle, startPos, SeekOrigin::Start);
+	pos = startPos;
 
 	return count;
 }

From 751d4dc7cc6217c859c05ceb49edc00f6496827d Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 24 Mar 2021 13:42:50 +0100
Subject: [PATCH 76/91] Fixed publishing messages having a stream as payload.
 (#2278)

---
 Sming/Core/Network/MqttClient.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Sming/Core/Network/MqttClient.cpp b/Sming/Core/Network/MqttClient.cpp
index c9b2377c4c..94b4f2555e 100644
--- a/Sming/Core/Network/MqttClient.cpp
+++ b/Sming/Core/Network/MqttClient.cpp
@@ -388,13 +388,20 @@ void MqttClient::onReadyToSendData(TcpConnectionEvent sourceEvent)
 			break;
 		}
 
+		if(outgoingMessage->common.type == MQTT_TYPE_PUBLISH && payloadStream != nullptr) {
+			// The packetLength should be big enought for the header ONLY.
+			// Payload will be attached as a second stream
+			packetLength -= outgoingMessage->publish.content.length;
+			outgoingMessage->publish.content.data = nullptr;
+		}
+
 		uint8_t packet[packetLength];
 		mqtt_serialiser_write(&serialiser, outgoingMessage, packet, packetLength);
 
 		delete stream;
 		auto headerStream = new MemoryDataStream();
 		headerStream->write(packet, packetLength);
-		if(outgoingMessage->common.type == MQTT_TYPE_PUBLISH && payloadStream != nullptr) {
+		if(payloadStream != nullptr) {
 			auto streamChain = new StreamChain();
 			streamChain->attachStream(headerStream);
 			streamChain->attachStream(payloadStream);

From 8009d83780ec409873a71eca88ff24138a17a3e8 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 24 Mar 2021 14:19:13 +0100
Subject: [PATCH 77/91] Call MQTT event handler also on connection error.
 (#2279)

Breaking Change: Now MqttClient's onConnected event handler will be called also when the connection was unsuccessful.
---
 Sming/Components/mqtt-codec       |  2 +-
 Sming/Core/Network/MqttClient.cpp | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Sming/Components/mqtt-codec b/Sming/Components/mqtt-codec
index 172f792ee2..3767dfce41 160000
--- a/Sming/Components/mqtt-codec
+++ b/Sming/Components/mqtt-codec
@@ -1 +1 @@
-Subproject commit 172f792ee2b90b6f13631390886c52ec2f4b6362
+Subproject commit 3767dfce416ebb0ea42903a4bbd93f5675be6cdb
diff --git a/Sming/Core/Network/MqttClient.cpp b/Sming/Core/Network/MqttClient.cpp
index 94b4f2555e..1647272fce 100644
--- a/Sming/Core/Network/MqttClient.cpp
+++ b/Sming/Core/Network/MqttClient.cpp
@@ -168,13 +168,11 @@ int MqttClient::onMessageEnd(mqtt_message_t* message)
 			// failure
 			clearBits(flags, MQTT_CLIENT_CONNECTED);
 			setTimeOut(1); // schedule the connection for closing
-
-			return message->connack.return_code;
+		} else {
+			// success
+			setTimeOut(USHRT_MAX);
+			setBits(flags, MQTT_CLIENT_CONNECTED);
 		}
-
-		// success
-		setTimeOut(USHRT_MAX);
-		setBits(flags, MQTT_CLIENT_CONNECTED);
 	}
 
 	auto& handler = static_cast<const HandlerMap&>(eventHandlers)[message->common.type];

From de3d128794b868048fcce47f62bdcf29a36573bc Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 24 Mar 2021 13:38:12 +0000
Subject: [PATCH 78/91] Bugfix: Base64 size calculations wrong (#2283)

---
 Sming/Core/Network/WebHelpers/base64.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Sming/Core/Network/WebHelpers/base64.cpp b/Sming/Core/Network/WebHelpers/base64.cpp
index 945862b4f8..2cf3ab9fdc 100644
--- a/Sming/Core/Network/WebHelpers/base64.cpp
+++ b/Sming/Core/Network/WebHelpers/base64.cpp
@@ -14,16 +14,17 @@
 #include "libb64/cencode.h"
 #include "libb64/cdecode.h"
 
-// Base-64 encoding produces 3 output bytes for every 2 input bytes
-#define MIN_ENCODE_LEN(_in_len) (((_in_len)*3 + 1) / 2)
-#define MIN_DECODE_LEN(_in_len) (((_in_len)*2 + 2) / 3)
+// Base-64 encodes 6 bits into one character (4 output chars for every 3 input bytes)
+#define MIN_ENCODE_LEN(_in_len) (((_in_len)*4 + 2) / 3)
+#define MIN_DECODE_LEN(_in_len) (((_in_len)*3 + 3) / 4)
 
 int base64_encode(size_t in_len, const unsigned char* in, size_t out_len, char* out)
 {
 	// Base-64 encoding produces 3 output bytes for every 2 input bytes
 	unsigned min_out_len = MIN_ENCODE_LEN(in_len);
-	if(out_len < min_out_len)
+	if(out_len < min_out_len) {
 		return -1;
+	}
 
 	base64_encodestate state;
 	base64_init_encodestate(&state, 0); // Don't include any linebreaks
@@ -35,12 +36,14 @@ int base64_encode(size_t in_len, const unsigned char* in, size_t out_len, char*
 String base64_encode(const unsigned char* in, size_t in_len)
 {
 	String s;
-	if(!s.setLength(MIN_ENCODE_LEN(in_len)))
+	if(!s.setLength(MIN_ENCODE_LEN(in_len))) {
 		return nullptr;
+	}
 
 	int len = base64_encode(in_len, in, s.length(), s.begin());
-	if(len < 0)
+	if(len < 0) {
 		return nullptr;
+	}
 
 	s.setLength(len);
 	return s;
@@ -49,8 +52,9 @@ String base64_encode(const unsigned char* in, size_t in_len)
 /* decode a base64 string in one shot */
 int base64_decode(size_t in_len, const char* in, size_t out_len, unsigned char* out)
 {
-	if(out_len < MIN_DECODE_LEN(in_len))
+	if(out_len < MIN_DECODE_LEN(in_len)) {
 		return -1;
+	}
 
 	base64_decodestate _state;
 	base64_init_decodestate(&_state);
@@ -60,12 +64,14 @@ int base64_decode(size_t in_len, const char* in, size_t out_len, unsigned char*
 String base64_decode(const char* in, size_t in_len)
 {
 	String s;
-	if(!s.setLength(MIN_DECODE_LEN(in_len)))
+	if(!s.setLength(MIN_DECODE_LEN(in_len))) {
 		return nullptr;
+	}
 
 	int outlen = base64_decode(in_len, in, s.length(), (unsigned char*)s.begin());
-	if(outlen < 0)
+	if(outlen < 0) {
 		return nullptr;
+	}
 
 	s.setLength(outlen);
 	return s;

From b1765f6fd9f259a35a8d6b11a04934750451e58a Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Wed, 24 Mar 2021 13:57:09 +0000
Subject: [PATCH 79/91] Update ArduinoFFT library to latest, fix patch filename
 (#2285)

---
 .../{arduinoFFT.patch => ArduinoFFT.patch}    | 42 ++++++++-----------
 Sming/Libraries/ArduinoFFT                    |  2 +-
 2 files changed, 19 insertions(+), 25 deletions(-)
 rename Sming/Libraries/.patches/{arduinoFFT.patch => ArduinoFFT.patch} (92%)

diff --git a/Sming/Libraries/.patches/arduinoFFT.patch b/Sming/Libraries/.patches/ArduinoFFT.patch
similarity index 92%
rename from Sming/Libraries/.patches/arduinoFFT.patch
rename to Sming/Libraries/.patches/ArduinoFFT.patch
index 66fa4a9937..79fb67b3db 100644
--- a/Sming/Libraries/.patches/arduinoFFT.patch
+++ b/Sming/Libraries/.patches/ArduinoFFT.patch
@@ -1,16 +1,16 @@
 diff --git a/src/arduinoFFT.h b/src/arduinoFFT.h
-index 73927dc..3436c9d 100644
+index c3c1a0b..8f7e2e4 100644
 --- a/src/arduinoFFT.h
 +++ b/src/arduinoFFT.h
-@@ -75,21 +75,11 @@
+@@ -75,7 +75,6 @@
  class arduinoFFT {
  public:
  	/* Constructor */
 -	arduinoFFT(void);
  	arduinoFFT(double *vReal, double *vImag, uint16_t samples, double samplingFrequency);
--	/* Destructor */
--	~arduinoFFT(void);
- 	/* Functions */
+ 	/* Destructor */
+ 	~arduinoFFT(void);
+@@ -83,13 +82,7 @@ public:
  	uint8_t Revision(void);
  	uint8_t Exponent(uint16_t value);
  
@@ -19,13 +19,13 @@ index 73927dc..3436c9d 100644
 -	void Compute(double *vReal, double *vImag, uint16_t samples, uint8_t power, uint8_t dir);
 -	void DCRemoval(double *vData, uint16_t samples);
 -	double MajorPeak(double *vD, uint16_t samples, double samplingFrequency);
--	void MajorPeak(double *vD, uint16_t samples, double samplingFrequency, double *f, double *v);
+ 	void MajorPeak(double *vD, uint16_t samples, double samplingFrequency, double *f, double *v);
 -	void Windowing(double *vData, uint16_t samples, uint8_t windowType, uint8_t dir);
  
  	void ComplexToMagnitude();
  	void Compute(uint8_t dir);
 diff --git a/src/arduinoFFT.cpp b/src/arduinoFFT.cpp
-index 790da4f..dcdcfae 100644
+index fb602a9..e038b41 100644
 --- a/src/arduinoFFT.cpp
 +++ b/src/arduinoFFT.cpp
 @@ -21,11 +21,6 @@
@@ -40,17 +40,7 @@ index 790da4f..dcdcfae 100644
  arduinoFFT::arduinoFFT(double *vReal, double *vImag, uint16_t samples, double samplingFrequency)
  {// Constructor
  	this->_vReal = vReal;
-@@ -35,22 +30,11 @@ arduinoFFT::arduinoFFT(double *vReal, double *vImag, uint16_t samples, double sa
- 	this->_power = Exponent(samples);
- }
- 
--arduinoFFT::~arduinoFFT(void)
--{
--// Destructor
--}
--
- uint8_t arduinoFFT::Revision(void)
- {
+@@ -45,12 +40,6 @@ uint8_t arduinoFFT::Revision(void)
  	return(FFT_LIB_REV);
  }
  
@@ -63,7 +53,7 @@ index 790da4f..dcdcfae 100644
  void arduinoFFT::Compute(uint8_t dir)
  {// Computes in-place complex-to-complex FFT /
  	// Reverse bits /
-@@ -115,71 +99,6 @@ void arduinoFFT::Compute(uint8_t dir)
+@@ -115,71 +104,6 @@ void arduinoFFT::Compute(uint8_t dir)
  	}
  }
  
@@ -135,7 +125,7 @@ index 790da4f..dcdcfae 100644
  void arduinoFFT::ComplexToMagnitude()
  { // vM is half the size of vReal and vImag
  	for (uint16_t i = 0; i < this->_samples; i++) {
-@@ -187,14 +106,6 @@ void arduinoFFT::ComplexToMagnitude()
+@@ -187,14 +111,6 @@ void arduinoFFT::ComplexToMagnitude()
  	}
  }
  
@@ -150,7 +140,7 @@ index 790da4f..dcdcfae 100644
  void arduinoFFT::DCRemoval()
  {
  	// calculate the mean of vData
-@@ -211,23 +122,6 @@ void arduinoFFT::DCRemoval()
+@@ -211,23 +127,6 @@ void arduinoFFT::DCRemoval()
  	}
  }
  
@@ -174,7 +164,7 @@ index 790da4f..dcdcfae 100644
  void arduinoFFT::Windowing(uint8_t windowType, uint8_t dir)
  {// Weighing factors are computed once before multiple use of FFT
  // The weighing function is symetric; half the weighs are recorded
-@@ -285,63 +179,6 @@ void arduinoFFT::Windowing(uint8_t windowType, uint8_t dir)
+@@ -285,63 +184,6 @@ void arduinoFFT::Windowing(uint8_t windowType, uint8_t dir)
  }
  
  
@@ -238,7 +228,7 @@ index 790da4f..dcdcfae 100644
  double arduinoFFT::MajorPeak()
  {
  	double maxY = 0;
-@@ -391,61 +228,8 @@ void arduinoFFT::MajorPeak(double *f, double *v)
+@@ -391,58 +233,6 @@ void arduinoFFT::MajorPeak(double *f, double *v)
  	#endif
  }
  
@@ -294,10 +284,14 @@ index 790da4f..dcdcfae 100644
 -	#endif
 -}
 -
+ double arduinoFFT::MajorPeakParabola()
+ {
+ 	double maxY = 0;
+@@ -492,7 +282,6 @@ void arduinoFFT::Parabola(double x1, double y1, double x2, double y2, double x3,
+ 
  uint8_t arduinoFFT::Exponent(uint16_t value)
  {
 -	#warning("This method may not be accessible on future revisions.")
  	// Calculates the base 2 logarithm of a value
  	uint8_t result = 0;
  	while (((value >> result) & 1) != 1) result++;
- 	
\ No newline at end of file
diff --git a/Sming/Libraries/ArduinoFFT b/Sming/Libraries/ArduinoFFT
index 566803e9ca..bb99065f9a 160000
--- a/Sming/Libraries/ArduinoFFT
+++ b/Sming/Libraries/ArduinoFFT
@@ -1 +1 @@
-Subproject commit 566803e9ca2b6ff50895da2791fcfbf80f8fd23a
+Subproject commit bb99065f9aad9e5781c5bf9e77613bdd33f0074d

From a6f41b2416ddceb7c81bfc8c5a0fc4a672c4593a Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 24 Mar 2021 15:10:29 +0100
Subject: [PATCH 80/91] Compilation fixes for ESP8266 EQT toolchain. (#2287)

---
 Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.h b/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.h
index 7b34375a33..eec39954c6 100644
--- a/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.h
+++ b/Sming/Libraries/OtaUpgrade/OtaUpgrade/EncryptedStream.h
@@ -12,6 +12,7 @@
 
 #include "BasicStream.h"
 #include <sodium/crypto_secretstream_xchacha20poly1305.h>
+#include <memory>
 
 namespace OtaUpgrade
 {
@@ -20,7 +21,7 @@ namespace OtaUpgrade
  *
  * The class processes encrypted firmware upgrade files created by otatool.py.
  * A buffer is allocated dynamically to fit the largest chunk of the encryption container
- * (2kB unless otatool.py was modified). The actual processing of the decrypted data is 
+ * (2kB unless otatool.py was modified). The actual processing of the decrypted data is
  * defered to #BasicStream.
  */
 class EncryptedStream : public BasicStream

From cf8a982aff665f26b0777b91a60a6ae486b1b37c Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Thu, 25 Mar 2021 09:14:04 +0000
Subject: [PATCH 81/91] MultiStream & StreamTransformer improvements (#2288)

* Coding style, move trivial methods into header

* Try to simplify StreamTransformer fill loop logic

* Simplify MultiStream

Remove redundant method overrides
Use `std::unique_ptr` to manage stream

* Add tests for Base64OutputStream / StreamTransformer and MultipartStream / MultiStream
---
 Sming/Core/Data/Stream/Base64OutputStream.cpp |  12 +---
 Sming/Core/Data/Stream/Base64OutputStream.h   |  20 +++---
 Sming/Core/Data/Stream/MultiStream.cpp        |  11 ++-
 Sming/Core/Data/Stream/MultiStream.h          |  20 +-----
 Sming/Core/Data/StreamTransformer.cpp         |  65 ++++++++----------
 Sming/Core/Data/StreamTransformer.h           |   8 ++-
 tests/HostTests/app/resource.cpp              |   5 +-
 tests/HostTests/include/resource.h            |   7 +-
 tests/HostTests/modules/Stream.cpp            |  42 +++++++++++
 tests/HostTests/resource/.gitattributes       |   1 +
 tests/HostTests/resource/image.png            | Bin 0 -> 4320 bytes
 tests/HostTests/resource/multipart-result.txt |  22 ++++++
 12 files changed, 123 insertions(+), 90 deletions(-)
 create mode 100644 tests/HostTests/resource/.gitattributes
 create mode 100644 tests/HostTests/resource/image.png
 create mode 100644 tests/HostTests/resource/multipart-result.txt

diff --git a/Sming/Core/Data/Stream/Base64OutputStream.cpp b/Sming/Core/Data/Stream/Base64OutputStream.cpp
index dbe3df1c38..5bc2df6e0c 100644
--- a/Sming/Core/Data/Stream/Base64OutputStream.cpp
+++ b/Sming/Core/Data/Stream/Base64OutputStream.cpp
@@ -23,7 +23,7 @@ Base64OutputStream::Base64OutputStream(IDataSourceStream* stream, size_t resultS
 
 size_t Base64OutputStream::transform(const uint8_t* source, size_t sourceLength, uint8_t* target, size_t targetLength)
 {
-	size_t count = 0;
+	size_t count;
 	if(sourceLength == 0) {
 		count = base64_encode_blockend((char*)target, &state);
 	} else {
@@ -32,13 +32,3 @@ size_t Base64OutputStream::transform(const uint8_t* source, size_t sourceLength,
 
 	return count;
 }
-
-void Base64OutputStream::saveState()
-{
-	memcpy(&lastState, &state, sizeof(base64_encodestate));
-}
-
-void Base64OutputStream::restoreState()
-{
-	memcpy(&state, &lastState, sizeof(base64_encodestate));
-}
diff --git a/Sming/Core/Data/Stream/Base64OutputStream.h b/Sming/Core/Data/Stream/Base64OutputStream.h
index 206224c2fe..a81af415a7 100644
--- a/Sming/Core/Data/Stream/Base64OutputStream.h
+++ b/Sming/Core/Data/Stream/Base64OutputStream.h
@@ -31,17 +31,17 @@ class Base64OutputStream : public StreamTransformer
 
 	size_t transform(const uint8_t* source, size_t sourceLength, uint8_t* target, size_t targetLength) override;
 
-	/**
-	 * @brief A method that backs up the current state
-	 */
-	void saveState() override;
+	void saveState() override
+	{
+		savedState = state;
+	}
 
-	/**
-	 * @brief A method that restores the last backed up state
-	 */
-	void restoreState() override;
+	void restoreState() override
+	{
+		state = savedState;
+	}
 
 private:
-	base64_encodestate state = {};
-	base64_encodestate lastState = {};
+	base64_encodestate state{};
+	base64_encodestate savedState{};
 };
diff --git a/Sming/Core/Data/Stream/MultiStream.cpp b/Sming/Core/Data/Stream/MultiStream.cpp
index ac606cbc80..62cf474a4e 100644
--- a/Sming/Core/Data/Stream/MultiStream.cpp
+++ b/Sming/Core/Data/Stream/MultiStream.cpp
@@ -14,14 +14,13 @@
 
 uint16_t MultiStream::readMemoryBlock(char* data, int bufSize)
 {
-	if(stream != nullptr && stream->isFinished()) {
-		delete stream;
-		stream = nullptr;
+	if(stream && stream->isFinished()) {
+		stream.reset();
 	}
 
-	if(stream == nullptr) {
-		stream = getNextStream();
-		if(stream == nullptr) {
+	if(!stream) {
+		stream.reset(getNextStream());
+		if(!stream) {
 			finished = true;
 			return 0;
 		}
diff --git a/Sming/Core/Data/Stream/MultiStream.h b/Sming/Core/Data/Stream/MultiStream.h
index 78dc5a5876..425546434f 100644
--- a/Sming/Core/Data/Stream/MultiStream.h
+++ b/Sming/Core/Data/Stream/MultiStream.h
@@ -14,6 +14,7 @@
 #pragma once
 
 #include "DataSourceStream.h"
+#include <memory>
 
 /**
  * @brief Base class for read-only stream which generates output from multiple source streams
@@ -22,21 +23,6 @@
 class MultiStream : public IDataSourceStream
 {
 public:
-	~MultiStream()
-	{
-		delete stream;
-	}
-
-	StreamType getStreamType() const override
-	{
-		return eSST_Unknown;
-	}
-
-	int available() override
-	{
-		return -1;
-	}
-
 	uint16_t readMemoryBlock(char* data, int bufSize) override;
 
 	bool seek(int len) override;
@@ -55,6 +41,6 @@ class MultiStream : public IDataSourceStream
 	virtual IDataSourceStream* getNextStream() = 0;
 
 private:
-	IDataSourceStream* stream = nullptr;
-	bool finished = false;
+	std::unique_ptr<IDataSourceStream> stream;
+	bool finished{false};
 };
diff --git a/Sming/Core/Data/StreamTransformer.cpp b/Sming/Core/Data/StreamTransformer.cpp
index f3ac23902a..4090ec6122 100644
--- a/Sming/Core/Data/StreamTransformer.cpp
+++ b/Sming/Core/Data/StreamTransformer.cpp
@@ -24,57 +24,46 @@ uint16_t StreamTransformer::readMemoryBlock(char* data, int bufSize)
 		tempStream = new CircularBuffer(NETWORK_SEND_BUFFER_SIZE + 10);
 	}
 
-	if(tempStream->isFinished()) {
-		if(sourceStream->isFinished()) {
-			return 0;
-		}
-
-		// Fill the temp stream with data...
-		int i = bufSize / blockSize + 1;
-		do {
-			int len = blockSize;
-			if(i == 1) {
-				len = bufSize % blockSize;
-			}
-
-			len = sourceStream->readMemoryBlock(data, len);
-			if(!len) {
-				break;
-			}
+	// Use provided buffer as a temporary store for this operation
+	fillTempStream(data, bufSize);
 
-			saveState();
-			size_t outLength = transform(reinterpret_cast<const uint8_t*>(data), len, result, resultSize);
-			if(outLength > tempStream->room()) {
-				restoreState();
-				break;
-			}
-
-			if(tempStream->write(result, outLength) != outLength) {
-				debug_e("That should not happen!");
-				restoreState();
-				break;
-			}
+	return tempStream->readMemoryBlock(data, bufSize);
+}
 
-			sourceStream->seek(len);
-		} while(--i);
+void StreamTransformer::fillTempStream(char* buffer, size_t bufSize)
+{
+	size_t room;
+	auto maxChunkSize = std::min(bufSize, blockSize);
+	while((room = tempStream->room()) >= maxChunkSize) {
+		auto chunkSize = sourceStream->readMemoryBlock(buffer, maxChunkSize);
+		if(chunkSize == 0) {
+			return;
+		}
 
-		if(sourceStream->isFinished()) {
-			int outLength = transform(nullptr, 0, result, resultSize);
-			tempStream->write(result, outLength);
+		saveState();
+		size_t outLength = transform(reinterpret_cast<const uint8_t*>(buffer), chunkSize, result, resultSize);
+		if(outLength > room) {
+			restoreState();
+			return;
 		}
 
-	} /* if(tempStream->isFinished()) */
+		auto written = tempStream->write(result, outLength);
+		assert(written == outLength);
 
-	return tempStream->readMemoryBlock(data, bufSize);
+		sourceStream->seek(chunkSize);
+	}
+
+	if(sourceStream->isFinished()) {
+		auto outLength = transform(nullptr, 0, result, resultSize);
+		tempStream->write(result, outLength);
+	}
 }
 
-//Use base class documentation
 bool StreamTransformer::seek(int len)
 {
 	return tempStream->seek(len);
 }
 
-//Use base class documentation
 bool StreamTransformer::isFinished()
 {
 	return (sourceStream->isFinished() && (tempStream == nullptr || tempStream->isFinished()));
diff --git a/Sming/Core/Data/StreamTransformer.h b/Sming/Core/Data/StreamTransformer.h
index dee5dcfb08..fe293ec88e 100644
--- a/Sming/Core/Data/StreamTransformer.h
+++ b/Sming/Core/Data/StreamTransformer.h
@@ -117,9 +117,11 @@ class StreamTransformer : public IDataSourceStream
 	StreamTransformerCallback transformCallback = nullptr;
 
 private:
-	IDataSourceStream* sourceStream = nullptr;
-	CircularBuffer* tempStream = nullptr;
-	uint8_t* result = nullptr;
+	void fillTempStream(char* buffer, size_t bufSize);
+
+	IDataSourceStream* sourceStream{nullptr};
+	CircularBuffer* tempStream{nullptr};
+	uint8_t* result{nullptr};
 	size_t resultSize;
 	size_t blockSize;
 };
diff --git a/tests/HostTests/app/resource.cpp b/tests/HostTests/app/resource.cpp
index 2814d56af8..84508bad7c 100644
--- a/tests/HostTests/app/resource.cpp
+++ b/tests/HostTests/app/resource.cpp
@@ -10,7 +10,8 @@ RESOURCE(abstract_txt, "abstract.txt")
 RESOURCE(test_json, "test.json")
 RESOURCE(ut_template1_in_rst, "ut_template1.in.rst")
 RESOURCE(ut_template1_out1_rst, "ut_template1.out1.rst")
-//RESOURCE(ut_template2_in_rst, "ut_template2.in.rst")
-//RESOURCE(ut_template2_out_rst, "ut_template2.in.rst")
+
+RESOURCE(image_png, "image.png")
+RESOURCE(multipart_result, "multipart-result.txt")
 
 } // namespace Resource
diff --git a/tests/HostTests/include/resource.h b/tests/HostTests/include/resource.h
index 5fd853534e..a0d91656c6 100644
--- a/tests/HostTests/include/resource.h
+++ b/tests/HostTests/include/resource.h
@@ -12,8 +12,9 @@ DECLARE_FSTR(README_md)
 DECLARE_FSTR(unit_testing_rst) // Unmodified file
 DECLARE_FSTR(ut_template1_in_rst)
 DECLARE_FSTR(ut_template1_out1_rst) // emit_contents = true
-//DECLARE_FSTR(ut_template1_out2_rst)
-//DECLARE_FSTR(ut_template2_in_rst)
-//DECLARE_FSTR(ut_template2_out_rst)
+
+// Multipart streams
+DECLARE_FSTR(image_png)
+DECLARE_FSTR(multipart_result)
 
 } // namespace Resource
diff --git a/tests/HostTests/modules/Stream.cpp b/tests/HostTests/modules/Stream.cpp
index 80f1fa2331..90802023ac 100644
--- a/tests/HostTests/modules/Stream.cpp
+++ b/tests/HostTests/modules/Stream.cpp
@@ -1,6 +1,8 @@
 #include <HostTests.h>
 #include <FlashString/TemplateStream.hpp>
 #include <Data/Stream/MemoryDataStream.h>
+#include <Data/Stream/Base64OutputStream.h>
+#include <Network/WebHelpers/base64.h>
 
 DEFINE_FSTR_LOCAL(template1, "Stream containing {var1}, {var2} and {var3}. {} {{}} {{12345")
 DEFINE_FSTR_LOCAL(template1_1, "Stream containing value #1, value #2 and {var3}. {} {{}} {{12345")
@@ -71,6 +73,46 @@ class StreamTest : public TestGroup
 			REQUIRE(FS_abstract == s);
 			REQUIRE(strlen(s.c_str()) == s.length());
 		}
+
+		TEST_CASE("Base64OutputStream / StreamTransformer")
+		{
+			auto src = new FSTR::Stream(Resource::image_png);
+			Base64OutputStream base64stream(src);
+			MemoryDataStream output;
+			output.copyFrom(&base64stream);
+			String s;
+			REQUIRE(output.moveString(s));
+			s = base64_decode(s);
+			REQUIRE(Resource::image_png == s);
+		}
+
+		TEST_CASE("MultipartStream / MultiStream")
+		{
+			unsigned itemIndex{0};
+			constexpr const FlashString* items[]{
+				&template1, &template1_1, &template1_2, &template2, &template2_1,
+			};
+			MultipartStream multi([&]() -> MultipartStream::BodyPart {
+				MultipartStream::BodyPart part;
+				if(itemIndex < ARRAY_SIZE(items)) {
+					part.headers = new HttpHeaders;
+					part.stream = new FSTR::Stream(*items[itemIndex++]);
+				}
+				return part;
+			});
+
+			// For testing, hack the boundary value so we can compare it against a reference output
+			auto boundary = const_cast<char*>(multi.getBoundary());
+			memcpy(boundary, _F("oALsXuO7vSbrvve"), 16);
+
+			MemoryDataStream mem;
+			size_t copySize = mem.copyFrom(&multi);
+			debug_i("copySize = %u", copySize);
+			REQUIRE(int(copySize) == mem.available());
+			String s;
+			REQUIRE(mem.moveString(s));
+			REQUIRE(Resource::multipart_result == s);
+		}
 	}
 
 private:
diff --git a/tests/HostTests/resource/.gitattributes b/tests/HostTests/resource/.gitattributes
new file mode 100644
index 0000000000..a559067916
--- /dev/null
+++ b/tests/HostTests/resource/.gitattributes
@@ -0,0 +1 @@
+multipart-result.txt binary
diff --git a/tests/HostTests/resource/image.png b/tests/HostTests/resource/image.png
new file mode 100644
index 0000000000000000000000000000000000000000..369e55dc65f5826ebc16940c7f320ec88e19011e
GIT binary patch
literal 4320
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
O0000<MNUMnLSTY~xKtPb

literal 0
HcmV?d00001

diff --git a/tests/HostTests/resource/multipart-result.txt b/tests/HostTests/resource/multipart-result.txt
new file mode 100644
index 0000000000..6c9315186e
--- /dev/null
+++ b/tests/HostTests/resource/multipart-result.txt
@@ -0,0 +1,22 @@
+
+--oALsXuO7vSbrvve
+Content-Length: 60
+
+Stream containing {var1}, {var2} and {var3}. {} {{}} {{12345
+--oALsXuO7vSbrvve
+Content-Length: 64
+
+Stream containing value #1, value #2 and {var3}. {} {{}} {{12345
+--oALsXuO7vSbrvve
+Content-Length: 68
+
+Stream containing value #1, value #2 and [value #3]. {} {{}} {{12345
+--oALsXuO7vSbrvve
+Content-Length: 82
+
+This text should {disable}not {var1} really {var2:hello} again {enable}be missing.
+--oALsXuO7vSbrvve
+Content-Length: 28
+
+This text should be missing.
+--oALsXuO7vSbrvve--

From 061f3adc38eec7f026005c86ec257b14fd3020da Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Thu, 25 Mar 2021 13:49:22 +0000
Subject: [PATCH 82/91] Fix SMTP issues (#2280)

* Handle SMTP disconnect using TCP timeout, allows SSL connection to close gracefully

If SSL connection closed prematurely, `assert` goes pop. Replace with debug error.

* Tidy SMTP auth code

* Coding style, move trivial methods into header
---
 Sming/Components/ssl/src/Session.cpp |  5 +-
 Sming/Core/Network/SmtpClient.cpp    | 83 +++++++++++++---------------
 Sming/Core/Network/SmtpClient.h      | 27 +++++----
 3 files changed, 56 insertions(+), 59 deletions(-)

diff --git a/Sming/Components/ssl/src/Session.cpp b/Sming/Components/ssl/src/Session.cpp
index e3034e0012..208fee87c0 100644
--- a/Sming/Components/ssl/src/Session.cpp
+++ b/Sming/Components/ssl/src/Session.cpp
@@ -145,7 +145,10 @@ void Session::close()
 
 int Session::read(InputBuffer& input, uint8_t*& output)
 {
-	assert(connection != nullptr);
+	if(connection == nullptr) {
+		debug_w("SSL: no connection");
+		return -1;
+	}
 	int len = connection->read(input, output);
 	if(len < 0) {
 		debug_w("SSL: Got error: %d (%s)", len, connection->getErrorString(len).c_str());
diff --git a/Sming/Core/Network/SmtpClient.cpp b/Sming/Core/Network/SmtpClient.cpp
index 321898003a..c78a04cee0 100644
--- a/Sming/Core/Network/SmtpClient.cpp
+++ b/Sming/Core/Network/SmtpClient.cpp
@@ -35,7 +35,7 @@
 	}
 #define ADVANCE_UNTIL_EOL                                                                                              \
 	do {                                                                                                               \
-		if(*(buffer - 1) == '\r' && *buffer == '\n') {                                                                 \
+		if(buffer[-1] == '\r' && buffer[0] == '\n') {                                                                  \
 			ADVANCE_AND_BREAK;                                                                                         \
 		}                                                                                                              \
 		ADVANCE;                                                                                                       \
@@ -44,7 +44,7 @@
 #define ADVANCE_UNTIL_EOL_OR_BREAK                                                                                     \
 	{                                                                                                                  \
 		ADVANCE_UNTIL_EOL;                                                                                             \
-		if(*(buffer - 1) != '\n') {                                                                                    \
+		if(buffer[-1] != '\n') {                                                                                       \
 			break;                                                                                                     \
 		}                                                                                                              \
 	}
@@ -61,10 +61,6 @@
 		break;                                                                                                         \
 	}
 
-SmtpClient::SmtpClient(bool autoDestroy) : TcpClient(autoDestroy)
-{
-}
-
 SmtpClient::~SmtpClient()
 {
 	delete outgoingMail;
@@ -143,45 +139,39 @@ void SmtpClient::onReadyToSendData(TcpConnectionEvent sourceEvent)
 	}
 
 	case eSMTP_SendAuth: {
-		if(authMethods.count()) {
-			auto methodPlain = F("PLAIN");
-			auto methodCramMd5 = F("CRAM-MD5");
-			// TODO: Simplify the code in that block...
-			Vector<String> preferredOrder;
-			if(useSsl) {
-				preferredOrder.addElement(methodPlain);
-				preferredOrder.addElement(methodCramMd5);
-			} else {
-				preferredOrder.addElement(methodCramMd5);
-				preferredOrder.addElement(methodPlain);
-			}
-
-			for(unsigned i = 0; i < preferredOrder.count(); i++) {
-				if(authMethods.contains(preferredOrder[i])) {
-					if(preferredOrder[i] == methodPlain) {
-						// base64('\0' + username + '\0' + password)
-						String token = '\0' + url.User + '\0' + url.Password;
-						String hash = base64_encode(token);
-						sendString(F("AUTH PLAIN ") + hash + "\r\n");
-						state = eSMTP_SendingAuth;
-						break;
-					} else if(preferredOrder[i] == methodCramMd5) {
-						// otherwise we can try the slow cram-md5 authentication...
-						sendString(F("AUTH CRAM-MD5\r\n"));
-						state = eSMTP_RequestingAuthChallenge;
-						break;
-					}
-				}
+		auto authPlain = [this]() {
+			// base64('\0' + username + '\0' + password)
+			String token = '\0' + url.User + '\0' + url.Password;
+			String hash = base64_encode(token);
+			sendString(F("AUTH PLAIN ") + hash + "\r\n");
+			state = eSMTP_SendingAuth;
+		};
+
+		auto authCramMd5 = [this]() {
+			// Slower cram-md5 authentication
+			sendString(F("AUTH CRAM-MD5\r\n"));
+			state = eSMTP_RequestingAuthChallenge;
+		};
+
+		DEFINE_FSTR_LOCAL(methodPlain, "PLAIN")
+		DEFINE_FSTR_LOCAL(methodCramMd5, "CRAM-MD5")
+		if(useSsl) {
+			if(authMethods.contains(methodPlain)) {
+				authPlain();
+			} else if(authMethods.contains(methodCramMd5)) {
+				authCramMd5();
 			}
-		} /* authMethods.count */
+		} else if(authMethods.contains(methodCramMd5)) {
+			authCramMd5();
+		} else if(authMethods.contains(methodPlain)) {
+			authPlain();
+		}
 
 		if(state == eSMTP_SendAuth) {
 			state = eSMTP_Ready;
 		}
 
 		break;
-
-	default:; // Do nothing
 	}
 
 	case eSMTP_SendAuthResponse: {
@@ -264,10 +254,12 @@ void SmtpClient::onReadyToSendData(TcpConnectionEvent sourceEvent)
 	}
 
 	case eSMTP_Disconnect: {
-		close();
+		setTimeOut(1);
 		return;
 	}
 
+	default:; // Do nothing
+
 	} /* switch(state) */
 
 	TcpClient::onReadyToSendData(sourceEvent);
@@ -277,15 +269,14 @@ MultipartStream::BodyPart SmtpClient::multipartProducer()
 {
 	MultipartStream::BodyPart result;
 
-	if(outgoingMail->attachments.count()) {
+	if(!outgoingMail->attachments.isEmpty()) {
 		result = outgoingMail->attachments[0];
+		outgoingMail->attachments.remove(0);
 
 		if(!result.headers->contains(HTTP_HEADER_CONTENT_TRANSFER_ENCODING)) {
 			result.stream = new Base64OutputStream(result.stream);
 			(*result.headers)[HTTP_HEADER_CONTENT_TRANSFER_ENCODING] = _F("base64");
 		}
-
-		outgoingMail->attachments.remove(0);
 	}
 
 	return result;
@@ -300,7 +291,7 @@ void SmtpClient::sendMailHeaders(MailMessage* mail)
 		mail->stream = new QuotedPrintableOutputStream(mail->stream);
 	}
 
-	if(mail->attachments.count()) {
+	if(!mail->attachments.isEmpty()) {
 		MultipartStream* mStream = new MultipartStream(MultipartStream::Producer(&SmtpClient::multipartProducer, this));
 		MultipartStream::BodyPart text;
 		text.headers = new HttpHeaders();
@@ -343,12 +334,13 @@ err_t SmtpClient::onReceive(pbuf* buf)
 	pbuf* cur = buf;
 	int parsedBytes = 0;
 	while(cur != nullptr && cur->len > 0) {
-		parsedBytes += smtpParse((char*)cur->payload, cur->len);
+		parsedBytes += smtpParse(static_cast<char*>(cur->payload), cur->len);
 		cur = cur->next;
 	}
 
 	if(parsedBytes != buf->tot_len) {
-		debug_e("Got error: %s:%s", code, message);
+		debug_e("[SMTP] Got error %s: %s", code, message);
+		debug_hex(DBG, "SMTP", buf->payload, buf->len);
 
 		if(!errorCallback || errorCallback(*this, codeValue, message) != 0) {
 			// abort the connection if we cannot handle it.
@@ -492,7 +484,6 @@ int SmtpClient::smtpParse(char* buffer, size_t len)
 
 		case eSMTP_Quitting: {
 			RETURN_ON_ERROR(SMTP_CODE_BYE);
-			close();
 			state = eSMTP_Disconnect;
 
 			break;
diff --git a/Sming/Core/Network/SmtpClient.h b/Sming/Core/Network/SmtpClient.h
index 0dabf487ae..2b4b4149ad 100644
--- a/Sming/Core/Network/SmtpClient.h
+++ b/Sming/Core/Network/SmtpClient.h
@@ -90,7 +90,10 @@ using SmtpClientCallback = Delegate<int(SmtpClient& client, int code, char* stat
 class SmtpClient : protected TcpClient
 {
 public:
-	SmtpClient(bool autoDestroy = false);
+	SmtpClient(bool autoDestroy = false) : TcpClient(autoDestroy)
+	{
+	}
+
 	~SmtpClient();
 
 	/**
@@ -183,18 +186,18 @@ class SmtpClient : protected TcpClient
 	Url url;
 	Vector<String> authMethods;
 	ObjectQueue<MailMessage, SMTP_QUEUE_SIZE> mailQ;
-	char code[4] = {0};
-	int codeValue = 0;
+	char code[4]{0};
+	int codeValue{0};
 	String authChallenge;
-	char message[SMTP_ERROR_LENGTH + 1] = {0};
-	bool isLastLine = false;
-	uint8_t codeLength = 0;
-	int options = 0;
-	MailMessage* outgoingMail = nullptr;
-	SmtpState state = eSMTP_Banner;
-
-	SmtpClientCallback errorCallback = nullptr;
-	SmtpClientCallback messageSentCallback = nullptr;
+	char message[SMTP_ERROR_LENGTH + 1]{0};
+	bool isLastLine{false};
+	uint8_t codeLength{0};
+	int options{0};
+	MailMessage* outgoingMail{nullptr};
+	SmtpState state{eSMTP_Banner};
+
+	SmtpClientCallback errorCallback;
+	SmtpClientCallback messageSentCallback;
 
 private:
 	/**

From 0d77c34f59860633ac8adfba4948cc4e5bce2c72 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Fri, 26 Mar 2021 07:44:03 +0000
Subject: [PATCH 83/91] Add `host_debug_X()` functions and associated `debug`
 command-line parameter (#2289)

---
 .../Arch/Host/Components/driver/hw_timer.cpp  |  2 +-
 .../Host/Components/driver/uart_server.cpp    | 12 ++++----
 Sming/Arch/Host/Components/esp_hal/tasks.cpp  |  8 +++---
 Sming/Arch/Host/Components/hostlib/hostmsg.c  |  2 ++
 Sming/Arch/Host/Components/hostlib/hostmsg.h  | 16 +++++++++++
 Sming/Arch/Host/Components/hostlib/options.h  |  4 ++-
 .../Arch/Host/Components/hostlib/sockets.cpp  | 10 +++----
 .../Arch/Host/Components/hostlib/startup.cpp  | 28 +++++++++++--------
 .../Host/Components/lwip/Linux/host_lwip.c    | 21 +++++++-------
 .../Host/Components/lwip/Windows/host_lwip.c  | 16 +++++------
 .../Host/Components/spi_flash/flashmem.cpp    | 16 +++++------
 Sming/Arch/Host/Platform/StationImpl.cpp      | 10 +++----
 .../Components/rboot/src/Arch/Host/rboot.cpp  | 12 ++++----
 samples/Basic_Utility/README.rst              |  7 ++++-
 14 files changed, 98 insertions(+), 66 deletions(-)

diff --git a/Sming/Arch/Host/Components/driver/hw_timer.cpp b/Sming/Arch/Host/Components/driver/hw_timer.cpp
index 2b6b04f638..6e8abc7172 100644
--- a/Sming/Arch/Host/Components/driver/hw_timer.cpp
+++ b/Sming/Arch/Host/Components/driver/hw_timer.cpp
@@ -168,7 +168,7 @@ void* CTimerThread::thread_routine()
 				continue; // state changed
 			}
 			if(errno != ETIMEDOUT) {
-				hostmsg("Warning! Timer thread errno = %u", errno);
+				host_debug_w("Timer thread errno = %u", errno);
 				break;
 			}
 		}
diff --git a/Sming/Arch/Host/Components/driver/uart_server.cpp b/Sming/Arch/Host/Components/driver/uart_server.cpp
index 5da69e90fa..08e9d4f74b 100644
--- a/Sming/Arch/Host/Components/driver/uart_server.cpp
+++ b/Sming/Arch/Host/Components/driver/uart_server.cpp
@@ -183,7 +183,7 @@ void CUartServer::terminate()
 {
 	close();
 	join();
-	hostmsg("UART%u server destroyed", uart_nr);
+	host_debug_i("UART%u server destroyed", uart_nr);
 }
 
 void CUartServer::onNotify(smg_uart_t* uart, smg_uart_notify_code_t code)
@@ -271,7 +271,7 @@ int CUartServer::serviceWrite()
 	do {
 		int sent = socket->send(data, avail);
 		if(sent < 0) {
-			hostmsg("Uart send returned %d", sent);
+			host_debug_w("Uart send returned %d", sent);
 			result = sent;
 			break;
 		}
@@ -295,11 +295,11 @@ void* CUartServer::thread_routine()
 	auto port = portBase + uart_nr;
 	CSockAddr addr(nullptr, port);
 	if(!listen(addr, 1)) {
-		hostmsg("Listen %s failed", addr.text().c_str());
+		host_debug_e("Listen %s failed", addr.text().c_str());
 		return nullptr;
 	}
 
-	hostmsg("UART%u server listening on port %u", uart_nr, port);
+	host_debug_i("UART%u server listening on port %u", uart_nr, port);
 
 	while(active()) {
 		socket = try_connect();
@@ -308,7 +308,7 @@ void* CUartServer::thread_routine()
 			continue;
 		}
 
-		hostmsg("Uart #%u socket open", uart_nr);
+		host_debug_i("Uart #%u socket open", uart_nr);
 
 		while(socket->active()) {
 			if(txsem.timedwait(IDLE_SLEEP_MS)) {
@@ -335,7 +335,7 @@ void* CUartServer::thread_routine()
 		}
 
 		socket->close();
-		hostmsg("Uart #%u socket closed", uart_nr);
+		host_debug_i("Uart #%u socket closed", uart_nr);
 	}
 
 	return nullptr;
diff --git a/Sming/Arch/Host/Components/esp_hal/tasks.cpp b/Sming/Arch/Host/Components/esp_hal/tasks.cpp
index eec99b5bb7..064fe7e860 100644
--- a/Sming/Arch/Host/Components/esp_hal/tasks.cpp
+++ b/Sming/Arch/Host/Components/esp_hal/tasks.cpp
@@ -55,12 +55,12 @@ const uint8_t HOST_TASK_PRIO = USER_TASK_PRIO_MAX;
 bool system_os_task(os_task_t callback, uint8_t prio, os_event_t* events, uint8_t qlen)
 {
 	if(prio >= USER_TASK_PRIO_MAX) {
-		hostmsg("Invalid priority %u", prio);
+		host_debug_e("Invalid priority %u", prio);
 		return false;
 	}
 	auto& queue = task_queues[prio];
 	if(queue != nullptr) {
-		hostmsg("Queue %u already initialised", prio);
+		host_debug_e("Queue %u already initialised", prio);
 		return false;
 	}
 
@@ -71,12 +71,12 @@ bool system_os_task(os_task_t callback, uint8_t prio, os_event_t* events, uint8_
 bool system_os_post(uint8_t prio, os_signal_t sig, os_param_t par)
 {
 	if(prio >= USER_TASK_PRIO_MAX) {
-		hostmsg("Invalid priority %u", prio);
+		host_debug_e("Invalid priority %u", prio);
 		return false;
 	}
 	auto& queue = task_queues[prio];
 	if(queue == nullptr) {
-		hostmsg("Task queue %u not initialised", prio);
+		host_debug_e("Task queue %u not initialised", prio);
 		return false;
 	}
 
diff --git a/Sming/Arch/Host/Components/hostlib/hostmsg.c b/Sming/Arch/Host/Components/hostlib/hostmsg.c
index 6076a9fefe..c4be9a91c4 100644
--- a/Sming/Arch/Host/Components/hostlib/hostmsg.c
+++ b/Sming/Arch/Host/Components/hostlib/hostmsg.c
@@ -22,6 +22,8 @@
 #include <string.h>
 #include "hostmsg.h"
 
+int host_debug_level = 2;
+
 /*
  * e.g. from "void a::sub(int)" we just want "a::sub"
  */
diff --git a/Sming/Arch/Host/Components/hostlib/hostmsg.h b/Sming/Arch/Host/Components/hostlib/hostmsg.h
index 1fd6537dc4..149c62335c 100644
--- a/Sming/Arch/Host/Components/hostlib/hostmsg.h
+++ b/Sming/Arch/Host/Components/hostlib/hostmsg.h
@@ -36,6 +36,22 @@ void host_puts(const char* str);
 #define hostmsg(fmt, ...) host_printfp(fmt "\n", __func__, ##__VA_ARGS__)
 #endif
 
+/**
+ * @brief Emit message only if host_debug_level >= level
+ */
+#define host_debug(level, fmt, ...)                                                                                    \
+	do {                                                                                                               \
+		if(host_debug_level >= (level)) {                                                                              \
+			host_printf(fmt "\n", ##__VA_ARGS__);                                                                      \
+		}                                                                                                              \
+	} while(0)
+
+#define host_debug_e(fmt, ...) host_debug(0, "Error! " fmt, ##__VA_ARGS__)
+#define host_debug_w(fmt, ...) host_debug(1, "Warning! " fmt, ##__VA_ARGS__)
+#define host_debug_i(fmt, ...) host_debug(2, fmt, ##__VA_ARGS__)
+
+extern int host_debug_level;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Sming/Arch/Host/Components/hostlib/options.h b/Sming/Arch/Host/Components/hostlib/options.h
index f148b70847..a7371993b6 100644
--- a/Sming/Arch/Host/Components/hostlib/options.h
+++ b/Sming/Arch/Host/Components/hostlib/options.h
@@ -48,7 +48,9 @@
 	XX(flashsize, required_argument, "Change default flash size if file doesn't exist", "SIZE",                        \
 	   "Size of flash in bytes (e.g. 512K, 524288, 0x80000)", nullptr)                                                 \
 	XX(initonly, no_argument, "Initialise only, do not start Sming", nullptr, nullptr, nullptr)                        \
-	XX(nonet, no_argument, "Skip network initialisation", nullptr, nullptr, nullptr)
+	XX(nonet, no_argument, "Skip network initialisation", nullptr, nullptr, nullptr)                                   \
+	XX(debug, required_argument, "Set debug verbosity", "LEVEL", "Maximum debug message level to print",               \
+	   "0 = errors only, 1 = +warnings, 2 = +info\0")
 
 enum option_tag_t {
 #define XX(tag, has_arg, desc, argname, arghelp, examples) opt_##tag,
diff --git a/Sming/Arch/Host/Components/hostlib/sockets.cpp b/Sming/Arch/Host/Components/hostlib/sockets.cpp
index 41c4a3fbb5..5be1025302 100644
--- a/Sming/Arch/Host/Components/hostlib/sockets.cpp
+++ b/Sming/Arch/Host/Components/hostlib/sockets.cpp
@@ -147,20 +147,20 @@ bool CSocket::create()
 	// creation of the socket
 	m_fd = ::socket(AF_INET, m_type, 0);
 	if(m_fd <= 0) {
-		hostmsg("%s", socket_strerror().c_str());
+		host_debug_e("%s", socket_strerror().c_str());
 		return false;
 	}
 
 	int reuse = 1;
 	if(setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (sock_ptr_t)&reuse, sizeof(reuse)) < 0) {
-		hostmsg("REUSEADDR: %s", socket_strerror().c_str());
+		host_debug_e("REUSEADDR: %s", socket_strerror().c_str());
 		close();
 		return false;
 	}
 
 #ifdef SO_REUSEPORT
 	if(setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (sock_ptr_t)&reuse, sizeof(reuse)) < 0) {
-		hostmsg("REUSEPORT: %s", socket_strerror().c_str());
+		host_debug_e("REUSEPORT: %s", socket_strerror().c_str());
 		close();
 		return false;
 	}
@@ -212,7 +212,7 @@ void CSocket::close()
 		return;
 	}
 
-	hostmsg("%s", addr().text().c_str());
+	host_debug_i("%s", addr().text().c_str());
 
 	socket_close(m_fd);
 	m_fd = 0;
@@ -375,7 +375,7 @@ CSocket* CSocketList::recv(void* buf, size_t& n)
 #endif
 				if(errno != EPIPE) {
 					// Broken pipe
-					hostmsg("%s", socket_strerror().c_str());
+					host_debug_e("%s", socket_strerror().c_str());
 				}
 				skt->close();
 			}
diff --git a/Sming/Arch/Host/Components/hostlib/startup.cpp b/Sming/Arch/Host/Components/hostlib/startup.cpp
index dc918e8fd8..7b09ea3797 100644
--- a/Sming/Arch/Host/Components/hostlib/startup.cpp
+++ b/Sming/Arch/Host/Components/hostlib/startup.cpp
@@ -51,19 +51,19 @@ static void cleanup()
 	CUartServer::shutdown();
 	sockets_finalise();
 	host_lwip_shutdown();
-	hostmsg("Goodbye!");
+	host_debug_i("Goodbye!");
 }
 
 void host_exit(int code)
 {
 	static unsigned exit_count;
 
-	hostmsg("returning %d", code);
+	host_debug_i("returning %d", code);
 	exitCode = code;
 	done = true;
 
 	if(exit_count++) {
-		hostmsg("Forcing exit");
+		host_debug_w("Forcing exit");
 		exit(exitCode);
 	}
 }
@@ -108,8 +108,6 @@ int main(int argc, char* argv[])
 {
 	trap_exceptions();
 
-	host_printf("\nWelcome to the Sming Host emulator\n\n");
-
 	static struct {
 		int pause;
 		int exitpause;
@@ -197,10 +195,16 @@ int main(int argc, char* argv[])
 			config.enable_network = false;
 			break;
 
+		case opt_debug:
+			host_debug_level = atoi(arg);
+			break;
+
 		default:;
 		}
 	}
 
+	host_debug_i("\nWelcome to the Sming Host emulator\n\n");
+
 	auto i = get_first_non_option();
 	commandLine.parse(argc - i, &argv[i]);
 
@@ -213,7 +217,7 @@ int main(int argc, char* argv[])
 	atexit(cleanup);
 
 	if(config.initonly) {
-		hostmsg("Initialise-only requested");
+		host_debug_i("Initialise-only requested");
 	} else {
 		Storage::initialize();
 
@@ -233,13 +237,15 @@ int main(int argc, char* argv[])
 				host_wifi_lwip_init_complete();
 			}
 		} else {
-			hostmsg("Network initialisation skipped as requested");
+			host_debug_i("Network initialisation skipped as requested");
 		}
 
-		hostmsg("If required, you may start terminal application(s) now");
-		pause(config.pause);
+		if(config.pause != 0) {
+			hostmsg("If required, you may start terminal application(s) now");
+			pause(config.pause);
+		}
 
-		hostmsg(">> Starting Sming <<\n");
+		host_debug_i(">> Starting Sming <<\n");
 
 		System.initialize();
 
@@ -257,7 +263,7 @@ int main(int argc, char* argv[])
 			system_soft_wdt_feed();
 		}
 
-		hostmsg(">> Normal Exit <<\n");
+		host_debug_i(">> Normal Exit <<\n");
 	}
 
 	pause(config.exitpause);
diff --git a/Sming/Arch/Host/Components/lwip/Linux/host_lwip.c b/Sming/Arch/Host/Components/lwip/Linux/host_lwip.c
index d5c38414c4..9c84f4fe9a 100644
--- a/Sming/Arch/Host/Components/lwip/Linux/host_lwip.c
+++ b/Sming/Arch/Host/Components/lwip/Linux/host_lwip.c
@@ -75,7 +75,7 @@ static bool getifaddr(const char* ifname, struct net_config* netcfg)
 {
 	struct ifaddrs* list;
 	if(getifaddrs(&list) < 0) {
-		hostmsg("getifaddrs: %s", strerror(errno));
+		host_debug_e("getifaddrs: %s", strerror(errno));
 		return false;
 	}
 
@@ -111,26 +111,26 @@ static bool getifaddr(const char* ifname, struct net_config* netcfg)
 
 bool host_lwip_init(const struct lwip_param* param)
 {
-	hostmsg("%s", "Initialising LWIP");
+	host_debug_i("%s", "Initialising LWIP");
 
 	struct net_config netcfg = {0};
 
 	if(!getifaddr(param->ifname, &netcfg)) {
 		if(param->ifname == NULL) {
-			hostmsg("%s", "No compatible interface found");
+			host_debug_e("%s", "No compatible interface found");
 		} else {
-			hostmsg("Interface '%s' not found", param->ifname);
+			host_debug_e("Interface '%s' not found", param->ifname);
 		}
 		return false;
 	}
 
 	if(param->gateway != NULL && ip4addr_aton(param->gateway, &netcfg.gw) != 1) {
-		hostmsg("Failed to parse provided Gateway address '%s'", param->gateway);
+		host_debug_e("Failed to parse provided Gateway address '%s'", param->gateway);
 		return false;
 	}
 
 	if(param->netmask != NULL && ip4addr_aton(param->netmask, &netcfg.netmask) != 1) {
-		hostmsg("Failed to parse provided Network Mask '%s'", param->netmask);
+		host_debug_e("Failed to parse provided Network Mask '%s'", param->netmask);
 		return false;
 	}
 
@@ -139,7 +139,7 @@ bool host_lwip_init(const struct lwip_param* param)
 		IP4_ADDR(&netcfg.ipaddr, (uint32_t)ip4_addr1(&netcfg.gw), (uint32_t)ip4_addr2(&netcfg.gw),
 				 (uint32_t)ip4_addr3(&netcfg.gw), 10U);
 	} else if(ip4addr_aton(param->ipaddr, &netcfg.ipaddr) != 1) {
-		hostmsg("Failed to parse provided IP address '%s'", param->ipaddr);
+		host_debug_e("Failed to parse provided IP address '%s'", param->ipaddr);
 		return false;
 	}
 
@@ -149,7 +149,8 @@ bool host_lwip_init(const struct lwip_param* param)
 	ip4addr_ntoa_r(&netcfg.netmask, nm_str, sizeof(nm_str));
 	char gw_str[IP4ADDR_STRLEN_MAX];
 	ip4addr_ntoa_r(&netcfg.gw, gw_str, sizeof(gw_str));
-	hostmsg("Using interface '%s', gateway = %s, netmask = %s; using ip = %s", netcfg.ifname, gw_str, nm_str, ip_str);
+	host_debug_i("Using interface '%s', gateway = %s, netmask = %s; using ip = %s", netcfg.ifname, gw_str, nm_str,
+				 ip_str);
 
 	setenv("PRECONFIGURED_TAPIF", netcfg.ifname, true);
 
@@ -158,8 +159,8 @@ bool host_lwip_init(const struct lwip_param* param)
 	netif_add(&netif, &netcfg.ipaddr, &netcfg.netmask, &netcfg.gw, NULL, tapif_init, ethernet_input);
 
 	getMacAddress(netcfg.ifname, netif.hwaddr);
-	hostmsg("MAC: %02x:%02x:%02x:%02x:%02x:%02x", netif.hwaddr[0], netif.hwaddr[1], netif.hwaddr[2], netif.hwaddr[3],
-			netif.hwaddr[4], netif.hwaddr[5]);
+	host_debug_i("MAC: %02x:%02x:%02x:%02x:%02x:%02x", netif.hwaddr[0], netif.hwaddr[1], netif.hwaddr[2],
+				 netif.hwaddr[3], netif.hwaddr[4], netif.hwaddr[5]);
 
 	netif_set_default(&netif);
 
diff --git a/Sming/Arch/Host/Components/lwip/Windows/host_lwip.c b/Sming/Arch/Host/Components/lwip/Windows/host_lwip.c
index 521be8507b..4c9751d1df 100644
--- a/Sming/Arch/Host/Components/lwip/Windows/host_lwip.c
+++ b/Sming/Arch/Host/Components/lwip/Windows/host_lwip.c
@@ -84,7 +84,7 @@ static bool find_adapter(const struct lwip_param* param, struct net_config* netc
 	pcap_if_t* alldevs;
 	char errbuf[PCAP_ERRBUF_SIZE + 1];
 	if(pcap_findalldevs(&alldevs, errbuf) < 0) {
-		hostmsg("Error in pcap_findalldevs: %s", errbuf);
+		host_debug_e("Error in pcap_findalldevs: %s", errbuf);
 		return false;
 	}
 
@@ -163,7 +163,7 @@ static bool find_adapter(const struct lwip_param* param, struct net_config* netc
 
 bool host_lwip_init(const struct lwip_param* param)
 {
-	hostmsg("%s", "Initialising LWIP");
+	host_debug_i("%s", "Initialising LWIP");
 
 	if(!npcap_init()) {
 		return false;
@@ -172,17 +172,17 @@ bool host_lwip_init(const struct lwip_param* param)
 	struct net_config netcfg = {0};
 
 	if(param->ipaddr != NULL && ip4addr_aton(param->ipaddr, &netcfg.ipaddr) != 1) {
-		hostmsg("Failed to parse IP address '%s'", param->ipaddr);
+		host_debug_e("Failed to parse IP address '%s'", param->ipaddr);
 		return false;
 	}
 
 	if(param->netmask != NULL && ip4addr_aton(param->netmask, &netcfg.netmask) != 1) {
-		hostmsg("Failed to parse Network Mask '%s'", param->netmask);
+		host_debug_e("Failed to parse Network Mask '%s'", param->netmask);
 		return false;
 	}
 
 	if(param->gateway != NULL && ip4addr_aton(param->gateway, &netcfg.gw) != 1) {
-		hostmsg("Failed to parse Gateway address '%s'", param->gateway);
+		host_debug_e("Failed to parse Gateway address '%s'", param->gateway);
 		return false;
 	}
 
@@ -196,7 +196,7 @@ bool host_lwip_init(const struct lwip_param* param)
 	ip4addr_ntoa_r(&netcfg.netmask, nm_str, sizeof(nm_str));
 	char gw_str[IP4ADDR_STRLEN_MAX];
 	ip4addr_ntoa_r(&netcfg.gw, gw_str, sizeof(gw_str));
-	hostmsg("gateway = %s, netmask = %s; using ip = %s", gw_str, nm_str, ip_str);
+	host_debug_i("gateway = %s, netmask = %s; using ip = %s", gw_str, nm_str, ip_str);
 
 	// Even though we're running as NO_SYS, stuff like crypt needs initialising
 	sys_init();
@@ -206,8 +206,8 @@ bool host_lwip_init(const struct lwip_param* param)
 	netif_add(&netif, &netcfg.ipaddr, &netcfg.netmask, &netcfg.gw, state, pcapif_init, ethernet_input);
 	netif_set_default(&netif);
 
-	hostmsg("MAC: %02x:%02x:%02x:%02x:%02x:%02x", netif.hwaddr[0], netif.hwaddr[1], netif.hwaddr[2], netif.hwaddr[3],
-			netif.hwaddr[4], netif.hwaddr[5]);
+	host_debug_i("MAC: %02x:%02x:%02x:%02x:%02x:%02x", netif.hwaddr[0], netif.hwaddr[1], netif.hwaddr[2],
+				 netif.hwaddr[3], netif.hwaddr[4], netif.hwaddr[5]);
 
 	return true;
 }
diff --git a/Sming/Arch/Host/Components/spi_flash/flashmem.cpp b/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
index 6fead07de7..ae479fbcba 100644
--- a/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
+++ b/Sming/Arch/Host/Components/spi_flash/flashmem.cpp
@@ -40,7 +40,7 @@ constexpr uint32_t FLASHMEM_REAL_MASK{~FLASHMEM_REAL_BIT};
 
 #define CHECK_RANGE(_addr, _size)                                                                                      \
 	if((_addr) + (_size) > flashFileSize) {                                                                            \
-		hostmsg("addr = 0x%08x, size = 0x%08x", _addr, _size);                                                         \
+		host_debug_e("addr = 0x%08x, size = 0x%08x", _addr, _size);                                                         \
 		return false;                                                                                                  \
 	}
 
@@ -59,13 +59,13 @@ bool host_flashmem_init(FlashmemConfig& config)
 	}
 
 	if(!flashFile.open(flashFileName, IFS::File::Create | IFS::File::ReadWrite)) {
-		hostmsg("Error opening \"%s\"", flashFileName);
+		host_debug_e("Error opening \"%s\"", flashFileName);
 		return false;
 	}
 
 	int res = flashFile.seek(0, SeekOrigin::End);
 	if(res < 0) {
-		hostmsg("Error seeking \"%s\": %s", flashFileName, flashFile.getErrorString(res).c_str());
+		host_debug_e("Error seeking \"%s\": %s", flashFileName, flashFile.getErrorString(res).c_str());
 		flashFile.close();
 		return false;
 	}
@@ -74,14 +74,14 @@ bool host_flashmem_init(FlashmemConfig& config)
 		size_t size = config.createSize ?: flashFileSize;
 		res = flashFile.seek(size, SeekOrigin::Start);
 		if(res != int(size)) {
-			hostmsg("Error seeking beyond end of file \"%s\"", flashFileName);
+			host_debug_e("Error seeking beyond end of file \"%s\"", flashFileName);
 		} else if(!flashFile.truncate(size)) {
-			hostmsg("Error truncating \"%s\" to %u bytes", flashFileName, size);
+			host_debug_e("Error truncating \"%s\" to %u bytes", flashFileName, size);
 		} else {
-			hostmsg("Created blank \"%s\", %u bytes", flashFileName, size);
+			host_debug_i("Created blank \"%s\", %u bytes", flashFileName, size);
 		}
 	} else {
-		hostmsg("Opened \"%s\", size = 0x%08x", flashFileName, res);
+		host_debug_i("Opened \"%s\", size = 0x%08x", flashFileName, res);
 	}
 
 	flashFileSize = res;
@@ -93,7 +93,7 @@ bool host_flashmem_init(FlashmemConfig& config)
 void host_flashmem_cleanup()
 {
 	flashFile.close();
-	hostmsg("Closed \"%s\"", flashFileName);
+	host_debug_i("Closed \"%s\"", flashFileName);
 }
 
 static int readFlashFile(uint32_t offset, void* buffer, size_t count)
diff --git a/Sming/Arch/Host/Platform/StationImpl.cpp b/Sming/Arch/Host/Platform/StationImpl.cpp
index caca7f7934..4128401682 100644
--- a/Sming/Arch/Host/Platform/StationImpl.cpp
+++ b/Sming/Arch/Host/Platform/StationImpl.cpp
@@ -124,10 +124,10 @@ void StationImpl::statusCallback(netif* nif)
 	if(changed_flags & NETIF_FLAG_UP) {
 		assert(currentAp != nullptr);
 		if(nif->flags & NETIF_FLAG_UP) {
-			host_printf("IF_UP, AP: %s\n", currentAp->ssid);
+			host_debug_i("IF_UP, AP: %s", currentAp->ssid);
 			wifiEventsImpl.stationConnected(*currentAp);
 		} else {
-			host_printf("IF_DOWN, AP: %s\n", currentAp->ssid);
+			host_debug_i("IF_DOWN, AP: %s", currentAp->ssid);
 			wifiEventsImpl.stationDisconnected(*currentAp, WIFI_DISCONNECT_REASON_CONNECTION_FAIL);
 		}
 	}
@@ -138,12 +138,12 @@ void StationImpl::statusCallback(netif* nif)
 			ipaddr = nif->ip_addr;
 			netmask = nif->netmask;
 			gateway = nif->gw;
-			host_printf("IP_CHANGE, ip: %s, netmask: %s, gateway: %s\n", ipaddr.toString().c_str(),
-						netmask.toString().c_str(), gateway.toString().c_str());
+			host_debug_i("IP_CHANGE, ip: %s, netmask: %s, gateway: %s", ipaddr.toString().c_str(),
+						 netmask.toString().c_str(), gateway.toString().c_str());
 			wifiEventsImpl.stationGotIp(ipaddr, netmask, gateway);
 		}
 	} else {
-		hostmsg("No IP address");
+		host_debug_w("No IP address");
 		connectionStatus = eSCS_ConnectionFailed;
 	}
 }
diff --git a/Sming/Components/rboot/src/Arch/Host/rboot.cpp b/Sming/Components/rboot/src/Arch/Host/rboot.cpp
index 3eec026938..a75031fb6f 100644
--- a/Sming/Components/rboot/src/Arch/Host/rboot.cpp
+++ b/Sming/Components/rboot/src/Arch/Host/rboot.cpp
@@ -19,7 +19,7 @@ static uint32_t SPIRead(uint32_t addr, void* outptr, uint32_t len)
 }
 
 #define SPIEraseSector(sector) flashmem_erase_sector(sector)
-#define echof(fmt, ...) host_printf(fmt, ##__VA_ARGS__)
+#define echof(fmt, ...) host_debug_i(fmt, ##__VA_ARGS__)
 
 #include <partition.h>
 
@@ -33,10 +33,10 @@ void host_init_bootloader()
 	// fresh install or old version?
 	bool init = false;
 	if(romconf.magic != BOOT_CONFIG_MAGIC) {
-		hostmsg("MAGIC mismatch");
+		host_debug_w("MAGIC mismatch");
 		init = true;
 	} else if(romconf.version != BOOT_CONFIG_VERSION) {
-		hostmsg("VERSION mismatch: %u found, current %u", romconf.version, BOOT_CONFIG_VERSION);
+		host_debug_w("VERSION mismatch: %u found, current %u", romconf.version, BOOT_CONFIG_VERSION);
 		init = true;
 	}
 
@@ -54,13 +54,13 @@ void host_init_bootloader()
 	}
 
 	if(romconf.count == 0) {
-		hostmsg("ERROR! No App partitions found\r\n");
+		host_debug_w("Note: No App partitions found\r\n");
 		return;
 	}
 
 	if(init || config_changed) {
 		bool ok = rboot_set_config(&romconf);
-		hostmsg("Update rBoot config: %s", ok ? "OK" : "FAIL");
+		host_debug_i("Update rBoot config: %s", ok ? "OK" : "FAIL");
 	}
 
 	String addr;
@@ -70,5 +70,5 @@ void host_init_bootloader()
 		}
 		addr += '#' + String(i) + ": 0x" + String(romconf.roms[i], 16);
 	}
-	hostmsg("ROM count = %u, current = %u, %s", romconf.count, romconf.current_rom, addr.c_str());
+	host_debug_i("ROM count = %u, current = %u, %s", romconf.count, romconf.current_rom, addr.c_str());
 }
diff --git a/samples/Basic_Utility/README.rst b/samples/Basic_Utility/README.rst
index 613614d5ae..02827fb11d 100644
--- a/samples/Basic_Utility/README.rst
+++ b/samples/Basic_Utility/README.rst
@@ -15,6 +15,11 @@ To run the application directly, you can do this::
 
    out/Host/debug/firmware/app --nonet command=testWebConstants
 
-``--nonet`` is optional. Use ``--help`` to see available emulator options.
+``--nonet`` is optional.
+
+You may find ``--debug=0`` useful to suppress all but host error messages.
+Specify ``1`` to include warnings.
+
+Use ``--help`` to see available emulator options.
 
 See :envvar:`HOST_PARAMETERS` for further details.

From 54231b9e43b751b2ccfb906a73510230364509be Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Fri, 26 Mar 2021 07:44:45 +0000
Subject: [PATCH 84/91] Upgrade to clang-format 8 (#2268)

* Update to clang-format 8

* Revise installer to use clang-format-8

* Update documentation
---
 Sming/Core/Network/NtpClient.cpp              | 15 ++++++++-------
 Sming/Core/Network/TcpConnection.cpp          | 19 ++++++++++---------
 Sming/Core/Task.h                             | 17 +++++++++--------
 Tools/install.sh                              |  6 +++---
 .../information/develop/clang-tools.rst       | 17 ++++++++++++-----
 5 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/Sming/Core/Network/NtpClient.cpp b/Sming/Core/Network/NtpClient.cpp
index c79698164b..ed49a6d819 100644
--- a/Sming/Core/Network/NtpClient.cpp
+++ b/Sming/Core/Network/NtpClient.cpp
@@ -46,13 +46,14 @@ void NtpClient::requestTime()
 	}
 
 	ip_addr_t resolvedIp;
-	int result = dns_gethostbyname(server.c_str(), &resolvedIp,
-								   [](const char* name, LWIP_IP_ADDR_T* ip, void* arg) {
-									   // We do a new request since the last one was never done.
-									   if(ip)
-										   reinterpret_cast<NtpClient*>(arg)->internalRequestTime(*ip);
-								   },
-								   this);
+	int result = dns_gethostbyname(
+		server.c_str(), &resolvedIp,
+		[](const char* name, LWIP_IP_ADDR_T* ip, void* arg) {
+			// We do a new request since the last one was never done.
+			if(ip)
+				reinterpret_cast<NtpClient*>(arg)->internalRequestTime(*ip);
+		},
+		this);
 
 	debug_d("dns_gethostbyname() returned %d", result);
 
diff --git a/Sming/Core/Network/TcpConnection.cpp b/Sming/Core/Network/TcpConnection.cpp
index 2b930ba3db..528abb68cd 100644
--- a/Sming/Core/Network/TcpConnection.cpp
+++ b/Sming/Core/Network/TcpConnection.cpp
@@ -89,15 +89,16 @@ bool TcpConnection::connect(const String& server, int port, bool useSsl)
 		int port;
 	};
 	DnsLookup* look = new DnsLookup{this, port};
-	err_t dnslook = dns_gethostbyname(server.c_str(), &addr,
-									  [](const char* name, LWIP_IP_ADDR_T* ipaddr, void* arg) {
-										  auto dlook = static_cast<DnsLookup*>(arg);
-										  if(dlook != nullptr) {
-											  dlook->con->internalOnDnsResponse(name, ipaddr, dlook->port);
-											  delete dlook;
-										  }
-									  },
-									  look);
+	err_t dnslook = dns_gethostbyname(
+		server.c_str(), &addr,
+		[](const char* name, LWIP_IP_ADDR_T* ipaddr, void* arg) {
+			auto dlook = static_cast<DnsLookup*>(arg);
+			if(dlook != nullptr) {
+				dlook->con->internalOnDnsResponse(name, ipaddr, dlook->port);
+				delete dlook;
+			}
+		},
+		look);
 	if(dnslook == ERR_INPROGRESS) {
 		// Operation pending - see internalOnDnsResponse()
 		return true;
diff --git a/Sming/Core/Task.h b/Sming/Core/Task.h
index a4b0de7c06..1c04dc72e0 100644
--- a/Sming/Core/Task.h
+++ b/Sming/Core/Task.h
@@ -112,14 +112,15 @@ class Task
 		switch(state) {
 		case State::Suspended:
 		case State::Running:
-			sleepTimer.initializeMs(interval,
-									[](void* param) {
-										auto task = static_cast<Task*>(param);
-										task->notify(Notify::Waking);
-										task->state = State::Running;
-										task->service();
-									},
-									this);
+			sleepTimer.initializeMs(
+				interval,
+				[](void* param) {
+					auto task = static_cast<Task*>(param);
+					task->notify(Notify::Waking);
+					task->state = State::Running;
+					task->service();
+				},
+				this);
 			sleepTimer.startOnce();
 			notify(Notify::Sleeping);
 			state = State::Sleeping;
diff --git a/Tools/install.sh b/Tools/install.sh
index c739ba63c7..d3d096f282 100755
--- a/Tools/install.sh
+++ b/Tools/install.sh
@@ -93,7 +93,7 @@ if [ -n "$APPVEYOR" ] || [ -n "$GITHUB_ACTION" ]; then
 
     sudo apt-get -y update
     $PKG_INSTALL \
-        clang-format-6.0 \
+        clang-format-8 \
         g++-9-multilib \
         python3-setuptools
 
@@ -105,7 +105,7 @@ else
         debian)
             sudo apt-get -y update
             $PKG_INSTALL \
-                clang-format-6.0 \
+                clang-format-8 \
                 cmake \
             	curl \
             	git \
@@ -143,7 +143,7 @@ else
 
 fi
 
-sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 100
+sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-8 100
 
 python3 -m pip install --upgrade pip -r $SMING_HOME/../Tools/requirements.txt
 
diff --git a/docs/source/information/develop/clang-tools.rst b/docs/source/information/develop/clang-tools.rst
index 3f00dbdaa0..aba5e45913 100644
--- a/docs/source/information/develop/clang-tools.rst
+++ b/docs/source/information/develop/clang-tools.rst
@@ -1,11 +1,11 @@
 Clang Tools
 ===========
 
-`clang-format <https://releases.llvm.org/6.0.0/tools/clang/docs/ClangFormat.html>`__
+`clang-format <https://releases.llvm.org/8.0.1/tools/clang/docs/ClangFormat.html>`__
 is a tool that implements automatic source code formatting.
 It can be used to automatically enforce the layout rules for Sming.
 
-`clang-tidy <https://releases.llvm.org/6.0.0/tools/clang/tools/extra/docs/clang-tidy/index.html>`__
+`clang-tidy <https://releases.llvm.org/8.0.1/tools/clang/tools/extra/docs/clang-tidy/index.html>`__
 is a C++ “linter� tool to assist with diagnosing and fixing  typical programming errors
 such as style violations, interface misuse, or bugs that can be deduced via static analysis.
 It is provided as part of 
@@ -26,9 +26,16 @@ See the the `download <http://releases.llvm.org/download.html>`__ page
 of the Clang project for installation instructions for other operating
 systems.
 
-We are using version 6.0 of clang-format and clang-tidy on our
-Continuous Integration (CI) System. You should install the same
-version or newer on your development computer.
+.. important::
+
+   Different versions of clang-format can produce different results,
+   despite using the same configuration file.
+
+   We are using version 8.0.1 of clang-format and clang-tidy on our
+   Continuous Integration (CI) System.
+   
+   You should install the same version on your development computer.
+
 
 
 Configuration

From 1acfad5fb05a16b1e506499df26d68a068a28d2f Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Fri, 26 Mar 2021 14:56:38 +0100
Subject: [PATCH 85/91] Firmware update via MQTT (#2269)

Contains library, sample and tool to facilitate fast and efficient firmware upgrade over MQTT.
---
 README.md                                     |   2 +-
 .../Arch/Host/Components/hostlib/startup.cpp  |   2 +-
 Sming/Arch/Host/spiffs-two-roms.hw            |  13 ++
 Sming/Libraries/OtaUpgradeMqtt/.cs            |   0
 Sming/Libraries/OtaUpgradeMqtt/README.rst     | 155 +++++++++++++
 Sming/Libraries/OtaUpgradeMqtt/api.rst        |   8 +
 Sming/Libraries/OtaUpgradeMqtt/component.mk   |  49 ++++
 .../OtaUpgradeMqtt/samples/Upgrade/.cproject  | 151 ++++++++++++
 .../OtaUpgradeMqtt/samples/Upgrade/.cs        |   0
 .../OtaUpgradeMqtt/samples/Upgrade/.gitignore |   1 +
 .../OtaUpgradeMqtt/samples/Upgrade/.project   |  28 +++
 .../OtaUpgradeMqtt/samples/Upgrade/Makefile   |   9 +
 .../OtaUpgradeMqtt/samples/Upgrade/README.rst |  88 +++++++
 .../samples/Upgrade/app/application.cpp       | 155 +++++++++++++
 .../samples/Upgrade/component.mk              |  62 +++++
 .../Upgrade/files/certificate.pem.crt.der     | Bin 0 -> 787 bytes
 .../samples/Upgrade/files/private.pem.key.der | Bin 0 -> 610 bytes
 .../src/AdvancedPayloadParser.cpp             |  44 ++++
 .../OtaUpgradeMqtt/src/PayloadParser.cpp      | 127 +++++++++++
 .../OtaUpgradeMqtt/src/RbootPayloadParser.cpp |  46 ++++
 .../OtaUpgrade/Mqtt/AdvancedPayloadParser.h   |  37 +++
 .../include/OtaUpgrade/Mqtt/PayloadParser.h   |  85 +++++++
 .../OtaUpgrade/Mqtt/RbootPayloadParser.h      |  43 ++++
 .../OtaUpgradeMqtt/tools/deployer/.cproject   |  97 ++++++++
 .../OtaUpgradeMqtt/tools/deployer/.project    |  30 +++
 .../OtaUpgradeMqtt/tools/deployer/Makefile    |   9 +
 .../OtaUpgradeMqtt/tools/deployer/README.rst  |   7 +
 .../tools/deployer/app/application.cpp        | 214 ++++++++++++++++++
 .../tools/deployer/component.mk               |  14 ++
 docs/source/getting-started/windows/index.rst |  28 ++-
 docs/source/index.rst                         |   2 +-
 31 files changed, 1495 insertions(+), 11 deletions(-)
 create mode 100644 Sming/Arch/Host/spiffs-two-roms.hw
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/.cs
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/README.rst
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/api.rst
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/component.mk
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.cproject
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.cs
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.gitignore
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.project
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/Makefile
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/README.rst
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/app/application.cpp
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/files/certificate.pem.crt.der
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/files/private.pem.key.der
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/src/AdvancedPayloadParser.cpp
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/src/PayloadParser.cpp
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/src/RbootPayloadParser.cpp
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/AdvancedPayloadParser.h
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/PayloadParser.h
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/RbootPayloadParser.h
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/tools/deployer/.cproject
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/tools/deployer/.project
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/tools/deployer/Makefile
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/tools/deployer/README.rst
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/tools/deployer/app/application.cpp
 create mode 100644 Sming/Libraries/OtaUpgradeMqtt/tools/deployer/component.mk

diff --git a/README.md b/README.md
index 5a0f819509..2676f91342 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ Please note Version 4 documentation is at [sming.readthedocs.io](https://sming.r
     * With clients supporting: HTTP, MQTT, WebSockets and SMTP.
     * And servers for: DNS, FTP, HTTP(+ WebSockets), Telnet.
     * With [SSL support](https://sming.readthedocs.io/en/latest/_inc/Sming/Components/ssl/index.html) for all network clients and servers. Based on [axTLS](http://axtls.sourceforge.net/) and [BearSSL](https://www.bearssl.org/).
-    * Out of the box support for OTA over HTTPS.
+    * Over-The-Air(OTA) firmware upgrades via HTTP(S) and MQTT(S).
 * ESP8266 specific features.
     * Integrated boot loader [rboot](https://sming.readthedocs.io/en/latest/_inc/Sming/Components/rboot/index.html) with support for 1MB ROMs, OTA firmware updating and ROM switching.
     * [Crash handlers](https://sming.readthedocs.io/en/latest/information/debugging.html) for analyzing/handling system restarts due to fatal errors or WDT resets.
diff --git a/Sming/Arch/Host/Components/hostlib/startup.cpp b/Sming/Arch/Host/Components/hostlib/startup.cpp
index 7b09ea3797..6349932a03 100644
--- a/Sming/Arch/Host/Components/hostlib/startup.cpp
+++ b/Sming/Arch/Host/Components/hostlib/startup.cpp
@@ -241,7 +241,7 @@ int main(int argc, char* argv[])
 		}
 
 		if(config.pause != 0) {
-			hostmsg("If required, you may start terminal application(s) now");
+			host_debug_i("If required, you may start terminal application(s) now");
 			pause(config.pause);
 		}
 
diff --git a/Sming/Arch/Host/spiffs-two-roms.hw b/Sming/Arch/Host/spiffs-two-roms.hw
new file mode 100644
index 0000000000..80128f0191
--- /dev/null
+++ b/Sming/Arch/Host/spiffs-two-roms.hw
@@ -0,0 +1,13 @@
+{
+	"name": "Two ROM slots with single SPIFFS",
+	"base_config": "spiffs",
+	"partitions": {
+		"rom1": {
+			"address": "0x108000",
+			"size": "992K",
+			"type": "app",
+			"subtype": "ota_1",
+			"filename": "$(BLANK_BIN)"
+		}
+	}
+}
diff --git a/Sming/Libraries/OtaUpgradeMqtt/.cs b/Sming/Libraries/OtaUpgradeMqtt/.cs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Sming/Libraries/OtaUpgradeMqtt/README.rst b/Sming/Libraries/OtaUpgradeMqtt/README.rst
new file mode 100644
index 0000000000..55386d1f0a
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/README.rst
@@ -0,0 +1,155 @@
+OTA Firmware Upgrade via MQTT
+=============================
+
+.. highlight:: c++
+
+Introduction
+------------
+
+This library allows Sming applications to upgrade their firmware Over-The-Air (OTA) using the MQTT protocol.
+MTQTT has less overhead compared to HTTP and can be used for faster delivery of application updates.
+
+Using
+-----
+
+1. Add ``COMPONENT_DEPENDS += OtaUpgradeMqtt`` to your application componenent.mk file.
+2. Add these lines to your application::
+
+      #include <OtaUpgrade/Mqtt/RbootPayloadParser.h>
+
+      #if ENABLE_OTA_ADVANCED
+      #include <OtaUpgrade/Mqtt/AdvancedPayloadParser.h>
+      #endif
+
+      MqttClient mqtt;
+
+      // Call when IP address has been obtained
+      void onIp(IpAddress ip, IpAddress mask, IpAddress gateway)
+      {
+         // ...
+
+         mqtt.connect(Url(MQTT_URL), "sming");
+
+      #if ENABLE_OTA_ADVANCED
+          /*
+           * The advanced parser suppors all firmware upgrades supported by the `OtaUpgrade` library.
+           * `OtaUpgrade` library provides firmware signing, firmware encryption and so on.
+           */
+          auto parser = new OtaUpgrade::Mqtt::AdvancedPayloadParser(APP_VERSION_PATCH);
+      #else
+          /*
+           * The command below uses class that stores the firmware directly
+           * using RbootOutputStream on a location provided by us
+           */
+          auto parser = new OtaUpgrade::Mqtt::RbootPayloadParser(part, APP_VERSION_PATCH);
+       #endif
+
+            mqtt.setPayloadParser([parser]
+            (MqttPayloadParserState& state, mqtt_message_t* message, const char* buffer, int length) -> int
+            {
+               return parser->parse(state, message, buffer, length);
+            });
+
+            String updateTopic = "a/test/u/4.3";
+            mqtt.subscribe(updateTopic);
+
+         // ...
+      }
+
+See the :sample:`Upgrade` sample application.
+
+Versioning Principles
+---------------------
+To simplify the OTA process we strongly recommend the following versioning principles for your application:
+
+1. Use `semantic versioning <https://semver.org/>`_.
+   If your current application version is 4.3.1 then 4 is the major, 3 is the minor and 1 is the patch version number.
+
+2. Every application firmware knows its version.
+
+3. An application with the same major and minor version should be compatible for update no matter what the patch number is.
+   If the new firmware is not compatible then a new minor or major version should be used.
+
+Theory Of Operation
+-------------------
+1. On a period of time the application connects to check if there is a new version of the firmware.
+   In your application this period has to be carefully selected so that OTA updates occur when the device has
+   enough resources: memory, space on flash, power and time to complete such an update. Also there should be no critical task running at the moment.
+   Depending on the size of the new firmware and the speed of the connection an update can take 10 to 20 seconds.
+
+2. The application connects via MQTT to a remote server and subscribes to a special topic. The topic is based on the
+   application id and its current version. If the current application id is ``test`` and version is ``4.3.1`` then the topic that will be used for OTA is ``a/test/u/4.3``.
+
+3. If there is a need to support both stable and unstable/nightly builds then the topic name can have `s` or `u` suffix. For example
+   all stable versions should be published and downloaded from the topic ``a/test/u/4.3/s``. For the unstable ones we can use the topic ``a/test/u/4.3/u``.
+   If an application is interested in both stable and unstable versions then it can subscribe using the following pattern ``a/test/u/4.3/+``.
+
+4. The application is waiting for new firmware. When the application is on battery than it makes sense to wait for a limited time and if there is no
+   message coming back to disconnect.
+
+Firmware packaging
+------------------
+The firmware update must come as one MQTT message. The MQTT protocol allows messages with a maximum size of 268435455 bytes approx 260MB.
+This should be perfectly enough for a device that has maximum 1MB available for an application ROM.
+
+One MQTT message contains:
+
+- patch version of the firmware
+- followed by the firmware data itself
+
+Based on the :envvar:`ENABLE_OTA_VARINT_VERSION` the patch version can be encoded either using one byte or a `varint <https://developers.google.com/protocol-buffers/docs/encoding#varints>`_.
+Based on :envvar:`ENABLE_OTA_ADVANCED` the firmware data can be either without any encoding or be signed and encrypted.
+
+To simplify the packaging this library comes with a tool called ``deployer``. To create a package type the following from your application::
+
+   make ota-pack OTA_PATCH_VERSION=127
+
+Replace 127 with the desired patch version.
+If the option ``OTA_PATCH_VERSION`` is omitted from the command line then the patch version will be generated automatically and it will contain the current unix timestamp.
+
+Once a package is created it can be deployed to the firmware MQTT server using the command below::
+
+   make ota-deploy MQTT_FIRMWARE_URL=mqtt://relser:relpassword@attachix.com/a/test/u/4.3
+
+The ``MQTT_FIRMWARE_URL`` above specifies that
+
+- protocol is: mqtt without SSL. Allowed values here are ``mqtt`` and ``mqtts``. The latter uses SSL.
+- user is: relser
+- password is: relpassword
+- host is: attachix.com
+- path is: /a/test/u/4.3. The path without leading and ending slashes is used to generate the topic name ``a/test/u/4.3``.
+
+Make sure to replace the MQTT_FIRMWARE_URL value with your MQTT server credentials, host and topic.
+
+Security
+--------
+For additional security a standard SSL/TLS can be used
+
+1. The communication should be secured using standard SSL.
+
+2. To prove that the server is the correct one: The MQTT clients should pin the public key fingerprint on the server.
+   OR have a list of public key fingerprints that are allowed.
+
+3. To prove that the clients are allowed to connect: Every MQTT client should also have a client certificate that is signed by the server.
+
+Configuration
+-------------
+
+.. envvar:: ENABLE_OTA_VARINT_VERSION
+
+   Default: 1 (enabled)
+
+   If set to 1 the OTA upgrade mechanism and application will use a `varint <https://developers.google.com/protocol-buffers/docs/encoding#varints>`_
+   encoding for the patch version. Thus allowing unlimited number of patch versions. Useful for enumerating unstable/nightly releases.
+   A bit more difficult to read and write but allows for unlimited versions.
+
+   If set to 0 the OTA upgrade mechanism and application will use one byte for the patch version which will limit it to 256 possible patch versions.
+   Useful for enumarating stable releases. Easier to write and read but limited to 256 versions only.
+
+.. envvar:: ENABLE_OTA_ADVANCED
+
+   Default: 0 (disabled)
+
+   If set to 1 the library will work with OtaUpgradeStream which supports signature and encryption of the firmware data itself.
+   See :component:`OtaUpgrade` for details. In the application the AdvancedPayloadParser can be used to do the MQTT message handling.
+
diff --git a/Sming/Libraries/OtaUpgradeMqtt/api.rst b/Sming/Libraries/OtaUpgradeMqtt/api.rst
new file mode 100644
index 0000000000..e9aca95651
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/api.rst
@@ -0,0 +1,8 @@
+OTA Upgrade over MQTT classes
+=============================
+
+.. doxygentypedef:: OtaUpgrade::Mqtt
+
+.. doxygenclass:: OtaUpgrade::Mqtt::PayloadParser
+.. doxygenclass:: OtaUpgrade::Mqtt::RbootPayloadParser
+.. doxygenclass:: OtaUpgrade::Mqtt::AdvancedPayloadParser
diff --git a/Sming/Libraries/OtaUpgradeMqtt/component.mk b/Sming/Libraries/OtaUpgradeMqtt/component.mk
new file mode 100644
index 0000000000..7896ab0797
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/component.mk
@@ -0,0 +1,49 @@
+COMPONENT_SRCDIRS  := 
+COMPONENT_SRCFILES := src/PayloadParser.cpp src/RbootPayloadParser.cpp 
+COMPONENT_INCDIRS  := src/include
+
+# If enabled (set to 1) then we can use all sofisticated mechanisms to upgrade the firmware using the ``OtaUpgrade`` library.
+COMPONENT_VARS := ENABLE_OTA_ADVANCED
+ENABLE_OTA_ADVANCED ?= 0
+
+ifneq ($(ENABLE_OTA_ADVANCED),0)
+	COMPONENT_SRCFILES += src/AdvancedPayloadParser.cpp
+	COMPONENT_DEPENDS  := OtaUpgrade
+endif
+
+# If enabled (set to 1) then we can use unlimited number of patch versions
+COMPONENT_VARS += ENABLE_OTA_VARINT_VERSION 
+ENABLE_OTA_VARINT_VERSION ?= 1
+
+COMPONENT_CXXFLAGS := -DENABLE_OTA_ADVANCED=$(ENABLE_OTA_ADVANCED) \
+					  -DENABLE_OTA_VARINT_VERSION=$(ENABLE_OTA_VARINT_VERSION)
+				
+##@Firmware Upgrade
+					  
+OTA_TOOLS := $(COMPONENT_PATH)/tools
+OTA_DEPLOYMENT_TOOL = $(OTA_TOOLS)/deployer/out/Host/debug/firmware/deployer$(TOOL_EXT)
+
+$(OTA_DEPLOYMENT_TOOL):
+	$(Q) $(MAKE) -C $(OTA_TOOLS)/deployer SMING_ARCH=Host ENABLE_CUSTOM_LWIP=2
+
+
+# SDP = Sming Deployment Pakage
+OTA_PACKAGE_EXT =.sdp
+
+OTA_PATCH_VERSION ?= $(shell date +%s)
+
+PACKAGE_IN = $(RBOOT_ROM_0_BIN)
+ifneq ($(ENABLE_OTA_ADVANCED), 0)
+	PACKAGE_IN = $(OTA_UPGRADE_FILE)
+endif
+PACKAGE_OUT = $(PACKAGE_IN)$(OTA_PACKAGE_EXT)
+
+.PHONY: ota-pack
+ota-pack: $(PACKAGE_OUT) ##Creates a deployment package from the current application (use OTA_PATCH_VERSION to specify the version number)
+
+$(PACKAGE_OUT): $(PACKAGE_IN) $(OTA_DEPLOYMENT_TOOL) 
+	$(Q) $(OTA_DEPLOYMENT_TOOL) pack --debug=0 --nonet -- $(PACKAGE_IN) $(PACKAGE_OUT) $(OTA_PATCH_VERSION) $(ENABLE_OTA_VARINT_VERSION)
+
+.PHONY: ota-deploy
+ota-deploy: $(PACKAGE_OUT) ##Uploads new firmware version of the current application (use MQTT_FIRMWARE_URL to specify the MQTT URL)
+	$(Q) $(OTA_DEPLOYMENT_TOOL) deploy --debug=0 -- $(PACKAGE_OUT) $(MQTT_FIRMWARE_URL)
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.cproject b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.cproject
new file mode 100644
index 0000000000..e1450b6031
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.cproject
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" moduleId="org.eclipse.cdt.core.settings" name="Sming">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147" name="Sming" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463" name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1164554300" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
+							<option id="cdt.managedbuild.option.gnu.cross.prefix.521205673" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
+							<option id="cdt.managedbuild.option.gnu.cross.path.393887888" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.712123812" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
+							<builder id="cdt.managedbuild.builder.gnu.cross.2110485170" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
+								<option id="gnu.c.compiler.option.include.paths.357494572" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.313321806" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
+								<option id="gnu.cpp.compiler.option.include.paths.611746109" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.65193859" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1795850540" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.364843833" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.525412186" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.assembler.587940548" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
+								<option id="gnu.both.asm.option.include.paths.1067006329" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/system/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SMING_HOME}/Libraries&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${ESP_HOME}/sdk/include&quot;"/>
+								</option>
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.651581712" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="{{ProjectName}}.null.1347473968" name="{{ProjectName}}"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Sming">
+			<resource resourceType="PROJECT" workspacePath="/{{ProjectName}}"/>
+		</configuration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+		<buildTargets>
+			<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>all</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>clean</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flash</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashonefile" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashonefile</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashinit" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashinit</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flashboot" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>flashboot</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="rebuild" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-f ${ProjDirPath}/Makefile</buildArguments>
+				<buildTarget>rebuild</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+		</buildTargets>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2032390008;cdt.managedbuild.tool.gnu.c.compiler.input.1700912488">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.c.compiler.1168221903;cdt.managedbuild.tool.gnu.c.compiler.input.313321806">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1999763015;cdt.managedbuild.tool.gnu.cpp.compiler.input.1330530366">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.454898447;cdt.managedbuild.tool.gnu.cpp.compiler.input.501261625">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+</cproject>
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.cs b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.cs
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.gitignore b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.gitignore
new file mode 100644
index 0000000000..a662abf847
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.gitignore
@@ -0,0 +1 @@
+ota.key
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.project b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.project
new file mode 100644
index 0000000000..76f0847014
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Ota_Mqtt</name>
+	<comment></comment>
+	<projects>
+		<project>SmingFramework</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/Makefile b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/Makefile
new file mode 100644
index 0000000000..ff51b6c3a7
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/Makefile
@@ -0,0 +1,9 @@
+#####################################################################
+#### Please don't change this file. Use component.mk instead ####
+#####################################################################
+
+ifndef SMING_HOME
+$(error SMING_HOME is not set: please configure it as an environment variable)
+endif
+
+include $(SMING_HOME)/project.mk
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/README.rst b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/README.rst
new file mode 100644
index 0000000000..cc14bab324
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/README.rst
@@ -0,0 +1,88 @@
+OTA over MQTT
+=============
+
+.. highlight:: bash
+
+Introduction
+------------
+
+This example demonstrates how you can create an application that updates its firmware Over The Air (OTA) using the MQTT protocol.
+This application uses :component:`OtaUpgradeMqtt` and follows the recommended versioning principles.
+
+Based on :envvar:`ENABLE_OTA_ADVANCED` the firmware data can be either without any encoding or be signed and encrypted.
+
+Tools
+-----
+There are two tools that facilitate the packiging and deployment of a new firmware.
+
+For more information read ``Firmware packaging`` in the documentation of the :component:`OtaUpgradeMqtt` component.
+
+Security
+--------
+Depending on :envvar:`ENABLE_SSL` a standard SSL/TLS can be enabled. This way
+
+1. The communication between the application and the server will be encrypted using standard SSL.
+
+2. To prove that the server is the correct one: The MQTT clients should pin the public key fingerprint on the server.
+   OR have a list of public key fingerprints that are allowed.
+
+3. Depending on :envvar:`ENABLE_CLIENT_CERTIFICATE` the application can send a client certificate that is signed by the server.
+
+Configuration
+-------------
+
+.. envvar:: APP_ID
+
+   Default: "test"
+
+   This variable contains the unique application name.
+
+.. envvar:: APP_VERSION
+
+   Default: not set
+
+   Contains the application major and minor versions separated by comma. Example "4.2".
+   If not set will use the current major and minor version from Sming.
+
+.. envvar:: APP_VERSION_PATCH
+
+   Default: not set
+
+   Contains the application patch version as integer. For stable versions you can use 0 until 255.
+   For unstable versions the current timestamp can be used as a patch version.
+
+.. envvar:: ENABLE_OTA_VARINT_VERSION
+
+   Default: 1 (enabled)
+
+   If set to 1 the OTA upgrade mechanism and application will use a `varint <https://developers.google.com/protocol-buffers/docs/encoding#varints>`_
+   encoding for the patch version. Thus allowing unlimited number of patch versions. Useful for enumerating unstable/nightly releases.
+   A bit more difficult to read and write but allows for unlimited versions.
+
+   If set to 0 the OTA upgrade mechanism and application will use one byte for the patch version which will limit it to 256 possible patch versions.
+   Useful for enumarating stable releases. Easier to write and read but limited to 256 versions only.
+
+.. envvar:: ENABLE_OTA_ADVANCED
+
+   Default: 0 (disabled)
+
+   If set to 1 the library will work with OtaUpgradeStream which supports signature and encryption of the firmware data itself.
+   See :component:`OtaUpgrade` for details.
+
+.. envvar:: ENABLE_SSL
+
+   Default: unset (disable)
+
+   If set to 1 (highly recommended), OTA upgrade files will be trasnferred securely over TLS/SSL.
+
+.. envvar:: ENABLE_CLIENT_CERTIFICATE
+
+   Default: 0 (disabled)
+
+   Used in combination with ``ENABLE_SSL``. Set to 1 if the remote server requires the application to authenticate via client certficate.
+
+.. envvar:: MQTT_URL
+
+   Default: depends on  ``ENABLE_SSL`` and ``ENABLE_CLIENT_CERTIFICATE`` values
+
+   Url containing the location of the firmware update MQTT server.
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/app/application.cpp b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/app/application.cpp
new file mode 100644
index 0000000000..87dbb20d31
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/app/application.cpp
@@ -0,0 +1,155 @@
+#include <SmingCore.h>
+#include <rboot-api.h>
+#include <Storage/SpiFlash.h>
+#include <OtaUpgrade/Mqtt/RbootPayloadParser.h>
+
+#if ENABLE_OTA_ADVANCED
+#include <OtaUpgrade/Mqtt/AdvancedPayloadParser.h>
+#endif
+
+// If you want, you can define WiFi settings globally in Eclipse Environment Variables
+#ifndef WIFI_SSID
+#define WIFI_SSID "PleaseEnterSSID" // Put your SSID and password here
+#define WIFI_PWD "PleaseEnterPass"
+#endif
+
+#ifndef APP_VERSION
+#include <SmingVersion.h>
+#define APP_VERSION MACROQUOTE(SMING_MAJOR_VERSION) "." MACROQUOTE(SMING_MINOR_VERSION)
+#define APP_VERSION_PATCH SMING_PATCH_VERSION
+#endif
+
+namespace
+{
+MqttClient mqtt;
+
+#if ENABLE_CLIENT_CERTIFICATE
+IMPORT_FSTR(privateKeyData, PROJECT_DIR "/files/private.pem.key.der");
+IMPORT_FSTR(certificateData, PROJECT_DIR "/files/certificate.pem.crt.der");
+#endif
+
+Storage::Partition findRomPartition(uint8_t slot)
+{
+	auto part = Storage::spiFlash->partitions().findOta(slot);
+	if(!part) {
+		debug_w("Rom slot %d not found", slot);
+	}
+	return part;
+}
+
+void otaUpdate()
+{
+	if(mqtt.isProcessing()) {
+		Serial.println("There is an update in progress. Refusing to start new update.");
+		return;
+	}
+
+	uint8 slot = rboot_get_current_rom();
+	if(slot == 0) {
+		slot = 1;
+	} else {
+		slot = 0;
+	}
+
+	Serial.println("Checking for a new application firmware...");
+
+	auto part = findRomPartition(slot);
+	if(!part) {
+		Serial.println("FAILED: Cannot find application address");
+		return;
+	}
+
+#ifdef ENABLE_SSL
+	mqtt.setSslInitHandler([](Ssl::Session& session) {
+		// These fingerprints change very frequently.
+		static const Ssl::Fingerprint::Cert::Sha1 sha1Fingerprint PROGMEM = {MQTT_FINGERPRINT_SHA1};
+
+		// Trust certificate only if it matches the SHA1 fingerprint...
+		session.validators.pin(sha1Fingerprint);
+
+		// We're using fingerprints, so don't attempt to validate full certificate
+		session.options.verifyLater = true;
+
+#if ENABLE_CLIENT_CERTIFICATE
+		session.keyCert.assign(privateKeyData, certificateData);
+#endif
+
+		// Use all supported cipher suites to make a connection
+		session.cipherSuites = &Ssl::CipherSuites::full;
+	});
+#endif
+
+	mqtt.connect(Url(MQTT_URL), "sming");
+
+#if ENABLE_OTA_ADVANCED
+	/*
+	 * The advanced parser suppors all firmware upgrades supported by the `OtaUpgrade` library.
+	 * `OtaUpgrade` library provides firmware signing, firmware encryption and so on.
+	 */
+	auto parser = new OtaUpgrade::Mqtt::AdvancedPayloadParser(APP_VERSION_PATCH);
+#else
+	/*
+	 * The command below uses class that stores the firmware directly
+	 * using RbootOutputStream on a location provided by us
+	 */
+	auto parser = new OtaUpgrade::Mqtt::RbootPayloadParser(part, APP_VERSION_PATCH);
+#endif
+
+	mqtt.setPayloadParser([parser](MqttPayloadParserState& state, mqtt_message_t* message, const char* buffer,
+								   int length) -> int { return parser->parse(state, message, buffer, length); });
+
+	String updateTopic = "a/";
+	updateTopic += APP_ID;
+	updateTopic += "/u/";
+	updateTopic += APP_VERSION;
+	debug_d("Subscribing to topic: %s", updateTopic.c_str());
+	mqtt.subscribe(updateTopic);
+}
+
+void showInfo()
+{
+	Serial.printf(_F("\r\nSDK: v%s\r\n"), system_get_sdk_version());
+	Serial.printf(_F("Free Heap: %d\r\n"), system_get_free_heap_size());
+	Serial.printf(_F("CPU Frequency: %d MHz\r\n"), system_get_cpu_freq());
+	Serial.printf(_F("System Chip ID: %x\r\n"), system_get_chip_id());
+
+	rboot_config conf;
+	conf = rboot_get_config();
+
+	debug_d("Count: %d", conf.count);
+	debug_d("ROM 0: 0x%08x", conf.roms[0]);
+	debug_d("ROM 1: 0x%08x", conf.roms[1]);
+	debug_d("ROM 2: 0x%08x", conf.roms[2]);
+	debug_d("GPIO ROM: %d", conf.gpio_rom);
+
+	Serial.printf(_F("\r\nCurrently running rom %d. Application version: %s\r\n"), conf.current_rom, APP_VERSION);
+	Serial.println();
+}
+
+void connectOk(IpAddress ip, IpAddress mask, IpAddress gateway)
+{
+	/*
+	 This application starts the update right after a successful connecton.
+	 In a real-world application you should start the update procedure
+	 only when the chances of success are high enough.
+
+	 For example when there is enough power, free RAM and sufficient time
+	 AND there is no critical task running at the moment.
+	*/
+	otaUpdate();
+}
+
+} // end of anonymous namespace
+
+void init()
+{
+	Serial.begin(SERIAL_BAUD_RATE); // 115200 by default
+	Serial.systemDebugOutput(true); // Debug output to serial
+
+	showInfo();
+
+	WifiStation.enable(true);
+	WifiStation.config(WIFI_SSID, WIFI_PWD);
+
+	WifiEvents.onStationGotIP(connectOk);
+}
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk
new file mode 100644
index 0000000000..806c2b46b6
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/component.mk
@@ -0,0 +1,62 @@
+## User configurable settings
+
+## [Application id and version] ## 
+# Application id
+APP_ID ?= "test"
+
+# Application version: string containing only the major and minor version separated by comma
+# APP_VERSION := "1.2"
+# Application patch version: integer containing only the patch version
+# APP_VERSION_PATCH := 3
+
+## [TLS/SSL settings ] ##
+# Uncomment the line below to start using SSL
+CONFIG_VARS := ENABLE_SSL 
+# ENABLE_SSL := Bearssl
+
+# Set this to one if the remote firmware server requires client certificate
+# This option is in effect only when ENABLE_SSL is set
+CONFIG_VARS += ENABLE_CLIENT_CERTIFICATE
+ENABLE_CLIENT_CERTIFICATE ?= 0
+
+## [ Firmware Update Server ] ## 
+CONFIG_VARS += MQTT_URL
+ifeq ($(MQTT_URL),)
+    MQTT_URL := "mqtt://test.mosquitto.org:1883"
+    ifdef ENABLE_SSL
+    	ifneq ($(ENABLE_CLIENT_CERTIFICATE),0)
+    		MQTT_URL := "mqtts://test.mosquitto.org:8884"
+    	else
+    		MQTT_URL := "mqtts://test.mosquitto.org:8883"
+    	endif
+    endif
+endif
+
+# This variable contains the SHA1 fingerprint of the SSL certificate of the MQTT server. 
+# It is used for certificate pinning. Make sure to change it whenever changing the MQTT_URL
+CONFIG_VARS += MQTT_FINGERPRINT_SHA1
+MQTT_FINGERPRINT_SHA1 := "0xEE,0xBC,0x4B,0xF8,0x57,0xE3,0xD3,0xE4,0x07,0x54,0x23,0x1E,0xF0,0xC8,0xA1,0x56,0xE0,0xD3,0x1A,0x1C"
+
+CONFIG_VARS += ENABLE_OTA_ADVANCED
+ENABLE_OTA_ADVANCED ?= 0
+
+## End of user configurable settings. Don't change anything below this line
+
+COMPONENT_DEPENDS := OtaUpgradeMqtt
+
+## use rboot build mode
+RBOOT_ENABLED := 1
+
+## Use standard hardware config with two ROM slots and two SPIFFS partitions
+HWCONFIG := spiffs-two-roms
+
+APP_CFLAGS = -DMQTT_URL="\"$(MQTT_URL)"\"                \
+			 -DMQTT_FINGERPRINT_SHA1=$(MQTT_FINGERPRINT_SHA1)   \
+			 -DAPP_ID="\"$(APP_ID)"\"                    \
+			 -DENABLE_CLIENT_CERTIFICATE=$(ENABLE_CLIENT_CERTIFICATE)  \
+			 -DENABLE_OTA_ADVANCED=$(ENABLE_OTA_ADVANCED)
+			 
+ifneq ($(APP_VERSION),)
+	APP_CFLAGS += -DAPP_VERSION="\"$(APP_VERSION)"\"       \
+				  -DAPP_VERSION_PATCH=$(APP_VERSION_PATCH)
+endif
\ No newline at end of file
diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/files/certificate.pem.crt.der b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/files/certificate.pem.crt.der
new file mode 100644
index 0000000000000000000000000000000000000000..05534491e27661df50383ac69f03327d2df03d2c
GIT binary patch
literal 787
zcmXqLV&*q!V*I{<nTe5!iIKs8myJ`a&7<u*FC!y2D}zDf1Ve5EPB!LH7B*ofcPB$}
z15pr%gNH9PFS8^yMZr5WFFhqc*O1SE2PDDH!|IY+lvHUbWFP?IbMbKc<`);1W|oxX
z!%X7lVRCjf6f+P3DPZQ|&4nq@%P&edlsAxtJAso?OrR(~J+;Uou_QSoKOdyPKu(<3
z$k4#p&<qGI4NRiITr)!xDAyntW)INCF0L?#aPV*jmz0*2q$d`Y7)lt3K^(^)oC|cn
zf?H8yZfbdcQ8vsQ%si~cAQ?ji136^Z2o~ogmH{18l9-&4S)rGlpKH)KA34kzSs9oc
zdx7EB$<)}$aOXDfYmN!s<_9@*+CRP7tMfRH_ip}{wr6VXSt%>r6L)ZMACEuxL7e$i
z^TmX{iO%IoQw4+4xn94#UY0*WvSFf(>Dz8Q@41%c%T<L-`s23uUoOx8?`i&MrNScH
zovmx8Ck0#$j+z<%r0HZpywb%pH8-an+wv;Ycf0YVb((r}rfmGq#LURRxLC?S0vv_1
z!YoV%3<lglugmhYurM>RK0tOlFuIwW7#SJX_x0@Ak!PQNZ`aqo%zqYyyb*Z3yOVzh
z>#845d6%^_HOi#4Sm)o0_2{iM-}H26MgRImot@g3GF5NiTBx&LWv$G`?Kvt9^`+0*
z3_r);eYGvytlN5;!<^)B<+i(LV;I*ijXt!5ds`Y$az>!HO!MU{`KyE92R<^7Ru7xP
zl6!hLmt4=f*`9SX<QpHCu6{fD<PY9|owNAm#MhtcUQ$vt<*UP@^_r8+N*g9gsvl!Y
z3jSa6di5_MRwb68=tj$k^^*-*+)mgSoaSLzzp3!z{)->QHyBM%iYO8ixmPGz@9yxv
pTYIUX!^28((_7O_N-WBMT-op^p`^8GPsEFt8Z8^&PU^RO1pv937WM!D

literal 0
HcmV?d00001

diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/files/private.pem.key.der b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/files/private.pem.key.der
new file mode 100644
index 0000000000000000000000000000000000000000..bfd239930f780cd21038a40aa1b1099da4f7aca9
GIT binary patch
literal 610
zcmV-o0-gOZf&yLw0RRGlfdJgw4eJPyi#NduY=`pfy)5Hi4c%|FhUO-RYGkNKVYmnj
z$6wCy7X!+J(O|t{Lw9185mILg>*?2aZ;%;)ksLMci#|)8Id`We6LgPWw~y0zZ~sX*
z;;A5_J-LOfmts)WQ(Bo<<bugiUn0@WeA$-9wCZV1w=<HiDK4CpvG)Q40RRC4fq?+c
zi^<+jut))M)fIn9Wp9HKaQ(7#J}$P9aYJFh1OPlpu)VXpV$<lMSRqTvwRRTlR}?Y+
z*ttu8PAKw`>4+j<?~7Vauxqf|!cVi7ccBvcxr!UWG@TAqy)fTm6#V$Xo>nk5T7g4S
zM_vvsz>(m5d2YVJ1=Ydsx9sERPwoK%K>+*giB~+9hYm6igVGpH{o`yzUD#FetH-k(
zvS!U;WEl?k!F1uT8l9D;ErnEroI7^XO;GVzPv-cX57c=Ls(}JQ0N`!aZY(pJ%Okr0
zbUKg^Q*~1+#)wPPDLve43v~K|obneImvyH0>K#dDFuoCq8eQ%W*i&kEdDu>HO!uO2
zcLG2@Wlw(d+O&wLjes!0Bv1v+0|MJxE(t~C?(U%1t&fF8SI6p;8#9z-L=6f+?05a5
zXk-oWIM-2ivGJM4fy4m<K>&!JbJ>7!-Jc<z8MUWez~`npJ%!`Ee9O~Im7+k<s;CXS
zK2~oTcb}%ZV#)J5OM=jWHU<+ZahI#Kd@62e<r@M)0LUvg;Fn8K^@r8$3n-on=`Jm`
w?jf9_BTJQk@NL#pNTHga@*n;Fkgm^MoPZ0tOAuOQ4x?OyN?HSDbRK3GgdV#ixc~qF

literal 0
HcmV?d00001

diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/AdvancedPayloadParser.cpp b/Sming/Libraries/OtaUpgradeMqtt/src/AdvancedPayloadParser.cpp
new file mode 100644
index 0000000000..478b9a70d1
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/AdvancedPayloadParser.cpp
@@ -0,0 +1,44 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * AdvancedPayloadParser.cpp
+ *
+ *  Created: 2021 - Slavey Karadzhov <slav@attachix.com>
+ *
+ ****/
+
+#include "include/OtaUpgrade/Mqtt/AdvancedPayloadParser.h"
+
+namespace OtaUpgrade
+{
+namespace Mqtt
+{
+bool AdvancedPayloadParser::switchRom(const UpdateState& updateState)
+{
+	if(updateState.stream == nullptr) {
+		return false;
+	}
+
+	auto otaStream = static_cast<OtaUpgradeStream*>(updateState.stream);
+	if(otaStream == nullptr) {
+		return false;
+	}
+
+	if(otaStream->hasError()) {
+		debug_e("Got error: %s", toString(otaStream->errorCode).c_str());
+		return false;
+	}
+
+	return true;
+}
+
+ReadWriteStream* AdvancedPayloadParser::getStorageStream(size_t storageSize)
+{
+	return new OtaUpgradeStream();
+}
+
+} // namespace Mqtt
+} // namespace OtaUpgrade
diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/PayloadParser.cpp b/Sming/Libraries/OtaUpgradeMqtt/src/PayloadParser.cpp
new file mode 100644
index 0000000000..b63a479ea5
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/PayloadParser.cpp
@@ -0,0 +1,127 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * PayloadParser.cpp
+ *
+ *  Created: 2021 - Slavey Karadzhov <slav@attachix.com>
+ *
+ ****/
+
+#include "include/OtaUpgrade/Mqtt/PayloadParser.h"
+
+namespace OtaUpgrade
+{
+namespace Mqtt
+{
+int PayloadParser::parse(MqttPayloadParserState& state, mqtt_message_t* message, const char* buffer, int length)
+{
+	if(message == nullptr) {
+		debug_e("Invalid MQTT message");
+		return ERROR_INVALID_MQTT_MESSAGE;
+	}
+
+	if(length == MQTT_PAYLOAD_PARSER_START) {
+		UpdateState* updateState = new UpdateState();
+		updateState->stream = nullptr;
+		updateState->started = false;
+
+		state.offset = 0;
+		state.userData = updateState;
+		return 0;
+	}
+
+	auto updateState = static_cast<UpdateState*>(state.userData);
+	if(updateState == nullptr) {
+		debug_e("Update failed for unknown reason!");
+		return ERROR_UNKNOWN_REASON;
+	}
+
+	if(length == MQTT_PAYLOAD_PARSER_END) {
+		bool skip = (updateState->stream == nullptr);
+		if(!skip) {
+			bool success = switchRom(*updateState);
+			delete updateState->stream;
+			delete updateState;
+			if(success) {
+				debug_d("Switching was successful. Restarting...");
+				System.restart();
+			} else {
+				debug_e("Switching failed!");
+			}
+		}
+
+		return 0;
+	}
+
+	if(buffer == nullptr) {
+		debug_e("Invalid MQTT message");
+		return ERROR_INVALID_MQTT_MESSAGE;
+	}
+
+	if(!updateState->started) {
+		size_t offset = 0;
+		int patchVersion = getPatchVersion(buffer, length, offset, updateState->version);
+		state.offset += offset;
+#if ENABLE_OTA_VARINT_VERSION
+		if(patchVersion < 0) {
+			if(state.offset > allowedVersionBytes) {
+				debug_e("Invalid patch version.");
+				return ERROR_INVALID_PATCH_VERSION;
+			}
+			return 0;
+		}
+#endif
+
+		updateState->started = true;
+		if(size_t(patchVersion) < currentPatchVersion) {
+			// The update is not newer than our current patch version
+			return 0;
+		}
+
+		length -= offset;
+		buffer += offset;
+
+		updateState->stream = getStorageStream(message->common.length - offset);
+	}
+
+	auto stream = updateState->stream;
+	if(stream == nullptr) {
+		return 0;
+	}
+
+	auto written = stream->write(buffer, length);
+	return (written - length);
+}
+
+int PayloadParser::getPatchVersion(const char* buffer, int length, size_t& offset, size_t versionStart)
+{
+	if(buffer == nullptr || length < 1) {
+		return ERROR_INVALID_PATCH_VERSION;
+	}
+
+	size_t version = versionStart;
+#if ENABLE_OTA_VARINT_VERSION
+	offset = 0;
+	int useNextByte = 0;
+	do {
+		version += (buffer[offset] & 0x7f);
+		useNextByte = (buffer[offset++] & 0x80);
+	} while(useNextByte && (offset < size_t(length)));
+
+	if(useNextByte) {
+		// all the data is consumed and we still don't have a version number?!
+		return VERSION_NOT_READY;
+	}
+#else
+	offset = 1;
+	version += buffer[0];
+#endif
+
+	return version;
+}
+
+} // namespace Mqtt
+} // namespace OtaUpgrade
diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/RbootPayloadParser.cpp b/Sming/Libraries/OtaUpgradeMqtt/src/RbootPayloadParser.cpp
new file mode 100644
index 0000000000..05ca09033d
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/RbootPayloadParser.cpp
@@ -0,0 +1,46 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * RbootPayloadParser.cpp
+ *
+ *  Created: 2021 - Slavey Karadzhov <slav@attachix.com>
+ *
+ ****/
+
+#include "include/OtaUpgrade/Mqtt/RbootPayloadParser.h"
+
+namespace OtaUpgrade
+{
+namespace Mqtt
+{
+bool RbootPayloadParser::switchRom(const UpdateState& updateState)
+{
+	uint8_t after;
+	uint8_t before = rboot_get_current_rom();
+
+	if(before == 0) {
+		after = 1;
+	} else {
+		after = 0;
+	}
+
+	debug_d("Swapping from rom %u to rom %u.\r\n", before, after);
+
+	return rboot_set_current_rom(after);
+}
+
+ReadWriteStream* RbootPayloadParser::getStorageStream(size_t storageSize)
+{
+	if(storageSize > part.size()) {
+		debug_e("The new rom is too big to fit!");
+		return nullptr;
+	}
+
+	return new RbootOutputStream(part.address(), part.size());
+}
+
+} // namespace Mqtt
+} // namespace OtaUpgrade
diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/AdvancedPayloadParser.h b/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/AdvancedPayloadParser.h
new file mode 100644
index 0000000000..1cf01191cc
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/AdvancedPayloadParser.h
@@ -0,0 +1,37 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * AdvancedPayloadParser.h
+ *
+ *  Created: 2021 - Slavey Karadzhov <slav@attachix.com>
+ *
+ ****/
+
+#pragma once
+
+#include "PayloadParser.h"
+#include <OtaUpgradeStream.h>
+
+namespace OtaUpgrade
+{
+namespace Mqtt
+{
+/**
+ * This parser allows the processing of firmware data
+ * that can be encrypted or have signature
+ */
+class AdvancedPayloadParser : public PayloadParser
+{
+public:
+	using PayloadParser::PayloadParser;
+
+	bool switchRom(const UpdateState& updateState) override;
+
+	ReadWriteStream* getStorageStream(size_t storageSize) override;
+};
+
+} // namespace Mqtt
+} // namespace OtaUpgrade
diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/PayloadParser.h b/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/PayloadParser.h
new file mode 100644
index 0000000000..41d63dab03
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/PayloadParser.h
@@ -0,0 +1,85 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * PayloadParser.h
+ *
+ *  Created: 2021 - Slavey Karadzhov <slav@attachix.com>
+ *
+ ****/
+
+#pragma once
+
+#include <Platform/System.h>
+#include <Data/Stream/ReadWriteStream.h>
+#include <Network/Mqtt/MqttPayloadParser.h>
+
+namespace OtaUpgrade
+{
+namespace Mqtt
+{
+constexpr int8_t VERSION_NOT_READY{-1};
+
+constexpr int8_t ERROR_INVALID_MQTT_MESSAGE{-1};
+constexpr int8_t ERROR_INVALID_PATCH_VERSION{-2};
+constexpr int8_t ERROR_UNKNOWN_REASON{-10};
+
+class PayloadParser
+{
+public:
+	struct UpdateState {
+		ReadWriteStream* stream{nullptr};
+		bool started{false};
+		size_t version{0};
+	};
+
+	/**
+	 * @brief
+	 * @param currentPatchVersion
+	 * @param allowedVersionBytes - maximum allowed bytes to be used for describing a patch version
+	 */
+	PayloadParser(size_t currentPatchVersion, size_t allowedVersionBytes = 24)
+		: currentPatchVersion(currentPatchVersion), allowedVersionBytes(allowedVersionBytes)
+	{
+	}
+
+	virtual ~PayloadParser()
+	{
+	}
+
+	/**
+	 * @brief This method is responsible for switching the rom.
+	 * 		  This method is NOT restarting the system. It will happen lated in the parse method
+	 * @retval true if the switch was successful
+	 */
+	virtual bool switchRom(const UpdateState& updateState) = 0;
+
+	/**
+	 * @brief Creates new stream to store the firmware update
+	 * @param size_t storageSize the requested storage size
+	 *
+	 * @retval ReadWriteStream*
+	 */
+	virtual ReadWriteStream* getStorageStream(size_t storageSize) = 0;
+
+	/**
+	 * @brief This method takes care to read the incoming MQTT message and pass it to the stream that
+	 * 		  is responsoble for storing the data.
+	 *
+	 * @retval int
+	 * 				0 when everything is ok
+	 * 				<0 when an error has occurred
+	 */
+	int parse(MqttPayloadParserState& state, mqtt_message_t* message, const char* buffer, int length);
+
+private:
+	int getPatchVersion(const char* buffer, int length, size_t& offset, size_t versionStart = 0);
+
+	size_t currentPatchVersion;
+	size_t allowedVersionBytes;
+};
+
+} // namespace Mqtt
+} // namespace OtaUpgrade
diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/RbootPayloadParser.h b/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/RbootPayloadParser.h
new file mode 100644
index 0000000000..68e87dd53a
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/RbootPayloadParser.h
@@ -0,0 +1,43 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * RbootPayloadParser.h
+ *
+ *  Created: 2021 - Slavey Karadzhov <slav@attachix.com>
+ *
+ ****/
+
+#pragma once
+
+#include "PayloadParser.h"
+#include <Data/Stream/RbootOutputStream.h>
+
+namespace OtaUpgrade
+{
+namespace Mqtt
+{
+/**
+ * @brief This parser allows the processing of firmware data that is directly stored
+ * 		  to the flash memory using RbootOutputStream.
+ */
+class RbootPayloadParser : public PayloadParser
+{
+public:
+	RbootPayloadParser(Storage::Partition part, size_t currentVersion, size_t allowedVersionBytes = 24)
+		: PayloadParser(currentVersion, allowedVersionBytes), part(part)
+	{
+	}
+
+	bool switchRom(const UpdateState& updateState) override;
+
+	ReadWriteStream* getStorageStream(size_t storageSize) override;
+
+private:
+	Storage::Partition part;
+};
+
+} // namespace Mqtt
+} // namespace OtaUpgrade
diff --git a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/.cproject b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/.cproject
new file mode 100644
index 0000000000..fecee42f2f
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/.cproject
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="0.131700304">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.131700304" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration buildProperties="" description="" id="0.131700304" name="Default" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+					<folderInfo id="0.131700304." name="/" resourcePath="">
+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.481709424" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.481709424.1637922483" name=""/>
+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.1861624051" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.927548352" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.1318259878" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.49095807" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.451866905" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.952230018" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.639761705" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2127747414" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
+				<externalSettings containerId="Sming;" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier"/>
+			</storageModule>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="Basic_ControlPoint.null.1347473968" name="Basic_ControlPoint"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="0.2058741737">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2032390008;cdt.managedbuild.tool.gnu.c.compiler.input.1700912488">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="0.147001341">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="0.1962726862">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="0.358052692">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="0.131700304">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1135534147;cdt.managedbuild.toolchain.gnu.mingw.base.1135534147.86962463;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.454898447;cdt.managedbuild.tool.gnu.cpp.compiler.input.501261625">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+		<buildTargets>
+			<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments/>
+				<buildTarget>all</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="rebuild" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments/>
+				<buildTarget>rebuild</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+			<target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments/>
+				<buildTarget>flash</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
+		</buildTargets>
+	</storageModule>
+</cproject>
diff --git a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/.project b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/.project
new file mode 100644
index 0000000000..0b94d5c588
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>FirmwareDeployer</name>
+	<comment></comment>
+	<projects>
+		<project>SmingFramework</project>
+		<project>Libraries</project>
+		<project>Sming</project>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/Makefile b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/Makefile
new file mode 100644
index 0000000000..ff51b6c3a7
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/Makefile
@@ -0,0 +1,9 @@
+#####################################################################
+#### Please don't change this file. Use component.mk instead ####
+#####################################################################
+
+ifndef SMING_HOME
+$(error SMING_HOME is not set: please configure it as an environment variable)
+endif
+
+include $(SMING_HOME)/project.mk
diff --git a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/README.rst b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/README.rst
new file mode 100644
index 0000000000..5a0f568c0c
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/README.rst
@@ -0,0 +1,7 @@
+Deployer
+========
+
+.. highlight:: bash
+
+Utility to package and deploy firmware files for upgrade over MQTT
+See :library:`OtaUpgradeMqtt` for details.
diff --git a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/app/application.cpp b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/app/application.cpp
new file mode 100644
index 0000000000..ae8350511a
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/app/application.cpp
@@ -0,0 +1,214 @@
+#include <SmingCore.h>
+#include <Network/MqttClient.h>
+
+#ifdef ARCH_HOST
+#ifdef __WIN32__
+#include <io.h>
+#endif
+
+#include <hostlib/CommandLine.h>
+#include <sys/stat.h>
+#include <Data/Stream/HostFileStream.h>
+#endif
+
+// If you want, you can define WiFi settings globally in Eclipse Environment Variables
+#ifndef WIFI_SSID
+#define WIFI_SSID "PleaseEnterSSID" // Put you SSID and Password here
+#define WIFI_PWD "PleaseEnterPass"
+#endif
+
+namespace
+{
+MqttClient mqtt;
+
+#ifdef ARCH_HOST
+
+size_t charsWriter(const char* buffer, size_t length)
+{
+	return fwrite(buffer, sizeof(char), length, stdout);
+}
+
+template <typename T> void print(const T& arg)
+{
+	String s(arg);
+	m_nputs(s.c_str(), s.length());
+}
+
+void println()
+{
+	m_puts("\r\n");
+}
+
+template <typename T> void println(const T& arg)
+{
+	print(arg);
+	println();
+}
+
+int writePatchVersion(int patchVersion, bool useVarInt, ReadWriteStream* output)
+{
+	if(output == nullptr) {
+		return -1;
+	}
+
+	int written = 0;
+	if(useVarInt) {
+		while(patchVersion > 0x7f) {
+			if(output->write(((uint8_t)(patchVersion)) | 0x80) < 0) {
+				return false;
+			}
+			patchVersion >>= 7;
+			written++;
+		}
+		if(output->write(((uint8_t)patchVersion) & 0x7f) < 0) {
+			return false;
+		}
+		written++;
+	} else {
+		written = output->write((uint8_t)patchVersion);
+	}
+
+	return written;
+}
+
+bool pack(const String& inputFileName, const String& outputFileName, size_t patchVersion, bool useVarInt)
+{
+	HostFileStream input;
+	input.open(inputFileName);
+	if(!input.fileExist()) {
+		m_printf(_F("ERROR: Invalid input file: %s\r\n"), inputFileName.c_str());
+		return false;
+	}
+
+	HostFileStream output;
+	output.open(outputFileName, eFO_CreateNewAlways | eFO_WriteOnly);
+	writePatchVersion(patchVersion, useVarInt, &output);
+	output.copyFrom(&input);
+	output.close();
+
+	return true;
+}
+
+bool deploy(const String& outputFileName, const String& url)
+{
+	if(mqtt.isProcessing()) {
+		// we are still processing the data...
+		return false;
+	}
+
+	HostFileStream* output = new HostFileStream();
+	output->open(outputFileName);
+	if(!output->fileExist()) {
+		m_printf(_F("ERROR: Invalid input file: %s"), outputFileName.c_str());
+		return false;
+	}
+
+	WifiStation.enable(true, false);
+	WifiStation.config(WIFI_SSID, WIFI_PWD);
+	WifiAccessPoint.enable(false, false);
+	WifiEvents.onStationGotIP([url, output](IpAddress ip, IpAddress netmask, IpAddress gateway) {
+		Url mqttUrl(url);
+
+		mqtt.connect(mqttUrl, "sming");
+		mqtt.setConnectedHandler([mqttUrl, output](MqttClient& client, mqtt_message_t* message) -> int {
+			if(message == nullptr) {
+				// invalid message received
+				return 1;
+			}
+
+			if(message->connack.return_code) {
+				m_printf(_F("ERROR: Connection failed. Reason: %s\r\n"),
+						 mqtt_connect_error_string(static_cast<mqtt_connect_error_t>(message->connack.return_code)));
+				System.restart(1000);
+				return 0;
+			}
+
+			uint8_t retained = 1;
+			uint8_t QoS = 2;
+			uint8_t flags = (uint8_t)(retained + (QoS << 1));
+			mqtt.publish(mqttUrl.Path.substring(1), output, flags);
+			mqtt.setPublishedHandler([](MqttClient& client, mqtt_message_t* message) -> int {
+				println(F("Firmware uploaded successfully."));
+				System.restart(1000);
+				return 0;
+			});
+
+			return 0;
+		});
+	});
+
+	return true;
+}
+
+void help()
+{
+	println();
+	println(F("Available commands:"));
+	println(F("  pack   fileName.in fileName.out patchVersion <use-varint=1|0>    Creates a package to be deployed on "
+			  "firmware upgrade server."));
+	println(F("  deploy fileName.out mqttUrl                                      Deploys a deployment package to "
+			  "firmware upgrade server."));
+	println();
+}
+
+/*
+ * Return true to continue execution, false to quit.
+ */
+bool parseCommands()
+{
+	auto parameters = commandLine.getParameters();
+	if(parameters.count() == 0) {
+		help();
+		return false;
+	}
+
+	String cmd = parameters[0].text;
+	if(cmd == "pack") {
+		if(parameters.count() >= 4) {
+			bool useVarInt = false;
+			if(parameters.count() > 4) {
+				useVarInt = strtol(parameters[4].text, nullptr, 0);
+			}
+			if(pack(parameters[1].text, parameters[2].text, strtol(parameters[3].text, nullptr, 0), useVarInt)) {
+			}
+		}
+
+		return false; // after packaging the application can be terminated
+	}
+
+	if(cmd == "deploy") {
+		if(parameters.count() < 2) {
+			m_printf(_F("ERROR: Specify package filename.\r\n"));
+			return false;
+		}
+
+		if(parameters.count() < 3) {
+			m_printf(_F("ERROR: Specify MQTT_FIRMWARE_URL.\r\n"));
+			return false;
+		}
+
+		return deploy(parameters[1].text, parameters[2].text);
+	}
+
+	help();
+	return false;
+}
+
+#endif // ARCH_HOST
+
+} // namespace
+
+void init()
+{
+	Serial.setTxBufferSize(1024);
+	Serial.begin(SERIAL_BAUD_RATE);
+	Serial.systemDebugOutput(true);
+
+#ifdef ARCH_HOST
+	m_setPuts(charsWriter);
+
+	if(!parseCommands()) {
+		System.restart(1000);
+	}
+#endif
+}
diff --git a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/component.mk b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/component.mk
new file mode 100644
index 0000000000..fc77dcce33
--- /dev/null
+++ b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/component.mk
@@ -0,0 +1,14 @@
+COMPONENT_DEPENDS := OtaUpgradeMqtt
+APP_NAME := deployer
+
+SMING_ARCH := Host
+
+##@Firmware Upgrade
+
+APP=$(TARGET_OUT_0)
+
+pack: application $(APP)  ##Pack firmware files for deployment (HOST_PARAMETERS=inputFile packedFile version 1|0. Example: )
+	$(Q) $(APP) pack -- $(HOST_PARAMETERS)
+	
+deploy: application $(APP) ##Deploy firmware files to MQTT server (HOST_PARAMETERS=packedFile MQTTQ_URL. Example MQTT user: )
+	$(Q) $(APP) deploy -- $(HOST_PARAMETERS) 
\ No newline at end of file
diff --git a/docs/source/getting-started/windows/index.rst b/docs/source/getting-started/windows/index.rst
index d9fa84bfaa..b31bd9b026 100644
--- a/docs/source/getting-started/windows/index.rst
+++ b/docs/source/getting-started/windows/index.rst
@@ -23,6 +23,9 @@ Open an *administrative* **cmd.exe** command prompt and paste the text from the
 
    curl -LO https://raw.githubusercontent.com/SmingHub/Sming/develop/Tools/choco-install.cmd && choco-install.cmd
 
+At the moment the Esp32 toolchain is not installed by default. If you want to install it run the following command::
+
+   choco install -y sming.esp32
 
 .. important::
 
@@ -32,22 +35,31 @@ Open an *administrative* **cmd.exe** command prompt and paste the text from the
 
    It is also inadvisable to continue running with elevated privileges.
 
+If you followed and executed carefully the steps above Sming should be installed and configured.
+You can scroll down to :ref:`Build Basic_Blink` to check the installation.
+
+Optional step: Switch to stable version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The installer uses the latest **develop** branch. This one contains great new features and bugfixes but can be ``unstable`` at times.
+
+Switching to our ``stable`` release will guarantee you that Sming's code will not change so often.
+On the downside you will have to wait for all new shiny features and bugfixes.
+
+If you really want to use the latest ``stable`` release you can type the command below::
 
-The installer uses the latest **develop** branch.
-The command below will get for you the latest ``stable`` release::
+      cd %SMING_HOME%
+      git checkout master
+      git pull
 
-   cd %SMING_HOME%
-   git checkout master
-   git pull
 
+Optional step: Re-installation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In case something is broken, this will perform a forced re-install of all packages::
 
    rmdir /s /q c:\tools\sming
    choco install sming -y -f -x
 
-
-
 Packages
 --------
 
@@ -107,7 +119,7 @@ To check the installation, open a command prompt and type these commands::
    make
 
 The project should build without error.
-   
+
 
 Next steps
 ----------
diff --git a/docs/source/index.rst b/docs/source/index.rst
index fdb883e3f1..9111286243 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -30,7 +30,7 @@ Summary
   -  And servers for: DNS, FTP, HTTP(+ WebSockets), Telnet.
   -  With :doc:`SSL support <_inc/Sming/Components/ssl/index>` for all network clients and servers.
      Based on `axTLS <http://axtls.sourceforge.net/>`__ and `BearSSL <https://www.bearssl.org/>`__.
-  -  Out of the box support for OTA over HTTPS.
+  -  Over-The-Air(OTA) firmware upgrades via HTTP(S) and MQTT(S).
 
 -  ESP8266 specific features
 

From 7a11512d91f6c2300b83d64ebe221fb097feda61 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Fri, 26 Mar 2021 14:24:44 +0000
Subject: [PATCH 86/91] Fix broken host `--pause` option (#2291)

---
 Sming/Arch/Host/Components/hostlib/startup.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Sming/Arch/Host/Components/hostlib/startup.cpp b/Sming/Arch/Host/Components/hostlib/startup.cpp
index 6349932a03..f33bba2f5b 100644
--- a/Sming/Arch/Host/Components/hostlib/startup.cpp
+++ b/Sming/Arch/Host/Components/hostlib/startup.cpp
@@ -240,10 +240,8 @@ int main(int argc, char* argv[])
 			host_debug_i("Network initialisation skipped as requested");
 		}
 
-		if(config.pause != 0) {
-			host_debug_i("If required, you may start terminal application(s) now");
-			pause(config.pause);
-		}
+		host_debug_i("If required, you may start terminal application(s) now");
+		pause(config.pause);
 
 		host_debug_i(">> Starting Sming <<\n");
 

From 5984b18d2ec79bf0885b77f0c9f73bd59c47277a Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Sun, 28 Mar 2021 09:10:59 +0100
Subject: [PATCH 87/91] Fix IFS error handling issues (#2292)

Fix `IFS::FileStream::isFinished()` so it returns true on file error.
lastError was incorrectly reset in `FsBase` which masked errors and could cause recursion issues with `HostFileStream`.
File error messages not handled correctly; fixed, test added and verified on Esp8266, Esp32, Host/Linux and Host/Win32 targets.
---
 Sming/Components/IFS                    | 2 +-
 Sming/Core/Data/Stream/IFS/FileStream.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Sming/Components/IFS b/Sming/Components/IFS
index 7e58a78cf2..b31da3aa3e 160000
--- a/Sming/Components/IFS
+++ b/Sming/Components/IFS
@@ -1 +1 @@
-Subproject commit 7e58a78cf2820dd93c514d9ddb88f2077f55b242
+Subproject commit b31da3aa3ec5b786bbea1967ed31a8e6ff931676
diff --git a/Sming/Core/Data/Stream/IFS/FileStream.h b/Sming/Core/Data/Stream/IFS/FileStream.h
index f8d0430547..d9147d015f 100644
--- a/Sming/Core/Data/Stream/IFS/FileStream.h
+++ b/Sming/Core/Data/Stream/IFS/FileStream.h
@@ -71,7 +71,7 @@ class FileStream : public FsBase, public ReadWriteStream
 	bool isFinished() override
 	{
 		auto fs = getFileSystem();
-		return fs == nullptr || fs->eof(handle) != 0;
+		return fs == nullptr || lastError != FS_OK || fs->eof(handle) != 0;
 	}
 
 	/** @brief Filename of file stream is attached to

From 9bb398a56c4770775a1a3de49e6d4ed3e30bb072 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Mon, 29 Mar 2021 09:24:19 +0200
Subject: [PATCH 88/91] Add support for repeated HTTP header fields (#2290)

* Added support for headers that can appear multiple times in one HTTP response or request.
The following headers are supported:
- Set-Cookie
- WWW-Authenticate
- Proxy-Authentica

Updated HttpResponse::setCookie to support adding multiple cookies in one response.

* Added tests.

Co-authored-by: mikee47 <mike@sillyhouse.net>
---
 Sming/Core/Network/Http/HttpHeaderFields.cpp  |  38 ++++++-
 Sming/Core/Network/Http/HttpHeaderFields.h    | 101 +++++++++++-------
 Sming/Core/Network/Http/HttpHeaders.cpp       |  48 +++++++++
 Sming/Core/Network/Http/HttpHeaders.h         |  26 ++---
 Sming/Core/Network/Http/HttpResponse.cpp      |   9 +-
 Sming/Core/Network/Http/HttpResponse.h        |   2 +-
 .../HttpServer_Bootstrap/app/application.cpp  |   5 +
 tests/HostTests/modules/Http.cpp              |  25 ++++-
 8 files changed, 190 insertions(+), 64 deletions(-)
 create mode 100644 Sming/Core/Network/Http/HttpHeaders.cpp

diff --git a/Sming/Core/Network/Http/HttpHeaderFields.cpp b/Sming/Core/Network/Http/HttpHeaderFields.cpp
index 66d5c2f39f..5096b576ed 100644
--- a/Sming/Core/Network/Http/HttpHeaderFields.cpp
+++ b/Sming/Core/Network/Http/HttpHeaderFields.cpp
@@ -14,14 +14,28 @@
 #include <FlashString/Vector.hpp>
 
 // Define field name strings and a lookup table
-#define XX(_tag, _str, _comment) DEFINE_FSTR_LOCAL(hhfnStr_##_tag, _str);
+#define XX(tag, str, flags, comment) DEFINE_FSTR_LOCAL(hhfnStr_##tag, str);
 HTTP_HEADER_FIELDNAME_MAP(XX)
 #undef XX
 
-#define XX(_tag, _str, _comment) &hhfnStr_##_tag,
+#define XX(tag, str, flags, comment) &hhfnStr_##tag,
 DEFINE_FSTR_VECTOR_LOCAL(fieldNameStrings, FlashString, HTTP_HEADER_FIELDNAME_MAP(XX));
 #undef XX
 
+HttpHeaderFields::Flags HttpHeaderFields::getFlags(HttpHeaderFieldName name) const
+{
+	switch(name) {
+#define XX(tag, str, flags, comment)                                                                                   \
+	case HttpHeaderFieldName::tag:                                                                                     \
+		return flags;
+		HTTP_HEADER_FIELDNAME_MAP(XX)
+#undef XX
+	default:
+		// Custom fields
+		return 0;
+	}
+}
+
 String HttpHeaderFields::toString(HttpHeaderFieldName name) const
 {
 	if(name == HTTP_HEADER_UNKNOWN) {
@@ -35,6 +49,26 @@ String HttpHeaderFields::toString(HttpHeaderFieldName name) const
 	return customFieldNames[unsigned(name) - unsigned(HTTP_HEADER_CUSTOM)];
 }
 
+String HttpHeaderFields::toString(HttpHeaderFieldName name, const String& value) const
+{
+	String tag = toString(name);
+	if(getFlags(name)[Flag::Multi]) {
+		tag += ": ";
+		CStringArray values(value);
+		String s;
+		s.reserve((tag.length() + 2) * values.count() + value.length());
+		for(auto p : values) {
+			s += tag;
+			s += p;
+			s += "\r\n";
+		}
+
+		return s;
+	}
+
+	return toString(tag, value);
+}
+
 String HttpHeaderFields::toString(const String& name, const String& value)
 {
 	String s;
diff --git a/Sming/Core/Network/Http/HttpHeaderFields.h b/Sming/Core/Network/Http/HttpHeaderFields.h
index de05acd30b..2ec1c14431 100644
--- a/Sming/Core/Network/Http/HttpHeaderFields.h
+++ b/Sming/Core/Network/Http/HttpHeaderFields.h
@@ -14,6 +14,7 @@
 
 #include "Data/CStringArray.h"
 #include "WString.h"
+#include <Data/BitSet.h>
 
 /*
  * Common HTTP header field names. Enumerating these simplifies matching
@@ -25,68 +26,91 @@
  * A brief description of each header field is given for information purposes.
  * For details see https://www.iana.org/assignments/message-headers/message-headers.xhtml
  *
+ * Entries are formatted thus: XX(tag, str, flags, comment)
+ *   tag:     Identifier used in code (without HTTP_HEADER_ prefix)
+ *   str:     String used in HTTP protocol
+ *   flags:   Additional flags (see HttpHeaderFields::Flag)
+ *   comment: Further details
  */
 #define HTTP_HEADER_FIELDNAME_MAP(XX)                                                                                  \
-	XX(ACCEPT, "Accept", "Limit acceptable response types")                                                            \
-	XX(ACCESS_CONTROL_ALLOW_ORIGIN, "Access-Control-Allow-Origin", "")                                                 \
-	XX(AUTHORIZATION, "Authorization", "Basic user agent authentication")                                              \
-	XX(CC, "Cc", "email field")                                                                                        \
-	XX(CONNECTION, "Connection", "Indicates sender's desired control options")                                         \
-	XX(CONTENT_DISPOSITION, "Content-Disposition", "Additional information about how to process response payload")     \
-	XX(CONTENT_ENCODING, "Content-Encoding", "Applied encodings in addition to content type")                          \
-	XX(CONTENT_LENGTH, "Content-Length", "Anticipated size for payload when not using transfer encoding")              \
-	XX(CONTENT_TYPE, "Content-Type",                                                                                   \
+	XX(ACCEPT, "Accept", 0, "Limit acceptable response types")                                                         \
+	XX(ACCESS_CONTROL_ALLOW_ORIGIN, "Access-Control-Allow-Origin", 0, "")                                              \
+	XX(AUTHORIZATION, "Authorization", 0, "Basic user agent authentication")                                           \
+	XX(CC, "Cc", 0, "email field")                                                                                     \
+	XX(CONNECTION, "Connection", 0, "Indicates sender's desired control options")                                      \
+	XX(CONTENT_DISPOSITION, "Content-Disposition", 0, "Additional information about how to process response payload")  \
+	XX(CONTENT_ENCODING, "Content-Encoding", 0, "Applied encodings in addition to content type")                       \
+	XX(CONTENT_LENGTH, "Content-Length", 0, "Anticipated size for payload when not using transfer encoding")           \
+	XX(CONTENT_TYPE, "Content-Type", 0,                                                                                \
 	   "Payload media type indicating both data format and intended manner of processing by recipient")                \
-	XX(CONTENT_TRANSFER_ENCODING, "Content-Transfer-Encoding", "Coding method used in a MIME message body part")       \
-	XX(CACHE_CONTROL, "Cache-Control", "Directives for caches along the request/response chain")                       \
-	XX(DATE, "Date", "Message originating date/time")                                                                  \
-	XX(EXPECT, "Expect", "Behaviours to be supported by the server in order to properly handle this request.")         \
-	XX(ETAG, "ETag",                                                                                                   \
+	XX(CONTENT_TRANSFER_ENCODING, "Content-Transfer-Encoding", 0, "Coding method used in a MIME message body part")    \
+	XX(CACHE_CONTROL, "Cache-Control", 0, "Directives for caches along the request/response chain")                    \
+	XX(DATE, "Date", 0, "Message originating date/time")                                                               \
+	XX(EXPECT, "Expect", 0, "Behaviours to be supported by the server in order to properly handle this request.")      \
+	XX(ETAG, "ETag", 0,                                                                                                \
 	   "Validates resource, such as a file, so recipient can confirm whether it has changed - generally more "         \
 	   "reliable than Date")                                                                                           \
-	XX(FROM, "From", "email address of human user who controls the requesting user agent")                             \
-	XX(HOST, "Host",                                                                                                   \
+	XX(FROM, "From", 0, "email address of human user who controls the requesting user agent")                          \
+	XX(HOST, "Host", 0,                                                                                                \
 	   "Request host and port information for target URI; allows server to service requests for multiple hosts on a "  \
 	   "single IP address")                                                                                            \
-	XX(IF_MATCH, "If-Match",                                                                                           \
+	XX(IF_MATCH, "If-Match", 0,                                                                                        \
 	   "Precondition check using ETag to avoid accidental overwrites when servicing multiple user requests. Ensures "  \
 	   "resource entity tag matches before proceeding.")                                                               \
-	XX(IF_MODIFIED_SINCE, "If-Modified-Since", "Precondition check using Date")                                        \
-	XX(LAST_MODIFIED, "Last-Modified", "Server timestamp indicating date and time resource was last modified")         \
-	XX(LOCATION, "Location", "Used in redirect responses, amongst other places")                                       \
-	XX(SEC_WEBSOCKET_ACCEPT, "Sec-WebSocket-Accept", "Server response to opening Websocket handshake")                 \
-	XX(SEC_WEBSOCKET_VERSION, "Sec-WebSocket-Version",                                                                 \
+	XX(IF_MODIFIED_SINCE, "If-Modified-Since", 0, "Precondition check using Date")                                     \
+	XX(LAST_MODIFIED, "Last-Modified", 0, "Server timestamp indicating date and time resource was last modified")      \
+	XX(LOCATION, "Location", 0, "Used in redirect responses, amongst other places")                                    \
+	XX(SEC_WEBSOCKET_ACCEPT, "Sec-WebSocket-Accept", 0, "Server response to opening Websocket handshake")              \
+	XX(SEC_WEBSOCKET_VERSION, "Sec-WebSocket-Version", 0,                                                              \
 	   "Websocket opening request indicates acceptable protocol version. Can appear more than once.")                  \
-	XX(SEC_WEBSOCKET_KEY, "Sec-WebSocket-Key", "Websocket opening request validation key")                             \
-	XX(SEC_WEBSOCKET_PROTOCOL, "Sec-WebSocket-Protocol",                                                               \
+	XX(SEC_WEBSOCKET_KEY, "Sec-WebSocket-Key", 0, "Websocket opening request validation key")                          \
+	XX(SEC_WEBSOCKET_PROTOCOL, "Sec-WebSocket-Protocol", 0,                                                            \
 	   "Websocket opening request indicates supported protocol(s), response contains negotiated protocol(s)")          \
-	XX(SERVER, "Server", "Identifies software handling requests")                                                      \
-	XX(SET_COOKIE, "Set-Cookie", "Server may pass name/value pairs and associated metadata to user agent (client)")    \
-	XX(SUBJECT, "Subject", "email subject line")                                                                       \
-	XX(TO, "To", "email intended recipient address")                                                                   \
-	XX(TRANSFER_ENCODING, "Transfer-Encoding", "e.g. Chunked, compress, deflate, gzip")                                \
-	XX(UPGRADE, "Upgrade",                                                                                             \
+	XX(SERVER, "Server", 0, "Identifies software handling requests")                                                   \
+	XX(SET_COOKIE, "Set-Cookie", Flag::Multi,                                                                          \
+	   "Server may pass name/value pairs and associated metadata to user agent (client)")                              \
+	XX(SUBJECT, "Subject", 0, "email subject line")                                                                    \
+	XX(TO, "To", 0, "email intended recipient address")                                                                \
+	XX(TRANSFER_ENCODING, "Transfer-Encoding", 0, "e.g. Chunked, compress, deflate, gzip")                             \
+	XX(UPGRADE, "Upgrade", 0,                                                                                          \
 	   "Used to transition from HTTP to some other protocol on the same connection. e.g. Websocket")                   \
-	XX(USER_AGENT, "User-Agent", "Information about the user agent originating the request")                           \
-	XX(WWW_AUTHENTICATE, "WWW-Authenticate", "Indicates HTTP authentication scheme(s) and applicable parameters")
+	XX(USER_AGENT, "User-Agent", 0, "Information about the user agent originating the request")                        \
+	XX(WWW_AUTHENTICATE, "WWW-Authenticate", Flag::Multi,                                                              \
+	   "Indicates HTTP authentication scheme(s) and applicable parameters")                                            \
+	XX(PROXY_AUTHENTICATE, "Proxy-Authenticate", Flag::Multi,                                                          \
+	   "Indicates proxy authentication scheme(s) and applicable parameters")
 
 enum class HttpHeaderFieldName {
 	UNKNOWN = 0,
-#define XX(tag, str, comment) tag,
+#define XX(tag, str, flags, comment) tag,
 	HTTP_HEADER_FIELDNAME_MAP(XX)
 #undef XX
 		CUSTOM // First custom header tag value
 };
 
-#define XX(tag, str, comment) constexpr HttpHeaderFieldName HTTP_HEADER_##tag = HttpHeaderFieldName::tag;
-XX(UNKNOWN, "", "")
+#define XX(tag, str, flags, comment) constexpr HttpHeaderFieldName HTTP_HEADER_##tag = HttpHeaderFieldName::tag;
+XX(UNKNOWN, "", 0, "")
 HTTP_HEADER_FIELDNAME_MAP(XX)
-XX(CUSTOM, "", "")
+XX(CUSTOM, "", 0, "")
 #undef XX
 
 class HttpHeaderFields
 {
 public:
+	/**
+	 * @brief Flag values providing additional information about header fields
+	 */
+	enum class Flag {
+		Multi, ///< Field may have multiple values
+	};
+	using Flags = BitSet<uint8_t, Flag, 1>;
+
+	/**
+	 * @brief Get flags (if any) for given header field
+	 * @retval Flags
+	 */
+	Flags getFlags(HttpHeaderFieldName name) const;
+
 	String toString(HttpHeaderFieldName name) const;
 
 	/** @brief Produce a string for output in the HTTP header, with line ending
@@ -96,10 +120,7 @@ class HttpHeaderFields
 	 */
 	static String toString(const String& name, const String& value);
 
-	String toString(HttpHeaderFieldName name, const String& value) const
-	{
-		return toString(toString(name), value);
-	}
+	String toString(HttpHeaderFieldName name, const String& value) const;
 
 	/** @brief Find the enumerated value for the given field name string
 	 *  @param name
diff --git a/Sming/Core/Network/Http/HttpHeaders.cpp b/Sming/Core/Network/Http/HttpHeaders.cpp
new file mode 100644
index 0000000000..9f98985693
--- /dev/null
+++ b/Sming/Core/Network/Http/HttpHeaders.cpp
@@ -0,0 +1,48 @@
+/****
+ * Sming Framework Project - Open Source framework for high efficiency native ESP8266 development.
+ * Created 2015 by Skurydin Alexey
+ * http://github.com/SmingHub/Sming
+ * All files of the Sming Core are provided under the LGPL v3 license.
+ *
+ * HttpHeaders.cpp
+ *
+ ****/
+
+#include "HttpHeaders.h"
+#include <debug_progmem.h>
+
+const String& HttpHeaders::operator[](const String& name) const
+{
+	auto field = fromString(name);
+	if(field == HTTP_HEADER_UNKNOWN) {
+		return nil;
+	}
+	return operator[](field);
+}
+
+bool HttpHeaders::append(const HttpHeaderFieldName& name, const String& value)
+{
+	int i = indexOf(name);
+	if(i < 0) {
+		operator[](name) = value;
+		return true;
+	}
+
+	if(!getFlags(name)[Flag::Multi]) {
+		debug_w("[HTTP] Append not supported for header field '%s'", toString(name).c_str());
+		return false;
+	}
+
+	valueAt(i) += '\0' + value;
+
+	return true;
+}
+
+void HttpHeaders::setMultiple(const HttpHeaders& headers)
+{
+	for(unsigned i = 0; i < headers.count(); i++) {
+		HttpHeaderFieldName fieldName = headers.keyAt(i);
+		auto fieldNameString = headers.toString(fieldName);
+		operator[](fieldNameString) = headers.valueAt(i);
+	}
+}
diff --git a/Sming/Core/Network/Http/HttpHeaders.h b/Sming/Core/Network/Http/HttpHeaders.h
index 9c51d85857..0c3fd579e4 100644
--- a/Sming/Core/Network/Http/HttpHeaders.h
+++ b/Sming/Core/Network/Http/HttpHeaders.h
@@ -48,14 +48,7 @@ class HttpHeaders : public HttpHeaderFields, private HashMap<HttpHeaderFieldName
 	 *  @retval const String& Reference to value
 	 *  @note if the field doesn't exist a null String reference is returned
 	 */
-	const String& operator[](const String& name) const
-	{
-		auto field = fromString(name);
-		if(field == HTTP_HEADER_UNKNOWN) {
-			return nil;
-		}
-		return operator[](field);
-	}
+	const String& operator[](const String& name) const;
 
 	/** @brief Fetch a reference to the header field value by name
 	 *  @param name
@@ -86,19 +79,20 @@ class HttpHeaders : public HttpHeaderFields, private HashMap<HttpHeaderFieldName
 
 	using HashMap::remove;
 
+	/**
+	 * @brief Append value to multi-value field
+	 * @param name
+	 * @param value
+	 * @retval bool false if value exists and field does not permit multiple values
+	 */
+	bool append(const HttpHeaderFieldName& name, const String& value);
+
 	void remove(const String& name)
 	{
 		remove(fromString(name));
 	}
 
-	void setMultiple(const HttpHeaders& headers)
-	{
-		for(unsigned i = 0; i < headers.count(); i++) {
-			HttpHeaderFieldName fieldName = headers.keyAt(i);
-			auto fieldNameString = headers.toString(fieldName);
-			operator[](fieldNameString) = headers.valueAt(i);
-		}
-	}
+	void setMultiple(const HttpHeaders& headers);
 
 	HttpHeaders& operator=(const HttpHeaders& headers)
 	{
diff --git a/Sming/Core/Network/Http/HttpResponse.cpp b/Sming/Core/Network/Http/HttpResponse.cpp
index b0877e1902..0330e875bc 100644
--- a/Sming/Core/Network/Http/HttpResponse.cpp
+++ b/Sming/Core/Network/Http/HttpResponse.cpp
@@ -15,12 +15,17 @@
 #include "Data/Stream/MemoryDataStream.h"
 #include "Data/Stream/FileStream.h"
 
-HttpResponse* HttpResponse::setCookie(const String& name, const String& value)
+HttpResponse* HttpResponse::setCookie(const String& name, const String& value, bool append)
 {
 	String s = name;
 	s += '=';
 	s += value;
-	headers[HTTP_HEADER_SET_COOKIE] = s;
+	if(append) {
+		headers.append(HTTP_HEADER_SET_COOKIE, s);
+	} else {
+		headers[HTTP_HEADER_SET_COOKIE] = s;
+	}
+
 	return this;
 }
 
diff --git a/Sming/Core/Network/Http/HttpResponse.h b/Sming/Core/Network/Http/HttpResponse.h
index b852a8233d..d12d7f4725 100644
--- a/Sming/Core/Network/Http/HttpResponse.h
+++ b/Sming/Core/Network/Http/HttpResponse.h
@@ -77,7 +77,7 @@ class HttpResponse
 		return setContentType(::toString(type));
 	}
 
-	HttpResponse* setCookie(const String& name, const String& value);
+	HttpResponse* setCookie(const String& name, const String& value, bool append = false);
 
 	HttpResponse* setHeader(const String& name, const String& value)
 	{
diff --git a/samples/HttpServer_Bootstrap/app/application.cpp b/samples/HttpServer_Bootstrap/app/application.cpp
index 6a22cc7360..0d21f0beed 100644
--- a/samples/HttpServer_Bootstrap/app/application.cpp
+++ b/samples/HttpServer_Bootstrap/app/application.cpp
@@ -28,6 +28,11 @@ void onIndex(HttpRequest& request, HttpResponse& response)
 void onHello(HttpRequest& request, HttpResponse& response)
 {
 	response.setContentType(MIME_HTML);
+
+	// Below is an example how to send multiple cookies
+	response.setCookie("cookie1", "value1");
+	response.setCookie("cookie2", "value", true);
+
 	// Use direct strings output only for small amount of data (huge memory allocation)
 	response.sendString("Sming. Let's do smart things.");
 }
diff --git a/tests/HostTests/modules/Http.cpp b/tests/HostTests/modules/Http.cpp
index c888abe2ac..607c9c2805 100644
--- a/tests/HostTests/modules/Http.cpp
+++ b/tests/HostTests/modules/Http.cpp
@@ -35,11 +35,12 @@ class HttpTest : public TestGroup
 		TEST_CASE("http lookups")
 		{
 			auto s = toString(HPE_UNKNOWN);
-			REQUIRE(s == F("HPE_UNKNOWN"));
+			REQUIRE(s == "HPE_UNKNOWN");
 			s = httpGetErrorDescription(HPE_INVALID_URL);
-			REQUIRE(s == F("invalid URL"));
+			REQUIRE(s == "invalid URL");
 			s = toString(HTTP_STATUS_TOO_MANY_REQUESTS);
-			REQUIRE(s.equalsIgnoreCase(F("too many requests")));
+			DEFINE_FSTR_LOCAL(too_many_requests, "too many requests");
+			REQUIRE(s.equalsIgnoreCase(too_many_requests));
 		}
 	}
 
@@ -195,6 +196,24 @@ class HttpTest : public TestGroup
 			REQUIRE(serialize(headers2) == FS_serialized);
 			printHeaders(headers2);
 		}
+
+		DEFINE_FSTR_LOCAL(FS_cookies, "Set-Cookie: name1=value1\r\n"
+									  "Set-Cookie: name2=value2\r\n");
+
+		TEST_CASE("appendHeaders")
+		{
+			HttpHeaders headers2;
+			headers2.append(HTTP_HEADER_SET_COOKIE, "name1=value1");
+			headers2.append(HTTP_HEADER_SET_COOKIE, "name2=value2");
+			printHeaders(headers2);
+			REQUIRE(headers2.count() == 1);
+			REQUIRE(serialize(headers2) == FS_cookies);
+
+			// Append should work if field not already set
+			REQUIRE(headers2.append(HTTP_HEADER_CONTENT_LENGTH, "0") == true);
+			// But fail on actual append
+			REQUIRE(headers2.append(HTTP_HEADER_CONTENT_LENGTH, "1234") == false);
+		}
 	}
 };
 

From 4f5d76ee335b62225c575d4218c6665b435f47e3 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Mon, 29 Mar 2021 08:25:38 +0100
Subject: [PATCH 89/91] MQTT OTA Update review (#2293)

* Adjust `writePatchVersion` to avoid pointer parameters, int -> size_t

* Improve file error reporting

* Additional parameter checks

* Remove redundant check in `deploy()`

* Delegate stream destruction to `UpdateState` destructor, address possible memory leak on 'skip'
---
 .../samples/Upgrade/app/application.cpp       |   3 +-
 .../src/AdvancedPayloadParser.cpp             |   4 -
 .../OtaUpgradeMqtt/src/PayloadParser.cpp      |  12 +-
 .../OtaUpgradeMqtt/src/RbootPayloadParser.cpp |   8 +-
 .../include/OtaUpgrade/Mqtt/PayloadParser.h   |   5 +
 .../tools/deployer/app/application.cpp        | 130 +++++++++++-------
 .../tools/deployer/component.mk               |   2 +-
 7 files changed, 95 insertions(+), 69 deletions(-)

diff --git a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/app/application.cpp b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/app/application.cpp
index 87dbb20d31..d93860fc1a 100644
--- a/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/app/application.cpp
+++ b/Sming/Libraries/OtaUpgradeMqtt/samples/Upgrade/app/application.cpp
@@ -113,8 +113,7 @@ void showInfo()
 	Serial.printf(_F("CPU Frequency: %d MHz\r\n"), system_get_cpu_freq());
 	Serial.printf(_F("System Chip ID: %x\r\n"), system_get_chip_id());
 
-	rboot_config conf;
-	conf = rboot_get_config();
+	rboot_config conf = rboot_get_config();
 
 	debug_d("Count: %d", conf.count);
 	debug_d("ROM 0: 0x%08x", conf.roms[0]);
diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/AdvancedPayloadParser.cpp b/Sming/Libraries/OtaUpgradeMqtt/src/AdvancedPayloadParser.cpp
index 478b9a70d1..5aaf30cd97 100644
--- a/Sming/Libraries/OtaUpgradeMqtt/src/AdvancedPayloadParser.cpp
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/AdvancedPayloadParser.cpp
@@ -18,10 +18,6 @@ namespace Mqtt
 {
 bool AdvancedPayloadParser::switchRom(const UpdateState& updateState)
 {
-	if(updateState.stream == nullptr) {
-		return false;
-	}
-
 	auto otaStream = static_cast<OtaUpgradeStream*>(updateState.stream);
 	if(otaStream == nullptr) {
 		return false;
diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/PayloadParser.cpp b/Sming/Libraries/OtaUpgradeMqtt/src/PayloadParser.cpp
index b63a479ea5..56f39ab4e3 100644
--- a/Sming/Libraries/OtaUpgradeMqtt/src/PayloadParser.cpp
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/PayloadParser.cpp
@@ -24,12 +24,7 @@ int PayloadParser::parse(MqttPayloadParserState& state, mqtt_message_t* message,
 	}
 
 	if(length == MQTT_PAYLOAD_PARSER_START) {
-		UpdateState* updateState = new UpdateState();
-		updateState->stream = nullptr;
-		updateState->started = false;
-
-		state.offset = 0;
-		state.userData = updateState;
+		state = MqttPayloadParserState{new UpdateState};
 		return 0;
 	}
 
@@ -43,8 +38,6 @@ int PayloadParser::parse(MqttPayloadParserState& state, mqtt_message_t* message,
 		bool skip = (updateState->stream == nullptr);
 		if(!skip) {
 			bool success = switchRom(*updateState);
-			delete updateState->stream;
-			delete updateState;
 			if(success) {
 				debug_d("Switching was successful. Restarting...");
 				System.restart();
@@ -52,7 +45,8 @@ int PayloadParser::parse(MqttPayloadParserState& state, mqtt_message_t* message,
 				debug_e("Switching failed!");
 			}
 		}
-
+		delete updateState;
+		state.userData = nullptr;
 		return 0;
 	}
 
diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/RbootPayloadParser.cpp b/Sming/Libraries/OtaUpgradeMqtt/src/RbootPayloadParser.cpp
index 05ca09033d..b18a8fb151 100644
--- a/Sming/Libraries/OtaUpgradeMqtt/src/RbootPayloadParser.cpp
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/RbootPayloadParser.cpp
@@ -18,14 +18,8 @@ namespace Mqtt
 {
 bool RbootPayloadParser::switchRom(const UpdateState& updateState)
 {
-	uint8_t after;
 	uint8_t before = rboot_get_current_rom();
-
-	if(before == 0) {
-		after = 1;
-	} else {
-		after = 0;
-	}
+	uint8_t after = (before == 0) ? 1 : 0;
 
 	debug_d("Swapping from rom %u to rom %u.\r\n", before, after);
 
diff --git a/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/PayloadParser.h b/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/PayloadParser.h
index 41d63dab03..f246e43292 100644
--- a/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/PayloadParser.h
+++ b/Sming/Libraries/OtaUpgradeMqtt/src/include/OtaUpgrade/Mqtt/PayloadParser.h
@@ -33,6 +33,11 @@ class PayloadParser
 		ReadWriteStream* stream{nullptr};
 		bool started{false};
 		size_t version{0};
+
+		~UpdateState()
+		{
+			delete stream;
+		}
 	};
 
 	/**
diff --git a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/app/application.cpp b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/app/application.cpp
index ae8350511a..f3a513af69 100644
--- a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/app/application.cpp
+++ b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/app/application.cpp
@@ -45,61 +45,76 @@ template <typename T> void println(const T& arg)
 	println();
 }
 
-int writePatchVersion(int patchVersion, bool useVarInt, ReadWriteStream* output)
+/*
+ * Return number of bytes written, 0 if *any* writes failed
+ */
+size_t writePatchVersion(size_t patchVersion, bool useVarInt, ReadWriteStream& output)
 {
-	if(output == nullptr) {
-		return -1;
-	}
-
-	int written = 0;
+	size_t written = 0;
 	if(useVarInt) {
 		while(patchVersion > 0x7f) {
-			if(output->write(((uint8_t)(patchVersion)) | 0x80) < 0) {
-				return false;
+			if(output.write(uint8_t(patchVersion | 0x80)) != 1) {
+				return 0;
 			}
 			patchVersion >>= 7;
 			written++;
 		}
-		if(output->write(((uint8_t)patchVersion) & 0x7f) < 0) {
-			return false;
+		if(output.write(uint8_t(patchVersion & 0x7f)) != 1) {
+			return 0;
 		}
 		written++;
 	} else {
-		written = output->write((uint8_t)patchVersion);
+		written = output.write(uint8_t(patchVersion));
 	}
 
 	return written;
 }
 
+static void fileError(IFS::FsBase& fs, const String& filename, const String& operation)
+{
+	print(F("ERROR: Failed to "));
+	print(operation);
+	print(F(" file '"));
+	print(filename);
+	print("': ");
+	println(fs.getLastErrorString());
+}
+
 bool pack(const String& inputFileName, const String& outputFileName, size_t patchVersion, bool useVarInt)
 {
 	HostFileStream input;
-	input.open(inputFileName);
-	if(!input.fileExist()) {
-		m_printf(_F("ERROR: Invalid input file: %s\r\n"), inputFileName.c_str());
+	if(!input.open(inputFileName)) {
+		fileError(input, inputFileName, F("open input"));
 		return false;
 	}
 
 	HostFileStream output;
-	output.open(outputFileName, eFO_CreateNewAlways | eFO_WriteOnly);
-	writePatchVersion(patchVersion, useVarInt, &output);
+	if(!output.open(outputFileName, eFO_CreateNewAlways | eFO_WriteOnly)) {
+		fileError(output, outputFileName, F("open output"));
+		return false;
+	}
+	if(writePatchVersion(patchVersion, useVarInt, output) == 0) {
+		print(F("writePatchVersion() failed"));
+		return false;
+	}
 	output.copyFrom(&input);
-	output.close();
+	if(input.getLastError() != FS_OK) {
+		fileError(input, inputFileName, F("read from"));
+		return false;
+	}
+	if(output.getLastError() != FS_OK) {
+		fileError(output, outputFileName, F("write to"));
+		return false;
+	}
 
 	return true;
 }
 
 bool deploy(const String& outputFileName, const String& url)
 {
-	if(mqtt.isProcessing()) {
-		// we are still processing the data...
-		return false;
-	}
-
 	HostFileStream* output = new HostFileStream();
-	output->open(outputFileName);
-	if(!output->fileExist()) {
-		m_printf(_F("ERROR: Invalid input file: %s"), outputFileName.c_str());
+	if(!output->open(outputFileName)) {
+		fileError(*output, outputFileName, F("open output"));
 		return false;
 	}
 
@@ -117,15 +132,15 @@ bool deploy(const String& outputFileName, const String& url)
 			}
 
 			if(message->connack.return_code) {
-				m_printf(_F("ERROR: Connection failed. Reason: %s\r\n"),
-						 mqtt_connect_error_string(static_cast<mqtt_connect_error_t>(message->connack.return_code)));
+				print(F("ERROR: Connection failed. Reason: "));
+				println(mqtt_connect_error_string(mqtt_connect_error_t(message->connack.return_code)));
 				System.restart(1000);
 				return 0;
 			}
 
 			uint8_t retained = 1;
 			uint8_t QoS = 2;
-			uint8_t flags = (uint8_t)(retained + (QoS << 1));
+			uint8_t flags = uint8_t(retained + (QoS << 1));
 			mqtt.publish(mqttUrl.Path.substring(1), output, flags);
 			mqtt.setPublishedHandler([](MqttClient& client, mqtt_message_t* message) -> int {
 				println(F("Firmware uploaded successfully."));
@@ -163,31 +178,54 @@ bool parseCommands()
 	}
 
 	String cmd = parameters[0].text;
+
+	auto checkParameterCount = [&](unsigned minCount, unsigned maxCount) -> bool {
+		if(parameters.count() < minCount) {
+			print(F("Insufficient"));
+		} else if(parameters.count() > maxCount) {
+			print(F("Too many"));
+		} else {
+			return true;
+		}
+
+		print(F(" parameters for '"));
+		print(cmd);
+		println("'.");
+		return false;
+	};
+
 	if(cmd == "pack") {
-		if(parameters.count() >= 4) {
+		if(checkParameterCount(4, 5)) {
+			auto inputFileName = parameters[1].text;
+			auto outputFileName = parameters[2].text;
+			auto patchVersion = strtoul(parameters[3].text, nullptr, 0);
 			bool useVarInt = false;
 			if(parameters.count() > 4) {
-				useVarInt = strtol(parameters[4].text, nullptr, 0);
+				String p(parameters[4].text);
+				if(p == "0") {
+					useVarInt = false;
+				} else if(p == "1") {
+					useVarInt = true;
+				} else {
+					println(F("Invalid setting for useVarInt, must be 1 or 0"));
+					return false;
+				}
 			}
-			if(pack(parameters[1].text, parameters[2].text, strtol(parameters[3].text, nullptr, 0), useVarInt)) {
+			if(!useVarInt && patchVersion > 0xff) {
+				println(F("Patch version number too large for `useVarInt = 0`"));
+			} else {
+				pack(inputFileName, outputFileName, patchVersion, useVarInt);
 			}
+			return false; // after packaging the application can be terminated
 		}
-
-		return false; // after packaging the application can be terminated
-	}
-
-	if(cmd == "deploy") {
-		if(parameters.count() < 2) {
-			m_printf(_F("ERROR: Specify package filename.\r\n"));
-			return false;
-		}
-
-		if(parameters.count() < 3) {
-			m_printf(_F("ERROR: Specify MQTT_FIRMWARE_URL.\r\n"));
-			return false;
+	} else if(cmd == "deploy") {
+		if(checkParameterCount(2, 2)) {
+			return deploy(parameters[1].text, parameters[2].text);
 		}
-
-		return deploy(parameters[1].text, parameters[2].text);
+	} else {
+		print(F("ERROR: Unknown command '"));
+		print(cmd);
+		println("'.");
 	}
 
 	help();
diff --git a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/component.mk b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/component.mk
index fc77dcce33..3069b10758 100644
--- a/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/component.mk
+++ b/Sming/Libraries/OtaUpgradeMqtt/tools/deployer/component.mk
@@ -11,4 +11,4 @@ pack: application $(APP)  ##Pack firmware files for deployment (HOST_PARAMETERS=
 	$(Q) $(APP) pack -- $(HOST_PARAMETERS)
 	
 deploy: application $(APP) ##Deploy firmware files to MQTT server (HOST_PARAMETERS=packedFile MQTTQ_URL. Example MQTT user: )
-	$(Q) $(APP) deploy -- $(HOST_PARAMETERS) 
\ No newline at end of file
+	$(Q) $(APP) deploy -- $(HOST_PARAMETERS)

From 121fc40c7211d4d5abcc0039827caa9dc0aacaa1 Mon Sep 17 00:00:00 2001
From: Mike <mike@sillyhouse.net>
Date: Tue, 30 Mar 2021 10:47:53 +0100
Subject: [PATCH 90/91] Update hw profile editor, more like gparted (#2294)

Show (simplified) map and tree together, and synchronise selection
Implement auto zoom and set ON by default
Enable map scrolling with mousewheel (when autozoom off)
Verify changes (base config, options, editor) before applying and reloading
Use fractional sizes (K, M, G) as appropriate
---
 .../Storage/Tools/hwconfig/common.py          |   19 +
 .../Storage/Tools/hwconfig/config.py          |   14 +-
 .../Storage/Tools/hwconfig/editor.py          | 1069 +++++++++++------
 .../Storage/Tools/hwconfig/partition.py       |   20 +-
 Sming/Components/Storage/schema.json          |   23 +-
 5 files changed, 730 insertions(+), 415 deletions(-)

diff --git a/Sming/Components/Storage/Tools/hwconfig/common.py b/Sming/Components/Storage/Tools/hwconfig/common.py
index 47c6e2bfce..89d09efa87 100644
--- a/Sming/Components/Storage/Tools/hwconfig/common.py
+++ b/Sming/Components/Storage/Tools/hwconfig/common.py
@@ -64,6 +64,25 @@ def size_format(a):
     return "0x%08x" % a
 
 
+def size_frac_str(a):
+    KB = 1024
+    MB = KB * 1024
+    GB = MB * 1024
+    if a >= GB:
+        div = GB
+        unit = 'G'
+    elif a >= MB:
+        div = MB
+        unit = 'M'
+    else:
+        div = KB
+        unit = 'K'
+    if a % div == 0:
+        return "%u%s" % (a // div, unit)
+    else:
+        return "%.2f%s" % (a / div, unit)
+
+
 def quote(v):
     return '"' + v + '"'
 
diff --git a/Sming/Components/Storage/Tools/hwconfig/config.py b/Sming/Components/Storage/Tools/hwconfig/config.py
index 1e0c3ae29f..ff40d62ead 100644
--- a/Sming/Components/Storage/Tools/hwconfig/config.py
+++ b/Sming/Components/Storage/Tools/hwconfig/config.py
@@ -29,7 +29,7 @@ def get_config_list():
     list = {}
     dirs = get_config_dirs()
     for d in reversed(dirs):
-        for f in os.listdir(d):
+        for f in os.listdir(fixpath(d)):
             if f.endswith(HW_EXT):
                 n = os.path.splitext(f)[0]
                 list[n] = d + '/' + f
@@ -119,19 +119,18 @@ def parse_dict(self, data):
         partitions = data.pop('partitions', None)
 
         for k, v in data.items():
-            if k == 'name':
-                self.name = v
-            elif k == 'arch':
+            if k == 'arch':
                 self.arch = v
             elif k == 'partition_table_offset':
                 self.partitions.offset = v
             elif k == 'devices':
                 self.devices.parse_dict(v)
-            elif k == 'comment':
-                self.comment = v
-            else:
+            elif k != 'name' and k != 'comment':
                 raise InputError("Unknown config key '%s'" % k)
 
+        self.name = data.get('name', '')
+        self.comment = data.get('comment', '')
+
         if not partitions is None:
             self.partitions.parse_dict(partitions, self.devices)
 
@@ -142,6 +141,7 @@ def dict(self):
         if hasattr(self, 'comment'):
             res['comment'] = self.comment
         res['arch'] = self.arch;
+        res['options'] = self.options
         res['partition_table_offset'] = self.partitions.offset_str()
         res['devices'] = self.devices.dict()
         res['partitions'] = self.partitions.dict()
diff --git a/Sming/Components/Storage/Tools/hwconfig/editor.py b/Sming/Components/Storage/Tools/hwconfig/editor.py
index 5d2a03b5cc..3a66b3cfdf 100644
--- a/Sming/Components/Storage/Tools/hwconfig/editor.py
+++ b/Sming/Components/Storage/Tools/hwconfig/editor.py
@@ -3,6 +3,7 @@
 from config import *
 import tkinter as tk
 from tkinter import ttk, filedialog, messagebox, font
+from collections import OrderedDict
 
 app_name = 'Sming Hardware Profile Editor'
 
@@ -10,7 +11,7 @@ def read_property(obj, name):
     """Read an object property, preferring string representation
     """
     value = getattr(obj, name + '_str', None)
-    return getattr(obj, name, '') if value is None else value()
+    return getattr(obj, name, None) if value is None else value()
 
 
 def get_dict_value(dict, key, default):
@@ -34,21 +35,6 @@ def load_config_vars(filename):
     return parser['config']
 
 
-def to_KB(value):
-    """Round value up to whole KB
-    """
-    return (value + 1023) & ~0x3ff
-
-
-def percent_used(used, total):
-    """Get string showing size and percent of total
-    """
-    s = size_format(to_KB(used))
-    if total != 0:
-        s += " (%u%%)" % round(100 * used / total)
-    return s
-
-
 def checkProfilePath(filename):
     filename = os.path.realpath(filename)
     if filename.startswith(os.getcwd()):
@@ -60,6 +46,31 @@ def checkProfilePath(filename):
     return False
 
 
+def get_id(obj):
+    """Get string identifier for a device or partition object
+    """
+    if isinstance(obj, partition.Entry):
+        if obj.is_unused():
+            return obj.device.name + '/' + str(obj.address)
+    return obj.name
+
+def resolve_id(config, id):
+    """Get corresponding device or partition object given the ID value provided from get_id
+    """
+    elem = id.split('/')
+    if len(elem) == 2:
+        dev = config.devices.find_by_name(elem[0])
+        return config.map().find_by_address(dev, elem[1])
+    dev = config.devices.find_by_name(id)
+    if dev is not None:
+        return dev
+    part = config.map().find_by_name(id)
+    if part is not None:
+        return part
+
+def json_loads(s):
+    return json.loads(jsmin(s), object_pairs_hook=OrderedDict)
+
 class Field:
     """Manages widget and associated variable
     """
@@ -71,148 +82,243 @@ def get_value(self):
         return str(self.var.get())
 
     def is_disabled(self):
-        return str(self.widget.cget('state')) == 'disabled'
+        try:
+            return str(self.widget.cget('state')) == 'disabled'
+        except Exception:
+            return False
 
 
 class EditState(dict):
-    """Manage details of device/partition editing using dictionary of Field objects
+    """Manage details of Config/Device/Partition editing using dictionary of Field objects
     """
     def __init__(self, editor, objectType, dictName, obj, enumDict):
         super().__init__(self)
         self.editor = editor
         self.objectType = objectType
         self.dictName = dictName
-        if objectType == 'Partition' and obj.is_unused():
-            self.name = 'New Partition'
-        else:
-            self.name = obj.name
-        self.schema = editor.schema['definitions'][objectType]
+        self.enumDict = enumDict
         self.obj = obj
-        self.row = 0
+        self.name = obj.name
+        self.schema = editor.schema[objectType]
+        self.allow_delete = False
+        baseConfig = self.editor.getBaseConfig()
+        optionBaseConfig = self.editor.getOptionBaseConfig()
+        if objectType == 'Config':
+            self.is_inherited = False
+        elif objectType == 'Device':
+            self.is_inherited = optionBaseConfig.devices.find_by_name(self.name) is not None
+            self.allow_delete = not self.is_inherited
+        elif objectType == 'Partition':
+            if obj.is_unused():
+                self.name = 'New Partition'
+                self.is_inherited = False
+            else:
+                self.is_inherited = optionBaseConfig.map().find_by_name(self.name) is not None
+                self.allow_delete = not self.is_inherited
+        else:
+            raise InputError('Unsupported objectType')
+
+        if objectType == 'Config':
+            self.base_obj = baseConfig
+            self.obj_dict = editor.json
+        else:
+            self.base_obj = getattr(baseConfig, dictName).find_by_name(self.name)
+            self.obj_dict = editor.json.get(dictName, {}).get(self.name, {})
+
+        self.init()
+
+    def init(self):
+        f = self.editor.editFrame
+        for c in f.winfo_children():
+            c.destroy()
 
-        self.addControl('name')
-        for k in self.schema['properties'].keys():
-            self.addControl(k, enumDict)
-        btn = ttk.Button(editor.editFrame, text="Apply", command=self.apply)
-        btn.grid(row=100, column=0, columnspan=2)
+        label = ttk.Label(f, text=self.schema['title'], font='heading')
+        label.pack()
+        desc = self.schema.get('description')
+        if desc is not None:
+            label = ttk.Label(f, text=self.schema['description'])
+            label.pack()
 
-    def addControl(self, fieldName, enumDict = {}):
-        frame = self.editor.editFrame
+        f = self.controlFrame = ttk.Frame(self.editor.editFrame)
+        f.pack(side=tk.TOP)
+        self.array = {} # dictionary for array element variables
+        self.row = 0
+        keys = self.schema['properties'].keys()
+        if not 'name' in keys:
+            self.addControl('name')
+        for k in keys:
+            if k != 'devices' and k != 'partitions':
+                self.addControl(k)
+        f = ttk.Frame(self.editor.editFrame)
+        f.pack(side=tk.BOTTOM)
+        btn = ttk.Button(f, text='Apply', command=lambda *args: self.apply())
+        btn.grid(row=0, column=0)
+        btn = ttk.Button(f, text='Undo', command=lambda *args: self.init())
+        btn.grid(row=0, column=1)
+        if self.allow_delete:
+            btn = ttk.Button(f, text='Delete', command=lambda *args: self.delete())
+            btn.grid(row=0, column=2)
+
+    def addControl(self, fieldName):
         schema = self.get_property(fieldName)
+        fieldType = schema.get('type')
+        frame = self.controlFrame
         disabled = False
-        value = read_property(self.obj, fieldName)
-        if hasattr(value, 'name'):
-            value = value.name
-            disabled = True
-        elif value and schema['type'] == 'object':
-            value = json.dumps(value)
+        if fieldName == 'name':
+            value = self.name
+        else:
+            value = self.obj_dict.get(fieldName, self.obj.dict().get(fieldName))
+            if fieldName == 'device':
+                disabled = True
+            try:
+                if fieldType == 'object':
+                    value = '' if value is None else json.dumps(value)
+                elif fieldType == 'array':
+                    value = [] if value is None else json.dumps(value)
+            except Exception as err:
+                critical(str(err))
         var = tk.StringVar(value=value)
-        if schema['type'] == 'boolean':
+
+        if fieldType == 'boolean':
             c = ttk.Checkbutton(frame, text=fieldName, variable=var)
         else:
             l = tk.Label(frame, text=fieldName)
             l.grid(row=self.row, column=0, sticky=tk.W)
-            values = enumDict.get(fieldName, schema.get('enum'))
-            if values is not None:
-                c = ttk.Combobox(frame, values=values)
+            values = self.enumDict.get(fieldName, schema.get('enum'))
+            if values is None:
+                c = tk.Entry(frame, width=64, textvariable=var)
+            elif fieldType == 'array':
+                c = ttk.Frame(frame)
+                def array_changed(fieldName, key, var):
+                    values = set(json_loads(var.get()))
+                    if self.array[fieldName][key].get():
+                        values.add(key)
+                    else:
+                        values.discard(key)
+                    var.set(json.dumps(list(values)))
+                elements = self.array[fieldName] = {}
+                for k, v in values.items():
+                    elements[k] = tk.BooleanVar(value=k in getattr(self.obj, fieldName))
+                    btn = tk.Checkbutton(c, text = k + ': ' + v,
+                        command=lambda *args, fieldName=fieldName, key=k, var=var: array_changed(fieldName, key, var),
+                        variable=elements[k])
+                    btn.grid(sticky=tk.W)
+                    base = getattr(self.base_obj, fieldName)
+                    if base is not None and k in base:
+                        btn.configure(state='disabled')
+            else:
+                c = ttk.Combobox(frame, values=values, textvariable=var)
                 if fieldName == 'subtype':
                     def set_subtype_values():
                         t = self['type'].get_value()
                         t = partition.TYPES[t]
                         values = partition.SUBTYPES.get(t, [])
-                        critical("t = %s, %s" % (t, values))
                         c.configure(values=list(values))
                     c.configure(postcommand=set_subtype_values)
-            else:
-                c = tk.Entry(frame, width=64)
-            c.configure(textvariable=var)
         self[fieldName] = Field(var, c)
 
         if fieldName == 'name':
             # Name is read-only for inherited devices/partitions
-            objlist = getattr(self.editor.getBaseConfig(), self.dictName)
-            disabled = objlist.find_by_name(self.name) is not None
-            var.set(self.name)
+            if self.is_inherited:
+                disabled = self.is_inherited
         # Internal 'partitions' are generally not editable, but make an exception to allow
         # creation of new partitions (on an 'unused' type) or changing the partition table offset
-        if self.objectType == 'Partition':
-            if self.obj.is_internal() and not self.obj.is_unused():
-                if not (self.obj.is_internal(partition.INTERNAL_PARTITION_TABLE) and fieldName == 'address'):
-                    disabled = True
+        if self.objectType == 'Partition' and self.is_inherited and self.obj.is_internal() and not self.obj.is_unused():
+            if not (self.obj.is_internal(partition.INTERNAL_PARTITION_TABLE) and fieldName == 'address'):
+                disabled = True
         if disabled:
             c.configure(state='disabled')
         c.grid(row=self.row, column=1, sticky=tk.EW)
         self.row += 1
         return c
 
-    def apply(self, *args):
+    def apply(self):
         # Fetch base JSON for comparison
         baseConfig = self.editor.getBaseConfig()
-        base = getattr(baseConfig, self.dictName).find_by_name(self.name)
-        if base is None:
-            base = {}
-        else:
-            base = base.dict()
         json_config = copy.deepcopy(self.editor.json)
-        json_object = get_dict_value(json_config, self.dictName, {})
-        new_name = None
-        try:
-            obj = get_dict_value(json_object, self.name, {})
+        if self.objectType == 'Config':
+            base = baseConfig
+            json_dict = None
+            obj = json_config
+        else:
+            base = getattr(baseConfig, self.dictName).find_by_name(self.name)
+            json_dict = get_dict_value(json_config, self.dictName, {})
+            obj = get_dict_value(json_dict, self.name, {})
             if self.objectType == 'Partition' and self.obj.is_unused():
                 obj['device'] = self.obj.device.name
+        base = {} if base is None else base.dict()
+        new_name = None
+        try:
             for k, f in self.items():
                 if f.is_disabled():
                     continue
                 value = f.get_value()
                 schema = self.get_property(k)
-                if k == 'name':
+                fieldType = schema.get('type')
+                if k == 'name' and json_dict is not None:
                     value = value.strip()
                     if value != self.name:
                         if value in self.editor.config.map():
-                            self.editor.status.set("Name '%s' already used" % value)
-                            return
-                        old = json_object.pop(self.name)
-                        obj = json_object[value] = old
+                            raise InputError("Name '%s' already used" % value)
+                        old = json_dict.pop(self.name)
+                        obj = json_dict[value] = old
                         new_name = value
                         # If renaming a device, then all partitions must be updated
                         if self.objectType == 'Device':
                             for n, p in json_config.get('partitions', {}).items():
-                                if p['device'] == self.name:
+                                if p.get('device') == self.name:
                                     p['device'] = new_name
                 elif k == 'address' and self.objectType == 'Partition' and self.obj.is_internal(partition.INTERNAL_PARTITION_TABLE):
-                    if parse_int(value) == baseConfig.partitions.offset:
-                        if 'partition_table_offset' in json_config:
-                            del json_config['partition_table_offset']
-                    else:
-                        json_config['partition_table_offset'] = value
+                    json_config['partition_table_offset'] = value
                 elif value == '' and k != 'filename': # TODO mark 'allow empty' values in schema somehow
                     if k in obj:
                         del obj[k]
-                elif schema['type'] == 'object':
-                    obj[k] = {} if value == '' else json.loads(value)
-                elif schema['type'] == 'boolean':
+                elif fieldType == 'object' or fieldType == 'array':
+                    obj[k] = {} if value == '' else json_loads(value)
+                elif fieldType == 'boolean':
                     obj[k] = (value != '0')
-                elif value.isdigit() and 'integer' in schema['type']:
+                elif value.isdigit() and 'integer' in fieldType:
                     obj[k] = int(value)
                 else:
                     obj[k] = value
-                if k in base and obj[k] == base[k]:
+                if k in base and obj.get(k) == base[k]:
                     del obj[k]
+
             if len(obj) == 0:
-                del json_object[self.name]
-            Config.from_json(json_config).verify(False)
-            self.editor.json = json_config
-            if new_name is not None:
-                self.name = new_name
-                self.editor.updateEditTitle()
-            self.editor.reload()
-        except InputError as err:
-            self.editor.user_error(err)
-        except AttributeError as err:
-            self.editor.user_error(err)
-        except ValueError as err:
+                del json_dict[self.name]
+                if len(json_dict) == 0:
+                    del json_config[self.dictName]
+
+
+            if self.editor.verify_config(json_config):
+                self.editor.set_json(json_config)
+                if new_name is not None:
+                    self.name = new_name
+                if self.objectType != 'Config':
+                    self.editor.selected = self.name
+                self.editor.reload()
+        except Exception as err:
             self.editor.user_error(err)
-
+            raise err
+
+    def delete(self):
+        json_dict = self.editor.json[self.dictName]
+        # If deleting a device, then delete all partitions first
+        if self.objectType == 'Device':
+            devparts = []
+            partitions = self.editor.json.get('partitions', {})
+            for n, p in partitions.items():
+                if p.get('device') == self.name:
+                    devparts.append(n)
+            for n in devparts:
+                partitions.pop(n)
+            self.editor.selected = self.editor.config.devices[0].name
+        else:
+            self.editor.selected = self.obj.device.name
+        del json_dict[self.name]
+        if len(json_dict) == 0:
+            del self.editor.json[self.dictName]
+        self.editor.reload()
 
     def get_property(self, name):
         if name == 'name':
@@ -249,7 +355,24 @@ def getHeight(self):
     def setHeight(self, h):
         self.y2 = self.y + h
 
-    def pos(self):
+    def pos(self, anchor=tk.NW):
+        if anchor == tk.N:
+            return ((self.x + self.x2) / 2, self.y)
+        if anchor == tk.NE:
+            return (self.x2, self.y)
+        if anchor == tk.E:
+            return (self.x2, (self.y + self.y2) / 2)
+        if anchor == tk.SE:
+            return (self.x2, self.y2)
+        if anchor == tk.S:
+            return ((self.x + self.x2) / 2, self.y2)
+        if anchor == tk.SW:
+            return (self.x, self.y2)
+        if anchor == tk.W:
+            return (self.x, (self.y + self.y2) / 2)
+        if anchor == tk.CENTER:
+            return ((self.x + self.x2) / 2, (self.y + self.y2) / 2)
+        # Default and NW
         return (self.x, self.y)
 
     def bounds(self):
@@ -258,141 +381,384 @@ def bounds(self):
 
 class TkMap(tk.Frame):
     def __init__(self, parent, editor):
-        super().__init__(parent, width=200, height=200)
+        super().__init__(parent)
         self.pack(fill=tk.BOTH)
         self.editor = editor
-        canvas = self.canvas = tk.Canvas(self, width=200, height=200)
+        self.device = None
+        self.selected_id = None
+        self.bytesPerPixel = 32
+        self.maxPartitionDrawSize = 0x4000
+        canvas = self.canvas = tk.Canvas(self, height=150, xscrollincrement=1)
         canvas.pack(side=tk.TOP, expand=True, fill=tk.BOTH)
+        self.autoZoom = tk.BooleanVar(value=True)
+        btn = tk.Checkbutton(self, text='Auto Zoom', variable=self.autoZoom,
+            command=lambda *args: self.update())
+        btn.pack(side=tk.LEFT)
         s = ttk.Scrollbar(self, orient=tk.HORIZONTAL, command=canvas.xview)
         s.pack(side=tk.BOTTOM, fill=tk.X)
         canvas['xscrollcommand'] = s.set
+        # Windows
+        canvas.bind('<MouseWheel>', self.onMouseWheel)
+        # Linux
+        canvas.bind('<4>', self.onMouseWheel)
+        canvas.bind('<5>', self.onMouseWheel)
 
-    def update(self, device):
-        canvas = self.canvas
-        canvas.delete('all')
-
-        labelFont = font.Font(family='fixed', size=8)
-        labelFontBold = font.Font(family='fixed', size=8, weight='bold')
+    def clear(self):
+        self.canvas.delete('all')
+        self.items = {}
 
+    def update(self):
         # Margins to separate drawn rectangular regions
         M = 5
+        M_HEADING = 16
         M_OUTER = 20
 
         # Pixels to draw map row
-        ROW_HEIGHT = 160
+        ROW_HEIGHT = 80
         # Text line spacing
         LINE_SPACE = 16
         # How far ticks extend below map
         TICK_LENGTH = 10
-        # Linear scaling for view
-        BYTES_PER_PIXEL = 32
-        def xs(x):
-            return round(x / BYTES_PER_PIXEL)
 
-        # Drawing the map linearly would make navigation very difficult, too spread-out
-        # Instead, fix a limit for the drawn size of each partition (in bytes)
+        self.clear()
+
+        if self.device is None:
+            return
+
+        device = self.device
+        canvas = self.canvas
+        partitions = list(filter(lambda p: p.device == self.device, self.editor.config.map()))
+
+        # Minimum width (in pixels) to draw a partition
+        minPartitionWidth = M
+
+        if self.autoZoom.get():
+            self.bind('<Configure>', lambda x: self.update())
+            maxPartitionDrawSize = 0xffffffffffffffff
+            # Calculate draw width
+            w = self.winfo_width() - (M_OUTER + M) * 2 - M * len(partitions)
+            bytesPerPixel = self.device.size // w
+            minSize = minPartitionWidth * bytesPerPixel
+            # Now re-check to ensure all partitions have a sensible minimum drawn size
+            def is_small(p):
+                return p.size < minSize
+            extra = sum(minSize - p.size for p in filter(is_small, partitions))
+            bytesPerPixel = (self.device.size + extra) // w
+        else:
+            self.unbind('<Configure>')
+            bytesPerPixel = self.bytesPerPixel
+            maxPartitionDrawSize = self.maxPartitionDrawSize
+
+        # Partitions smaller than this will be expanded
+        minPartitionDrawSize = minPartitionWidth * bytesPerPixel
+
+        labelFont = font.Font(family='fixed', size=8)
+        labelFontBold = font.Font(family='fixed', size=8, weight='bold')
+        headingFont = font.Font(family='courier', size=10, weight='bold')
+
+        # Draw device title
+        s = "[%s]" % device.name
+        if device.size != 0:
+            s += ': %s' % size_frac_str(device.size)
+        if device.type != 0:
+            s += ' (%s)' % device.type_str()
+        canvas.create_text(self.winfo_width() / 2, 0, anchor=tk.N, text=s, font=headingFont, fill='blue')
+
+        # When auto-zoom is disabled, drawing the map linearly is unhelpful,
+        # it's too spread-out and navigation is difficult.
+        # So, fix a limit for the drawn size of each partition (in bytes)
         # Marker ticks will be drawn according to this scale
-        MAX_DRAWSIZE = 16 * 1024
         drawsize = 0      # Equivalent size (in bytes) for the partition
         x_device_end = 0  # Determines final x co-ordinate for end of device memory
 
+        MIN_TICK_SPACING = 100
         def draw_tick(x, addr):
-            canvas.create_line(x, r.y, x, r.y2 + 10, fill='black', width=3)
-            canvas.create_text(x, r.y + ROW_HEIGHT + TICK_LENGTH,
+            canvas.create_line(x, r.y2 + M, x, r.y2 + M + TICK_LENGTH, fill='black', width=3)
+            canvas.create_text(x, r.y + ROW_HEIGHT + M + TICK_LENGTH,
                 anchor=tk.N,
-                text=str(addr / 1024 / 1024) + 'MB',
+                text = size_frac_str(addr),
                 state='disabled',
                 font=labelFontBold)
 
         # Track current partition area
         r_prev = Rect()
-        r_prev.y = M_OUTER
+        r_prev.y = M_HEADING + M_OUTER
         r_prev.x = M_OUTER
         part_prev = None
 
-        class Used:
-            def __init__(self):
-                self.text = ''
-                self.size = 0
-                self.path = ''
-
-        for p in self.editor.config.map():
-            if p.device != device:
-                continue
-
-            used = Used()
-            if p.filename != '':
-                try:
-                    used.path = self.editor.resolve_path(p.filename)
-                    if os.path.exists(used.path):
-                        used.size = os.path.getsize(used.path)
-                        used.text = percent_used(used.size, p.size)
-                    else:
-                        used.text = '(not found)'
-                except KeyError as err:
-                    used.text = str(err) + ' undefined'
+        device_item = canvas.create_rectangle(r_prev.bounds(), fill='lightgray',  outline='black')
+        canvas.tag_bind(device_item, '<Button-1>', lambda x: self.editor.editDevice(self.device))
+        self.items[get_id(self.device)] = device_item
 
+        for p in partitions:
             # Starting x co-ordinate for this partition depends on scale of previous partition
             r = copy.copy(r_prev)
             r.setHeight(ROW_HEIGHT)
             if part_prev is not None:
-                r.x += xs(drawsize * (p.address - part_prev.address) / part_prev.size)
+                r.x += M + drawsize * (p.address - part_prev.address) / part_prev.size / bytesPerPixel
 
             # Determine actual size to draw this partition (in bytes)
-            drawsize = min(MAX_DRAWSIZE, p.size)
-            r.setWidth(xs(drawsize))
+            drawsize = min(maxPartitionDrawSize, max(minPartitionDrawSize, p.size))
+            r.setWidth(drawsize / bytesPerPixel)
             # Identify where end of device memory actually is in case partitions exceed this boundary
             if x_device_end == 0 and p.end() >= device.size - 1:
                 sz = device.size - p.address
-                x_device_end = r.x + xs(drawsize * sz / p.size)
+                x_device_end = r.x + (drawsize * sz / p.size / bytesPerPixel)
 
             # Draw tick marks
-            div = 256 * 1024
+            div = device.size // 16
             addr = p.address - (p.address % div)
+            x_next_tick = 0
             while addr <= p.end():
                 if addr >= p.address:
-                    x = r.x + xs(drawsize * (addr - p.address) / p.size)
-                    draw_tick(x, addr)
+                    x = r.x + (drawsize * (addr - p.address) / p.size / bytesPerPixel)
+                    if x >= x_next_tick:
+                        draw_tick(x, addr)
+                        x_next_tick = x + MIN_TICK_SPACING
                 addr += div
 
+            # Outer rectangle for partition
             r2 = copy.copy(r)
+            # r2.inflate(-M, -M)
+            color = 'lightgray' if p.is_unused() else 'white'
+            item = canvas.create_rectangle(r2.bounds(), fill=color, outline=color)
+            canvas.tag_bind(item, "<Button-1>", lambda event, part=p: self.editor.editPartition(part))
+            # Used region
+            used = self.editor.get_used(p)
+            if used.size != 0:
+                r3 = copy.copy(r2)
+                r3.inflate(-1, -1)
+                if used.size > p.size:
+                    color = 'lightpink'
+                else:
+                    r3.setWidth(used.size * r3.getWidth() / p.size)
+                    color = 'lightblue'
+                canvas.create_rectangle(r3.bounds(), fill=color, outline=color, state='disabled')
+            item = canvas.create_rectangle(r2.bounds(), outline='blue', state='disabled')
+            self.items[get_id(p)] = item
+
+            # Internal text
             r2.inflate(-M, -M)
-            id = canvas.create_rectangle(r2.bounds(), fill='lightgray' if p.is_unused() else 'gray', activefill='white', outline='red')
-            canvas.tag_bind(id, "<Button-1>", lambda event, part=p: self.editor.editPartition(part))
-            r2.inflate(-M, -M)
-            canvas.create_text(r2.pos(), anchor=tk.NW, text=p.address_str(), state='disabled', font=labelFont)
+            def createText(r, anchor, text, font):
+                if font.measure(text) < r.getWidth():
+                    canvas.create_text(r.pos(tk.N if anchor == tk.CENTER else tk.NW), anchor=anchor, text=text, state='disabled', font=font)
+            createText(r2, tk.NW, p.address_str(), labelFont)
             r2.y += LINE_SPACE
-            canvas.create_text(r2.pos(), anchor=tk.NW, text=p.name, state='disabled', font=labelFontBold)
             r2.y += LINE_SPACE
-            canvas.create_text(r2.pos(), anchor=tk.NW, text=p.size_str(), state='disabled', font=labelFontBold)
-            if not p.is_internal():
-                r2.y += LINE_SPACE
-                canvas.create_text(r2.pos(), anchor=tk.NW, text=p.type_str() + ' / ' + p.subtype_str(), state='disabled', font=labelFont)
-            r2.y += LINE_SPACE
-            if used.size != 0:
-                r2.setWidth(used.size * r2.getWidth() / p.size)
-                canvas.create_rectangle(r2.bounds(), fill='lightblue', outline='lightblue', state='disabled')
-            r2.x += M
+            createText(r2, tk.CENTER, p.name, labelFontBold)
             r2.y += LINE_SPACE
-            canvas.create_text(r2.pos(), anchor=tk.NW, text=used.text, state='disabled', font=labelFont)
-            if p.filename != '':
-                r2.y += LINE_SPACE
-                canvas.create_text(r2.pos(), anchor=tk.NW, text=p.filename, state='disabled', font=labelFont)
-                if used.path != p.filename:
-                    r2.y += LINE_SPACE
-                    canvas.create_text(r2.pos(), anchor=tk.NW, text=used.path, state='disabled', font=labelFont)
+            createText(r2, tk.CENTER, size_frac_str(p.size), labelFontBold)
 
             part_prev = p
             r_prev = r
 
-        r2 = Rect(M_OUTER, M_OUTER)
+        r2 = Rect(M_OUTER, M_HEADING + M_OUTER)
         r2.x2 = x_device_end
-        r2.y2 = r.y2
-        canvas.create_rectangle(r2.bounds(), outline='black', width=3, state='disabled')
-        if x_device_end >= r.x:
+        r2.y2 = r_prev.y2
+        r2.inflate(M, M)
+        self.canvas.coords(device_item, r2.bounds())
+        if x_device_end >= r_prev.x:
             draw_tick(x_device_end, device.size)
-        canvas.config(scrollregion=(0, 0, r.x2 + 100, 0))
+        self.scroll_width = r_prev.x2 + M_OUTER
+        canvas.config(scrollregion=(0, 0, self.scroll_width, 0))
+
+        # Highlight the selected item (if any)
+        item = self.items.get(self.selected_id)
+        if item is not None:
+            self.canvas.itemconfigure(item, width=3)
+
+    def onMouseWheel(self, event):
+        if self.autoZoom.get():
+            return
+        shift = (event.state & 0x01) != 0
+        control = (event.state & 0x04) != 0
+        if event.num == 5:
+            delta = -120
+        elif event.num == 4:
+            delta = 120
+        else:
+            delta = event.delta
+        # Adjust draw size
+        if shift and not control:
+            ds = self.maxPartitionDrawSize
+            if delta < 0:
+                ds >>= 1
+            else:
+                ds <<= 1
+            if ds >= 0x1000 and ds <= 0x100000:
+                self.maxPartitionDrawSize = ds
+                self.update()
+        if control and not shift:
+            # Zoom
+            bpp = self.bytesPerPixel
+            if delta < 0:
+                bpp <<= 1
+            else:
+                bpp >>= 1
+            if bpp >= 4 and bpp <= 0x10000:
+                self.bytesPerPixel = bpp
+                self.update()
+        if not (shift or control):
+            self.canvas.xview_scroll(delta, tk.UNITS)
+
+    def set_device(self, dev):
+        if self.device != dev:
+            self.device = dev
+            self.update()
+
+    def select(self):
+        id = self.editor.selected
+        if id == self.selected_id:
+            return
+        item = self.items.get(self.selected_id)
+        if item is not None:
+            self.canvas.itemconfigure(item, width=1)
+        item = self.items.get(id)
+        if item is None:
+            return
+        self.canvas.itemconfigure(item, width=3)
+        self.selected_id = id
+        # Ensure item is visible
+        pos = self.canvas.coords(item)
+        id_x1 = pos[0] / self.scroll_width
+        id_x2 = pos[2] / self.scroll_width
+        xview = self.canvas.xview()
+        if id_x1 > xview[0] and id_x1 < xview[1]:
+            return
+        if id_x2 > xview[0] and id_x2 < xview[1]:
+            return
+        if xview[0] >= id_x1 and xview[1] <= id_x2:
+            return
+        self.canvas.xview_moveto(id_x1)
+
+
+class TkTree(tk.Frame):
+    def __init__(self, parent, editor):
+        super().__init__(parent)
+        self.pack(fill=tk.BOTH)
+        self.editor = editor
+        s = ttk.Style()
+        s.configure('Treeview', font='TkFixedFont')
+        s.configure('Treeview.Heading', font='TkFixedFont', padding=4)
+        self.init()
+
+    def init(self):
+        self.headings = [
+            ("#0", "Partition"),
+            ("type", "Type"),
+            ("subtype", "Subtype"),
+            ("start", "Start"),
+            ("end", "End"),
+            ("size", "Size"),
+            ("used", "Used"),
+            ("unused", "Unused"),
+            ("filename", "Image Filename"),
+        ]
+
+        cols = [h[0] for h in self.headings[1:]]
+        tree = self.tree = ttk.Treeview(self, selectmode=tk.BROWSE, columns=cols)
+        tree.pack(side=tk.LEFT, expand=True, fill=tk.BOTH)
+
+        s = ttk.Scrollbar(self, orient=tk.VERTICAL, command=tree.yview)
+        s.pack(side=tk.RIGHT, fill=tk.Y)
+        tree['yscrollcommand'] = s.set
+
+        for (k, v) in self.headings:
+            tree.heading(k, text=v, anchor=tk.W)
+
+        def select(*args):
+            id = tree.focus()
+            if id == '':
+                return
+            obj = resolve_id(self.editor.config, id)
+            if isinstance(obj, partition.Entry):
+                self.editor.editPartition(obj)
+            elif isinstance(obj, storage.Device):
+                self.editor.editDevice(obj)
+        tree.bind('<<TreeviewSelect>>', select)
+
+    def clear(self):
+        for c in self.tree.get_children():
+            self.tree.delete(c)
+
+    def update(self):
+        config = self.editor.config
+        tree = self.tree
+        fnt = font.Font(font='TkFixedFont')
+
+        self.clear()
+
+        columnWidths = [0] * len(self.headings)
+        for i, (c, v) in enumerate(self.headings):
+            columnWidths[i] = fnt.measure(v)
+
+        def addItem(parent, id, values):
+            text = []
+            for i, (c, v) in enumerate(self.headings):
+                v = values.get(c, '')
+                if i != 0:
+                    text.append(v)
+                columnWidths[i] = max(columnWidths[i], fnt.measure(v))
+            tree.insert(parent, 'end', id, open=True, text=values['#0'], values=text)
 
+        # Devices are our root nodes
+        map = config.map()
+        for dev in config.devices:
+            def is_used(p):
+                return p.device == dev and not p.is_unused()
+            used = sum(p.size for p in filter(is_used, map))
+            values = {
+                "#0": dev.name,
+                "start": addr_format(0),
+                "end": addr_format(dev.size - 1),
+                "size": size_frac_str(dev.size),
+                "used": size_frac_str(used),
+                "unused": size_frac_str(dev.size - used),
+                "type": dev.type_str()
+            }
+            addItem('', get_id(dev), values)
+
+        # Partitions are children
+        for p in config.map():
+            used = self.editor.get_used(p)
+            values = {
+                "#0": p.name,
+                "start": p.address_str(),
+                "end": p.end_str(),
+                "size": size_frac_str(p.size),
+                "used": used.text,
+                "type": p.type_str(),
+                "subtype": p.subtype_str(),
+                "filename": p.filename
+            }
+            if used.path != '':
+                values['unused'] = size_frac_str(p.size - used.size)
+            addItem(p.device.name, get_id(p), values)
+
+        # Auto-size columns
+        columnWidths[0] += 32 # Allow for indented child items
+        for i, w in enumerate(columnWidths):
+            w += 16
+            tree.column(self.headings[i][0], stretch=False, width=w, minwidth=w)
+
+        self.select()
+
+
+    def select(self):
+        id = self.editor.selected
+        tree = self.tree
+        if tree.exists(id) and tree.focus() != id:
+            tree.focus(id)
+            tree.selection_set(id)
+
+
+class Schema(dict):
+    def __init__(self, filename):
+        with open(filename) as f:
+            self.schema = json.load(f, object_pairs_hook=OrderedDict)
+
+    def __getitem__(self, name):
+        return self.schema['definitions'][name]
 
 
 class Editor:
@@ -400,27 +766,25 @@ def __init__(self, root):
         root.title(app_name)
         self.main = root
         self.edit = None
+        self.selected = ''
         self.config_vars = load_config_vars('config.mk')
         self.config_vars.update(load_config_vars('debug.mk'))
         self.initialise()
 
     def initialise(self):
         self.main.option_add('*tearOff', False)
-        s = ttk.Style()
-        s.configure('Treeview', font='TkFixedFont')
-        s.configure('Treeview.Heading', font='TkFixedFont')
 
-        with open(os.environ['HWCONFIG_SCHEMA']) as f:
-            self.schema = json.load(f)
+        self.schema = Schema(os.environ['HWCONFIG_SCHEMA'])
 
         hwFilter = [('Hardware Profiles', '*' + HW_EXT)]
 
         # Menus
-        def fileNew(*args):
+        def fileNew():
             self.reset()
             self.reload()
+            self.editDevice(self.config.devices[0])
 
-        def fileOpen(*args):
+        def fileOpen():
             filename = filedialog.askopenfilename(
                 title='Select profile ' + HW_EXT + ' file',
                 filetypes=hwFilter,
@@ -428,7 +792,7 @@ def fileOpen(*args):
             if filename != '' and checkProfilePath(filename):
                 self.loadConfig(filename)
 
-        def fileSave(*args):
+        def fileSave():
             filename = self.json['name']
             filename = filedialog.asksaveasfilename(
                 title='Save profile to file',
@@ -442,147 +806,77 @@ def fileSave(*args):
                 with open(filename, "w") as f:
                     json.dump(self.json, f, indent=4)
 
-        def editAddDevice(*args):
-            dev = storage.Device('New device')
-            self.editDevice(dev)
-
-        menubar = tk.Menu(self.main)
-        self.main['menu'] = menubar
-        menu_file = tk.Menu(menubar)
-        menubar.add_cascade(menu=menu_file, label='File')
-        menu_file.add_command(label='New...', command=fileNew)
-        menu_file.add_command(label='Open...', command=fileOpen)
-        menu_file.add_command(label='Save...', command=fileSave)
-        menu_edit = tk.Menu(menubar)
-        menubar.add_cascade(menu=menu_edit, label='Edit')
-        menu_edit.add_command(label='Add Device', command=editAddDevice)
-
         # Toolbar
         toolbar = ttk.Frame(self.main)
         toolbar.pack(side=tk.TOP, fill=tk.X)
-        btnNew = ttk.Button(toolbar, text="New", command=fileNew)
-        btnNew.grid(row=0, column=1)
-        btnOpen = ttk.Button(toolbar, text="Open...", command=fileOpen)
-        btnOpen.grid(row=0, column=2)
-        btnSave = ttk.Button(toolbar, text="Save...", command=fileSave)
-        btnSave.grid(row=0, column=3)
-
-        # Group controls into two areas (top and bottom) which are sizeable by the user
+        btn = ttk.Button(toolbar, text="New", command=fileNew)
+        btn.grid(row=0, column=1)
+        btn = ttk.Button(toolbar, text="Open...", command=fileOpen)
+        btn.grid(row=0, column=2)
+        btn = ttk.Button(toolbar, text="Save...", command=fileSave)
+        btn.grid(row=0, column=3)
+        sep = ttk.Separator(toolbar, orient=tk.VERTICAL)
+        sep.grid(row=0, column=4, sticky=tk.NS)
+        btn = ttk.Button(toolbar, text='Edit Config', command=self.editConfig)
+        btn.grid(row=0, column=5)
+        btn = ttk.Button(toolbar, text='Add Device', command=self.addDevice)
+        btn.grid(row=0, column=6)
+
+
+        # Group main controls into areas which can be re-sized by the user
         pwin = ttk.PanedWindow(self.main, orient=tk.VERTICAL)
         pwin.pack(side=tk.TOP, expand=True, fill=tk.BOTH)
 
-        # Place alternate views in a tabbed area
-        self.notebook = ttk.Notebook(pwin)
-        pwin.add(self.notebook)
+        self.map = TkMap(pwin, self)
+        pwin.add(self.map)
+        self.tree = TkTree(pwin, self)
+        pwin.add(self.tree)
 
-        # Treeview for devices and partitions
 
-        f = ttk.Frame(self.notebook)
-        self.notebook.add(f, text="Tree")
-        tree = self.tree = ttk.Treeview(f, columns=['start', 'end', 'size', 'used', 'type', 'subtype', 'filename'])
-        tree.pack(side=tk.LEFT, expand=True, fill=tk.BOTH)
+        # Lower pane
+        lower = ttk.Frame(pwin)
+        pwin.add(lower)
 
-        s = ttk.Scrollbar(f, orient=tk.VERTICAL, command=tree.yview)
+        # Edit frame
+        frame = ttk.LabelFrame(lower, text='Edit')
+        frame.pack(anchor=tk.NW, side=tk.LEFT, fill=tk.BOTH)
+        canvas = self.editCanvas = tk.Canvas(frame, highlightthickness=0)
+        canvas.pack(side=tk.LEFT, expand=True, fill=tk.BOTH)
+        self.editFrame = ttk.Frame(canvas)
+        canvas.create_window(0, 0, window=self.editFrame, anchor=tk.NW)
+        s = self.editScroll = ttk.Scrollbar(frame, orient=tk.VERTICAL, command=canvas.yview)
         s.pack(side=tk.RIGHT, fill=tk.Y)
-        tree['yscrollcommand'] = s.set
-
-        tree.heading('start', text='Start', anchor=tk.W)
-        tree.heading('end', text='End', anchor=tk.W)
-        tree.heading('size', text='Size', anchor=tk.W)
-        tree.heading('used', text='Used', anchor=tk.W)
-        tree.heading('type', text='Type', anchor=tk.W)
-        tree.heading('subtype', text='Sub-Type', anchor=tk.W)
-        tree.heading('filename', text='Image filename', anchor=tk.W)
-
-        def select(*args):
-            id = tree.focus()
-            if id == '':
-                return
-            item = tree.item(id)
-            if 'device' in item['tags']:
-                dev = self.device_from_id(id)
-                self.editDevice(dev)
-            else:
-                part = self.config.map().find_by_name(id)
-                if part is None:
-                    dev = self.device_from_id(tree.parent(id))
-                    addr = item['values'][0]
-                    part = self.config.map().find_by_address(dev, addr)
-                self.editPartition(part)
-        tree.bind('<<TreeviewSelect>>', select)
-
-        # map of spiFlash device
-        self.map = TkMap(self.notebook, self)
-        self.notebook.add(self.map, text = 'map')
-
-        # Lower frame
-        frame = ttk.Frame(pwin)
-        frame.pack(expand=True, fill=tk.BOTH)
-        pwin.add(frame)
-
-        frame.rowconfigure(0, weight=1)
-        frame.columnconfigure(0, weight=1)
-
-        # Base configurations
-        f = ttk.LabelFrame(frame, text = 'Base Configuration')
-        f.grid(row=0, column=0, sticky=tk.SW)
-
-        def base_config_changed(*args):
-            self.json['base_config'] = self.base_config.get()
-            self.reload()
-
-        self.base_config = tk.StringVar(value = 'standard')
-        config_list = ttk.Combobox(f,
-            textvariable = self.base_config,
-            values = list(get_config_list().keys()))
-        config_list.bind('<<ComboboxSelected>>', base_config_changed)
-        config_list.grid()
+        canvas['yscrollcommand'] = s.set
+        def configure(event):
+            canvas.config(scrollregion=(0, 0, 0, self.editFrame.winfo_height()))
+            canvas.config(width = self.editFrame.winfo_width())
+        self.editFrame.bind('<Configure>', configure)
 
-        # Option checkboxes
-
-        f = ttk.LabelFrame(frame, text = 'Options')
-        f.grid(row=1, column=0, sticky=tk.NW)
-
-        def options_changed(*args):
-            self.json['options'] = []
-            for k, v in self.options.items():
-                if v.get():
-                    self.json['options'].append(k)
-            self.reload()
-
-        self.options = {}
-        for k, v in load_option_library().items():
-            self.options[k] = tk.BooleanVar()
-            btn = tk.Checkbutton(f, text = k + ': ' + v['description'],
-                command=options_changed, variable=self.options[k])
-            btn.grid(sticky=tk.W)
-
-        # Edit frame
-        self.editFrame = ttk.LabelFrame(frame, text='Edit Object')
-        self.editFrame.grid(row=0, column=1, rowspan=2, sticky=tk.SW)
 
         # JSON editor
-        jsonFrame = ttk.LabelFrame(frame, text='JSON Configuration')
-        jsonFrame.grid(row=0, column=2, rowspan=2, sticky=tk.NS)
+        frame = self.jsonFrame = ttk.LabelFrame(lower, text='JSON')
+        frame.pack(anchor=tk.NW, side=tk.LEFT, expand=True, fill=tk.BOTH)
         def apply(*args):
             try:
-                json_config = json.loads(self.jsonEditor.get('1.0', 'end'))
-                Config.from_json(json_config).verify(False)
-                self.json = json_config
-                self.updateWindowTitle()
-                self.reload()
-            except InputError as err:
+                json_config = json_loads(self.jsonEditor.get('1.0', 'end'))
+                if self.verify_config(json_config):
+                    self.set_json(json_config)
+                    self.updateWindowTitle()
+                    self.reload()
+            except Exception as err:
                 self.user_error(err)
-            except AttributeError as err:
-                self.user_error(err)
-            except ValueError as err:
-                self.user_error(err)
-        btn = ttk.Button(jsonFrame, text="Apply", command=apply)
-        btn.pack(anchor=tk.S, side=tk.BOTTOM)
-        self.jsonEditor = tk.Text(jsonFrame, height=14)
-        self.jsonEditor.pack(anchor=tk.N, side=tk.LEFT, fill=tk.BOTH)
-        s = ttk.Scrollbar(jsonFrame, orient=tk.VERTICAL, command=self.jsonEditor.yview)
-        s.pack(anchor=tk.N, side=tk.RIGHT, fill=tk.Y)
+        def undo(*args):
+            self.jsonEditor.replace('1.0', 'end', to_json(self.json))
+        f = ttk.Frame(frame)
+        f.pack(anchor=tk.S, side=tk.BOTTOM)
+        btn = ttk.Button(f, text="Apply", command=apply)
+        btn.grid(row=0, column=0)
+        btn = ttk.Button(f, text="Undo", command=undo)
+        btn.grid(row=0, column=1)
+        self.jsonEditor = tk.Text(frame, height=14)
+        self.jsonEditor.pack(anchor=tk.N, side=tk.LEFT, expand=True, fill=tk.BOTH)
+        s = ttk.Scrollbar(frame, orient=tk.VERTICAL, command=self.jsonEditor.yview)
+        s.pack(anchor=tk.NE, side=tk.RIGHT, fill=tk.Y)
         self.jsonEditor['yscrollcommand'] = s.set
 
         # Status box
@@ -597,6 +891,11 @@ def user_error(self, err):
         messagebox.showerror(type(err).__name__, err)
 
     def getBaseConfig(self):
+        """Load the base configuration
+        """
+        return Config.from_json(self.json_base_config)
+ 
+    def getOptionBaseConfig(self):
         """Load the base configuration with currently selected options applied
         """
         return Config.from_json(self.json_base_config, self.json.get('options', []))
@@ -605,24 +904,22 @@ def loadConfig(self, filename):
         self.reset()
         # If this is a core profile, don't edit it but create a new profile based on it
         if filename.startswith(os.environ['SMING_HOME']):
-            self.json = {}
-            self.json['name'] = 'New profile'
             config_name = os.path.splitext(os.path.basename(filename))[0]
             self.json['base_config'] = config_name
         else:
             with open(filename) as f:
-                self.json = json.loads(jsmin(f.read()))
-
-        with open(find_config(self.json['base_config'])) as f:
-            self.json_base_config = json.loads(jsmin(f.read()))
+                json_config = json_loads(f.read())
 
         options = get_dict_value(self.json, 'options', [])
         for opt in os.environ.get('HWCONFIG_OPTS', '').replace(' ', '').split():
             if not opt in options:
                 options.append(opt)
 
+        self.set_json(json_config)
+
         self.reload()
         self.updateWindowTitle()
+        self.editDevice(self.config.devices[0])
 
     def updateWindowTitle(self):
         name = self.json.get('name', None)
@@ -632,22 +929,27 @@ def updateWindowTitle(self):
             name = '"' + name + '"'
         self.main.title(self.config.arch + ' ' + name + ' - ' + app_name)
 
-    def clear(self):
-        # TODO: Prompt to save changes
-
-        # Clear the tree, etc.
-        for c in self.tree.get_children():
-            self.tree.delete(c)
-        self.status.set('')
+    def verify_config(self, json_config):
+        try:
+            Config.from_json(json_config).verify(False)
+            return True
+        except Exception as err:
+            self.user_error(err)
+            return False
+
+    def set_json(self, json_config):
+        # Keep output order consistent
+        self.json = {}
+        for k in self.schema['Config']['properties'].keys():
+            if k in json_config:
+                self.json[k] = json_config[k]
 
     def reset(self):
-        self.clear()
-        self.resetEditor()
+        self.tree.clear()
+        self.map.clear()
+        self.status.set('')
         self.json = {"name": "New Profile"}
         self.json['base_config'] = 'standard'
-        self.base_config.set('standard')
-        for k, v in self.options.items():
-            v.set(False)
         self.reload()
         self.updateWindowTitle()
 
@@ -661,96 +963,91 @@ def resolve_path(self, path):
                 return new_path
             tmp = new_path
 
+    class Used:
+        def __init__(self):
+            self.text = ''
+            self.size = 0
+            self.path = ''
+
+    def get_used(self, part):
+        used = self.Used()
+        if part.filename != '':
+            try:
+                used.path = self.resolve_path(part.filename)
+                if os.path.exists(used.path):
+                    used.size = os.path.getsize(used.path)
+                    used.text = size_frac_str(used.size)
+                else:
+                    used.text = '(not found)'
+            except KeyError as err:
+                used.text = str(err) + ' undefined'
+        return used
+
     def reload(self):
-        self.clear()
+        with open(find_config(self.json['base_config'])) as f:
+            self.json_base_config = json_loads(f.read())
+
         self.jsonEditor.replace('1.0', 'end', to_json(self.json))
         try:
-            config = self.config = Config.from_json(self.json)
-        except InputError as err:
-            self.status.set(str(err))
+            config = Config.from_json(self.json)
+        except Exception as err:
+            self.status.set(err)
             return
 
-        self.map.update(config.devices[0])
+        self.status.set('')
+        self.config = config
 
-        # Devices are our root nodes
-        for dev in config.devices:
-            used = 0
-            for p in config.map():
-                if p.device == dev and not p.is_unused():
-                    used += p.size
-            self.tree.insert('', 'end', dev.name, text=dev.name, open=True,
-                tags = ['device'],
-                values=[addr_format(0), addr_format(dev.size - 1), dev.size_str(), percent_used(used, dev.size), dev.type_str()])
+        self.map.update()
+        self.tree.update()
 
-        # Partitions are children
-        for p in config.map():
-            if p.is_unused():
-                id = p.device.name + '/' + p.address_str()
-            else:
-                id = p.name
-
-            def get_used():
-                if p.filename == '':
-                    return ''
-                try:
-                    path = self.resolve_path(p.filename)
-                except KeyError as err:
-                    return str(err) + ' undefined'
-                if not os.path.exists(path):
-                    return '(not found)'
-                return percent_used(os.path.getsize(path), p.size)
-
-            self.tree.insert(p.device.name, 'end', id, text=p.name,
-                values=[p.address_str(), p.end_str(), p.size_str(), get_used(), p.type_str(), p.subtype_str(), p.filename])
-
-        # Base configuration
-        self.base_config.set(config.base_config)
-
-        # Options
-        for k, v in self.options.items():
-            v.set(k in config.options)
-
-        if self.edit is not None:
-            id = self.edit.name
-            if self.tree.exists(id):
-                self.tree.focus(id)
-                self.tree.selection_set(id)
-
-
-    def device_from_id(self, id):
-        item = self.tree.item(id)
-        if 'device' in item['tags']:
-            return self.config.devices.find_by_name(item['text'])
+    def select(self, obj):
+        self.selected = get_id(obj)
+        if isinstance(obj, partition.Entry):
+            self.map.set_device(obj.device)
         else:
-            return None
+            self.map.set_device(obj)
+        self.map.select()
+        self.tree.select()
 
-    def updateEditTitle(self):
-        self.editFrame.configure(text="Edit %s '%s'" % (self.edit.objectType, self.edit.name))
+    def is_editing(self, obj):
+        return getattr(self.edit, 'obj', None) == obj
 
-    def resetEditor(self):
-        self.edit = None
-        f = self.editFrame
-        for c in f.winfo_children():
-            c.destroy()
-        self.editFrame.configure(text='')
-        return f
+    def editConfig(self):
+        if self.is_editing(self.config):
+            return
+        enumDict = {}
+        enumDict['base_config'] = list(get_config_list().keys())
+        optionlib = load_option_library()
+        options = {}
+        for k, v in optionlib.items():
+            options[k] = v['description']
+        enumDict['options'] = options
+        self.edit = EditState(self, 'Config', None, self.config, enumDict)
+
+    def addDevice(self):
+        dev = storage.Device('New device')
+        self.editDevice(dev)
 
     def editDevice(self, dev):
+        if isinstance(dev, str):
+            dev = self.config.devices.find_by_name(dev)
+        if self.is_editing(dev):
+            return
+        self.select(dev)
         enumDict = {}
         enumDict['type'] = list((storage.TYPES).keys())
-        self.resetEditor()
         self.edit = EditState(self, 'Device', 'devices', dev, enumDict)
-        self.updateEditTitle()
-
 
     def editPartition(self, part):
+        if isinstance(part, str):
+            part = self.config.partitions.find_by_name(part)
+        if self.is_editing(part):
+            return
+        self.select(part)
         enumDict = {}
-        enumDict['device'] = [dev.name for dev in self.config.devices]
         enumDict['type'] = list((partition.TYPES).keys() - ['storage', 'internal'])
         enumDict['subtype'] = []
-        self.resetEditor()
         self.edit = EditState(self, 'Partition', 'partitions', part, enumDict)
-        self.updateEditTitle()
 
 
 def main():
diff --git a/Sming/Components/Storage/Tools/hwconfig/partition.py b/Sming/Components/Storage/Tools/hwconfig/partition.py
index d04f143801..7551823109 100644
--- a/Sming/Components/Storage/Tools/hwconfig/partition.py
+++ b/Sming/Components/Storage/Tools/hwconfig/partition.py
@@ -135,8 +135,6 @@ def parse_dict(self, data, devices):
         for name, entry in data.items():
             if name in partnames:
                 raise InputError("Duplicate partition '%s'" % name)
-            if contains_whitespace(name):
-                raise InputError("Partition names may not contain spaces '%s'" % name)
             partnames += name
             part = self.find_by_name(name)
             if part is None:
@@ -380,8 +378,6 @@ def parse_dict(self, data, devices):
             v = data.pop('subtype', None)
             if not v is None:
                 self.subtype = parse_subtype(self.type, v)
-            if self.type is None or self.subtype is None:
-                raise InputError("type/subtype missing")
 
             for k, v in data.items():
                 if k == 'device':
@@ -399,9 +395,6 @@ def parse_dict(self, data, devices):
                         self.build.update(v)
                 else:
                     setattr(self, k, v)
-
-            if self.address is None or self.size is None:
-                raise InputError("address/size missing")
         except InputError as e:
             raise InputError("Error in partition entry '%s': %s" % (self.name, e))
 
@@ -505,10 +498,10 @@ def verify(self, arch, secure):
         align = self.alignment(arch)
         if self.address % align:
             raise ValidationError(self, "Offset 0x%x is not aligned to 0x%x" % (self.address, align))
-        if self.size % align and secure:
-            raise ValidationError(self, "Size 0x%x is not aligned to 0x%x" % (self.size, align))
         if self.size is None or self.size == 0:
             raise ValidationError(self, "Size field is not set")
+        if self.size % align and secure:
+            raise ValidationError(self, "Size 0x%x is not aligned to 0x%x" % (self.size, align))
         if self.address >= self.device.size:
             raise ValidationError(self, "Offset 0x%x exceeds device size 0x%x" % (self.address, self.device.size))
         if self.end() >= self.device.size:
@@ -518,9 +511,8 @@ def verify(self, arch, secure):
             raise ValidationError(self, "Name not specified")
         if len(self.name) > PARTITION_NAME_SIZE:
             raise ValidationError(self, "Name too long, max. %u chars" % PARTITION_NAME_SIZE)
-        for c in self.name:
-            if c.isspace():
-                raise ValidationError(self, "Name may not contain whitespace")
+        if contains_whitespace(self.name):
+            raise ValidationError(self, "Name may not contain whitespace")
         if self.name in TYPES and TYPES.get(self.name, "") != self.type:
             raise ValidationError(self, "Name is a partition type, but does not match this partition's type (%s)" % (self.type))
         all_subtype_names = []
@@ -587,8 +579,9 @@ def add_unused(table, device, address, last_end):
             add(partitions, device, 'Partition Table', table.offset, PARTITION_TABLE_SIZE, INTERNAL_PARTITION_TABLE)
 
         # Devices with no defined partitions
+        pdevs = set(p.device for p in partitions)
         for dev in devices:
-            if partitions.find_by_address(dev, 0) is None:
+            if not dev in pdevs:
                 add_unused(partitions, dev, dev.size, -1)
 
         partitions.sort()
@@ -599,6 +592,7 @@ def add_unused(table, device, address, last_end):
                 if p.device != last.device:
                     add_unused(self, device, last.device.size, last.end())
                     device = p.device
+                    add_unused(self, device, p.address, -1)
                 elif p.address > last.end() + 1:
                     add_unused(self, device, p.address, last.end())
             self.append(p)
diff --git a/Sming/Components/Storage/schema.json b/Sming/Components/Storage/schema.json
index ca72edc2cd..5e05c9ff10 100644
--- a/Sming/Components/Storage/schema.json
+++ b/Sming/Components/Storage/schema.json
@@ -11,6 +11,14 @@
 				"name": {
 					"type": "string"
 				},
+				"comment": {
+					"type": "string"
+				},
+				"arch": {
+					"type": "string",
+					"title": "Target architecture",
+					"description": "Defined *only* in the base 'standard' spec"
+				},
 				"base_config": {
 					"type": "string",
 					"title": "Base configuration",
@@ -21,22 +29,19 @@
 					"title": "List of option fragments",
 					"description": "Import additional settings from option libraries"
 				},
-				"comment": {
-					"type": "string"
-				},
-				"arch": {
-					"type": "string",
-					"title": "Target architecture",
-					"description": "Defined *only* in the base 'standard' spec"
-				},
 				"partition_table_offset": {
-					"type": "string",
+					"type": [
+						"string",
+						"integer"
+					],
 					"description": "Location of partition table in spiFlash. Simple address or python expression to be evaluated."
 				},
 				"devices": {
+					"type": "object",
 					"$ref": "#/definitions/Devices"
 				},
 				"partitions": {
+					"type": "object",
 					"$ref": "#/definitions/Partitions"
 				}
 			},

From eddaa0d76f8331a0f6ffb397d95248cf1fe56939 Mon Sep 17 00:00:00 2001
From: slaff <slaff2@gmail.com>
Date: Wed, 31 Mar 2021 10:57:51 +0200
Subject: [PATCH 91/91] Preparation for release 4.3.0. (#2295)

---
 README.md                 | 2 +-
 Sming/Core/SmingVersion.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2676f91342..102408e219 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,7 @@ Supported SDK: ESP-IDF v4.1
 
 ### Stable
 
-- [Sming V4.2.0](https://github.com/SmingHub/Sming/releases/tag/4.2.0) - great new features, performance and stability improvements.
+- [Sming V4.3.0](https://github.com/SmingHub/Sming/releases/tag/4.3.0) - great new features, performance and stability improvements.
 
 
 ### Long Term Support (LTS)
diff --git a/Sming/Core/SmingVersion.h b/Sming/Core/SmingVersion.h
index d62d01e2da..363d7ebdb1 100644
--- a/Sming/Core/SmingVersion.h
+++ b/Sming/Core/SmingVersion.h
@@ -6,7 +6,7 @@
  */
 
 #define SMING_MAJOR_VERSION 4
-#define SMING_MINOR_VERSION 2
+#define SMING_MINOR_VERSION 3
 #define SMING_PATCH_VERSION 0
 #define SMING_PRE_RELEASE ""