ST77xx memory corruption + mp3 sync using library + mutex for poll in stream() - release

extend poll() protection - release
protect stream poll against race condition - release
2025-12-07 20:17:04 +03:00 · 2020-08-29 22:07:07 -07:00 · 2020-08-28 19:40:57 -07:00 · 2020-08-28 17:13:05 -07:00 · 2020-08-27 16:43:49 -07:00 · 2020-08-27 16:40:11 -07:00
196 changed files with 16201 additions and 7976 deletions
--- a/.cproject
+++ b/.cproject
@@ -3,383 +3,13 @@
    <storageModule moduleId="org.eclipse.cdt.core.settings">
-        <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348">
+        <cconfiguration id="org.eclipse.cdt.core.default.config.959280881">
-            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348" moduleId="org.eclipse.cdt.core.settings" name="Default">
+            <storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="org.eclipse.cdt.core.default.config.959280881" moduleId="org.eclipse.cdt.core.settings" name="Configuration">
                <macros>
                    <stringMacro name="RECOVERY_APPLICATION" type="VALUE_TEXT" value="0"/>
                </macros>
                <externalSettings/>
-                <extensions>
+                <extensions/>
                    <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
                    <extension id="org.eclipse.cdt.core.GASErrorParser" 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.GLDErrorParser" 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"/>
                </extensions>
            </storageModule>
            <storageModule moduleId="cdtBuildSystem" version="4.0.0">
                <configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348" name="Default" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.emptycfg">
                    <folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.949515869" name="/" resourcePath="">
                        <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1860816932" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
                            <option id="cdt.managedbuild.option.gnu.cross.prefix.211558150" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
                            <option id="cdt.managedbuild.option.gnu.cross.path.660444977" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
                            <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1109615480" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
                            <builder arguments="-j8 EXTRA_CPPFLAGS=&quot;-DRECOVERY_APPLICATION=0&quot;" command="make" id="cdt.managedbuild.builder.gnu.cross.1247197310" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.924305212" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="gnu.c.compiler.option.preprocessor.def.symbols.237333664" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"/>
                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.851339966" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                            </tool>
                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1689301712" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="gnu.cpp.compiler.option.preprocessor.def.1320841573" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"/>
                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1117032298" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                            </tool>
                            <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.69706729" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1919651858" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1241928244" 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.1543827445" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.assembler.1248561272" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.736707865" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                            </tool>
                        </toolChain>
                    </folderInfo>
                </configuration>
            </storageModule>
            <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
        </cconfiguration>
        <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934">
            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934" moduleId="org.eclipse.cdt.core.settings" name="recovery">
                <macros>
                    <stringMacro name="RECOVERY_APPLICATION" type="VALUE_TEXT" value="1"/>
                </macros>
                <externalSettings/>
                <extensions>
                    <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
                    <extension id="org.eclipse.cdt.core.GASErrorParser" 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.GLDErrorParser" 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"/>
                </extensions>
            </storageModule>
            <storageModule moduleId="cdtBuildSystem" version="4.0.0">
                <configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934" name="recovery" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.emptycfg">
                    <folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934." name="/" resourcePath="">
                        <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1561608239" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
                            <option id="cdt.managedbuild.option.gnu.cross.prefix.878380733" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
                            <option id="cdt.managedbuild.option.gnu.cross.path.576225618" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
                            <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1674304340" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
                            <builder arguments="-j8 EXTRA_CPPFLAGS=&quot;-DRECOVERY_APPLICATION=1&quot;" command="make" id="cdt.managedbuild.builder.gnu.cross.1616827916" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1397900624" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="gnu.c.compiler.option.preprocessor.def.symbols.1168574489" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"/>
                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.24917724" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                            </tool>
                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.40066190" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="gnu.cpp.compiler.option.preprocessor.def.1538103313" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"/>
                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.773825889" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                            </tool>
                            <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.750042642" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.791695355" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.363611836" 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.788163154" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.assembler.747849588" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.597864277" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                            </tool>
                        </toolChain>
                    </folderInfo>
                </configuration>
            </storageModule>
            <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
        </cconfiguration>
        <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291">
            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291" moduleId="org.eclipse.cdt.core.settings" name="recovery_windows">
                <macros>
                    <stringMacro name="RECOVERY_APPLICATION" type="VALUE_TEXT" value="1"/>
                </macros>
                <externalSettings/>
                <extensions>
                    <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
                    <extension id="org.eclipse.cdt.core.GASErrorParser" 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.GLDErrorParser" 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"/>
                </extensions>
            </storageModule>
            <storageModule moduleId="cdtBuildSystem" version="4.0.0">
                <configuration artifactName="${ProjName}" buildProperties="" description="Building recovery in windows" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291" name="recovery_windows" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
                    <folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291." name="/" resourcePath="">
                        <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.845245133" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
                            <option id="cdt.managedbuild.option.gnu.cross.prefix.1090509495" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
                            <option id="cdt.managedbuild.option.gnu.cross.path.447265559" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
                            <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1831977109" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
                            <builder arguments="&quot;c:/msys32/opt/esp-idf/tools/windows/eclipse_make.py&quot;  EXTRA_CPPFLAGS='-DRECOVERY_APPLICATION=${RECOVERY_APPLICATION}'" buildPath="${workspace_loc:/squeezelite-esp32}" command="python" id="cdt.managedbuild.builder.gnu.cross.1069921467" 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.1302011176" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="gnu.c.compiler.option.preprocessor.def.symbols.623798750" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"/>
                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.539301587" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                            </tool>
                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1722031516" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="gnu.cpp.compiler.option.preprocessor.def.2010227748" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"/>
                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2073997022" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                            </tool>
                            <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.746651743" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.149944553" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1372009292" 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.649046248" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.assembler.2132030687" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1779870241" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                            </tool>
                        </toolChain>
                    </folderInfo>
                </configuration>
            </storageModule>
            <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
        </cconfiguration>
        <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736">
            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736" moduleId="org.eclipse.cdt.core.settings" name="squeezelite_windows">
                <macros>
                    <stringMacro name="RECOVERY_APPLICATION" type="VALUE_TEXT" value="0"/>
                </macros>
                <externalSettings/>
                <extensions>
                    <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
                    <extension id="org.eclipse.cdt.core.GASErrorParser" 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.GLDErrorParser" 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"/>
                </extensions>
            </storageModule>
            <storageModule moduleId="cdtBuildSystem" version="4.0.0">
                <configuration artifactName="${ProjName}" buildProperties="" description="building squeezelite app in windows" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736" name="squeezelite_windows" optionalBuildProperties="" parent="org.eclipse.cdt.build.core.emptycfg">
                    <folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736." name="/" resourcePath="">
                        <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1034176750" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
                            <option id="cdt.managedbuild.option.gnu.cross.prefix.1038632104" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
                            <option id="cdt.managedbuild.option.gnu.cross.path.1589817380" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
                            <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.784380822" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
                            <builder arguments="&quot;C:/msys32/opt/esp-idf/tools/windows/eclipse_make.py&quot; -j8 EXTRA_CPPFLAGS=&quot;-DRECOVERY_APPLICATION=0&quot;" command="python" id="cdt.managedbuild.builder.gnu.cross.1150681639" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.824219909" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="gnu.c.compiler.option.preprocessor.def.symbols.217201640" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols"/>
                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.644208200" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                            </tool>
                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1907231332" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
                                <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="gnu.cpp.compiler.option.preprocessor.def.959275134" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"/>
                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.604467026" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                            </tool>
                            <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1073903870" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.898376794" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1560070168" 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.1462690215" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
                            <tool id="cdt.managedbuild.tool.gnu.cross.assembler.40469999" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.798539361" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                            </tool>
                        </toolChain>
                    </folderInfo>
                </configuration>
            </storageModule>
@@ -389,190 +19,14 @@
    </storageModule>
-    <storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
+    <storageModule moduleId="org.eclipse.cdt.core.pathentry">
    <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-        <project id="squeezelite-esp32-merge.null.1711307563" name="squeezelite-esp32-merge"/>
+        <pathentry excluding="**/CMakeFiles/**" kind="out" path="build"/>
    </storageModule>
    <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-    <storageModule moduleId="refreshScope" versionNumber="2">
+    <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
        <configuration configurationName="squeezelite_windows">
            <resource resourceType="PROJECT" workspacePath="/squeezelite-esp32-merge"/>
        </configuration>
        <configuration configurationName="recovery_windows">
            <resource resourceType="PROJECT" workspacePath="/squeezelite-esp32"/>
        </configuration>
        <configuration configurationName="recovery">
            <resource resourceType="PROJECT" workspacePath="/squeezelite-esp32"/>
        </configuration>
        <configuration configurationName="Default">
            <resource resourceType="PROJECT" workspacePath="/squeezelite-esp32"/>
        </configuration>
    </storageModule>
    <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
    <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
        <buildTargets>
            <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                <buildCommand>make</buildCommand>
                <buildArguments>-j8 EXTRA_CPPFLAGS="-DRECOVERY_APPLICATION=1"</buildArguments>
                <buildTarget>all</buildTarget>
                <stopOnError>true</stopOnError>
                <useDefaultCommand>true</useDefaultCommand>
                <runAllBuilders>true</runAllBuilders>
            </target>
            <target name="app" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
                <buildCommand>make</buildCommand>
                <buildArguments>-j8 EXTRA_CPPFLAGS="-DRECOVERY_APPLICATION=1"</buildArguments>
                <buildTarget>app</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>-j8 EXTRA_CPPFLAGS="-DRECOVERY_APPLICATION=1"</buildArguments>
                <buildTarget>clean</buildTarget>
                <stopOnError>true</stopOnError>
                <useDefaultCommand>true</useDefaultCommand>
                <runAllBuilders>true</runAllBuilders>
            </target>
        </buildTargets>
    </storageModule>
    <storageModule moduleId="scannerConfiguration">
        <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.58932738;cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.1067614858;cdt.managedbuild.tool.gnu.c.compiler.cygwin.base.1865841553;cdt.managedbuild.tool.gnu.c.compiler.input.cygwin.1383814557">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934;cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.40066190;cdt.managedbuild.tool.gnu.cpp.compiler.input.773825889">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736;cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1907231332;cdt.managedbuild.tool.gnu.cpp.compiler.input.604467026">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291;cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1722031516;cdt.managedbuild.tool.gnu.cpp.compiler.input.2073997022">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291;cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.;cdt.managedbuild.tool.gnu.cross.c.compiler.1302011176;cdt.managedbuild.tool.gnu.c.compiler.input.539301587">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.58932738;cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.1067614858;cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base.410547198;cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin.1499974240">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736;cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736.;cdt.managedbuild.tool.gnu.cross.c.compiler.824219909;cdt.managedbuild.tool.gnu.c.compiler.input.644208200">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707;cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707.;cdt.managedbuild.tool.gnu.c.compiler.cygwin.base.211315976;cdt.managedbuild.tool.gnu.c.compiler.input.cygwin.857914729">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1943329896;cdt.managedbuild.toolchain.gnu.cross.base.1943329896.30011915;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1749746745;cdt.managedbuild.tool.gnu.cpp.compiler.input.1914005798">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1476804786;cdt.managedbuild.toolchain.gnu.cross.base.1476804786.1800826258;cdt.managedbuild.tool.gnu.cross.cpp.compiler.254690821;cdt.managedbuild.tool.gnu.cpp.compiler.input.1365876654">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1943329896;cdt.managedbuild.toolchain.gnu.cross.base.1943329896.30011915;cdt.managedbuild.tool.gnu.cross.c.compiler.2083405506;cdt.managedbuild.tool.gnu.c.compiler.input.404320567">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707;cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707.;cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base.145410566;cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin.1181636367">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1476804786;cdt.managedbuild.toolchain.gnu.cross.base.1476804786.1800826258;cdt.managedbuild.tool.gnu.cross.c.compiler.1502936757;cdt.managedbuild.tool.gnu.c.compiler.input.1614739014">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
        <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934;cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934.;cdt.managedbuild.tool.gnu.cross.c.compiler.1397900624;cdt.managedbuild.tool.gnu.c.compiler.input.24917724">
            <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
        </scannerConfigBuildInfo>
    </storageModule>
 </cproject>
--- a/.gitignore
+++ b/.gitignore
@@ -65,5 +65,7 @@ libs/
 /cdump.cmd
 /_*
 sdkconfig
 squeezelite-esp32-jsonblob.zip
 /flash_cmd.txt
 /writeSequeezeEsp.bat
 /writeSequeezeEsp.sh
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,6 +2,6 @@
 	path = components/telnet/libtelnet
 	url = https://github.com/seanmiddleditch/libtelnet
 	branch = develop
-[submodule "esp-dsp"]
+[submodule "components/esp-dsp"]
-	path = esp-dsp
+	path = components/esp-dsp
-	url = https://github.com/philippe44/esp-dsp
+	url = https://github.com/philippe44/esp-dsp.git
--- a/.project
+++ b/.project
@@ -1,28 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>squeezelite-esp32</name>
+	<name>squeezelite-esp32-idfv4</name>
 	<comment></comment>
 	<projects>
 		<project>esp-idf</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<name>org.eclipse.cdt.core.cBuilder</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>com.espressif.idf.core.idfNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>
--- a/.pydevproject
+++ b/.pydevproject
@@ -0,0 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
    <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
    <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
 </pydev_project>
--- a/.settings/.gitignore
+++ b/.settings/.gitignore
@@ -1 +0,0 @@
 /org.eclipse.ltk.core.refactoring.prefs
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -1,100 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
    <configuration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348" name="Default">
        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
            <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
            <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="66711578333" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                <language-scope id="org.eclipse.cdt.core.gcc"/>
                <language-scope id="org.eclipse.cdt.core.g++"/>
            </provider>
            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
        </extension>
    </configuration>
    <configuration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934" name="recovery">
        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="true" name="CDT GCC Build Output Parser" parameter="xtensa-esp32-elf-(gcc|g\+\+|c\+\+|cc|cpp|clang)" prefer-non-shared="true"/>
            <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="29929057949" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="xtensa-esp32-elf-gcc ${FLAGS} -std=c++11 -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                <language-scope id="org.eclipse.cdt.core.gcc"/>
                <language-scope id="org.eclipse.cdt.core.g++"/>
            </provider>
            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
        </extension>
    </configuration>
    <configuration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291" name="recovery_windows">
        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
            <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1502478736382965477" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                <language-scope id="org.eclipse.cdt.core.gcc"/>
                <language-scope id="org.eclipse.cdt.core.g++"/>
            </provider>
            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
        </extension>
    </configuration>
    <configuration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736" name="squeezelite_windows">
        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="true" name="CDT GCC Build Output Parser" parameter="xtensa-esp32-elf-(gcc|g\+\+|c\+\+|cc|cpp|clang)" prefer-non-shared="true"/>
            <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1766868238676867652" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="xtensa-esp32-elf-gcc ${FLAGS} -std=c++11 -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                <language-scope id="org.eclipse.cdt.core.gcc"/>
                <language-scope id="org.eclipse.cdt.core.g++"/>
            </provider>
            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
        </extension>
    </configuration>
 </project>
--- a/.settings/org.eclipse.cdt.core.prefs
+++ b/.settings/org.eclipse.cdt.core.prefs
@@ -1,116 +0,0 @@
 eclipse.preferences.version=1
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/value=1
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/EXTRA_CFLAGS/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/EXTRA_CFLAGS/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/EXTRA_CFLAGS/value=-DRECOVERY_APPLICATION\=1
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/IDF_PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/IDF_PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/IDF_PATH/value=/var/opt/esp-idf
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/append=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/appendContributed=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/BATCH_BUILD/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/BATCH_BUILD/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/BATCH_BUILD/value=1
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/EXTRA_CFLAGS/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/EXTRA_CFLAGS/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/EXTRA_CFLAGS/value=
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/IDF_PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/IDF_PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/IDF_PATH/value=/var/opt/esp-idf
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/PATH/delimiter=;
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/PATH/value=C\:/msys2/opt/xtensa-esp32-elf/bin;C\:/jdk-12.0.2/bin/server;C\:/jdk-12.0.2/bin;C\:\\Windows\\system32;C\:\\Windows;C\:\\Windows\\System32\\Wbem;C\:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C\:\\Program Files\\NVIDIA Corporation\\NVIDIA NvDLISR;C\:\\jdk-12.0.2\\bin;C\:\\Program Files\\PuTTY\\;C\:\\Program Files (x86)\\HP\\IdrsOCR_15.2.10.1114\\;C\:\\eclipse
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/append=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/appendContributed=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/BATCH_BUILD/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/BATCH_BUILD/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/BATCH_BUILD/value=1
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/IDF_PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/IDF_PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/IDF_PATH/value=C\:/msys32/opt/esp-idf
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/PATH/value=C\:\\msys32\\usr\\bin;C\:\\msys32\\mingw32\\bin;C\:\\msys32\\opt\\xtensa-esp32-elf\\bin\\
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/PROJECT_NAME/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/PROJECT_NAME/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/PROJECT_NAME/value=recovery.custom
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/PROJECT_VER/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/PROJECT_VER/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/PROJECT_VER/value=custom
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/append=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.395881736/appendContributed=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/BATCH_BUILD/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/BATCH_BUILD/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/BATCH_BUILD/value=1
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/IDF_PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/IDF_PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/IDF_PATH/value=C\:/msys32/opt/esp-idf
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/PATH/value=C\:\\msys32\\opt\\openocd-esp32\\bin;c\:\\msys32\\opt\\xtensa-esp32-elf\\bin\\;c\:\\msys32\\mingw32\\bin;C\:\\msys32\\usr\\bin;c\:\\Python27;C\:\\msys32\\usr\\bin\\vendor_perl;C\:\\msys32\\usr\\bin\\core_perl
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/PROJECT_NAME/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/PROJECT_NAME/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/PROJECT_NAME/value=recovery
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/PROJECT_VER/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/PROJECT_VER/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/PROJECT_VER/value=custom
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/append=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291/appendContributed=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/BATCH_BUILD/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/BATCH_BUILD/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/BATCH_BUILD/value=1
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/IDF_PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/IDF_PATH/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/IDF_PATH/value=/var/opt/esp-idf/
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/PATH/value=/var/opt/xtensa-esp32-elf/bin/\:/sbin\:/bin\:/usr/bin\:/usr/local/bin\:/snap/bin\:/bin\:/sbin\:/usr/bin\:/usr/local/bin\:/snap/bin
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/PROJECT_NAME/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/PROJECT_NAME/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/PROJECT_NAME/value=recovery.custom
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/PROJECT_VER/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/PROJECT_VER/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/PROJECT_VER/value=custom
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/append=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.839256934/appendContributed=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/BATCH_BUILD/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/BATCH_BUILD/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/BATCH_BUILD/value=1
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/IDF_PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/IDF_PATH/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/IDF_PATH/value=/var/opt/esp-idf/
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/PATH/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/PATH/value=/var/opt/xtensa-esp32-elf/bin/\:/sbin\:/bin\:/usr/bin\:/usr/local/bin\:/snap/bin\:/bin\:/sbin\:/usr/bin\:/usr/local/bin\:/snap/bin
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/PROJECT_NAME/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/PROJECT_NAME/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/PROJECT_NAME/value=squeezelite.custom
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/PROJECT_VER/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/PROJECT_VER/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/PROJECT_VER/value=custom
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/append=true
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348/appendContributed=true
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/BATCH_BUILD/delimiter=;
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/BATCH_BUILD/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/BATCH_BUILD/value=1
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/IDF_PATH/delimiter=;
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/IDF_PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/IDF_PATH/value=c\:/msys32/opt/esp-idf
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/PATH/delimiter=;
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/PATH/value=C\:\\msys32\\usr\\bin;C\:\\msys32\\mingw32\\bin;C\:\\msys32\\opt\\xtensa-esp32-elf\\bin;C\:\\Python27
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/append=true
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738.859326707/appendContributed=false
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/BATCH_BUILD/delimiter=;
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/BATCH_BUILD/operation=append
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/BATCH_BUILD/value=1
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/IDF_PATH/delimiter=;
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/IDF_PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/IDF_PATH/value=c\:/msys32/opt/esp-idf
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/PATH/delimiter=;
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/PATH/operation=replace
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/PATH/value=C\:\\msys32\\usr\\bin;C\:\\msys32\\mingw32\\bin;C\:\\msys32\\opt\\xtensa-esp32-elf\\bin;C\:\\Python27
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/append=true
 environment/project/cdt.managedbuild.toolchain.gnu.cygwin.base.58932738/appendContributed=false
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,15 @@
 cmake_minimum_required(VERSION 3.5)
 set(EXTRA_COMPONENT_DIRS components/platform_console/app_recovery components/platform_console/app_squeezelite  )
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(squeezelite-esp32)
+
 message(STATUS  "Building RECOVERY")
 project(recovery)
 set_property(TARGET recovery.elf PROPERTY RECOVERY_PREFIX app_recovery )
 include(squeezelite.cmake)
 set(PROJECT_VER $ENV{PROJECT_VER})
 #target_compile_definitions(__idf_squeezelite-ota PRIVATE -DLOG_LOCAL_LEVEL=ESP_LOG_VERBOSE)
 #target_compile_definitions(__idf_driver_bt PRIVATE -DLOG_LOCAL_LEVEL=ESP_LOG_VERBOSE)
--- a/10
+++ b/10
@@ -10,9 +10,13 @@
 #recovery: PROJECT_NAME:=recovery.$(PROJECT_CONFIG_TARGET)
-#recovery: CPPFLAGS+=-DRECOVERY_APPLICATION=1
+#recovery: EXTRA_CPPFLAGS+=-DRECOVERY_APPLICATION=1
 PROJECT_NAME?=squeezelite
-EXTRA_COMPONENT_DIRS := esp-dsp
+EXTRA_CPPFLAGS+=  -I$(PROJECT_PATH)/main 
 #/-Wno-error=maybe-uninitialized 
 include $(IDF_PATH)/make/project.mk 
-CPPFLAGS+= -Wno-error=maybe-uninitialized
+
 # for future gcc version, this could be needed: CPPFLAGS+= -Wno-error=format-overflow -Wno-error=stringop-truncation
--- a/README.md
+++ b/README.md
@@ -235,6 +235,8 @@ channel=0..7,scale=<scale>
 NB: Set parameter to empty to disable battery reading
 ## Setting up ESP-IDF
 ### Docker
 #### **************** todo: Docker scripts needs some rework.
 You can use docker to build squeezelite-esp32  
 First you need to build the Docker container:
 ```
@@ -248,12 +250,15 @@ The above command will mount this repo into the docker container and start a bas
 for you to then follow the below build steps
 ### Manual Install of ESP-IDF
 <<<<<<< HEAD
 Follow the instructions from https://docs.espressif.com/projects/esp-idf/en/v4.0/get-started/index.html to install the esp-idf v4.0. This is the currently supported release of the espressif software development system. 
 =======
 <strong>Currently the master branch of this project requires this [IDF](https://github.com/espressif/esp-idf/tree/28f1cdf5ed7149d146ad5019c265c8bc3bfa2ac9) with gcc 5.2 (toolschain dated 20181001)
 If you want to use a more recent version of gcc and IDF (4.0 stable), move to cmake-master branch</strong>
 You can install IDF manually on Linux or Windows (using the Subsystem for Linux) following the instructions at: https://www.instructables.com/id/ESP32-Development-on-Windows-Subsystem-for-Linux/
 And then copying the i2s.c patch file from this repo over to the esp-idf folder
 You also need to use esp-dsp recent version or at least make sure you have this patch https://github.com/espressif/esp-dsp/pull/12/commits/8b082c1071497d49346ee6ed55351470c1cb4264
 >>>>>>> refs/remotes/origin/master
 ## Building Squeezelite-esp32
 MOST IMPORTANT: create the right default config file
@@ -264,29 +269,11 @@ Then adapt the config file to your wifi/BT/I2C device (can also be done on the c
 Then
 ```
-# Build recovery.bin, bootloader.bin, ota_data_initial.bin, partitions.bin  
+idf.py -p PORT [-b BAUD] flash
-# force appropriate rebuild by touching all the files which may have a RECOVERY_APPLICATION specific source compile logic
+idf.py -p PORT [-b BAUD] monitor
 	find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -type f -print0 | xargs -0 grep -l "RECOVERY_APPLICATION" | xargs touch
 	export PROJECT_NAME="recovery" 
 	make -j4 all EXTRA_CPPFLAGS='-DRECOVERY_APPLICATION=1'
 make flash
 #
 # Build squeezelite.bin
 # Now force a rebuild by touching all the files which may have a RECOVERY_APPLICATION specific source compile logic
 find . \( -name "*.cpp" -o -name "*.c" -o -name "*.h" \) -type f -print0 | xargs -0 grep -l "RECOVERY_APPLICATION" | xargs touch
 export PROJECT_NAME="squeezelite" 
 make -j4 app EXTRA_CPPFLAGS='-DRECOVERY_APPLICATION=0'
 python ${IDF_PATH}/components/esptool_py/esptool/esptool.py --chip esp32 --port ${ESPPORT} --baud ${ESPBAUD} --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0x150000 ./build/squeezelite.bin  
 # monitor serial output
 make monitor
 ```
 You can also manually download the recovery & initial boot
 ```
 python ${IDF_PATH}/components/esptool_py/esptool/esptool.py --chip esp32 --port ${ESPPORT} --baud ${ESPBAUD} --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xd000 ./build/ota_data_initial.bin 0x1000 ./build/bootloader/bootloader.bin 0x10000 ./build/recovery.bin 0x8000 ./build/partitions.bin
 ```
 # Configuration
 1/ setup WiFi
 - Boot the esp, look for a new wifi access point showing up and connect to it. Default build ssid and passwords are "squeezelite"/"squeezelite". 
@@ -367,5 +354,3 @@ See squeezlite command line, but keys options are
 - If you have already cloned the repository and you are getting compile errors on one of the submodules (e.g. telnet), run the following git command in the root of the repository location
 	-  git submodule update --init --recursive
--- a/3
+++ b/3
@@ -1,4 +1,5 @@
 - in squeezelite some buffers (stream, output, header, recv) are allocated 
 although they are almost static (expect output). This creates a risk of 
 memory fragmentation, especially because the large output is re-allocated for
-AirPlay
+AirPlay
 - libflac in lpc.c can be unrolled - that gains 43k of code, at the expense of 4% CPU
--- a/alltags.txt
+++ b/alltags.txt
@@ -1,65 +0,0 @@
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.15
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.20
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.47
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.49
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.50
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.51
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.52
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.53
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.54
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.55
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.59
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.60
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.61
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.62
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.63
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.64
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.65
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.66
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/I2S-4MFlash-v0.1.67
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/SqueezeAmp-v0.1.13
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/SqueezeAmp-v0.1.14
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/SqueezeAmp-v0.1.15
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/SqueezeAmp-v0.1.20
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/WiFi-Manager/SqueezeAmp-v0.1.66
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.12-I2S-4MFlash
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.12-SqueezeAmp
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.16-I2S-4MFlash
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.16-SqueezeAmp
 d9c6c78df2f3ba49d74d91cf246f300a881af742	refs/tags/v0.1.44-I2S-4MFlash
 d9c6c78df2f3ba49d74d91cf246f300a881af742	refs/tags/v0.1.44-SqueezeAmp
 d9c6c78df2f3ba49d74d91cf246f300a881af742	refs/tags/v0.1.45-I2S-4MFlash
 d9c6c78df2f3ba49d74d91cf246f300a881af742	refs/tags/v0.1.45-SqueezeAmp
 d9c6c78df2f3ba49d74d91cf246f300a881af742	refs/tags/v0.1.46-I2S-4MFlash
 d9c6c78df2f3ba49d74d91cf246f300a881af742	refs/tags/v0.1.46-SqueezeAmp
 d9c6c78df2f3ba49d74d91cf246f300a881af742	refs/tags/v0.1.47-I2S-4MFlash
 d9c6c78df2f3ba49d74d91cf246f300a881af742	refs/tags/v0.1.47-SqueezeAmp
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.5-I2S-4MFlash
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.5-SqueezeAmp
 c34cf06be18ea4ab14ce28d77e1d48d0a1bb70f7	refs/tags/v0.1.50-I2S-4MFlash
 c34cf06be18ea4ab14ce28d77e1d48d0a1bb70f7	refs/tags/v0.1.50-SqueezeAmp
 c34cf06be18ea4ab14ce28d77e1d48d0a1bb70f7	refs/tags/v0.1.51-I2S-4MFlash
 c34cf06be18ea4ab14ce28d77e1d48d0a1bb70f7	refs/tags/v0.1.51-SqueezeAmp
 20edae43287b4c2d8942ea4263ccf9547f310946	refs/tags/v0.1.52-I2S-4MFlash
 20edae43287b4c2d8942ea4263ccf9547f310946	refs/tags/v0.1.52-SqueezeAmp
 964bb4d57d35bca06badfb504534b42e9b3b8678	refs/tags/v0.1.53-I2S-4MFlash
 964bb4d57d35bca06badfb504534b42e9b3b8678	refs/tags/v0.1.53-SqueezeAmp
 71531bcdc20d7c7da254699855eb2e1e7b2bd48f	refs/tags/v0.1.54-I2S-4MFlash
 71531bcdc20d7c7da254699855eb2e1e7b2bd48f	refs/tags/v0.1.54-SqueezeAmp
 9c56cfb1d05862bca5763b3fbe9911b4bab9619a	refs/tags/v0.1.55-I2S-4MFlash
 9c56cfb1d05862bca5763b3fbe9911b4bab9619a	refs/tags/v0.1.55-SqueezeAmp
 53369475dc85471a4d7f2d78c62f37fcd7f6e3da	refs/tags/v0.1.57-I2S-4MFlash
 53369475dc85471a4d7f2d78c62f37fcd7f6e3da	refs/tags/v0.1.57-SqueezeAmp
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.6-I2S-4MFlash
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.6-SqueezeAmp
 eef9ae969cdfd1a62d7057d8edf2c31af60804f3	refs/tags/v0.1.67-WiFi-Manager/I2S-4MFlash
 2cf87d5943caa0d0b15c8692482ff72308c0c0a8	refs/tags/v0.1.71-I2S-4MFlash
 2cf87d5943caa0d0b15c8692482ff72308c0c0a8	refs/tags/v0.1.71-SqueezeAmp
 2cf87d5943caa0d0b15c8692482ff72308c0c0a8	refs/tags/v0.1.72-I2S-4MFlash
 2cf87d5943caa0d0b15c8692482ff72308c0c0a8	refs/tags/v0.1.72-SqueezeAmp
 2cf87d5943caa0d0b15c8692482ff72308c0c0a8	refs/tags/v0.1.73-I2S-4MFlash
 2cf87d5943caa0d0b15c8692482ff72308c0c0a8	refs/tags/v0.1.73-SqueezeAmp
 2cf87d5943caa0d0b15c8692482ff72308c0c0a8	refs/tags/v0.1.74-I2S-4MFlash
 2cf87d5943caa0d0b15c8692482ff72308c0c0a8	refs/tags/v0.1.74-SqueezeAmp
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.9-I2S-4MFlash
 3bd886b8dff0fb5bc59079e83f1d283097a14697	refs/tags/v0.1.9-SqueezeAmp
--- a/build-scripts/ESP32-A1S-sdkconfig.defaults
+++ b/build-scripts/ESP32-A1S-sdkconfig.defaults
--- a/build-scripts/I2S-4MFlash-sdkconfig.defaults
+++ b/build-scripts/I2S-4MFlash-sdkconfig.defaults
--- a/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults
+++ b/build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults
@@ -524,8 +524,9 @@ CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=n
+# CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED is not set
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=n
+# CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED is not set
--- a/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults
+++ b/build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults
@@ -523,8 +523,8 @@ CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12
-CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=n
+# CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED is not set
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=n
+# CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED is not set
--- a/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults
+++ b/build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults
--- a/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults
+++ b/build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults
--- a/build-scripts/sdkconfig
+++ b/build-scripts/sdkconfig
@@ -0,0 +1,840 @@
 #
 # Automatically generated file. DO NOT EDIT.
 # Espressif IoT Development Framework (ESP-IDF) Project Configuration
 #
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 #
 # SDK tool configuration
 #
 CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-"
 CONFIG_APP_COMPILE_TIME_DATE=y
 # CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set
 # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
 CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
 # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
 CONFIG_BOOTLOADER_LOG_LEVEL=3
 CONFIG_BOOTLOADER_SPI_WP_PIN=7
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 # CONFIG_BOOTLOADER_FACTORY_RESET is not set
 # CONFIG_BOOTLOADER_APP_TEST is not set
 CONFIG_BOOTLOADER_WDT_ENABLE=y
 # CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE is not set
 CONFIG_BOOTLOADER_WDT_TIME_MS=9000
 # CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
 # CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set
 # CONFIG_SECURE_BOOT_ENABLED is not set
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
 CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
 # CONFIG_ESPTOOLPY_FLASHMODE_DIO is not set
 # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
 CONFIG_ESPTOOLPY_FLASHMODE="dio"
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set
 # CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ="80m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
 CONFIG_ESPTOOLPY_BEFORE="default_reset"
 CONFIG_ESPTOOLPY_AFTER_RESET=y
 # CONFIG_ESPTOOLPY_AFTER_NORESET is not set
 CONFIG_ESPTOOLPY_AFTER="hard_reset"
 # CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set
 # CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set
 CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
 # CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set
 # CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set
 # CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set
 # CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set
 CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 CONFIG_LOGGING_SLIMPROTO="info"
 CONFIG_LOGGING_STREAM="info"
 CONFIG_LOGGING_DECODE="info"
 CONFIG_LOGGING_OUTPUT="info"
 # CONFIG_SQUEEZEAMP is not set
 # CONFIG_A1S is not set
 CONFIG_BASIC_I2C_BT=y
 CONFIG_I2S_NUM=0
 CONFIG_I2S_BCK_IO=33
 CONFIG_I2S_WS_IO=25
 CONFIG_I2S_DO_IO=32
 CONFIG_I2S_DI_IO=-1
 CONFIG_SDIF_NUM=0
 CONFIG_SPDIF_BCK_IO=33
 CONFIG_SPDIF_WS_IO=25
 CONFIG_SPDIF_DO_IO=15
 CONFIG_A2DP_SINK_NAME="SMSL BT4.2"
 CONFIG_A2DP_DEV_NAME="Squeezelite"
 CONFIG_A2DP_CONTROL_DELAY_MS=500
 CONFIG_A2DP_CONNECT_TIMEOUT_MS=1000
 CONFIG_BT_SINK=y
 CONFIG_BT_NAME="ESP32-BT"
 CONFIG_BT_SINK_PIN=1234
 CONFIG_AIRPLAY_SINK=y
 CONFIG_AIRPLAY_NAME="ESP32-AirPlay"
 CONFIG_AIRPLAY_PORT="5000"
 CONFIG_DISPLAY_CONFIG=""
 CONFIG_I2C_CONFIG=""
 CONFIG_SPI_CONFIG=""
 CONFIG_SET_GPIO=""
 CONFIG_ROTARY_ENCODER=""
 CONFIG_LED_GREEN_GPIO=-1
 CONFIG_LED_RED_GPIO=-1
 CONFIG_JACK_GPIO=-1
 CONFIG_SPKFAULT_GPIO=-1
 CONFIG_BAT_CHANNEL=-1
 CONFIG_WIFI_MANAGER_TASK_PRIORITY=5
 CONFIG_WIFI_MANAGER_MAX_RETRY=2
 CONFIG_DEFAULT_AP_SSID="squeezelite"
 CONFIG_DEFAULT_AP_PASSWORD="squeezelite"
 CONFIG_DEFAULT_AP_CHANNEL=1
 CONFIG_DEFAULT_AP_IP="192.168.4.1"
 CONFIG_DEFAULT_AP_GATEWAY="192.168.4.1"
 CONFIG_DEFAULT_AP_NETMASK="255.255.255.0"
 CONFIG_DEFAULT_AP_MAX_CONNECTIONS=4
 CONFIG_DEFAULT_AP_BEACON_INTERVAL=100
 CONFIG_DEFAULT_COMMAND_LINE="squeezelite -o I2S -b 500:2000 -d all=info -C 30"
 # CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
 CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE is not set
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
 # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
 # CONFIG_COMPILER_CXX_EXCEPTIONS is not set
 CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_STACK_CHECK_MODE_NORM is not set
 # CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set
 # CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set
 # CONFIG_COMPILER_STACK_CHECK is not set
 # CONFIG_COMPILER_WARN_WRITE_STRINGS is not set
 # CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set
 # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
 CONFIG_ESP32_APPTRACE_DEST_NONE=y
 # CONFIG_ESP32_APPTRACE_ENABLE is not set
 CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
 CONFIG_BT_ENABLED=y
 # CONFIG_BTDM_CTRL_MODE_BLE_ONLY is not set
 CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=y
 # CONFIG_BTDM_CTRL_MODE_BTDM is not set
 CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=2
 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0
 # CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_HCI is not set
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1
 # CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF is not set
 CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=0
 CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2
 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CTRL_PINNED_TO_CORE_0=y
 # CONFIG_BTDM_CTRL_PINNED_TO_CORE_1 is not set
 CONFIG_BTDM_CTRL_PINNED_TO_CORE=0
 CONFIG_BTDM_CTRL_HCI_MODE_VHCI=y
 # CONFIG_BTDM_CTRL_HCI_MODE_UART_H4 is not set
 CONFIG_BTDM_MODEM_SLEEP=y
 CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG=y
 # CONFIG_BTDM_MODEM_SLEEP_MODE_EVED is not set
 CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL=y
 CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF=1
 # CONFIG_BTDM_COEX_BT_OPTIONS is not set
 CONFIG_BT_BLUEDROID_ENABLED=y
 # CONFIG_BT_NIMBLE_ENABLED is not set
 # CONFIG_BT_CONTROLLER_ONLY is not set
 CONFIG_BT_BTC_TASK_STACK_SIZE=3072
 CONFIG_BT_BLUEDROID_PINNED_TO_CORE_0=y
 # CONFIG_BT_BLUEDROID_PINNED_TO_CORE_1 is not set
 CONFIG_BT_BLUEDROID_PINNED_TO_CORE=0
 CONFIG_BT_BTU_TASK_STACK_SIZE=4096
 # CONFIG_BT_BLUEDROID_MEM_DEBUG is not set
 CONFIG_BT_CLASSIC_ENABLED=y
 CONFIG_BT_A2DP_ENABLE=y
 # CONFIG_BT_SPP_ENABLED is not set
 # CONFIG_BT_HFP_ENABLE is not set
 CONFIG_BT_SSP_ENABLED=y
 CONFIG_BT_BLE_ENABLED=y
 CONFIG_BT_GATTS_ENABLE=y
 # CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL is not set
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0
 CONFIG_BT_GATTC_ENABLE=y
 # CONFIG_BT_GATTC_CACHE_NVS_FLASH is not set
 CONFIG_BT_BLE_SMP_ENABLE=y
 # CONFIG_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE is not set
 CONFIG_BT_STACK_NO_LOG=y
 CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 CONFIG_BT_SMP_ENABLE=y
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_RESERVE_DRAM=0xdb5c
 # CONFIG_BLE_MESH is not set
 # CONFIG_ADC_FORCE_XPD_FSM is not set
 CONFIG_ADC_DISABLE_DAC=y
 # CONFIG_SPI_MASTER_IN_IRAM is not set
 CONFIG_SPI_MASTER_ISR_IN_IRAM=y
 # CONFIG_SPI_SLAVE_IN_IRAM is not set
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # CONFIG_EFUSE_CUSTOM_TABLE is not set
 # CONFIG_EFUSE_VIRTUAL is not set
 # CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set
 CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
 # CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set
 CONFIG_EFUSE_MAX_BLK_LEN=192
 # CONFIG_ESP_TLS_SERVER is not set
 CONFIG_ESP32_REV_MIN_0=y
 # CONFIG_ESP32_REV_MIN_1 is not set
 # CONFIG_ESP32_REV_MIN_2 is not set
 # CONFIG_ESP32_REV_MIN_3 is not set
 CONFIG_ESP32_REV_MIN=0
 CONFIG_ESP32_DPORT_WORKAROUND=y
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_ESP32_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_BOOT_INIT=y
 # CONFIG_SPIRAM_USE_MEMMAP is not set
 # CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
 CONFIG_SPIRAM_USE_MALLOC=y
 CONFIG_SPIRAM_TYPE_AUTO=y
 # CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set
 # CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
 CONFIG_SPIRAM_SIZE=-1
 # CONFIG_SPIRAM_SPEED_40M is not set
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM_MEMTEST=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
 CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=256
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=65536
 CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y
 # CONFIG_SPIRAM_OCCUPY_HSPI_HOST is not set
 CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y
 # CONFIG_SPIRAM_OCCUPY_NO_HOST is not set
 CONFIG_D0WD_PSRAM_CLK_IO=17
 CONFIG_D0WD_PSRAM_CS_IO=16
 CONFIG_D2WD_PSRAM_CLK_IO=9
 CONFIG_D2WD_PSRAM_CS_IO=10
 CONFIG_PICO_PSRAM_CS_IO=10
 # CONFIG_ESP32_MEMMAP_TRACEMEM is not set
 # CONFIG_ESP32_MEMMAP_TRACEMEM_TWOBANKS is not set
 # CONFIG_ESP32_TRAX is not set
 CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0
 # CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
 # CONFIG_ESP32_ULP_COPROC_ENABLED is not set
 CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=0
 # CONFIG_ESP32_PANIC_PRINT_HALT is not set
 CONFIG_ESP32_PANIC_PRINT_REBOOT=y
 # CONFIG_ESP32_PANIC_SILENT_REBOOT is not set
 # CONFIG_ESP32_PANIC_GDBSTUB is not set
 CONFIG_ESP32_DEBUG_OCDAWARE=y
 # CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set
 CONFIG_ESP32_BROWNOUT_DET=y
 CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y
 # CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set
 # CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_2 is not set
 # CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_3 is not set
 # CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_4 is not set
 # CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_5 is not set
 # CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_6 is not set
 # CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_7 is not set
 CONFIG_ESP32_BROWNOUT_DET_LVL=0
 CONFIG_ESP32_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
 # CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set
 # CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set
 # CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set
 CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y
 # CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set
 # CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set
 # CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set
 CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP32_XTAL_FREQ_40=y
 # CONFIG_ESP32_XTAL_FREQ_26 is not set
 # CONFIG_ESP32_XTAL_FREQ_AUTO is not set
 CONFIG_ESP32_XTAL_FREQ=40
 # CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set
 # CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
 # CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set
 CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 # CONFIG_PM_ENABLE is not set
 CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
 CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
 CONFIG_ADC_CAL_LUT_ENABLE=y
 # CONFIG_ESP_TIMER_PROFILING is not set
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
 CONFIG_ESP_MAIN_TASK_STACK_SIZE=8192
 CONFIG_ESP_IPC_TASK_STACK_SIZE=1024
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=3584
 CONFIG_ESP_CONSOLE_UART_DEFAULT=y
 # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
 # CONFIG_ESP_CONSOLE_UART_NONE is not set
 CONFIG_ESP_CONSOLE_UART_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
 CONFIG_ESP_INT_WDT_CHECK_CPU1=y
 CONFIG_ESP_TASK_WDT=y
 # CONFIG_ESP_TASK_WDT_PANIC is not set
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
 CONFIG_ETH_USE_ESP32_EMAC=y
 CONFIG_ETH_PHY_INTERFACE_RMII=y
 # CONFIG_ETH_PHY_INTERFACE_MII is not set
 CONFIG_ETH_RMII_CLK_INPUT=y
 # CONFIG_ETH_RMII_CLK_OUTPUT is not set
 CONFIG_ETH_RMII_CLK_IN_GPIO=0
 CONFIG_ETH_DMA_BUFFER_SIZE=512
 CONFIG_ETH_DMA_RX_BUFFER_NUM=10
 CONFIG_ETH_DMA_TX_BUFFER_NUM=10
 # CONFIG_ETH_USE_SPI_ETHERNET is not set
 # CONFIG_ESP_EVENT_LOOP_PROFILING is not set
 CONFIG_ESP_EVENT_POST_FROM_ISR=y
 CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
 # CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
 CONFIG_HTTPD_MAX_URI_LEN=512
 CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
 CONFIG_HTTPD_PURGE_BUF_LEN=32
 # CONFIG_HTTPD_LOG_PURGE_DATA is not set
 CONFIG_OTA_ALLOW_HTTP=y
 # CONFIG_ESP_HTTPS_SERVER_ENABLE is not set
 CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=12
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12
 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set
 # CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED is not set
 # CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED is not set
 CONFIG_ESP32_WIFI_RX_BA_WIN=16
 CONFIG_ESP32_WIFI_NVS_ENABLED=y
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
 # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 is not set
 CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 # CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE is not set
 # CONFIG_ESP32_WIFI_IRAM_OPT is not set
 # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
 #CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION=y
 CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP32_PHY_MAX_TX_POWER=20
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
 CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
 # CONFIG_ESP32_ENABLE_COREDUMP is not set
 # CONFIG_FATFS_CODEPAGE_DYNAMIC is not set
 CONFIG_FATFS_CODEPAGE_437=y
 # CONFIG_FATFS_CODEPAGE_720 is not set
 # CONFIG_FATFS_CODEPAGE_737 is not set
 # CONFIG_FATFS_CODEPAGE_771 is not set
 # CONFIG_FATFS_CODEPAGE_775 is not set
 # CONFIG_FATFS_CODEPAGE_850 is not set
 # CONFIG_FATFS_CODEPAGE_852 is not set
 # CONFIG_FATFS_CODEPAGE_855 is not set
 # CONFIG_FATFS_CODEPAGE_857 is not set
 # CONFIG_FATFS_CODEPAGE_860 is not set
 # CONFIG_FATFS_CODEPAGE_861 is not set
 # CONFIG_FATFS_CODEPAGE_862 is not set
 # CONFIG_FATFS_CODEPAGE_863 is not set
 # CONFIG_FATFS_CODEPAGE_864 is not set
 # CONFIG_FATFS_CODEPAGE_865 is not set
 # CONFIG_FATFS_CODEPAGE_866 is not set
 # CONFIG_FATFS_CODEPAGE_869 is not set
 # CONFIG_FATFS_CODEPAGE_932 is not set
 # CONFIG_FATFS_CODEPAGE_936 is not set
 # CONFIG_FATFS_CODEPAGE_949 is not set
 # CONFIG_FATFS_CODEPAGE_950 is not set
 CONFIG_FATFS_CODEPAGE=437
 CONFIG_FATFS_LFN_NONE=y
 # CONFIG_FATFS_LFN_HEAP is not set
 # CONFIG_FATFS_LFN_STACK is not set
 CONFIG_FATFS_FS_LOCK=0
 CONFIG_FATFS_TIMEOUT_MS=10000
 CONFIG_FATFS_PER_FILE_CACHE=y
 CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y
 CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150
 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
 CONFIG_FMB_QUEUE_LENGTH=20
 CONFIG_FMB_SERIAL_TASK_STACK_SIZE=2048
 CONFIG_FMB_SERIAL_BUF_SIZE=256
 CONFIG_FMB_SERIAL_TASK_PRIO=10
 # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
 CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
 CONFIG_FMB_CONTROLLER_STACK_SIZE=4096
 CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FMB_TIMER_GROUP=0
 CONFIG_FMB_TIMER_INDEX=0
 # CONFIG_FREERTOS_UNICORE is not set
 CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
 CONFIG_FREERTOS_CORETIMER_0=y
 # CONFIG_FREERTOS_CORETIMER_1 is not set
 CONFIG_FREERTOS_HZ=100
 CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
 CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
 # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
 CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1
 CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
 # CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
 # CONFIG_FREERTOS_ASSERT_DISABLE is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536
 CONFIG_FREERTOS_ISR_STACKSIZE=1536
 # CONFIG_FREERTOS_LEGACY_HOOKS is not set
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set
 CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2432
 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10
 CONFIG_FREERTOS_QUEUE_REGISTRY_SIZE=0
 CONFIG_FREERTOS_USE_TRACE_FACILITY=y
 CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y
 CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=y
 CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=y
 CONFIG_FREERTOS_RUN_TIME_STATS_USING_ESP_TIMER=y
 # CONFIG_FREERTOS_RUN_TIME_STATS_USING_CPU_CLK is not set
 # CONFIG_FREERTOS_DEBUG_INTERNALS is not set
 CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set
 CONFIG_HEAP_POISONING_DISABLED=y
 # CONFIG_HEAP_POISONING_LIGHT is not set
 # CONFIG_HEAP_POISONING_COMPREHENSIVE is not set
 CONFIG_HEAP_TRACING_OFF=y
 # CONFIG_HEAP_TRACING_STANDALONE is not set
 # CONFIG_HEAP_TRACING_TOHOST is not set
 # CONFIG_HEAP_TRACING is not set
 # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
 # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
 CONFIG_LOG_DEFAULT_LEVEL_INFO=y
 # CONFIG_LOG_DEFAULT_LEVEL_INFO is not set
 # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
 # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
 CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_LOG_COLORS=y
 CONFIG_LWIP_LOCAL_HOSTNAME="squeezelite-esp32"
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
 # CONFIG_LWIP_IRAM_OPTIMIZATION is not set
 CONFIG_LWIP_TIMERS_ONDEMAND=y
 CONFIG_LWIP_MAX_SOCKETS=16
 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 # CONFIG_LWIP_SO_RCVBUF is not set
 CONFIG_LWIP_IP_FRAG=y
 # CONFIG_LWIP_IP_REASSEMBLY is not set
 # CONFIG_LWIP_STATS is not set
 # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
 CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
 CONFIG_LWIP_GARP_TMR_INTERVAL=60
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
 CONFIG_LWIP_DHCPS_LEASE_UNIT=60
 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 # CONFIG_LWIP_AUTOIP is not set
 # CONFIG_LWIP_IPV6_AUTOCONFIG is not set
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
 CONFIG_LWIP_TCP_MAXRTX=12
 CONFIG_LWIP_TCP_SYNMAXRTX=6
 CONFIG_LWIP_TCP_MSS=1440
 CONFIG_LWIP_TCP_MSL=60000
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192
 CONFIG_LWIP_TCP_WND_DEFAULT=32768
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=32
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
 # CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
 CONFIG_LWIP_TCP_OVERSIZE_MSS=y
 # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
 # CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set
 # CONFIG_LWIP_WND_SCALE is not set
 CONFIG_LWIP_MAX_UDP_PCBS=16
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=32
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=3072
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
 CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 # CONFIG_LWIP_PPP_SUPPORT is not set
 # CONFIG_LWIP_MULTICAST_PING is not set
 # CONFIG_LWIP_BROADCAST_PING is not set
 CONFIG_LWIP_MAX_RAW_PCBS=16
 CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC is not set
 CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=y
 # CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC is not set
 # CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC is not set
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
 CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
 # CONFIG_MBEDTLS_DEBUG is not set
 # CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
 # CONFIG_MBEDTLS_CMAC_C is not set
 CONFIG_MBEDTLS_HARDWARE_AES=y
 # CONFIG_MBEDTLS_HARDWARE_MPI is not set
 CONFIG_MBEDTLS_HARDWARE_SHA=y
 CONFIG_MBEDTLS_HAVE_TIME=y
 # CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
 # CONFIG_MBEDTLS_TLS_SERVER_AND_CLIENT is not set
 # CONFIG_MBEDTLS_TLS_SERVER_ONLY is not set
 CONFIG_MBEDTLS_TLS_CLIENT_ONLY=y
 # CONFIG_MBEDTLS_TLS_DISABLED is not set
 CONFIG_MBEDTLS_TLS_CLIENT=y
 CONFIG_MBEDTLS_TLS_ENABLED=y
 # CONFIG_MBEDTLS_PSK_MODES is not set
 CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y
 CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
 # CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set
 CONFIG_MBEDTLS_SSL_PROTO_TLS1=y
 CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y
 CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
 # CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
 CONFIG_MBEDTLS_SSL_ALPN=y
 CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
 CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
 CONFIG_MBEDTLS_AES_C=y
 # CONFIG_MBEDTLS_CAMELLIA_C is not set
 # CONFIG_MBEDTLS_DES_C is not set
 CONFIG_MBEDTLS_RC4_DISABLED=y
 # CONFIG_MBEDTLS_RC4_ENABLED_NO_DEFAULT is not set
 # CONFIG_MBEDTLS_RC4_ENABLED is not set
 # CONFIG_MBEDTLS_BLOWFISH_C is not set
 # CONFIG_MBEDTLS_XTEA_C is not set
 CONFIG_MBEDTLS_CCM_C=y
 CONFIG_MBEDTLS_GCM_C=y
 # CONFIG_MBEDTLS_RIPEMD160_C is not set
 CONFIG_MBEDTLS_PEM_PARSE_C=y
 CONFIG_MBEDTLS_PEM_WRITE_C=y
 CONFIG_MBEDTLS_X509_CRL_PARSE_C=y
 CONFIG_MBEDTLS_X509_CSR_PARSE_C=y
 CONFIG_MBEDTLS_ECP_C=y
 CONFIG_MBEDTLS_ECDH_C=y
 CONFIG_MBEDTLS_ECDSA_C=y
 CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
 CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
 CONFIG_MDNS_MAX_SERVICES=10
 CONFIG_MQTT_PROTOCOL_311=y
 CONFIG_MQTT_TRANSPORT_SSL=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET=y
 CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y
 # CONFIG_MQTT_USE_CUSTOM_CONFIG is not set
 # CONFIG_MQTT_TASK_CORE_SELECTION_ENABLED is not set
 # CONFIG_MQTT_CUSTOM_OUTBOX is not set
 CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y
 # CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF is not set
 # CONFIG_NEWLIB_STDOUT_LINE_ENDING_CR is not set
 # CONFIG_NEWLIB_STDIN_LINE_ENDING_CRLF is not set
 # CONFIG_NEWLIB_STDIN_LINE_ENDING_LF is not set
 CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 # CONFIG_NEWLIB_NANO_FORMAT is not set
 # CONFIG_OPENSSL_DEBUG is not set
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 # CONFIG_OPENSSL_ASSERT_EXIT is not set
 CONFIG_PTHREAD_TASK_PRIO_DEFAULT=5
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
 CONFIG_PTHREAD_STACK_MIN=768
 # CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY is not set
 # CONFIG_PTHREAD_DEFAULT_CORE_0 is not set
 CONFIG_PTHREAD_DEFAULT_CORE_1=y
 CONFIG_PTHREAD_TASK_CORE_DEFAULT=1
 CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 # CONFIG_SPI_FLASH_VERIFY_WRITE is not set
 # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set
 # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set
 # CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set
 CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y
 CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y
 CONFIG_SPIFFS_MAX_PARTITIONS=3
 CONFIG_SPIFFS_CACHE=y
 CONFIG_SPIFFS_CACHE_WR=y
 # CONFIG_SPIFFS_CACHE_STATS is not set
 CONFIG_SPIFFS_PAGE_CHECK=y
 CONFIG_SPIFFS_GC_MAX_RUNS=10
 # CONFIG_SPIFFS_GC_STATS is not set
 CONFIG_SPIFFS_PAGE_SIZE=256
 CONFIG_SPIFFS_OBJ_NAME_LEN=32
 CONFIG_SPIFFS_USE_MAGIC=y
 CONFIG_SPIFFS_USE_MAGIC_LENGTH=y
 CONFIG_SPIFFS_META_LENGTH=4
 CONFIG_SPIFFS_USE_MTIME=y
 # CONFIG_SPIFFS_DBG is not set
 # CONFIG_SPIFFS_API_DBG is not set
 # CONFIG_SPIFFS_GC_DBG is not set
 # CONFIG_SPIFFS_CACHE_DBG is not set
 # CONFIG_SPIFFS_CHECK_DBG is not set
 # CONFIG_SPIFFS_TEST_VISUALISATION is not set
 CONFIG_NETIF_IP_LOST_TIMER_INTERVAL=120
 CONFIG_TCPIP_LWIP=y
 CONFIG_UNITY_ENABLE_FLOAT=y
 CONFIG_UNITY_ENABLE_DOUBLE=y
 # CONFIG_UNITY_ENABLE_COLOR is not set
 CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 # CONFIG_UNITY_ENABLE_FIXTURE is not set
 # CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set
 CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT=y
 CONFIG_VFS_SUPPORT_TERMIOS=y
 CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
 CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
 CONFIG_WL_SECTOR_SIZE_512=y
 # CONFIG_WL_SECTOR_SIZE_4096 is not set
 CONFIG_WL_SECTOR_SIZE=512
 # CONFIG_WL_SECTOR_MODE_PERF is not set
 CONFIG_WL_SECTOR_MODE_SAFE=y
 CONFIG_WL_SECTOR_MODE=1
 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 CONFIG_WPA_MBEDTLS_CRYPTO=y
 # CONFIG_DSP_ANSI is not set
 CONFIG_DSP_OPTIMIZED=y
 CONFIG_DSP_OPTIMIZATION=1
 CONFIG_DSP_MAX_FFT_SIZE_512=y
 # CONFIG_DSP_MAX_FFT_SIZE_1024 is not set
 # CONFIG_DSP_MAX_FFT_SIZE_2048 is not set
 # CONFIG_DSP_MAX_FFT_SIZE_4096 is not set
 # CONFIG_DSP_MAX_FFT_SIZE_8192 is not set
 # CONFIG_DSP_MAX_FFT_SIZE_16384 is not set
 # CONFIG_DSP_MAX_FFT_SIZE_32768 is not set
 CONFIG_DSP_MAX_FFT_SIZE=512
 # CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set
 # Deprecated options for backward compatibility
 CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
 # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
 # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
 # CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
 CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
 # CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set
 # CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
 CONFIG_LOG_BOOTLOADER_LEVEL=3
 # CONFIG_APP_ROLLBACK_ENABLE is not set
 # CONFIG_FLASH_ENCRYPTION_ENABLED is not set
 CONFIG_FLASHMODE_QIO=y
 # CONFIG_FLASHMODE_QOUT is not set
 # CONFIG_FLASHMODE_DIO is not set
 # CONFIG_FLASHMODE_DOUT is not set
 # CONFIG_MONITOR_BAUD_9600B is not set
 # CONFIG_MONITOR_BAUD_57600B is not set
 CONFIG_MONITOR_BAUD_115200B=y
 # CONFIG_MONITOR_BAUD_230400B is not set
 # CONFIG_MONITOR_BAUD_921600B is not set
 # CONFIG_MONITOR_BAUD_2MB is not set
 # CONFIG_MONITOR_BAUD_OTHER is not set
 CONFIG_MONITOR_BAUD_OTHER_VAL=115200
 CONFIG_MONITOR_BAUD=115200
 # CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
 CONFIG_OPTIMIZATION_LEVEL_RELEASE=y
 # CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED is not set
 CONFIG_OPTIMIZATION_ASSERTIONS_SILENT=y
 # CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
 # CONFIG_CXX_EXCEPTIONS is not set
 CONFIG_STACK_CHECK_NONE=y
 # CONFIG_STACK_CHECK_NORM is not set
 # CONFIG_STACK_CHECK_STRONG is not set
 # CONFIG_STACK_CHECK_ALL is not set
 # CONFIG_STACK_CHECK is not set
 # CONFIG_WARN_WRITE_STRINGS is not set
 # CONFIG_DISABLE_GCC8_WARNINGS is not set
 # CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY is not set
 CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=y
 # CONFIG_BTDM_CONTROLLER_MODE_BTDM is not set
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN=2
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
 CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI=y
 # CONFIG_BTDM_CONTROLLER_HCI_MODE_UART_H4 is not set
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=y
 CONFIG_BLUEDROID_ENABLED=y
 CONFIG_BTC_TASK_STACK_SIZE=3072
 CONFIG_BLUEDROID_PINNED_TO_CORE_0=y
 # CONFIG_BLUEDROID_PINNED_TO_CORE_1 is not set
 CONFIG_BLUEDROID_PINNED_TO_CORE=0
 CONFIG_BTU_TASK_STACK_SIZE=4096
 # CONFIG_BLUEDROID_MEM_DEBUG is not set
 CONFIG_CLASSIC_BT_ENABLED=y
 CONFIG_A2DP_ENABLE=y
 # CONFIG_HFP_ENABLE is not set
 CONFIG_GATTS_ENABLE=y
 # CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL is not set
 CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0
 CONFIG_GATTC_ENABLE=y
 # CONFIG_GATTC_CACHE_NVS_FLASH is not set
 CONFIG_BLE_SMP_ENABLE=y
 # CONFIG_SMP_SLAVE_CON_PARAMS_UPD_ENABLE is not set
 # CONFIG_BLE_HOST_QUEUE_CONGESTION_CHECK is not set
 CONFIG_SMP_ENABLE=y
 CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30
 CONFIG_ADC2_DISABLE_DAC=y
 CONFIG_SPIRAM_SUPPORT=y
 CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
 # CONFIG_MEMMAP_TRACEMEM is not set
 # CONFIG_MEMMAP_TRACEMEM_TWOBANKS is not set
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
 # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set
 CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
 # CONFIG_ULP_COPROC_ENABLED is not set
 CONFIG_ULP_COPROC_RESERVE_MEM=0
 CONFIG_BROWNOUT_DET=y
 CONFIG_BROWNOUT_DET_LVL_SEL_0=y
 # CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set
 # CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set
 # CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set
 # CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set
 # CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set
 # CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set
 # CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set
 CONFIG_BROWNOUT_DET_LVL=0
 CONFIG_REDUCE_PHY_TX_POWER=y
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC is not set
 # CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set
 # CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set
 # CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
 CONFIG_MAIN_TASK_STACK_SIZE=8192
 CONFIG_IPC_TASK_STACK_SIZE=1024
 CONFIG_TIMER_TASK_STACK_SIZE=3584
 CONFIG_CONSOLE_UART_DEFAULT=y
 # CONFIG_CONSOLE_UART_CUSTOM is not set
 # CONFIG_CONSOLE_UART_NONE is not set
 CONFIG_CONSOLE_UART_NUM=0
 CONFIG_CONSOLE_UART_BAUDRATE=115200
 CONFIG_INT_WDT=y
 CONFIG_INT_WDT_TIMEOUT_MS=800
 CONFIG_INT_WDT_CHECK_CPU1=y
 CONFIG_TASK_WDT=y
 # CONFIG_TASK_WDT_PANIC is not set
 CONFIG_TASK_WDT_TIMEOUT_S=5
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
 # CONFIG_EVENT_LOOP_PROFILING is not set
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 CONFIG_SW_COEXIST_ENABLE=y
 CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150
 CONFIG_MB_MASTER_DELAY_MS_CONVERT=200
 CONFIG_MB_QUEUE_LENGTH=20
 CONFIG_MB_SERIAL_TASK_STACK_SIZE=2048
 CONFIG_MB_SERIAL_BUF_SIZE=256
 CONFIG_MB_SERIAL_TASK_PRIO=10
 # CONFIG_MB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20
 CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
 CONFIG_MB_CONTROLLER_STACK_SIZE=4096
 CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
 CONFIG_MB_TIMER_PORT_ENABLED=y
 CONFIG_MB_TIMER_GROUP=0
 CONFIG_MB_TIMER_INDEX=0
 CONFIG_SUPPORT_STATIC_ALLOCATION=y
 # CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set
 CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2432
 CONFIG_TIMER_QUEUE_LENGTH=10
 # CONFIG_L2_TO_L3_COPY is not set
 # CONFIG_USE_ONLY_LWIP_SELECT is not set
 CONFIG_ESP_GRATUITOUS_ARP=y
 CONFIG_GARP_TMR_INTERVAL=60
 CONFIG_TCPIP_RECVMBOX_SIZE=32
 CONFIG_TCP_MAXRTX=12
 CONFIG_TCP_SYNMAXRTX=6
 CONFIG_TCP_MSS=1440
 CONFIG_TCP_MSL=60000
 CONFIG_TCP_SND_BUF_DEFAULT=8192
 CONFIG_TCP_WND_DEFAULT=32768
 CONFIG_TCP_RECVMBOX_SIZE=32
 CONFIG_TCP_QUEUE_OOSEQ=y
 # CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set
 CONFIG_TCP_OVERSIZE_MSS=y
 # CONFIG_TCP_OVERSIZE_QUARTER_MSS is not set
 # CONFIG_TCP_OVERSIZE_DISABLE is not set
 CONFIG_UDP_RECVMBOX_SIZE=32
 CONFIG_TCPIP_TASK_STACK_SIZE=3072
 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set
 # CONFIG_TCPIP_TASK_AFFINITY_CPU1 is not set
 CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 # CONFIG_PPP_SUPPORT is not set
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
 CONFIG_ESP32_PTHREAD_STACK_MIN=768
 # CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY is not set
 # CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0 is not set
 CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y
 CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1
 CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
 # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set
 # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set
 CONFIG_IP_LOST_TIMER_INTERVAL=120
 CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
 CONFIG_SUPPORT_TERMIOS=y
 # End of deprecated options
--- a/build_flash_cmd.sh
+++ b/build_flash_cmd.sh
@@ -0,0 +1,113 @@
 #!/bin/bash
 echo 
 echo =================================================================
 echo Build flash command
 echo =================================================================
 # Location of partitions.csv relative to this script
 partitionsCsv="../partitions.csv"
 # File to output readme instructions to
 outputReadme="./flash_cmd.txt"
 # File to output bash script to
 outputBashScript="./writeSequeezeEsp.sh"
 # File to output bat script to
 outputBatScript="./writeSequeezeEsp.bat"
 # The name of partitions to ignore from partitions.csv
 paritionsToIgnore=(
  "nvs"
  "phy_init"
  "storage"
  "coredump"
  "settings"
 )
 # Function that maps partition name to actual bin file
 # defaults to "[PARTION_NAME_FROM_CSV].bin"
 function partitionNameToBinFile {
  if [[ "$1" == "otadata" ]]; then
    echo "ota_data_initial.bin"
  elif [[ "$1" == "ota_0" || "$1" == "factory" ]]; then
    echo "squeezelite.bin"
  else
    echo $1.bin
  fi
 }
 # write parameters for esptool.py
 writeParameters="$writeParameters write_flash"
 writeParameters="$writeParameters --flash_mode dio --flash_freq 80m --flash_size detect"
 # bootloader.bin and partitions.bin not in partitions.csv so manually add here
 partitionsParameters=" 0x1000 bootloader/bootloader.bin"
 partitionsParameters="$partitionsParameters 0x8000 partitions.bin"
 # ==============================================================================
 # Loop over partitions.csv and add partition bins and offsets to partitionsParameters
 for line in $($IDF_PATH/components/partition_table/gen_esp32part.py --quiet build/partitions.bin | grep '^[^#]')
 do
  partitionName=$(echo $line | awk -F',' '{printf "%s", $1}' )
  partitionOffset=$(echo $line |awk -F',' '{printf "%s", $4}' )
  partitionFile=$(partitionNameToBinFile $partitionName)
  if [[ " ${paritionsToIgnore[@]} " =~ " ${partitionName} " ]]; then
 	continue
  fi
  partitionsParameters="$partitionsParameters $partitionOffset $partitionFile"
  echo "$partitionsParameters"
 done
 # Write README Instructions
 if [ ! -f "$outputReadme" ]; then
  touch $outputReadme
 fi
 echo "" >> $outputReadme
 echo "====LINUX====" >> $outputReadme
 echo "To flash sequeezelite run the following script:" >> $outputReadme
 echo "$outputBashScript [PORT_HERE] [BAUD_RATE]" >> $outputReadme
 echo "e.g. $outputBashScript /dev/ttyUSB0 115200" >> $outputReadme
 echo "" >> $outputReadme
 echo "====WINDOWS====" >> $outputReadme
 echo "To flash sequeezelite run the following script:" >> $outputReadme
 echo "$outputBatScript [PORT_HERE] [BAUD_RATE]" >> $outputReadme
 echo "e.g. $outputBatScript COM11 115200" >> $outputReadme
 echo "" >> $outputReadme
 echo "If you don't know how to run the BAT file with arguments then you can" >> $outputReadme
 echo "edit the bat file in Notepad. Open the file up and edit the following:" >> $outputReadme
 echo "Change 'set port=%1' to 'set port=[PORT_HERE]'. E.g. 'set port=COM11'" >> $outputReadme
 echo "Change 'set baud=%2' to 'set baud=[BAUD_RATE]'. E.g. 'set baud=115200'" >> $outputReadme
 echo "" >> $outputReadme
 echo "====MANUAL====" >> $outputReadme
 echo "Python esptool.py --port [PORT_HERE] --baud [BAUD_RATE] $writeParameters $partitionsParameters" >> $outputReadme
 # Write Linux BASH File
 if [ ! -f "$outputBashScript" ]; then
  touch $outputBashScript
 fi
 echo "#!/bin/bash" >> $outputBashScript
 echo >> $outputBashScript
 echo "port=\$1" >> $outputBashScript
 echo "baud=\$2" >> $outputBashScript
 linuxFlashCommand="Python esptool.py --port \$port --baud \$baud"
 echo "$linuxFlashCommand $writeParameters $partitionsParameters" >> $outputBashScript
 # Write Windows BAT File
 if [ ! -f "$outputBatScript" ]; then
  touch $outputBatScript
 fi
 echo "echo off" >> $outputBatScript
 echo "" >> $outputBatScript
 echo "set port=%1" >> $outputBatScript
 echo "set baud=%2" >> $outputBatScript
 windowsFlashCommand="Python esptool.py --port %port% --baud %baud%"
 echo "$windowsFlashCommand $writeParameters $partitionsParameters" >> $outputBatScript
--- a/components/audio/CMakeLists.txt
+++ b/components/audio/CMakeLists.txt
@@ -0,0 +1,10 @@
 idf_component_register(	SRC_DIRS .
 						INCLUDE_DIRS .  inc 
 						)
 add_prebuilt_library(esp_processing lib/libesp_processing.a)
 target_link_libraries(${COMPONENT_LIB} PRIVATE esp_processing)
 #target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-u pow")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-u cos")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-u sin")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-u sqrt")
--- a/components/audio/link_helper.c
+++ b/components/audio/link_helper.c
@@ -0,0 +1,3 @@
 void dummy_obj() {
 	return;
 }
--- a/components/cmd_i2c/CMakeLists.txt
+++ b/components/cmd_i2c/CMakeLists.txt
@@ -1,5 +0,0 @@
 set(COMPONENT_SRCS "cmd_i2ctools.c")
 set(COMPONENT_ADD_INCLUDEDIRS ".")
 set(COMPONENT_REQUIRES console spi_flash)
 register_component()
--- a/components/cmd_i2c/component.mk
+++ b/components/cmd_i2c/component.mk
@@ -1,4 +0,0 @@
 #
 # Main Makefile. This is basically the same as a component makefile.
 #
 COMPONENT_ADD_INCLUDEDIRS := .
--- a/components/cmd_nvs/CMakeLists.txt
+++ b/components/cmd_nvs/CMakeLists.txt
@@ -1,7 +0,0 @@
 set(COMPONENT_ADD_INCLUDEDIRS .)
 set(COMPONENT_SRCS "cmd_nvs.c")
 set(COMPONENT_REQUIRES console nvs_flash)
 register_component()
--- a/components/cmd_system/CMakeLists.txt
+++ b/components/cmd_system/CMakeLists.txt
@@ -1,7 +0,0 @@
 set(COMPONENT_ADD_INCLUDEDIRS .)
 set(COMPONENT_SRCS "cmd_system.c")
 set(COMPONENT_REQUIRES console spi_flash)
 register_component()
--- a/components/cmd_system/component.mk
+++ b/components/cmd_system/component.mk
@@ -1,12 +0,0 @@
 #
 # Component Makefile
 #
 # This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default,
 # this will take the sources in the src/ directory, compile them and link them into
 # lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
 # please read the SDK documents if you need to do this.
 #
 COMPONENT_ADD_INCLUDEDIRS := .
 COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/main/
 COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/components/tools/
--- a/components/codecs/CMakeLists.txt
+++ b/components/codecs/CMakeLists.txt
@@ -0,0 +1,24 @@
 idf_component_register(SRC_DIRS . 
 					   INCLUDE_DIRS .  ./inc  inc/alac inc/FLAC  inc/helix-aac inc/mad inc/ogg inc/opus inc/opusfile inc/resample16 inc/soxr inc/vorbis
 					   PRIV_REQUIRES newlib
 )
 add_prebuilt_library(libmad 		lib/libmad.a)
 add_prebuilt_library(libFLAC 		lib/libFLAC.a ) 
 add_prebuilt_library(libhelix-aac 	lib/libhelix-aac.a ) 
 add_prebuilt_library(libvorbisidec 	lib/libvorbisidec.a ) 
 add_prebuilt_library(libogg 		lib/libogg.a )
 add_prebuilt_library(libalac 		lib/libalac.a ) 
 add_prebuilt_library(libremple16 	lib/libresample16.a ) 
 add_prebuilt_library(libopusfile 	lib/libopusfile.a ) 
 add_prebuilt_library(libopus 		lib/libopus.a ) 
 target_link_libraries(${COMPONENT_LIB} PRIVATE libmad)
 target_link_libraries(${COMPONENT_LIB} PRIVATE libFLAC)
 target_link_libraries(${COMPONENT_LIB} PRIVATE libhelix-aac)
 target_link_libraries(${COMPONENT_LIB} PRIVATE libvorbisidec)
 target_link_libraries(${COMPONENT_LIB} PRIVATE libogg)
 target_link_libraries(${COMPONENT_LIB} PRIVATE libalac)
 target_link_libraries(${COMPONENT_LIB} PRIVATE libremple16)
 target_link_libraries(${COMPONENT_LIB} PRIVATE libopusfile)
 target_link_libraries(${COMPONENT_LIB} PRIVATE libopus)
--- a/components/codecs/inc/FLAC/all.h
+++ b/components/codecs/inc/FLAC/all.h
@@ -35,8 +35,8 @@
 #include "export.h"
 #include "assert.h"
 #include "callback.h"
 #include "flac_assert.h"
 #include "format.h"
 #include "metadata.h"
 #include "ordinals.h"
--- a/components/codecs/inc/FLAC/flac_assert.h
+++ b/components/codecs/inc/FLAC/flac_assert.h
--- a/components/codecs/lib/libmad.a
+++ b/components/codecs/lib/libmad.a
--- a/components/codecs/lib/libopus.a
+++ b/components/codecs/lib/libopus.a
--- a/components/codecs/lib/libopusfile.a
+++ b/components/codecs/lib/libopusfile.a
--- a/components/codecs/link_helper.c
+++ b/components/codecs/link_helper.c
@@ -0,0 +1,3 @@
 void dummy_obj() {
 	return;
 }
--- a/components/display/CMakeLists.txt
+++ b/components/display/CMakeLists.txt
@@ -1,6 +1,11 @@
-idf_component_register(SRCS "led.c" "audio_controls.c" "buttons.c" "services.c" "monitor.c"INCLUDE_DIRS 
+
-						INCLUDE_DIRS . ../tools/
+idf_component_register(SRC_DIRS . core core/ifaces  fonts
-                   
+						INCLUDE_DIRS . fonts core
 						REQUIRES platform_config tools esp_common
 						PRIV_REQUIRES services freertos driver           
 )
-
+set_source_files_properties(display.c
    PROPERTIES COMPILE_FLAGS
   -Wno-format-overflow
 )
--- a/components/display/ILI9341.c
+++ b/components/display/ILI9341.c
@@ -0,0 +1,365 @@
 /**
 * Copyright (c) 2017-2018 Tara Keeling
 *				 2020 Philippe G.
 * 
 * This software is released under the MIT License.
 * https://opensource.org/licenses/MIT
 */
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "driver/gpio.h"
 #include <esp_heap_caps.h>
 #include <esp_log.h>
 #include "gds.h"
 #include "gds_private.h"
 //#define SHADOW_BUFFER
 #define PAGE_BLOCK	1024
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 static char TAG[] = "ILI9341";
 #define L1_CMD_NOP 0X00
 #define L1_CMD_SOFTWARE_RESET 0X01
 #define L1_CMD_READ_DISPLAY_IDENTIFICATION_INFORMATION 0X04
 #define L1_CMD_READ_DISPLAY_STATUS 0X09
 #define L1_CMD_READ_DISPLAY_POWER_MODE 0X0A
 #define L1_CMD_READ_DISPLAY_MADCTL 0X0B
 #define L1_CMD_READ_DISPLAY_PIXEL_FORMAT 0X0C
 #define L1_CMD_READ_DISPLAY_IMAGE_FORMAT 0X0D
 #define L1_CMD_READ_DISPLAY_SIGNAL_MODE 0X0E
 #define L1_CMD_READ_DISPLAY_SELF_DIAGNOSTIC_RESULT 0X0F
 #define L1_CMD_ENTER_SLEEP_MODE 0X10
 #define L1_CMD_SLEEP_OUT 0X11
 #define L1_CMD_PARTIAL_MODE_ON 0X12
 #define L1_CMD_NORMAL_DISPLAY_MODE_ON 0X13
 #define L1_CMD_DISPLAY_INVERSION_OFF 0X20
 #define L1_CMD_DISPLAY_INVERSION_ON 0X21
 #define L1_CMD_GAMMA_SET 0X26
 #define L1_CMD_DISPLAY_OFF 0X28
 #define L1_CMD_DISPLAY_ON 0X29
 #define L1_CMD_COLUMN_ADDRESS_SET 0X2A
 #define L1_CMD_PAGE_ADDRESS_SET 0X2B
 #define L1_CMD_MEMORY_WRITE 0X2C
 #define L1_CMD_COLOR_SET 0X2D
 #define L1_CMD_MEMORY_READ 0X2E
 #define L1_CMD_PARTIAL_AREA 0X30
 #define L1_CMD_VERTICAL_SCROLLING_DEFINITION 0X33
 #define L1_CMD_TEARING_EFFECT_LINE_OFF 0X34
 #define L1_CMD_TEARING_EFFECT_LINE_ON 0X35
 #define L1_CMD_MEMORY_ACCESS_CONTROL 0X36
 #define L1_CMD_VERTICAL_SCROLLING_START_ADDRESS 0X37
 #define L1_CMD_IDLE_MODE_OFF 0X38
 #define L1_CMD_IDLE_MODE_ON 0X39
 #define L1_CMD_COLMOD_PIXEL_FORMAT_SET 0X3A
 #define L1_CMD_WRITE_MEMORY_CONTINUE 0X3C
 #define L1_CMD_READ_MEMORY_CONTINUE 0X3E
 #define L1_CMD_SET_TEAR_SCANLINE 0X44
 #define L1_CMD_GET_SCANLINE 0X45
 #define L1_CMD_WRITE_DISPLAY_BRIGHTNESS 0X51
 #define L1_CMD_READ_DISPLAY_BRIGHTNESS 0X52
 #define L1_CMD_WRITE_CTRL_DISPLAY 0X53
 #define L1_CMD_READ_CTRL_DISPLAY 0X54
 #define L1_CMD_WRITE_CONTENT_ADAPTIVE_BRIGHTNESS_CONTROL 0X55
 #define L1_CMD_READ_CONTENT_ADAPTIVE_BRIGHTNESS_CONTROL 0X56
 #define L1_CMD_WRITE_CABC_MINIMUM_BRIGHTNESS 0X5E
 #define L1_CMD_READ_CABC_MINIMUM_BRIGHTNESS 0X5F
 #define L1_CMD_READ_ID1 0XDA
 #define L1_CMD_READ_ID2 0XDB
 #define L1_CMD_READ_ID3 0XDC
 #define L2_CMD_RGB_INTERFACE_SIGNAL_CONTROL 0XB0
 #define L2_CMD_FRAME_RATE_CONTROL_IN_NORMAL_MODE_FULL_COLORS 0XB1
 #define L2_CMD_FRAME_RATE_CONTROL_IN_IDLE_MODE_8_COLORS 0XB2
 #define L2_CMD_FRAME_RATE_CONTROL_IN_PARTIAL_MODE_FULL_COLORS 0XB3
 #define L2_CMD_DISPLAY_INVERSION_CONTROL 0XB4
 #define L2_CMD_BLANKING_PORCH_CONTROL 0XB5
 #define L2_CMD_DISPLAY_FUNCTION_CONTROL 0XB6
 #define L2_CMD_ENTRY_MODE_SET 0XB7
 #define L2_CMD_BACKLIGHT_CONTROL_1 0XB8
 #define L2_CMD_BACKLIGHT_CONTROL_2 0XB9
 #define L2_CMD_BACKLIGHT_CONTROL_3 0XBA
 #define L2_CMD_BACKLIGHT_CONTROL_4 0XBB
 #define L2_CMD_BACKLIGHT_CONTROL_5 0XBC
 #define L2_CMD_BACKLIGHT_CONTROL_7 0XBE
 #define L2_CMD_BACKLIGHT_CONTROL_8 0XBF
 #define L2_CMD_POWER_CONTROL_1 0XC0
 #define L2_CMD_POWER_CONTROL_2 0XC1
 #define L2_CMD_VCOM_CONTROL_1 0XC5
 #define L2_CMD_VCOM_CONTROL_2 0XC7
 #define L2_CMD_NV_MEMORY_WRITE 0XD0
 #define L2_CMD_NV_MEMORY_PROTECTION_KEY 0XD1
 #define L2_CMD_NV_MEMORY_STATUS_READ 0XD2
 #define L2_CMD_READ_ID4 0XD3
 #define L2_CMD_POSITIVE_GAMMA_CORRECTION 0XE0
 #define L2_CMD_NEGATIVE_GAMMA_CORRECTION 0XE1
 #define L2_CMD_DIGITAL_GAMMA_CONTROL_1 0XE2
 #define L2_CMD_DIGITAL_GAMMA_CONTROL_2 0XE3
 #define L2_CMD_INTERFACE_CONTROL 0XF6
 /*
 The LCD needs a bunch of command/argument values to be initialized. They are stored in this struct.
 */
 typedef struct {
    uint8_t cmd;
    uint8_t data[16];
    uint8_t databytes; //No of data in data; bit 7 = delay after set; 0xFF = end of cmds.
 } lcd_init_cmd_t;
 static const lcd_init_cmd_t ili_init_cmds[]={
    /* Power contorl B, power control = 0, DC_ENA = 1 */
    {0xCF, {0x00, 0x83, 0X30}, 3},
    /* Power on sequence control,
     * cp1 keeps 1 frame, 1st frame enable
     * vcl = 0, ddvdh=3, vgh=1, vgl=2
     * DDVDH_ENH=1
     */
    {0xED, {0x64, 0x03, 0X12, 0X81}, 4},
    /* Driver timing control A,
     * non-overlap=default +1
     * EQ=default - 1, CR=default
     * pre-charge=default - 1
     */
    {0xE8, {0x85, 0x01, 0x79}, 3},
    /* Power control A, Vcore=1.6V, DDVDH=5.6V */
    {0xCB, {0x39, 0x2C, 0x00, 0x34, 0x02}, 5},
    /* Pump ratio control, DDVDH=2xVCl */
    {0xF7, {0x20}, 1},
    /* Driver timing control, all=0 unit */
    {0xEA, {0x00, 0x00}, 2},
    /* Power control 1, GVDD=4.75V */
    {0xC0, {0x26}, 1},
    /* Power control 2, DDVDH=VCl*2, VGH=VCl*7, VGL=-VCl*3 */
    {0xC1, {0x11}, 1},
    /* VCOM control 1, VCOMH=4.025V, VCOML=-0.950V */
    {0xC5, {0x35, 0x3E}, 2},
    /* VCOM control 2, VCOMH=VMH-2, VCOML=VML-2 */
    {0xC7, {0xBE}, 1},
    /* Memory access contorl, MX=MY=0, MV=1, ML=0, BGR=1, MH=0 */
    {0x36, {0x28}, 1},
    /* Pixel format, 16bits/pixel for RGB/MCU interface */
    {0x3A, {0x55}, 1},
    /* Frame rate control, f=fosc, 70Hz fps */
    {0xB1, {0x00, 0x1B}, 2},
    /* Enable 3G, disabled */
    {0xF2, {0x08}, 1},
    /* Gamma set, curve 1 */
    {0x26, {0x01}, 1},
    /* Positive gamma correction */
    {0xE0, {0x1F, 0x1A, 0x18, 0x0A, 0x0F, 0x06, 0x45, 0X87, 0x32, 0x0A, 0x07, 0x02, 0x07, 0x05, 0x00}, 15},
    /* Negative gamma correction */
    {0XE1, {0x00, 0x25, 0x27, 0x05, 0x10, 0x09, 0x3A, 0x78, 0x4D, 0x05, 0x18, 0x0D, 0x38, 0x3A, 0x1F}, 15},
    /* Column address set, SC=0, EC=0xEF */
    {0x2A, {0x00, 0x00, 0x00, 0xEF}, 4},
    /* Page address set, SP=0, EP=0x013F */
    {0x2B, {0x00, 0x00, 0x01, 0x3f}, 4},
    /* Memory write */
    {0x2C, {0}, 0},
    /* Entry mode set, Low vol detect disabled, normal display */
    {0xB7, {0x07}, 1},
    /* Display function control */
    {0xB6, {0x0A, 0x82, 0x27, 0x00}, 4},
    /* Sleep out */
    {0x11, {0}, 0x80},
    /* Display on */
    {0x29, {0}, 0x80},
    {0, {0}, 0xff},
 };
 //To speed up transfers, every SPI transfer sends a bunch of lines. This define specifies how many. More means more memory use,
 //but less overhead for setting up / finishing transfers. Make sure 240 is dividable by this.
 #define PARALLEL_LINES 16
 struct PrivateSpace {
 	uint8_t *iRAM, *Shadowbuffer;
 	uint8_t ReMap, PageSize;
 	uint8_t Offset;
 };
 // Functions are not declared to minimize # of lines
 static void WriteDataByte( struct GDS_Device* Device, uint8_t Data ) {
 	Device->WriteData( Device, &Data, 1);
 }
 static void SetColumnAddress( struct GDS_Device* Device, uint8_t Start, uint8_t End ) {
 	Device->WriteCommand( Device, L1_CMD_COLUMN_ADDRESS_SET );
 	Device->WriteData( Device, &Start, 1 );
 	Device->WriteData( Device, &End, 1 );
 }
 static void SetRowAddress( struct GDS_Device* Device, uint8_t Start, uint8_t End ) {
 	Device->WriteCommand( Device, L1_CMD_PAGE_ADDRESS_SET );
 	Device->WriteData( Device, &Start, 1 );
 	Device->WriteData( Device, &End, 1 );
 }
 static void Update( struct GDS_Device* Device ) {
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	//SetColumnAddress( Device, Private->Offset, Private->Offset + Device->Width / 4 - 1);
 	SetColumnAddress( Device, Private->Offset, Private->Offset + Device->Width - 1);
 #ifdef SHADOW_BUFFER
 	uint16_t *optr = (uint16_t*) Private->Shadowbuffer, *iptr = (uint16_t*) Device->Framebuffer;
 	bool dirty = false;
 	for (int r = 0, page = 0; r < Device->Height; r++) {
 		// look for change and update shadow (cheap optimization = width always / by 2)
 		for (int c = Device->Width / 2 / 2; --c >= 0;) {
 			if (*optr != *iptr) {
 				dirty = true;
 				*optr = *iptr;
 			}
 			iptr++; optr++;
 		}
 		// one line done, check for page boundary
 		if (++page == Private->PageSize) {
 			if (dirty) {
 				uint16_t *optr = (uint16_t*) Private->iRAM, *iptr = (uint16_t*) (Private->Shadowbuffer + (r - page + 1) * Device->Width / 2);
 				SetRowAddress( Device, r - page + 1, r );
 				for (int i = page * Device->Width / 2 / 2; --i >= 0; iptr++) *optr++ = (*iptr >> 8) | (*iptr << 8);
 				//memcpy(Private->iRAM, Private->Shadowbuffer + (r - page + 1) * Device->Width / 2, page * Device->Width / 2 );
 				Device->WriteCommand( Device, 0x5c );
 				Device->WriteData( Device, Private->iRAM, Device->Width * page / 2 );
 				dirty = false;
 			}	
 			page = 0;
 		}	
 	}	
 #else
 	for (int r = 0; r < Device->Height; r += Private->PageSize) {
 		SetRowAddress( Device, r, r + Private->PageSize - 1 );
 		Device->WriteCommand( Device, L1_CMD_MEMORY_WRITE );
 		if (Private->iRAM) {
 			uint16_t *optr = (uint16_t*) Private->iRAM, *iptr = (uint16_t*) (Device->Framebuffer + r * Device->Width / 2);
 			for (int i = Private->PageSize * Device->Width / 2 / 2; --i >= 0; iptr++) *optr++ = (*iptr >> 8) | (*iptr << 8);
 			//memcpy(Private->iRAM, Device->Framebuffer + r * Device->Width / 2, Private->PageSize * Device->Width / 2 );
 			Device->WriteData( Device, Private->iRAM, Private->PageSize * Device->Width / 2 );
 		} else	{
 			Device->WriteData( Device, Device->Framebuffer + r * Device->Width / 2, Private->PageSize * Device->Width / 2 );
 		}	
 	}	
 #endif	
 }
 //Bit 	Name 						Description
 //---	---------------------------	------------------------------------------------------
 //MY  	Row Address Order 	 		MCU to memory write/read direction.
 //MX 	Column Address Order 		MCU to memory write/read direction.
 //MV 	Row / Column Exchange 		MCU to memory write/read direction.
 //ML 	Vertical Refresh Order 		LCD vertical refresh direction control.
 //BGR 	RGB-BGR Order 				Color selector switch control
 //									(0=RGB color filter panel, 1=BGR color filter panel)
 //MH 	Horizontal Refresh ORDER 	LCD horizontal refreshing direction control.
 // Bits 17-0
 //		XX XX XX XX XX XX XX XX XX XX MY MX MV ML BGR MH 0 0
 typedef enum  {
 	MAC_BIT_MH=2,
 	MAC_BIT_BGR,
 	MAC_BIT_ML,
 	MAC_BIT_MV,
 	MAC_BIT_MX,
 	MAC_BIT_MY,
 } mac_bits;
 uint16_t set_mac_bit(mac_bits bit, uint16_t val){
 	return (1 << bit) | val;
 }
 uint16_t unset_mac_bit(mac_bits bit, uint16_t val){
 	return ~(1 << bit) & val;
 }
 static void SetLayout( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate ) { 
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	Private->ReMap = HFlip ? (Private->ReMap & ~(1 << MAC_BIT_MX)) : (Private->ReMap | (1 << MAC_BIT_MX));
 	Private->ReMap = VFlip ? (Private->ReMap | (1 << MAC_BIT_MY)) : (Private->ReMap & ~(1 << MAC_BIT_MY));
 	Device->WriteCommand( Device, L1_CMD_MEMORY_ACCESS_CONTROL );
 	Device->WriteData( Device, &Private->ReMap, 1 );
 	WriteDataByte(Device,0x00);
 }	
 static void DisplayOn( struct GDS_Device* Device ) { Device->WriteCommand( Device, L1_CMD_DISPLAY_ON ); }
 static void DisplayOff( struct GDS_Device* Device ) { Device->WriteCommand( Device, L1_CMD_DISPLAY_OFF ); }
 static void SetContrast( struct GDS_Device* Device, uint8_t Contrast ) {
    Device->WriteCommand( Device, L1_CMD_WRITE_DISPLAY_BRIGHTNESS );
    uint8_t loc_contrast =  (uint8_t)((float)Contrast/5.0f*  255.0f);
    Device->WriteData( Device, &loc_contrast , 1 );
    WriteDataByte(Device,0x00);
 }
 static bool Init( struct GDS_Device* Device ) {
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 //	Private->Offset = (480 - Device->Width) / 4 / 2;
 	// find a page size that is not too small is an integer of height
 	Private->PageSize = min(8, PAGE_BLOCK / (Device->Width / 2));
 	Private->PageSize = Device->Height / (Device->Height / Private->PageSize) ;
 #ifdef SHADOW_BUFFER	
 //	Private->Shadowbuffer = malloc( Device->FramebufferSize );
 //	memset(Private->Shadowbuffer, 0xFF, Device->FramebufferSize);
 #endif
 	Private->iRAM =NULL;
 	//Private->iRAM =heap_caps_malloc(320*PARALLEL_LINES*sizeof(uint16_t), MALLOC_CAP_DMA);
 	//ESP_LOGI(TAG, "ILI9341 with offset %u, page %u, iRAM %p", Private->Offset, Private->PageSize, Private->iRAM);
 	ESP_LOGI(TAG, "ILI9341 ");
 	// need to be off and disable display RAM
 	Device->DisplayOff( Device );
 	int cmd=0;
 	//Send all the commands
 	while (ili_init_cmds[cmd].databytes!=0xff) {
 		Device->WriteCommand( Device, ili_init_cmds[cmd].cmd );
 		Device->WriteData(Device,ili_init_cmds[cmd].data,ili_init_cmds[cmd].databytes&0x1F);
 		if (ili_init_cmds[cmd].databytes&0x80) {
 			vTaskDelay(100 / portTICK_RATE_MS);
 		}
 		cmd++;
 	}
 	// gone with the wind
 	Device->DisplayOn( Device );
 	Device->Update( Device );
 	return true;
 }	
 static const struct GDS_Device ILI9341 = {
 	.DisplayOn = DisplayOn, .DisplayOff = DisplayOff, .SetContrast = SetContrast,
 	.SetLayout = SetLayout,
 	.Update = Update, .Init = Init,
 };	
 struct GDS_Device* ILI9341_Detect(char *Driver, struct GDS_Device* Device) {
 	if (!strcasestr(Driver, "ILI9341")) return NULL;
 	if (!Device) Device = calloc(1, sizeof(struct GDS_Device));
 	*Device = ILI9341;
 	Device->Depth = 4;
 	return Device;
 }
--- a/components/display/SH1106.c
+++ b/components/display/SH1106.c
@@ -73,8 +73,11 @@ static void Update( struct GDS_Device* Device ) {
 #endif	
 }
-static void SetHFlip( struct GDS_Device* Device, bool On ) { Device->WriteCommand( Device, On ? 0xA1 : 0xA0 ); }
+static void SetLayout( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate ) {
-static void SetVFlip( struct GDS_Device *Device, bool On ) { Device->WriteCommand( Device, On ? 0xC8 : 0xC0 ); }
+	Device->WriteCommand( Device, HFlip ? 0xA1 : 0xA0 );
 	Device->WriteCommand( Device, VFlip ? 0xC8 : 0xC0 );
 }	
 static void DisplayOn( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAF ); }
 static void DisplayOff( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAE ); }
@@ -117,8 +120,7 @@ static bool Init( struct GDS_Device* Device ) {
    Device->WriteCommand( Device, 0x40 + 0x00 );
 	Device->SetContrast( Device, 0x7F );
 	// set flip modes
-	Device->SetVFlip( Device, false );
+	Device->SetLayout( Device, false, false, false );
 	Device->SetHFlip( Device, false );
 	// no Display Inversion
    Device->WriteCommand( Device, 0xA6 );
 	// set Clocks
@@ -135,8 +137,12 @@ static bool Init( struct GDS_Device* Device ) {
 static const struct GDS_Device SH1106 = {
 	.DisplayOn = DisplayOn, .DisplayOff = DisplayOff, .SetContrast = SetContrast,
-	.SetVFlip = SetVFlip, .SetHFlip = SetHFlip,
+	.SetLayout = SetLayout,
 	.Update = Update, .Init = Init,
 	.Depth = 1,
 #if !defined SHADOW_BUFFER && defined USE_IRAM	
 	.Alloc = GDS_ALLOC_IRAM_SPI;
 #endif		
 };	
 struct GDS_Device* SH1106_Detect(char *Driver, struct GDS_Device* Device) {
@@ -144,10 +150,7 @@ struct GDS_Device* SH1106_Detect(char *Driver, struct GDS_Device* Device) {
 	if (!Device) Device = calloc(1, sizeof(struct GDS_Device));
 	*Device = SH1106;
-	Device->Depth = 1;
+
 #if !defined SHADOW_BUFFER && defined USE_IRAM	
 	Device->Alloc = GDS_ALLOC_IRAM_SPI;
 #endif	
 	ESP_LOGI(TAG, "SH1106 driver");
 	return Device;
--- a/components/display/SSD1306.c
+++ b/components/display/SSD1306.c
@@ -85,8 +85,11 @@ static void Update( struct GDS_Device* Device ) {
 #endif	
 }
-static void SetHFlip( struct GDS_Device* Device, bool On ) { Device->WriteCommand( Device, On ? 0xA1 : 0xA0 ); }
+static void SetLayout( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate ) { 
-static void SetVFlip( struct GDS_Device *Device, bool On ) { Device->WriteCommand( Device, On ? 0xC8 : 0xC0 ); }
+	Device->WriteCommand( Device, HFlip ? 0xA1 : 0xA0 );
 	Device->WriteCommand( Device, VFlip ? 0xC8 : 0xC0 );
 }
 static void DisplayOn( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAF ); }
 static void DisplayOff( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAE ); }
@@ -129,8 +132,7 @@ static bool Init( struct GDS_Device* Device ) {
    Device->WriteCommand( Device, 0x40 + 0x00 );
 	Device->SetContrast( Device, 0x7F );
 	// set flip modes
-	Device->SetVFlip( Device, false );
+	Device->SetLayout( Device, false, false, false);
 	Device->SetHFlip( Device, false );
 	// no Display Inversion
    Device->WriteCommand( Device, 0xA6 );
 	// set Clocks
@@ -150,8 +152,12 @@ static bool Init( struct GDS_Device* Device ) {
 static const struct GDS_Device SSD1306 = {
 	.DisplayOn = DisplayOn, .DisplayOff = DisplayOff, .SetContrast = SetContrast,
-	.SetVFlip = SetVFlip, .SetHFlip = SetHFlip,
+	.SetLayout = SetLayout,
 	.Update = Update, .Init = Init,
 	.Mode = GDS_MONO, .Depth = 1,
 #if !defined SHADOW_BUFFER && defined USE_IRAM	
 	.Alloc = GDS_ALLOC_IRAM_SPI,
 #endif		
 };	
 struct GDS_Device* SSD1306_Detect(char *Driver, struct GDS_Device* Device) {
@@ -159,10 +165,7 @@ struct GDS_Device* SSD1306_Detect(char *Driver, struct GDS_Device* Device) {
 	if (!Device) Device = calloc(1, sizeof(struct GDS_Device));
 	*Device = SSD1306;	
-	Device->Depth = 1;
+	
 #if !defined SHADOW_BUFFER && defined USE_IRAM	
 	Device->Alloc = GDS_ALLOC_IRAM_SPI;
 #endif	
 	ESP_LOGI(TAG, "SSD1306 driver");
 	return Device;
--- a/components/display/SSD1322.c
+++ b/components/display/SSD1322.c
@@ -96,22 +96,15 @@ static void Update( struct GDS_Device* Device ) {
 #endif	
 }
-static void SetHFlip( struct GDS_Device* Device, bool On ) { 
+static void SetLayout( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate ) { 
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
-	Private->ReMap = On ? (Private->ReMap & ~(1 << 1)) : (Private->ReMap | (1 << 1));
+	Private->ReMap = HFlip ? (Private->ReMap & ~(1 << 1)) : (Private->ReMap | (1 << 1));
 	Private->ReMap = VFlip ? (Private->ReMap | (1 << 4)) : (Private->ReMap & ~(1 << 4));
 	Device->WriteCommand( Device, 0xA0 );
 	Device->WriteData( Device, &Private->ReMap, 1 );
 	WriteDataByte( Device, 0x11 );		
 }	
 static void SetVFlip( struct GDS_Device *Device, bool On ) { 
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	Private->ReMap = On ? (Private->ReMap | (1 << 4)) : (Private->ReMap & ~(1 << 4));
 	Device->WriteCommand( Device, 0xA0 );
 	Device->WriteData( Device, &Private->ReMap, 1 );
 	WriteDataByte( Device, 0x11 );		
 }	
 static void DisplayOn( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAF ); }
 static void DisplayOff( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAE ); }
@@ -128,7 +121,7 @@ static bool Init( struct GDS_Device* Device ) {
 	// find a page size that is not too small is an integer of height
 	Private->PageSize = min(8, PAGE_BLOCK / (Device->Width / 2));
-	Private->PageSize = Device->Height / (Device->Height / Private->PageSize) ;	
+	while (Private->PageSize && Device->Height != (Device->Height / Private->PageSize) * Private->PageSize) Private->PageSize--;
 #ifdef SHADOW_BUFFER	
 	Private->Shadowbuffer = malloc( Device->FramebufferSize );	
@@ -152,8 +145,7 @@ static bool Init( struct GDS_Device* Device ) {
 	// set flip modes
 	Private->ReMap = 0;
-	Device->SetVFlip( Device, false );
+	Device->SetLayout( Device, false, false, false);
 	Device->SetHFlip( Device, false );
 	// set Clocks
    Device->WriteCommand( Device, 0xB3 );
@@ -187,8 +179,9 @@ static bool Init( struct GDS_Device* Device ) {
 static const struct GDS_Device SSD1322 = {
 	.DisplayOn = DisplayOn, .DisplayOff = DisplayOff, .SetContrast = SetContrast,
-	.SetVFlip = SetVFlip, .SetHFlip = SetHFlip,
+	.SetLayout = SetLayout,
 	.Update = Update, .Init = Init,
 	.Mode = GDS_GRAYSCALE, .Depth = 4,
 };	
 struct GDS_Device* SSD1322_Detect(char *Driver, struct GDS_Device* Device) {
@@ -197,7 +190,6 @@ struct GDS_Device* SSD1322_Detect(char *Driver, struct GDS_Device* Device) {
 	if (!Device) Device = calloc(1, sizeof(struct GDS_Device));
 	*Device = SSD1322;	
-	Device->Depth = 4;
+			
 	return Device;
 }
--- a/components/display/SSD132x.c
+++ b/components/display/SSD132x.c
@@ -168,7 +168,7 @@ static void Update1( struct GDS_Device* Device ) {
 }
 // in 1 bit mode, SSD1326 has a different memory map than SSD1306 and SH1106
-static void IRAM_ATTR DrawPixel1Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
+static void IRAM_ATTR _DrawPixel1Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
    uint32_t XBit = ( X & 0x07 );
    uint8_t* FBOffset = Device->Framebuffer + ( ( Y * Device->Width + X ) >> 3 );
@@ -188,12 +188,12 @@ static void ClearWindow( struct GDS_Device* Device, int x1, int y1, int x2, int
 	for (int r = y1; r <= y2; r++) {
 		int c = x1;
 		// for a row that is not on a boundary, not column opt can be done, so handle all columns on that line
-		while (c & 0x07 && c <= x2) DrawPixel1Fast( Device, c++, r, Color );
+		while (c & 0x07 && c <= x2) _DrawPixel1Fast( Device, c++, r, Color );
 		// at this point we are aligned on column boundary
 		int chunk = (x2 - c + 1) >> 3;
 		memset(optr + Width * r + (c >> 3), _Color, chunk );
 		c += chunk * 8;
-		while (c <= x2) DrawPixel1Fast( Device, c++, r, Color );
+		while (c <= x2) _DrawPixel1Fast( Device, c++, r, Color );
 	}
 }
@@ -222,22 +222,19 @@ static void DrawBitmapCBR(struct GDS_Device* Device, uint8_t *Data, int Width, i
 	}
 }
-static void SetHFlip( struct GDS_Device* Device, bool On ) { 
+static void SetLayout( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate ) { 
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
-	if (Private->Model == SSD1326) Private->ReMap = On ? (Private->ReMap | ((1 << 0) | (1 << 2))) : (Private->ReMap & ~((1 << 0) | (1 << 2)));
+	if (Private->Model == SSD1326) {
-	else Private->ReMap = On ? (Private->ReMap | ((1 << 0) | (1 << 1))) : (Private->ReMap & ~((1 << 0) | (1 << 1)));
+		Private->ReMap = HFlip ? (Private->ReMap | ((1 << 0) | (1 << 2))) : (Private->ReMap & ~((1 << 0) | (1 << 2)));
 		Private->ReMap = HFlip ? (Private->ReMap | (1 << 1)) : (Private->ReMap & ~(1 << 1));		
 	} else {
 		Private->ReMap = VFlip ? (Private->ReMap | ((1 << 0) | (1 << 1))) : (Private->ReMap & ~((1 << 0) | (1 << 1)));
 		Private->ReMap = VFlip ? (Private->ReMap | (1 << 4)) : (Private->ReMap & ~(1 << 4));
 	}	
 	Device->WriteCommand( Device, 0xA0 );
 	Device->WriteCommand( Device, Private->ReMap );
 }	
 static void SetVFlip( struct GDS_Device *Device, bool On ) { 
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	if (Private->Model == SSD1326) Private->ReMap = On ? (Private->ReMap | (1 << 1)) : (Private->ReMap & ~(1 << 1));
 	else Private->ReMap = On ? (Private->ReMap | (1 << 4)) : (Private->ReMap & ~(1 << 4));
 	Device->WriteCommand( Device, 0xA0 );
 	Device->WriteCommand( Device, Private->ReMap );
 }	
 static void DisplayOn( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAF ); }
 static void DisplayOff( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAE ); }
@@ -251,7 +248,7 @@ static bool Init( struct GDS_Device* Device ) {
 	// find a page size that is not too small is an integer of height
 	Private->PageSize = min(8, PAGE_BLOCK / (Device->Width / 2));
-	Private->PageSize = Device->Height / (Device->Height / Private->PageSize) ;	
+	while (Private->PageSize && Device->Height != (Device->Height / Private->PageSize) * Private->PageSize) Private->PageSize--;
 #ifdef SHADOW_BUFFER	
 #ifdef USE_IRAM
@@ -270,7 +267,6 @@ static bool Init( struct GDS_Device* Device ) {
 #ifdef USE_IRAM	
 	if (Device->Depth == 4 && Device->IF == GDS_IF_SPI) Private->iRAM = heap_caps_malloc( Private->PageSize * Device->Width / 2, MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA );
 #endif	
 #endif
 	ESP_LOGI(TAG, "SSD1326/7 with bit depth %u, page %u, iRAM %p", Device->Depth, Private->PageSize, Private->iRAM);
@@ -292,8 +288,7 @@ static bool Init( struct GDS_Device* Device ) {
 	Device->WriteCommand( Device, 0x00 );
 	Device->SetContrast( Device, 0x7F );
 	// set flip modes
-	Device->SetVFlip( Device, false );
+	Device->SetLayout( Device, false, false, false );
 	Device->SetHFlip( Device, false );
 	// no Display Inversion
    Device->WriteCommand( Device, 0xA6 );
 	// set Clocks
@@ -317,14 +312,15 @@ static bool Init( struct GDS_Device* Device ) {
 static const struct GDS_Device SSD132x = {
 	.DisplayOn = DisplayOn, .DisplayOff = DisplayOff, .SetContrast = SetContrast,
-	.SetVFlip = SetVFlip, .SetHFlip = SetHFlip,
+	.SetLayout = SetLayout,
 	.Update = Update4, .Init = Init,
 	.Mode = GDS_GRAYSCALE, .Depth = 4,
 };	
 struct GDS_Device* SSD132x_Detect(char *Driver, struct GDS_Device* Device) {
 	uint8_t Model;
 	int Depth;
-	
+		
 	if (strcasestr(Driver, "SSD1326")) Model = SSD1326;
 	else if (strcasestr(Driver, "SSD1327")) Model = SSD1327;
 	else return NULL;
@@ -332,22 +328,22 @@ struct GDS_Device* SSD132x_Detect(char *Driver, struct GDS_Device* Device) {
 	if (!Device) Device = calloc(1, sizeof(struct GDS_Device));
 	*Device = SSD132x;	
-	((struct PrivateSpace*) Device->Private)->Model = Model;
+	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	Private->Model = Model;
 	sscanf(Driver, "%*[^:]:%u", &Depth);
-	Device->Depth = Depth;
+		
-	
+	if (Model == SSD1326 && Depth == 1) {
 	if (Model == SSD1326 && Device->Depth == 1) {
 		Device->Update = Update1;
-		Device->DrawPixelFast = DrawPixel1Fast;
+		Device->DrawPixelFast = _DrawPixel1Fast;
 		Device->DrawBitmapCBR = DrawBitmapCBR;
 		Device->ClearWindow = ClearWindow;
 		Device->Depth = 1;		
 		Device->Mode = GDS_MONO;
 #if !defined SHADOW_BUFFER && defined USE_IRAM	
 		Device->Alloc = GDS_ALLOC_IRAM_SPI;
 #endif	
-	} else {
+	}
-		Device->Depth = 4;
+	
 	}	
 	return Device;
 }
--- a/components/display/SSD1351.c
+++ b/components/display/SSD1351.c
@@ -0,0 +1,286 @@
 /**
 * Copyright (c) 2017-2018 Tara Keeling
 *				 2020 Philippe G.
 * 
 * This software is released under the MIT License.
 * https://opensource.org/licenses/MIT
 */
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <esp_heap_caps.h>
 #include <esp_log.h>
 #include "gds.h"
 #include "gds_private.h"
 #define SHADOW_BUFFER
 #define USE_IRAM
 #define PAGE_BLOCK		2048
 #define ENABLE_WRITE	0x5c
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 static char TAG[] = "SSD1351";
 struct PrivateSpace {
 	uint8_t *iRAM, *Shadowbuffer;
 	uint8_t ReMap, PageSize;
 };
 // Functions are not declared to minimize # of lines
 static void WriteByte( struct GDS_Device* Device, uint8_t Data ) {
 	Device->WriteData( Device, &Data, 1 );
 }
 static void SetColumnAddress( struct GDS_Device* Device, uint8_t Start, uint8_t End ) {
 	Device->WriteCommand( Device, 0x15 );
 	WriteByte( Device, Start );
 	WriteByte( Device, End );
 }
 static void SetRowAddress( struct GDS_Device* Device, uint8_t Start, uint8_t End ) {
 	Device->WriteCommand( Device, 0x75 );
 	WriteByte( Device, Start );
 	WriteByte( Device, End );
 }
 static void Update16( struct GDS_Device* Device ) {
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 #ifdef SHADOW_BUFFER
 	uint32_t *optr = (uint32_t*) Private->Shadowbuffer, *iptr = (uint32_t*) Device->Framebuffer;
 	int FirstCol = Device->Width / 2, LastCol = 0, FirstRow = -1, LastRow = 0;  
 	for (int r = 0; r < Device->Height; r++) {
 		// look for change and update shadow (cheap optimization = width is always a multiple of 2)
 		for (int c = 0; c < Device->Width / 2; c++, iptr++, optr++) {
 			if (*optr != *iptr) {
 				*optr = *iptr;
 				if (c < FirstCol) FirstCol = c;	
 				if (c > LastCol) LastCol = c;
 				if (FirstRow < 0) FirstRow = r;
 				LastRow = r;
 			}
 		}
 		// wait for a large enough window - careful that window size might increase by more than a line at once !
 		if (FirstRow < 0 || ((LastCol - FirstCol + 1) * (r - FirstRow + 1) * 4 < PAGE_BLOCK && r != Device->Height - 1)) continue;
 		FirstCol *= 2;
 		LastCol = LastCol * 2 + 1;
 		SetRowAddress( Device, FirstRow, LastRow );
 		SetColumnAddress( Device, FirstCol, LastCol );
 		Device->WriteCommand( Device, ENABLE_WRITE );
 		int ChunkSize = (LastCol - FirstCol + 1) * 2;
 		// own use of IRAM has not proven to be much better than letting SPI do its copy
 		if (Private->iRAM) {
 			uint8_t *optr = Private->iRAM;
 			for (int i = FirstRow; i <= LastRow; i++) {
 				memcpy(optr, Private->Shadowbuffer + (i * Device->Width + FirstCol) * 2, ChunkSize);
 				optr += ChunkSize;
 				if (optr - Private->iRAM < PAGE_BLOCK && i < LastRow) continue;
 				Device->WriteData(Device, Private->iRAM, optr - Private->iRAM);
 				optr = Private->iRAM;
 			}
 		} else for (int i = FirstRow; i <= LastRow; i++) {
 			Device->WriteData( Device, Private->Shadowbuffer + (i * Device->Width + FirstCol) * 2, ChunkSize );
 		}	
 		FirstCol = Device->Width / 2; LastCol = 0;
 		FirstRow = -1;
 	}	
 #else
 	// always update by full lines
 	SetColumnAddress( Device, 0, Device->Width - 1);
 	for (int r = 0; r < Device->Height; r += min(Private->PageSize, Device->Height - r)) {
 		int Height = min(Private->PageSize, Device->Height - r);
 		SetRowAddress( Device, r, r + Height - 1 );
 		Device->WriteCommand(Device, ENABLE_WRITE);		
 		if (Private->iRAM) {
 			memcpy(Private->iRAM, Device->Framebuffer + r * Device->Width * 2, Height * Device->Width * 2 );
 			Device->WriteData( Device, Private->iRAM, Height * Device->Width * 2 );
 		} else	{
 			Device->WriteData( Device, Device->Framebuffer + r * Device->Width * 2, Height * Device->Width * 2 );
 		}	
 	}	
 #endif	
 }
 static void Update24( struct GDS_Device* Device ) {
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	int FirstCol = (Device->Width * 3) / 2, LastCol = 0, FirstRow = -1, LastRow = 0;  
 #ifdef SHADOW_BUFFER
 	uint16_t *optr = (uint16_t*) Private->Shadowbuffer, *iptr = (uint16_t*) Device->Framebuffer;
 	for (int r = 0; r < Device->Height; r++) {
 		// look for change and update shadow (cheap optimization = width always / by 2)
 		for (int c = 0; c < (Device->Width * 3) / 2; c++, optr++, iptr++) {
 			if (*optr != *iptr) {
 				*optr = *iptr;
 				if (c < FirstCol) FirstCol = c;	
 				if (c > LastCol) LastCol = c;
 				if (FirstRow < 0) FirstRow = r;
 				LastRow = r;
 			}
 		}
 		// do we have enough to send (cols are divided by 3/2)
 		if (FirstRow < 0 || ((((LastCol - FirstCol + 1) * 2 + 3 - 1) / 3) * (r - FirstRow + 1) * 3 < PAGE_BLOCK && r != Device->Height - 1)) continue;
 		FirstCol = (FirstCol * 2) / 3;
 		LastCol = (LastCol * 2 + 1) / 3; 
 		SetRowAddress( Device, FirstRow, LastRow );
 		SetColumnAddress( Device, FirstCol, LastCol );
 		Device->WriteCommand( Device, ENABLE_WRITE );
 		int ChunkSize = (LastCol - FirstCol + 1) * 3;
 		// own use of IRAM has not proven to be much better than letting SPI do its copy
 		if (Private->iRAM) {
 			uint8_t *optr = Private->iRAM;
 			for (int i = FirstRow; i <= LastRow; i++) {
 				memcpy(optr, Private->Shadowbuffer + (i * Device->Width + FirstCol) * 3, ChunkSize);
 				optr += ChunkSize;
 				if (optr - Private->iRAM < PAGE_BLOCK && i < LastRow) continue;
 				Device->WriteData(Device, Private->iRAM, optr - Private->iRAM);
 				optr = Private->iRAM;
 			}	
 		} else for (int i = FirstRow; i <= LastRow; i++) {
 			Device->WriteData( Device, Private->Shadowbuffer + (i * Device->Width + FirstCol) * 3, ChunkSize );
 		}	
 		FirstCol = (Device->Width * 3) / 2; LastCol = 0;
 		FirstRow = -1;
 	}	
 #else
 	// always update by full lines
 	SetColumnAddress( Device, 0, Device->Width - 1);
 	for (int r = 0; r < Device->Height; r += min(Private->PageSize, Device->Height - r)) {
 		int Height = min(Private->PageSize, Device->Height - r);
 		SetRowAddress( Device, r, r + Height - 1 );
 		Device->WriteCommand(Device, ENABLE_WRITE);
 		if (Private->iRAM) {
 			memcpy(Private->iRAM, Device->Framebuffer + r * Device->Width * 3, Height * Device->Width * 3 );
 			Device->WriteData( Device, Private->iRAM, Height * Device->Width * 3 );
 		} else	{
 			Device->WriteData( Device, Device->Framebuffer + r * Device->Width * 3, Height * Device->Width * 3 );
 		}	
 	}	
 #endif	
 }
 static void SetLayout( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate ) { 
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	Private->ReMap = HFlip ? (Private->ReMap & ~(1 << 1)) : (Private->ReMap | (1 << 1));
 	Private->ReMap = VFlip ? (Private->ReMap | (1 << 4)) : (Private->ReMap & ~(1 << 4));
 	Device->WriteCommand( Device, 0xA0 );
 	WriteByte( Device, Private->ReMap );
 }	
 static void DisplayOn( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAF ); }
 static void DisplayOff( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0xAE ); }
 static void SetContrast( struct GDS_Device* Device, uint8_t Contrast ) {
    Device->WriteCommand( Device, 0xC7 );
 	WriteByte( Device, Contrast >> 4);
 }
 static bool Init( struct GDS_Device* Device ) {
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	int Depth = (Device->Depth + 8 - 1) / 8;
 	Private->PageSize = min(8, PAGE_BLOCK / (Device->Width * Depth));
 #ifdef SHADOW_BUFFER	
 	Private->Shadowbuffer = malloc( Device->FramebufferSize );	
 	memset(Private->Shadowbuffer, 0xFF, Device->FramebufferSize);
 #endif
 #ifdef USE_IRAM
 	Private->iRAM = heap_caps_malloc( (Private->PageSize + 1) * Device->Width * Depth, MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA );
 #endif
 	ESP_LOGI(TAG, "SSD1351 with bit depth %u, page %u, iRAM %p", Device->Depth, Private->PageSize, Private->iRAM);
 	// unlock (specially 0xA2)
 	Device->WriteCommand( Device, 0xFD);
 	WriteByte(Device, 0xB1);
 	// set clocks
 	/*
    Device->WriteCommand( Device, 0xB3 );
    WriteByte( Device, ( 0x08 << 4 ) | 0x00 );
 	*/
 	// need to be off and disable display RAM
 	Device->DisplayOff( Device );
 	// need COM split (5)
 	Private->ReMap = (1 << 5);
 	// Display Offset
    Device->WriteCommand( Device, 0xA2 );
    WriteByte( Device, 0x00 );
 	// Display Start Line
    Device->WriteCommand( Device, 0xA1 );
 	WriteByte( Device, 0x00 );
 	// set flip modes & contrast
 	Device->SetContrast( Device, 0x7F );
 	Device->SetLayout( Device, false, false, false );
 	// set Adressing Mode Horizontal
 	Private->ReMap |= (0 << 2);
 	// set screen depth (16/18)
 	if (Device->Depth == 24) Private->ReMap |= (0x02 << 6);
 	// write ReMap byte
 	Device->WriteCommand( Device, 0xA0 );
 	WriteByte( Device, Private->ReMap );		
 	// no Display Inversion
    Device->WriteCommand( Device, 0xA6 );	
 	// gone with the wind
 	Device->DisplayOn( Device );
 	Device->Update( Device );
 	return true;
 }	
 static const struct GDS_Device SSD1351 = {
 	.DisplayOn = DisplayOn, .DisplayOff = DisplayOff, .SetContrast = SetContrast,
 	.SetLayout = SetLayout,
 	.Update = Update16, .Init = Init,
 	.Mode = GDS_RGB565, .Depth = 16,
 };	
 struct GDS_Device* SSD1351_Detect(char *Driver, struct GDS_Device* Device) {
 	int Depth;
 	if (!strcasestr(Driver, "SSD1351")) return NULL;
 	if (!Device) Device = calloc(1, sizeof(struct GDS_Device));
 	*Device = SSD1351;	
 	sscanf(Driver, "%*[^:]:%u", &Depth);
 	if (Depth == 18) {
 		Device->Mode = GDS_RGB666;
 		Device->Depth = 24;
 		Device->Update = Update24;
 	} 	
 	return Device;
 }
--- a/components/display/SSD1675.c
+++ b/components/display/SSD1675.c
@@ -118,7 +118,7 @@ static void Update( struct GDS_Device* Device ) {
 }
 // remember that for these ELD drivers W and H are "inverted"
-static void IRAM_ATTR DrawPixelFast( struct GDS_Device* Device, int X, int Y, int Color ) {
+static inline void _DrawPixel( struct GDS_Device* Device, int X, int Y, int Color ) {
    uint32_t YBit = ( Y & 0x07 );
    Y>>= 3;
@@ -129,7 +129,7 @@ static void IRAM_ATTR DrawPixelFast( struct GDS_Device* Device, int X, int Y, in
 static void ClearWindow( struct GDS_Device* Device, int x1, int y1, int x2, int y2, int Color ) {
 	for (int r = y1; r <= y2; r++) {
 		for (int c = x1; c <= x2; c++) {
-			DrawPixelFast( Device, c, r, Color );
+			_DrawPixel( Device, c, r, Color );
 		}	
 	}
 }
@@ -228,8 +228,10 @@ static bool Init( struct GDS_Device* Device ) {
 static const struct GDS_Device SSD1675 = {
 	.DrawBitmapCBR = DrawBitmapCBR, .ClearWindow = ClearWindow,
-	.DrawPixelFast = DrawPixelFast,
+	.DrawPixelFast = _DrawPixel,
 	.Update = Update, .Init = Init,
 	.Mode = GDS_MONO, .Depth = 1,
 	.Alloc = GDS_ALLOC_NONE,
 };	
 struct GDS_Device* SSD1675_Detect(char *Driver, struct GDS_Device* Device) {
@@ -238,9 +240,6 @@ struct GDS_Device* SSD1675_Detect(char *Driver, struct GDS_Device* Device) {
 	if (!Device) Device = calloc(1, sizeof(struct GDS_Device));
 	*Device = SSD1675;	
 	Device->Depth = 1;
 	Device->Alloc = GDS_ALLOC_NONE;
 	char *p;
 	struct PrivateSpace* Private = (struct PrivateSpace*) Device->Private;
 	Private->ReadyPin = -1;
--- a/components/display/ST77xx.c
+++ b/components/display/ST77xx.c
@@ -0,0 +1,298 @@
 /**
 * Copyright (c) 2017-2018 Tara Keeling
 *				 2020 Philippe G.
 * 
 * This software is released under the MIT License.
 * https://opensource.org/licenses/MIT
 */
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <esp_heap_caps.h>
 #include <esp_log.h>
 #include "gds.h"
 #include "gds_private.h"
 #define SHADOW_BUFFER
 #define USE_IRAM
 #define PAGE_BLOCK		2048
 #define ENABLE_WRITE	0x2c
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 static char TAG[] = "ST77xx";
 enum { ST7735, ST7789 };
 struct PrivateSpace {
 	uint8_t *iRAM, *Shadowbuffer;
 	struct {
 		uint16_t Height, Width;
 	} Offset;
 	uint8_t MADCtl, PageSize;
 	uint8_t Model;
 };
 // Functions are not declared to minimize # of lines
 static void WriteByte( struct GDS_Device* Device, uint8_t Data ) {
 	Device->WriteData( Device, &Data, 1 );
 }
 static void SetColumnAddress( struct GDS_Device* Device, uint16_t Start, uint16_t End ) {
 	uint32_t Addr = __builtin_bswap16(Start) | (__builtin_bswap16(End) << 16);
 	Device->WriteCommand( Device, 0x2A );
 	Device->WriteData( Device, (uint8_t*) &Addr, 4 );
 }
 static void SetRowAddress( struct GDS_Device* Device, uint16_t Start, uint16_t End ) {
 	uint32_t Addr = __builtin_bswap16(Start) | (__builtin_bswap16(End) << 16);
 	Device->WriteCommand( Device, 0x2B );
 	Device->WriteData( Device, (uint8_t*) &Addr, 4 );
 }
 static void Update16( struct GDS_Device* Device ) {
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 #ifdef SHADOW_BUFFER
 	uint32_t *optr = (uint32_t*) Private->Shadowbuffer, *iptr = (uint32_t*) Device->Framebuffer;
 	int FirstCol = Device->Width / 2, LastCol = 0, FirstRow = -1, LastRow = 0;  
 	for (int r = 0; r < Device->Height; r++) {
 		// look for change and update shadow (cheap optimization = width is always a multiple of 2)
 		for (int c = 0; c < Device->Width / 2; c++, iptr++, optr++) {
 			if (*optr != *iptr) {
 				*optr = *iptr;
 				if (c < FirstCol) FirstCol = c;	
 				if (c > LastCol) LastCol = c;
 				if (FirstRow < 0) FirstRow = r;
 				LastRow = r;
 			}
 		}
 		// wait for a large enough window - careful that window size might increase by more than a line at once !
 		if (FirstRow < 0 || ((LastCol - FirstCol + 1) * (r - FirstRow + 1) * 4 < PAGE_BLOCK && r != Device->Height - 1)) continue;
 		FirstCol *= 2;
 		LastCol = LastCol * 2 + 1;
 		SetRowAddress( Device, FirstRow + Private->Offset.Height, LastRow + Private->Offset.Height);
 		SetColumnAddress( Device, FirstCol + Private->Offset.Width, LastCol + Private->Offset.Width );
 		Device->WriteCommand( Device, ENABLE_WRITE );
 		int ChunkSize = (LastCol - FirstCol + 1) * 2;
 		// own use of IRAM has not proven to be much better than letting SPI do its copy
 		if (Private->iRAM) {
 			uint8_t *optr = Private->iRAM;
 			for (int i = FirstRow; i <= LastRow; i++) {
 				memcpy(optr, Private->Shadowbuffer + (i * Device->Width + FirstCol) * 2, ChunkSize);
 				optr += ChunkSize;
 				if (optr - Private->iRAM <= (PAGE_BLOCK - ChunkSize) && i < LastRow) continue;
 				Device->WriteData(Device, Private->iRAM, optr - Private->iRAM);
 				optr = Private->iRAM;
 			}
 		} else for (int i = FirstRow; i <= LastRow; i++) {
 			Device->WriteData( Device, Private->Shadowbuffer + (i * Device->Width + FirstCol) * 2, ChunkSize );
 		}	
 		FirstCol = Device->Width / 2; LastCol = 0;
 		FirstRow = -1;
 	}	
 #else
 	// always update by full lines
 	SetColumnAddress( Device, Private->Offset.Width, Device->Width - 1);
 	for (int r = 0; r < Device->Height; r += min(Private->PageSize, Device->Height - r)) {
 		int Height = min(Private->PageSize, Device->Height - r);
 		SetRowAddress( Device, Private->Offset.Height + r, Private->Offset.Height + r + Height - 1 );
 		Device->WriteCommand(Device, ENABLE_WRITE);
 		if (Private->iRAM) {
 			memcpy(Private->iRAM, Device->Framebuffer + r * Device->Width * 2, Height * Device->Width * 2 );
 			Device->WriteData( Device, Private->iRAM, Height * Device->Width * 2 );
 		} else	{
 			Device->WriteData( Device, Device->Framebuffer + r * Device->Width * 2, Height * Device->Width * 2 );
 		}	
 	}	
 #endif	
 }
 static void Update24( struct GDS_Device* Device ) {
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 #ifdef SHADOW_BUFFER
 	uint16_t *optr = (uint16_t*) Private->Shadowbuffer, *iptr = (uint16_t*) Device->Framebuffer;
 	int FirstCol = (Device->Width * 3) / 2, LastCol = 0, FirstRow = -1, LastRow = 0;  
 	for (int r = 0; r < Device->Height; r++) {
 		// look for change and update shadow (cheap optimization = width always / by 2)
 		for (int c = 0; c < (Device->Width * 3) / 2; c++, optr++, iptr++) {
 			if (*optr != *iptr) {
 				*optr = *iptr;
 				if (c < FirstCol) FirstCol = c;	
 				if (c > LastCol) LastCol = c;
 				if (FirstRow < 0) FirstRow = r;
 				LastRow = r;
 			}
 		}
 		// do we have enough to send (cols are divided by 3/2)
 		if (FirstRow < 0 || ((((LastCol - FirstCol + 1) * 2 + 3 - 1) / 3) * (r - FirstRow + 1) * 3 < PAGE_BLOCK && r != Device->Height - 1)) continue;
 		FirstCol = (FirstCol * 2) / 3;
 		LastCol = (LastCol * 2 + 1) / 3; 
 		SetRowAddress( Device, FirstRow + Private->Offset.Height, LastRow + Private->Offset.Height);
 		SetColumnAddress( Device, FirstCol + Private->Offset.Width, LastCol + Private->Offset.Width );
 		Device->WriteCommand( Device, ENABLE_WRITE );
 		int ChunkSize = (LastCol - FirstCol + 1) * 3;
 		// own use of IRAM has not proven to be much better than letting SPI do its copy
 		if (Private->iRAM) {
 			uint8_t *optr = Private->iRAM;
 			for (int i = FirstRow; i <= LastRow; i++) {
 				memcpy(optr, Private->Shadowbuffer + (i * Device->Width + FirstCol) * 3, ChunkSize);
 				optr += ChunkSize;
 				if (optr - Private->iRAM <= (PAGE_BLOCK - ChunkSize) && i < LastRow) continue;
 				Device->WriteData(Device, Private->iRAM, optr - Private->iRAM);
 				optr = Private->iRAM;
 			}	
 		} else for (int i = FirstRow; i <= LastRow; i++) {
 			Device->WriteData( Device, Private->Shadowbuffer + (i * Device->Width + FirstCol) * 3, ChunkSize );
 		}	
 		FirstCol = (Device->Width * 3) / 2; LastCol = 0;
 		FirstRow = -1;
 	}	
 #else
 	// always update by full lines
 	SetColumnAddress( Device, Private->Offset.Width, Device->Width - 1);
 	for (int r = 0; r < Device->Height; r += min(Private->PageSize, Device->Height - r)) {
 		int Height = min(Private->PageSize, Device->Height - r);
 		SetRowAddress( Device, Private->Offset.Height + r, Private->Offset.Height + r + Height - 1 );
 		Device->WriteCommand(Device, ENABLE_WRITE);
 		if (Private->iRAM) {
 			memcpy(Private->iRAM, Device->Framebuffer + r * Device->Width * 3, Height * Device->Width * 3 );
 			Device->WriteData( Device, Private->iRAM, Height * Device->Width * 3 );
 		} else	{
 			Device->WriteData( Device, Device->Framebuffer + r * Device->Width * 3, Height * Device->Width * 3 );
 		}	
 	}	
 #endif	
 }
 static void SetLayout( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate ) { 
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	Private->MADCtl = HFlip ? (Private->MADCtl | (1 << 7)) : (Private->MADCtl & ~(1 << 7));
 	Private->MADCtl = VFlip ? (Private->MADCtl | (1 << 6)) : (Private->MADCtl & ~(1 << 6));
 	Private->MADCtl = Rotate ? (Private->MADCtl | (1 << 5)) : (Private->MADCtl & ~(1 << 5));
 	Device->WriteCommand( Device, 0x36 );
 	WriteByte( Device, Private->MADCtl );
 	if (Private->Model == ST7789) {
 		if (Rotate) Private->Offset.Width = HFlip ? 320 - Device->Width : 0;
 		else Private->Offset.Height = HFlip ? 320 - Device->Height : 0;
 	}
 #ifdef SHADOW_BUFFER
 	// force a full refresh (almost ...)
 	memset(Private->Shadowbuffer, 0xAA, Device->FramebufferSize);
 #endif	
 }	
 static void DisplayOn( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0x29 ); }
 static void DisplayOff( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0x28 ); }
 static void SetContrast( struct GDS_Device* Device, uint8_t Contrast ) {
 	Device->WriteCommand( Device, 0x51 );
 	WriteByte( Device, Contrast );
 	Device->SetContrast = NULL;
 	GDS_SetContrast( Device, Contrast );
 	Device->SetContrast = SetContrast;
 }
 static bool Init( struct GDS_Device* Device ) {
 	struct PrivateSpace *Private = (struct PrivateSpace*) Device->Private;
 	int Depth = (Device->Depth + 8 - 1) / 8;
 	Private->PageSize = min(8, PAGE_BLOCK / (Device->Width * Depth));
 #ifdef SHADOW_BUFFER	
 	Private->Shadowbuffer = malloc( Device->FramebufferSize );	
 	memset(Private->Shadowbuffer, 0xFF, Device->FramebufferSize);
 #endif
 #ifdef USE_IRAM
 	Private->iRAM = heap_caps_malloc( (Private->PageSize + 1) * Device->Width * Depth, MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA );
 #endif
 	ESP_LOGI(TAG, "ST77xx with bit depth %u, page %u, iRAM %p", Device->Depth, Private->PageSize, Private->iRAM);
 	// Sleepout + Booster
 	Device->WriteCommand( Device, 0x11 );
 	// need BGR & Address Mode
 	Private->MADCtl = 1 << 3;
 	Device->WriteCommand( Device, 0x36 );
 	WriteByte( Device, Private->MADCtl );		
 	// set flip modes & contrast
 	GDS_SetContrast( Device, 0x7f );
 	Device->SetLayout( Device, false, false, false );
 	// set screen depth (16/18)
 	Device->WriteCommand( Device, 0x3A );
 	if (Private->Model == ST7789) WriteByte( Device, Device->Depth == 24 ? 0x066 : 0x55 );
 	else WriteByte( Device, Device->Depth == 24 ? 0x06 : 0x05 );
 	// no Display Inversion
    Device->WriteCommand( Device, Private->Model == ST7735 ? 0x20 : 0x21 );	
 	// gone with the wind
 	Device->DisplayOn( Device );
 	Device->Update( Device );
 	return true;
 }	
 static const struct GDS_Device ST77xx = {
 	.DisplayOn = DisplayOn, .DisplayOff = DisplayOff,
 	.SetLayout = SetLayout,
 	.Update = Update16, .Init = Init,
 	.Mode = GDS_RGB565, .Depth = 16,
 };		
 struct GDS_Device* ST77xx_Detect(char *Driver, struct GDS_Device* Device) {
 	uint8_t Model;
 	int Depth;
 	if (strcasestr(Driver, "ST7735")) Model = ST7735;
 	else if (strcasestr(Driver, "ST7789")) Model = ST7789;
 	else return NULL;
 	if (!Device) Device = calloc(1, sizeof(struct GDS_Device));
 	*Device = ST77xx;	
 	sscanf(Driver, "%*[^:]:%u", &Depth);
 	struct PrivateSpace* Private = (struct PrivateSpace*) Device->Private;
 	Private->Model = Model;
 	if (Depth == 18) {
 		Device->Mode = GDS_RGB666;
 		Device->Depth = 24;
 		Device->Update = Update24;
 	} 	
 	if (Model == ST7789) Device->SetContrast = SetContrast;
 	return Device;
 }
--- a/components/display/core/gds.c
+++ b/components/display/core/gds.c
@@ -9,22 +9,37 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdint.h>
 #include <math.h>
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "driver/gpio.h"
 #include "driver/ledc.h"
 #include "esp_log.h"
 #include "gds.h"
 #include "gds_private.h"
 static struct GDS_Device Display;
 static struct GDS_BacklightPWM PWMConfig;
 static char TAG[] = "gds";
-struct GDS_Device* GDS_AutoDetect( char *Driver, GDS_DetectFunc* DetectFunc[] ) {
+struct GDS_Device* GDS_AutoDetect( char *Driver, GDS_DetectFunc* DetectFunc[], struct GDS_BacklightPWM* PWM ) {
 	if (!Driver) return NULL;
 	if (PWM) PWMConfig = *PWM;
 	for (int i = 0; DetectFunc[i]; i++) {
 		if (DetectFunc[i](Driver, &Display)) {
-			ESP_LOGD(TAG, "Detected driver %p", &Display);
+			if (PWM && PWM->Init) {
 				ledc_timer_config_t PWMTimer = {
 						.duty_resolution = LEDC_TIMER_13_BIT,
 						.freq_hz = 5000,                   
 						.speed_mode = LEDC_HIGH_SPEED_MODE,
 						.timer_num = PWMConfig.Timer,
 					};
 				ledc_timer_config(&PWMTimer);
 			}	
 			ESP_LOGD(TAG, "Detected driver %p with PWM %d", &Display, PWM ? PWM->Init : 0);			
 			return &Display;
 		}	
 	}
@@ -53,12 +68,20 @@ void GDS_ClearExt(struct GDS_Device* Device, bool full, ...) {
 }	
 void GDS_Clear( struct GDS_Device* Device, int Color ) {
-	if (Device->Depth == 1) Color = Color == GDS_COLOR_BLACK ? 0 : 0xff;
+	if (Color == GDS_COLOR_BLACK) memset( Device->Framebuffer, 0, Device->FramebufferSize );
-	else if (Device->Depth == 4) Color = Color | (Color << 4);
+	else if (Device->Depth == 1) memset( Device->Framebuffer, 0xff, Device->FramebufferSize );
-    memset( Device->Framebuffer, Color, Device->FramebufferSize );
+	else if (Device->Depth == 4) memset( Device->Framebuffer, Color | (Color << 4), Device->FramebufferSize );
 	else if (Device->Depth == 8) memset( Device->Framebuffer, Color, Device->FramebufferSize );
 	else GDS_ClearWindow(Device, 0, 0, -1, -1, Color);
 	Device->Dirty = true;
 }
 #define CLEAR_WINDOW(x1,y1,x2,y2,F,W,C,T,N)				\
 	for (int y = y1; y <= y2; y++) {					\
 		T *Ptr = (T*) F + (y * W + x1)*N;				\
 		for (int c = (x2 - x1)*N; c-- >= 0; *Ptr++ = C);	\
 	}
 void GDS_ClearWindow( struct GDS_Device* Device, int x1, int y1, int x2, int y2, int Color ) {
 	// -1 means up to width/height
 	if (x2 < 0) x2 = Device->Width - 1;
@@ -80,7 +103,7 @@ void GDS_ClearWindow( struct GDS_Device* Device, int x1, int y1, int x2, int y2,
 				int c = x1;
 				// for a row that is not on a boundary, no optimization possible
 				while (r & 0x07 && r <= y2) {
-					for (c = x1; c <= x2; c++) GDS_DrawPixelFast( Device, c, r, Color );
+					for (c = x1; c <= x2; c++) DrawPixelFast( Device, c, r, Color );
 					r++;
 				}
 				// go fast if we have more than 8 lines to write
@@ -88,7 +111,7 @@ void GDS_ClearWindow( struct GDS_Device* Device, int x1, int y1, int x2, int y2,
 					memset(optr + Width * r + x1, _Color, x2 - x1 + 1);
 					r += 8;
 				} else while (r <= y2) {
-					for (c = x1; c <= x2; c++) GDS_DrawPixelFast( Device, c, r, Color );
+					for (c = x1; c <= x2; c++) DrawPixelFast( Device, c, r, Color );
 					r++;
 				}
 			}
@@ -104,16 +127,22 @@ void GDS_ClearWindow( struct GDS_Device* Device, int x1, int y1, int x2, int y2,
 			// try to do byte processing as much as possible
 			for (int r = y1; r <= y2; r++) {
 				int c = x1;
-				if (c & 0x01) GDS_DrawPixelFast( Device, c++, r, Color);
+				if (c & 0x01) DrawPixelFast( Device, c++, r, Color);
 				int chunk = (x2 - c + 1) >> 1;
 				memset(optr + ((r * Width + c)  >> 1), _Color, chunk);
-				if (c + chunk <= x2) GDS_DrawPixelFast( Device, x2, r, Color);
+				if (c + chunk <= x2) DrawPixelFast( Device, x2, r, Color);
 			}
 		}	
 	} else if (Device->Depth == 8) {
 		CLEAR_WINDOW(x1,y1,x2,y2,Device->Framebuffer,Device->Width,Color,uint8_t,1);
 	} else if (Device->Depth == 16) {
 		CLEAR_WINDOW(x1,y1,x2,y2,Device->Framebuffer,Device->Width,Color,uint16_t,1);
 	} else if (Device->Depth == 24) {
 		CLEAR_WINDOW(x1,y1,x2,y2,Device->Framebuffer,Device->Width,Color,uint8_t,3);
 	} else {
 		for (int y = y1; y <= y2; y++) {
 			for (int x = x1; x <= x2; x++) {
-				GDS_DrawPixelFast( Device, x, y, Color);
+				DrawPixelFast( Device, x, y, Color);
 			}
 		}
 	}
@@ -138,29 +167,80 @@ bool GDS_Reset( struct GDS_Device* Device ) {
 bool GDS_Init( struct GDS_Device* Device ) {
-	Device->FramebufferSize = (Device->Width * Device->Height) / (8 / Device->Depth);
+	if (Device->Depth > 8) Device->FramebufferSize = Device->Width * Device->Height * ((8 + Device->Depth - 1) / 8);
 	else Device->FramebufferSize = (Device->Width * Device->Height) / (8 / Device->Depth);
 	// allocate FB unless explicitely asked not to
 	if (!(Device->Alloc & GDS_ALLOC_NONE)) {
 		if ((Device->Alloc & GDS_ALLOC_IRAM) || ((Device->Alloc & GDS_ALLOC_IRAM_SPI) && Device->IF == GDS_IF_SPI)) {
-			heap_caps_calloc( 1, Device->FramebufferSize, MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA );
+			Device->Framebuffer = heap_caps_calloc( 1, Device->FramebufferSize, MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA );
 		} else {
 			Device->Framebuffer = calloc( 1, Device->FramebufferSize );
 		}	
 		NullCheck( Device->Framebuffer, return false );
 	}	
 	if (Device->Backlight.Pin >= 0) {
 		Device->Backlight.Channel = PWMConfig.Channel++;
 		Device->Backlight.PWM = PWMConfig.Max - 1;
 		ledc_channel_config_t PWMChannel = {
            .channel    = Device->Backlight.Channel,
            .duty       = Device->Backlight.PWM,
            .gpio_num   = Device->Backlight.Pin,
            .speed_mode = LEDC_HIGH_SPEED_MODE,
            .hpoint     = 0,
            .timer_sel  = PWMConfig.Timer,
        };
 		ledc_channel_config(&PWMChannel);
 	}
 	bool Res = Device->Init( Device );
-	if (!Res) free(Device->Framebuffer);
+	if (!Res && Device->Framebuffer) free(Device->Framebuffer);
 	return Res;
 }
-void GDS_SetContrast( struct GDS_Device* Device, uint8_t Contrast ) { if (Device->SetContrast) Device->SetContrast( Device, Contrast); }
+int GDS_GrayMap( struct GDS_Device* Device, uint8_t Level) {
-void GDS_SetHFlip( struct GDS_Device* Device, bool On ) { if (Device->SetHFlip) Device->SetHFlip( Device, On ); }
+	switch(Device->Mode) {
-void GDS_SetVFlip( struct GDS_Device* Device, bool On ) { if (Device->SetVFlip) Device->SetVFlip( Device, On ); }
+		case GDS_MONO: return Level;
 		case GDS_GRAYSCALE: return Level >> (8 - Device->Depth);
 		case GDS_RGB332:
 			Level >>= 5;	
 			return (Level << 6) | (Level << 3) | (Level >> 1);
 		case GDS_RGB444:	
 			Level >>= 4;
 			return (Level << 8) | (Level << 4) | Level;
 		case GDS_RGB555:	
 			Level >>= 3;
 			return (Level << 10) | (Level << 5) | Level;			
 		case GDS_RGB565:	
 			Level >>= 2;
 			return ((Level & ~0x01) << 10) | (Level << 5) | (Level >> 1);						
 		case GDS_RGB666:	
 			Level >>= 2;
 			return (Level << 12) | (Level << 6) | Level;									
 		case GDS_RGB888:	
 			return (Level << 16) | (Level << 8) | Level;												
 	}
 	return -1;
 }
 void GDS_SetContrast( struct GDS_Device* Device, uint8_t Contrast ) { 
 	if (Device->SetContrast) Device->SetContrast( Device, Contrast ); 
 	else if (Device->Backlight.Pin >= 0) {
 		Device->Backlight.PWM = PWMConfig.Max * powf(Contrast / 255.0, 3);
 		ledc_set_duty( LEDC_HIGH_SPEED_MODE, Device->Backlight.Channel, Device->Backlight.PWM );
 		ledc_update_duty( LEDC_HIGH_SPEED_MODE, Device->Backlight.Channel );		
 	}
 }
 void GDS_SetLayout( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate ) { if (Device->SetLayout) Device->SetLayout( Device, HFlip, VFlip, Rotate ); }
 void GDS_SetDirty( struct GDS_Device* Device ) { Device->Dirty = true; }
 int	GDS_GetWidth( struct GDS_Device* Device ) { return Device->Width; }
 int	GDS_GetHeight( struct GDS_Device* Device ) { return Device->Height; }
 int	GDS_GetDepth( struct GDS_Device* Device ) { return Device->Depth; }
 int	GDS_GetMode( struct GDS_Device* Device ) { return Device->Mode; }
 void GDS_DisplayOn( struct GDS_Device* Device ) { if (Device->DisplayOn) Device->DisplayOn( Device ); }
 void GDS_DisplayOff( struct GDS_Device* Device ) { if (Device->DisplayOff) Device->DisplayOff( Device ); }
--- a/components/display/core/gds.h
+++ b/components/display/core/gds.h
@@ -5,40 +5,43 @@
 #include <stdbool.h>
 /* NOTE for drivers:
- The build-in DrawPixel(Fast), DrawCBR and ClearWindow are optimized for 1 bit 
+ The build-in DrawPixel(Fast), DrawCBR and ClearWindow have optimized for 1 bit 
- and 4 bits screen depth. For any other type of screen, DrawCBR and ClearWindow
+ and 4 bits grayscale screen depth and 8, 16, 24 color. For any other type of screen, 
- default to use DrawPixel, which is very sub-optimal. For such other depth, you 
+ DrawCBR and ClearWindow default to use DrawPixel, which is very sub-optimal. For 
- must supply the DrawPixelFast. The built-in 1 bit depth function are only for 
+ other depth, you  must supply the DrawPixelFast. The built-in 1 bit depth function 
- screen with vertical framing (1 byte = 8 lines). For example SSD1326 in 
+ are only for screen with vertical framing (1 byte = 8 lines). For example SSD1326 in 
 monochrome mode is not such type of screen, SH1106 and SSD1306 are
 */ 
-enum { 	GDS_COLOR_L0 = 0, GDS_COLOR_L1, GDS_COLOR_L2, GDS_COLOR_L3, GDS_COLOR_L4, GDS_COLOR_L5, GDS_COLOR_L6, GDS_COLOR_L7, 
+// this is an ordered enum, do not change!
-		GDS_COLOR_L8, GDS_COLOR_L9, GDS_COLOR_L10, GDS_COLOR_L11, GDS_COLOR_L12, GDS_COLOR_L13, GDS_COLOR_L14, GDS_COLOR_L15,
+enum { GDS_MONO = 0, GDS_GRAYSCALE, GDS_RGB332, GDS_RGB444, GDS_RGB555, GDS_RGB565, GDS_RGB666, GDS_RGB888 };
 		GDS_COLOR_MAX
 };
 #define GDS_COLOR_BLACK (0)
 #define GDS_COLOR_WHITE (-1)
-#define GDS_COLOR_XOR 	(GDS_COLOR_MAX + 1)
+#define GDS_COLOR_XOR 	(256)
 struct GDS_Device;
 struct GDS_FontDef;
 struct GDS_BacklightPWM { 
 	int Channel, Timer, Max;
 	bool Init;
 };
 typedef struct GDS_Device* GDS_DetectFunc(char *Driver, struct GDS_Device *Device);
-struct GDS_Device*	GDS_AutoDetect( char *Driver, GDS_DetectFunc* DetectFunc[] );
+struct GDS_Device*	GDS_AutoDetect( char *Driver, GDS_DetectFunc* DetectFunc[], struct GDS_BacklightPWM *PWM );
 void 	GDS_SetContrast( struct GDS_Device* Device, uint8_t Contrast );
 void 	GDS_DisplayOn( struct GDS_Device* Device );
 void 	GDS_DisplayOff( struct GDS_Device* Device ); 
 void 	GDS_Update( struct GDS_Device* Device );
-void 	GDS_SetHFlip( struct GDS_Device* Device, bool On );
+void 	GDS_SetLayout( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate );
 void 	GDS_SetVFlip( struct GDS_Device* Device, bool On );
 void 	GDS_SetDirty( struct GDS_Device* Device );
 int 	GDS_GetWidth( struct GDS_Device* Device );
 int 	GDS_GetHeight( struct GDS_Device* Device );
 int 	GDS_GetDepth( struct GDS_Device* Device );
 int 	GDS_GetMode( struct GDS_Device* Device );
 int 	GDS_GrayMap( struct GDS_Device* Device, uint8_t Level );
 void 	GDS_ClearExt( struct GDS_Device* Device, bool full, ...);
 void 	GDS_Clear( struct GDS_Device* Device, int Color );
 void 	GDS_ClearWindow( struct GDS_Device* Device, int x1, int y1, int x2, int y2, int Color );
--- a/components/display/core/gds_default_if.h
+++ b/components/display/core/gds_default_if.h
@@ -8,10 +8,10 @@ extern "C" {
 struct GDS_Device;
 bool GDS_I2CInit( int PortNumber, int SDA, int SCL, int speed );
-bool GDS_I2CAttachDevice( struct GDS_Device* Device, int Width, int Height, int I2CAddress, int RSTPin );
+bool GDS_I2CAttachDevice( struct GDS_Device* Device, int Width, int Height, int I2CAddress, int RSTPin, int BacklightPin );
 bool GDS_SPIInit( int SPI, int DC );
-bool GDS_SPIAttachDevice( struct GDS_Device* Device, int Width, int Height, int CSPin, int RSTPin, int Speed );
+bool GDS_SPIAttachDevice( struct GDS_Device* Device, int Width, int Height, int CSPin, int RSTPin, int Speed, int BacklightPin );
 #ifdef __cplusplus
 }
--- a/components/display/core/gds_draw.c
+++ b/components/display/core/gds_draw.c
@@ -5,7 +5,6 @@
 * This software is released under the MIT License.
 * https://opensource.org/licenses/MIT
 */
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
@@ -45,9 +44,13 @@ __attribute__( ( always_inline ) ) static inline void SwapInt( int* a, int* b )
    *a = Temp;
 }
-// un-comment if need to be instanciated for external callers
+void IRAM_ATTR GDS_DrawPixelFast( struct GDS_Device* Device, int X, int Y, int Color ) {
-extern inline void IRAM_ATTR GDS_DrawPixelFast( struct GDS_Device* Device, int X, int Y, int Color );
+	DrawPixelFast( Device, X, Y, Color );
-extern inline void IRAM_ATTR GDS_DrawPixel( struct GDS_Device* Device, int X, int Y, int Color );
+}
 void IRAM_ATTR GDS_DrawPixel( struct GDS_Device* Device, int X, int Y, int Color ) {
 	DrawPixel( Device, X, Y, Color );
 }
 void GDS_DrawHLine( struct GDS_Device* Device, int x, int y, int Width, int Color ) {
    int XEnd = x + Width;
@@ -60,7 +63,7 @@ void GDS_DrawHLine( struct GDS_Device* Device, int x, int y, int Width, int Colo
 	if (y < 0) y = 0;
 	else if (y >= Device->Height) y = Device->Height - 1;
-    for ( ; x < XEnd; x++ ) GDS_DrawPixelFast( Device, x, y, Color );
+    for ( ; x < XEnd; x++ ) DrawPixelFast( Device, x, y, Color );
 }
 void GDS_DrawVLine( struct GDS_Device* Device, int x, int y, int Height, int Color ) {
@@ -74,7 +77,7 @@ void GDS_DrawVLine( struct GDS_Device* Device, int x, int y, int Height, int Col
 	if (y < 0) y = 0;
 	else if (YEnd >= Device->Height) YEnd = Device->Height - 1;
-    for ( ; y < YEnd; y++ ) GDS_DrawPixel( Device, x, y, Color );
+    for ( ; y < YEnd; y++ ) DrawPixel( Device, x, y, Color );
 }
 static inline void DrawWideLine( struct GDS_Device* Device, int x0, int y0, int x1, int y1, int Color ) {
@@ -94,7 +97,7 @@ static inline void DrawWideLine( struct GDS_Device* Device, int x0, int y0, int
    for ( ; x < x1; x++ ) {
        if ( IsPixelVisible( Device, x, y ) == true ) {
-            GDS_DrawPixelFast( Device, x, y, Color );
+            DrawPixelFast( Device, x, y, Color );
        }
        if ( Error > 0 ) {
@@ -123,7 +126,7 @@ static inline void DrawTallLine( struct GDS_Device* Device, int x0, int y0, int
    for ( ; y < y1; y++ ) {
        if ( IsPixelVisible( Device, x, y ) == true ) {
-            GDS_DrawPixelFast( Device, x, y, Color );
+            DrawPixelFast( Device, x, y, Color );
        }
        if ( Error > 0 ) {
@@ -199,7 +202,9 @@ void GDS_DrawBitmapCBR(struct GDS_Device* Device, uint8_t *Data, int Width, int
 	if (Device->DrawBitmapCBR) {
 		Device->DrawBitmapCBR( Device, Data, Width, Height, Color );
 	} else if (Device->Depth == 1) {
 		Height >>= 3;
 		// need to do row/col swap and bit-reverse
 		for (int r = 0; r < Height; r++) {
 			uint8_t *optr = Device->Framebuffer + r*Device->Width, *iptr = Data + r;
@@ -211,8 +216,10 @@ void GDS_DrawBitmapCBR(struct GDS_Device* Device, uint8_t *Data, int Width, int
 	} else if (Device->Depth == 4)	{
 		uint8_t *optr = Device->Framebuffer;
 		int LineLen = Device->Width >> 1;
 		Height >>= 3;
 		Color &= 0x0f;
 		for (int i = Width * Height, r = 0, c = 0; --i >= 0;) {
 			uint8_t Byte = BitReverseTable256[*Data++];
 			// we need to linearize code to let compiler better optimize
@@ -238,37 +245,107 @@ void GDS_DrawBitmapCBR(struct GDS_Device* Device, uint8_t *Data, int Width, int
 			// end of a column, move to next one
 			if (++r == Height) { c++; r = 0; optr = Device->Framebuffer + (c >> 1); }		
 		}
 	} else if (Device->Depth == 8) {
 		uint8_t *optr = Device->Framebuffer;
 		int LineLen = Device->Width;
 		Height >>= 3;
 		for (int i = Width * Height, r = 0, c = 0; --i >= 0;) {
 			uint8_t Byte = BitReverseTable256[*Data++];
 			// we need to linearize code to let compiler better optimize
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; 
 			// end of a column, move to next one
 			if (++r == Height) { c++; r = 0; optr = Device->Framebuffer + c; }		
 		}	
 	} else if (Device->Depth == 16) {
 		uint16_t *optr = (uint16_t*) Device->Framebuffer;
 		int LineLen = Device->Width;
 		Height >>= 3;
 		Color = __builtin_bswap16(Color);
 		for (int i = Width * Height, r = 0, c = 0; --i >= 0;) {
 			uint8_t Byte = BitReverseTable256[*Data++];
 			// we need to linearize code to let compiler better optimize
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			*optr = ((Byte & 0x01) * Color); optr += LineLen; 
 			// end of a column, move to next one
 			if (++r == Height) { c++; r = 0; optr = (uint16_t*) Device->Framebuffer + c; }		
 		}
 	} else if (Device->Depth == 24) {
 		uint8_t *optr = Device->Framebuffer;
 		int LineLen = Device->Width * 3;
 		Height >>= 3;
 		if (Device->Mode == GDS_RGB666) Color = ((Color << 4) & 0xff0000) | ((Color << 2) & 0xff00) | (Color & 0x00ff);
 		for (int i = Width * Height, r = 0, c = 0; --i >= 0;) {
 			uint8_t Byte = BitReverseTable256[*Data++];
 			// we need to linearize code to let compiler better optimize		
 			#define SET24(O,D) O[0]=(D)>>16; O[1]=(D)>>8; O[2]=(D);
 			SET24(optr,(Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			SET24(optr,(Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			SET24(optr,(Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			SET24(optr,(Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			SET24(optr,(Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			SET24(optr,(Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			SET24(optr,(Byte & 0x01) * Color); optr += LineLen; Byte >>= 1;
 			SET24(optr,(Byte & 0x01) * Color); optr += LineLen;
 			// end of a column, move to next one
 			if (++r == Height) { c++; r = 0; optr = Device->Framebuffer + c * 3; }		
 		}
 	} else {
 		Height >>= 3;
 		// don't know bitdepth, use brute-force solution
 		for (int i = Width * Height, r = 0, c = 0; --i >= 0;) {
 			uint8_t Byte = *Data++;
-			GDS_DrawPixelFast( Device, c, (r << 3) + 7, (Byte & 0x01) * Color ); Byte >>= 1;
+			DrawPixelFast( Device, c, (r << 3) + 7, (Byte & 0x01) * Color ); Byte >>= 1;
-			GDS_DrawPixelFast( Device, c, (r << 3) + 6, (Byte & 0x01) * Color ); Byte >>= 1;
+			DrawPixelFast( Device, c, (r << 3) + 6, (Byte & 0x01) * Color ); Byte >>= 1;
-			GDS_DrawPixelFast( Device, c, (r << 3) + 5, (Byte & 0x01) * Color ); Byte >>= 1;
+			DrawPixelFast( Device, c, (r << 3) + 5, (Byte & 0x01) * Color ); Byte >>= 1;
-			GDS_DrawPixelFast( Device, c, (r << 3) + 4, (Byte & 0x01) * Color ); Byte >>= 1;
+			DrawPixelFast( Device, c, (r << 3) + 4, (Byte & 0x01) * Color ); Byte >>= 1;
-			GDS_DrawPixelFast( Device, c, (r << 3) + 3, (Byte & 0x01) * Color ); Byte >>= 1;
+			DrawPixelFast( Device, c, (r << 3) + 3, (Byte & 0x01) * Color ); Byte >>= 1;
-			GDS_DrawPixelFast( Device, c, (r << 3) + 2, (Byte & 0x01) * Color ); Byte >>= 1;
+			DrawPixelFast( Device, c, (r << 3) + 2, (Byte & 0x01) * Color ); Byte >>= 1;
-			GDS_DrawPixelFast( Device, c, (r << 3) + 1, (Byte & 0x01) * Color ); Byte >>= 1;
+			DrawPixelFast( Device, c, (r << 3) + 1, (Byte & 0x01) * Color ); Byte >>= 1;
-			GDS_DrawPixelFast( Device, c, (r << 3) + 0, (Byte & 0x01) * Color ); 
+			DrawPixelFast( Device, c, (r << 3) + 0, (Byte & 0x01) * Color ); 
 			if (++r == Height) { c++; r = 0; }			
 		}
 		/* for better understanding, here is the mundane version 
 		for (int x = 0; x < Width; x++) {
 			for (int y = 0; y < Height; y++) {
 				uint8_t Byte = *Data++;
-				GDS_DrawPixel4Fast( Device, x, y * 8 + 0, ((Byte >> 7) & 0x01) * Color );
+				GDSDrawPixel4Fast( Device, x, y * 8 + 0, ((Byte >> 7) & 0x01) * Color );
-				GDS_DrawPixel4Fast( Device, x, y * 8 + 1, ((Byte >> 6) & 0x01) * Color );
+				GDSDrawPixel4Fast( Device, x, y * 8 + 1, ((Byte >> 6) & 0x01) * Color );
-				GDS_DrawPixel4Fast( Device, x, y * 8 + 2, ((Byte >> 5) & 0x01) * Color );
+				GDSDrawPixel4Fast( Device, x, y * 8 + 2, ((Byte >> 5) & 0x01) * Color );
-				GDS_DrawPixel4Fast( Device, x, y * 8 + 3, ((Byte >> 4) & 0x01) * Color );
+				GDSDrawPixel4Fast( Device, x, y * 8 + 3, ((Byte >> 4) & 0x01) * Color );
-				GDS_DrawPixel4Fast( Device, x, y * 8 + 4, ((Byte >> 3) & 0x01) * Color );
+				GDSDrawPixel4Fast( Device, x, y * 8 + 4, ((Byte >> 3) & 0x01) * Color );
-				GDS_DrawPixel4Fast( Device, x, y * 8 + 5, ((Byte >> 2) & 0x01) * Color );
+				GDSDrawPixel4Fast( Device, x, y * 8 + 5, ((Byte >> 2) & 0x01) * Color );
-				GDS_DrawPixel4Fast( Device, x, y * 8 + 6, ((Byte >> 1) & 0x01) * Color );
+				GDSDrawPixel4Fast( Device, x, y * 8 + 6, ((Byte >> 1) & 0x01) * Color );
-				GDS_DrawPixel4Fast( Device, x, y * 8 + 7, ((Byte >> 0) & 0x01) * Color );
+				GDSDrawPixel4Fast( Device, x, y * 8 + 7, ((Byte >> 0) & 0x01) * Color );
 			}
 		}
 		*/
 	}
 	Device->Dirty = true;
-}
+}
--- a/components/display/core/gds_draw.h
+++ b/components/display/core/gds_draw.h
@@ -17,15 +17,12 @@
 extern "C" {
 #endif
 #ifndef _GDS_PRIVATE_H_
 void IRAM_ATTR GDS_DrawPixelFast( struct GDS_Device* Device, int X, int Y, int Color );
 void IRAM_ATTR GDS_DrawPixel( struct GDS_Device* Device, int X, int Y, int Color );
 #endif
 void GDS_DrawHLine( struct GDS_Device* Device, int x, int y, int Width, int Color );
 void GDS_DrawVLine( struct GDS_Device* Device, int x, int y, int Height, int Color );
 void GDS_DrawLine( struct GDS_Device* Device, int x0, int y0, int x1, int y1, int Color );
 void GDS_DrawBox( struct GDS_Device* Device, int x1, int y1, int x2, int y2, int Color, bool Fill );
 // draw a bitmap with source 1-bit depth organized in column and col0 = bit7 of byte 0 
 void GDS_DrawBitmapCBR( struct GDS_Device* Device, uint8_t *Data, int Width, int Height, int Color);
--- a/components/display/core/gds_font.c
+++ b/components/display/core/gds_font.c
@@ -89,7 +89,7 @@ void GDS_FontDrawChar( struct GDS_Device* Device, char Character, int x, int y,
                YBit = ( i + OffsetY ) & 0x07;
                if ( GlyphData[ YByte ] & BIT( YBit ) ) {
-                    GDS_DrawPixel( Device, x, y, Color );
+                    DrawPixel( Device, x, y, Color );
                }            
            }
--- a/components/display/core/gds_image.c
+++ b/components/display/core/gds_image.c
@@ -24,10 +24,11 @@ typedef struct {
    const unsigned char *InData;	// Pointer to jpeg data
    int InPos;						// Current position in jpeg data
 	int Width, Height;	
 	uint8_t Mode;
 	union {
-		uint16_t *OutData;				// Decompress
+		void *OutData;
 		struct {						// DirectDraw
-			struct GDS_Device * Device;
+			struct GDS_Device *Device;
 			int XOfs, YOfs;
 			int XMin, YMin;
 			int Depth;
@@ -35,6 +36,40 @@ typedef struct {
 	};	
 } JpegCtx;
 /****************************************************************************************
 * RGB conversion (24 bits 888: RRRRRRRRGGGGGGGGBBBBBBBB and 16 bits 565: RRRRRGGGGGGBBBBB = B31..B0)
 * so in other words for an array of 888 bytes: [0]=B, [1]=G, [2]=R, ...
 * monochrome (0.2125 * color.r) + (0.7154 * color.g) + (0.0721 * color.b)
 * grayscale (0.3 * R) + (0.59 * G) + (0.11 * B) )
 */
 static inline int Scaler332(uint8_t *Pixels) {
 	return (Pixels[2] & ~0x1f) | ((Pixels[1] & ~0x1f) >> 3) | (Pixels[0] >> 6);
 }
 static inline int Scaler444(uint8_t *Pixels) {
 	return ((Pixels[2] & ~0x0f) << 4) | (Pixels[1] & ~0x0f) | (Pixels[0] >> 4);
 }
 static inline int Scaler555(uint8_t *Pixels) {
 	return ((Pixels[2] & ~0x07) << 7) | ((Pixels[1] & ~0x07) << 2) | (Pixels[0] >> 3);
 }
 static inline int Scaler565(uint8_t *Pixels) {
 	return ((Pixels[2] & ~0x07) << 8) | ((Pixels[1] & ~0x03) << 3) | (Pixels[0] >> 3);
 }
 static inline int Scaler666(uint8_t *Pixels) {
 	return ((Pixels[2] & ~0x03) << 10) | ((Pixels[1] & ~0x03) << 4) | (Pixels[0] >> 2);
 }
 static inline int Scaler888(uint8_t *Pixels) {
 	return (Pixels[2] << 16) | (Pixels[1] << 8) | Pixels[0];
 }
 static inline int ScalerGray(uint8_t *Pixels) {
 	return (Pixels[2] * 14 + Pixels[1] * 76 + Pixels[0] * 38) >> 7;
 }
 static unsigned InHandler(JDEC *Decoder, uint8_t *Buf, unsigned Len) {
    JpegCtx *Context = (JpegCtx*) Decoder->device;
    if (Buf) memcpy(Buf, Context->InData +  Context->InPos, Len);
@@ -42,43 +77,94 @@ static unsigned InHandler(JDEC *Decoder, uint8_t *Buf, unsigned Len) {
    return Len;
 }
 #define OUTHANDLER(F)										\
 	for (int y = Frame->top; y <= Frame->bottom; y++) {		\
 		for (int x = Frame->left; x <= Frame->right; x++) {	\
 			OutData[Context->Width * y + x] = F(Pixels);	\
 			Pixels += 3;									\
 		}													\
 	}	
 #define OUTHANDLER24(F)													\
 	for (int y = Frame->top; y <= Frame->bottom; y++) {					\
 		uint8_t *p = OutData + (Context->Width * y + Frame->left) * 3;	\
 		for (int c = Frame->right - Frame->left; c-- >= 0;) {			\
 			uint32_t v = F(Pixels);										\
 			*p++ = v; *p++ = v >> 8; *p++ = v >> 16;					\
 			Pixels += 3;												\
 		}																\
 	}		
 static unsigned OutHandler(JDEC *Decoder, void *Bitmap, JRECT *Frame) {
 	JpegCtx *Context = (JpegCtx*) Decoder->device;
    uint8_t *Pixels = (uint8_t*) Bitmap;
-	
+
-    for (int y = Frame->top; y <= Frame->bottom; y++) {
+	// decoded image is RGB888
-        for (int x = Frame->left; x <= Frame->right; x++) {
+	if (Context->Mode == GDS_RGB888) {
-            // Convert the 888 to RGB565
+		uint8_t *OutData = (uint8_t*) Context->OutData;		
-            uint16_t Value = (*Pixels++ & ~0x07) << 8;
+		OUTHANDLER24(Scaler888);
-            Value |= (*Pixels++ & ~0x03) << 3;
+	} else if (Context->Mode == GDS_RGB666) {
-            Value |= *Pixels++ >> 3;
+		uint8_t *OutData = (uint8_t*) Context->OutData;		
-            Context->OutData[Context->Width * y + x] = Value;
+		OUTHANDLER24(Scaler666);		
-        }
+	} else if (Context->Mode == GDS_RGB565) {
-    }
+		uint16_t *OutData = (uint16_t*) Context->OutData;
 		OUTHANDLER(Scaler565);		
 	} else if (Context->Mode == GDS_RGB555) {
 		uint16_t *OutData = (uint16_t*) Context->OutData;
 		OUTHANDLER(Scaler555);				
 	} else if (Context->Mode == GDS_RGB444) {
 		uint16_t *OutData = (uint16_t*) Context->OutData;
 		OUTHANDLER(Scaler444);						
 	} else if (Context->Mode == GDS_RGB332) {
 		uint8_t *OutData = (uint8_t*) Context->OutData;
 		OUTHANDLER(Scaler332);						
 	} else if (Context->Mode <= GDS_GRAYSCALE) { 	 
 		uint8_t *OutData = (uint8_t*) Context->OutData;		
 		OUTHANDLER(ScalerGray);
 	}
    return 1;
 }
 // Convert the RGB888 to destination color plane, use DrawPixel and not "fast" 
 // version as X,Y may be beyond screen				
 #define OUTHANDLERDIRECT(F,S)																		\
 	for (int y = Frame->top; y <= Frame->bottom; y++) {												\
 		if (y < Context->YMin) continue;															\
 		for (int x = Frame->left; x <= Frame->right; x++) {											\
 			if (x < Context->XMin) continue;														\
 			DrawPixel( Context->Device, x + Context->XOfs, y + Context->YOfs, F(Pixels) >> S);	\
 			Pixels += 3;																			\
 		}																							\
 	}
 static unsigned OutHandlerDirect(JDEC *Decoder, void *Bitmap, JRECT *Frame) {
 	JpegCtx *Context = (JpegCtx*) Decoder->device;
    uint8_t *Pixels = (uint8_t*) Bitmap;
 	int Shift = 8 - Context->Depth;
-    for (int y = Frame->top; y <= Frame->bottom; y++) {
+	// decoded image is RGB888, shift only make sense for grayscale
-		if (y < Context->YMin) continue;
+	if (Context->Mode == GDS_RGB888) {
-        for (int x = Frame->left; x <= Frame->right; x++) {
+		OUTHANDLERDIRECT(Scaler888, 0);
-			if (x < Context->XMin) continue;
+	} else if (Context->Mode == GDS_RGB666) {
-            // Convert the 888 to RGB565
+		OUTHANDLERDIRECT(Scaler666, 0);		
-            int Value = ((Pixels[0]*11 + Pixels[1]*59 + Pixels[2]*30) / 100) >> Shift;
+	} else if (Context->Mode == GDS_RGB565) {
-			Pixels += 3;
+		OUTHANDLERDIRECT(Scaler565, 0);		
-			// used DrawPixel and not "fast" version as X,Y may be beyond screen
+	} else if (Context->Mode == GDS_RGB555) {
-			GDS_DrawPixel( Context->Device, x + Context->XOfs, y + Context->YOfs, Value);
+		OUTHANDLERDIRECT(Scaler555, 0);				
-        }
+	} else if (Context->Mode == GDS_RGB444) {
-    }
+		OUTHANDLERDIRECT(Scaler444, 0);						
 	} else if (Context->Mode == GDS_RGB332) {
 		OUTHANDLERDIRECT(Scaler332, 0);						
 	} else if (Context->Mode <= GDS_GRAYSCALE) { 	 
 		OUTHANDLERDIRECT(ScalerGray, Shift);
 	}
    return 1;
 }
 //Decode the embedded image into pixel lines that can be used with the rest of the logic.
-static uint16_t* DecodeJPEG(uint8_t *Source, int *Width, int *Height, float Scale, bool SizeOnly) {
+static void* DecodeJPEG(uint8_t *Source, int *Width, int *Height, float Scale, bool SizeOnly, int RGB_Mode) {
    JDEC Decoder;
    JpegCtx Context;
 	char *Scratch = calloc(SCRATCH_SIZE, 1);
@@ -99,7 +185,9 @@ static uint16_t* DecodeJPEG(uint8_t *Source, int *Width, int *Height, float Scal
 	Decoder.scale = Scale;
    if (Res == JDR_OK && !SizeOnly) {
-		Context.OutData = malloc(Decoder.width * Decoder.height * sizeof(uint16_t));
+		if (RGB_Mode <= GDS_RGB332) Context.OutData = malloc(Decoder.width * Decoder.height);
 		else if (RGB_Mode < GDS_RGB666) Context.OutData = malloc(Decoder.width * Decoder.height * 2);
 		else if (RGB_Mode <= GDS_RGB888) Context.OutData = malloc(Decoder.width * Decoder.height * 3);
 		// find the scaling factor
 		uint8_t N = 0, ScaleInt =  ceil(1.0 / Scale);
@@ -114,6 +202,7 @@ static uint16_t* DecodeJPEG(uint8_t *Source, int *Width, int *Height, float Scal
 		if (Context.OutData) {
 			Context.Width = Decoder.width / (1 << N);
 			Context.Height = Decoder.height / (1 << N);
 			Context.Mode = RGB_Mode;
 			if (Width) *Width = Context.Width;
 			if (Height) *Height = Context.Height;
 			Res = jd_decomp(&Decoder, OutHandler, N);
@@ -121,150 +210,165 @@ static uint16_t* DecodeJPEG(uint8_t *Source, int *Width, int *Height, float Scal
 				ESP_LOGE(TAG, "Image decoder: jd_decode failed (%d)", Res);
 			}	
 		} else {
-			ESP_LOGE(TAG, "Can't allocate bitmap %dx%d", Decoder.width, Decoder.height);			
+			ESP_LOGE(TAG, "Can't allocate bitmap %dx%d or invalid mode %d", Decoder.width, Decoder.height, RGB_Mode);			
 		}	
 	} else if (!SizeOnly) {
        ESP_LOGE(TAG, "Image decoder: jd_prepare failed (%d)", Res);
    }    
-      
+
 	// free scratch area
    if (Scratch) free(Scratch);
    return Context.OutData;
 }
-uint16_t* GDS_DecodeJPEG(uint8_t *Source, int *Width, int *Height, float Scale) {
+void* GDS_DecodeJPEG(uint8_t *Source, int *Width, int *Height, float Scale, int RGB_Mode) {
-	return DecodeJPEG(Source, Width, Height, Scale, false);
+	return DecodeJPEG(Source, Width, Height, Scale, false, RGB_Mode);
 }	
 void GDS_GetJPEGSize(uint8_t *Source, int *Width, int *Height) {
-	DecodeJPEG(Source, Width, Height, 1, true);
+	DecodeJPEG(Source, Width, Height, 1, true, -1);
 }	
 /****************************************************************************************
- * Simply draw a RGB 16bits image
+ * RGB conversion (24 bits: RRRRRRRRGGGGGGGGBBBBBBBB and 16 bits 565: RRRRRGGGGGGBBBBB = B31..B0)
 * so in other words for an array of 888 bytes: [0]=B, [1]=G, [2]=R, ...
 * monochrome (0.2125 * color.r) + (0.7154 * color.g) + (0.0721 * color.b)
 * grayscale (0.3 * R) + (0.59 * G) + (0.11 * B) )
 */
-void GDS_DrawRGB16( struct GDS_Device* Device, uint16_t *Image, int x, int y, int Width, int Height, int RGB_Mode ) {
+ 
-	if (Device->DrawRGB16) {
+static inline int ToGray888(uint8_t **Pixel) {
-		Device->DrawRGB16( Device, Image, x, y, Width, Height, RGB_Mode );
+	uint32_t v = *(*Pixel)++; v |= *(*Pixel)++ << 8; v |= *(*Pixel)++ << 16; 
-	} else {
+	return (((v & 0xff) * 14) + ((v >> 8) & 0xff) * 76 + ((v >> 16) * 38) + 1) >> 7;
-		switch(RGB_Mode) {
+} 
-		case GDS_RGB565:
+ 
-			// 6 bits pixels to be placed. Use a linearized structure for a bit of optimization
+static inline int ToGray666(uint8_t **Pixel) {
-			if (Device->Depth < 6) {
+	uint32_t v = *(*Pixel)++; v |= *(*Pixel)++ << 8; v |= *(*Pixel)++ << 16; 
-				int Scale = 6 - Device->Depth;
+	return (((v & 0x3f) * 14) + ((v >> 6) & 0x3f) * 76 + ((v >> 12) * 38) + 1) >> 7;
-				for (int r = 0; r < Height; r++) {
+}
-					for (int c = 0; c < Width; c++) {
+
-						int pixel = *Image++;
+static inline int ToGray565(uint16_t **Pixel) {
-						pixel = ((((pixel & 0x1f) * 11) << 1) + ((pixel >> 5) & 0x3f) * 59 + (((pixel >> 11) * 30) << 1) + 1) / 100;
+	uint16_t v = *(*Pixel)++; 
-						GDS_DrawPixel( Device, c + x, r + y, pixel >> Scale);
+	return ((((v & 0x1f) * 14) << 1) + ((v >> 5) & 0x3f) * 76 + (((v >> 11) * 38) << 1) + 1) >> 7;
-					}	
+}
-				}	
+
-			} else {
+static inline int ToGray555(uint16_t **Pixel) {
-				int Scale = Device->Depth - 6;
+	uint16_t v = *(*Pixel)++; 
-				for (int r = 0; r < Height; r++) {
+	return ((v & 0x1f) * 14 + ((v >> 5) & 0x1f) * 76 + (v >> 10) * 38) >> 7;
-					for (int c = 0; c < Width; c++) {
+}
-						int pixel = *Image++;
+
-						pixel = ((((pixel & 0x1f) * 11) << 1) + ((pixel >> 5) & 0x3f) * 59 + (((pixel >> 11) * 30) << 1) + 1) / 100;
+static inline int ToGray444(uint16_t **Pixel) {
-						GDS_DrawPixel( Device, c + x, r + y, pixel << Scale);
+	uint16_t v = *(*Pixel)++; 
-					}	
+	return ((v & 0x0f) * 14 + ((v >> 4) & 0x0f) * 76 + (v >> 8) * 38) >> 7;
-				}	
+}
-			}	
+
-			break;
+static inline int ToGray332(uint8_t **Pixel) {
-		case GDS_RGB555:
+	uint8_t v = *(*Pixel)++; 
-			// 5 bits pixels to be placed Use a linearized structure for a bit of optimization
+	return ((((v & 0x3) * 14) << 1) + ((v >> 2) & 0x7) * 76 + (v >> 5) * 38 + 1) >> 7;
-			if (Device->Depth < 5) {
+}
-				int Scale = 5 - Device->Depth;
+
-				for (int r = 0; r < Height; r++) {
+static inline int ToSelf(uint8_t **Pixel) {
-					for (int c = 0; c < Width; c++) {
+	return *(*Pixel)++; 
-						int pixel = *Image++;
+}
-						pixel = ((pixel & 0x1f) * 11 + ((pixel >> 5) & 0x1f) * 59 + (pixel >> 10) * 30) / 100;
+	
-						GDS_DrawPixel( Device, c + x, r + y, pixel >> Scale);
+#define DRAW_GRAYRGB(S,F)													\
-					}	
+	if (Scale > 0) {														\
-				}	
+		for (int r = 0; r < Height; r++) {									\
-			} else {
+			for (int c = 0; c < Width; c++) {								\
-				int Scale = Device->Depth - 5;
+				DrawPixel( Device, c + x, r + y, F(S) >> Scale);		\
-				for (int r = 0; r < Height; r++) {
+			}																\
-					for (int c = 0; c < Width; c++) {
+		}																	\
-						int pixel = *Image++;
+	} else {																\
-						pixel = ((pixel & 0x1f) * 11 + ((pixel >> 5) & 0x1f) * 59 + (pixel >> 10) * 30) / 100;
+		for (int r = 0; r < Height; r++) {									\
-						GDS_DrawPixel( Device, c + x, r + y, pixel << Scale);
+			for (int c = 0; c < Width; c++) {								\
-					}	
+				DrawPixel( Device, c + x, r + y, F(S) << -Scale);	\
-				}		
+			}																\
-			}	
+		}																	\
-			break;
+	}									
-		case GDS_RGB444:
+	
-			// 4 bits pixels to be placed 
+#define DRAW_RGB(T)										\
-			if (Device->Depth < 4) {
+	T *S = (T*) Image;									\
-				int Scale = 4 - Device->Depth;
+	for (int r = 0; r < Height; r++) {					\
-				for (int r = 0; r < Height; r++) {
+		for (int c = 0; c < Width; c++) {				\
-					for (int c = 0; c < Width; c++) {
+			DrawPixel(Device, c + x, r + y, *S++);	\
-						int pixel = *Image++;
+		}												\
-						pixel = (pixel & 0x0f) * 11 + ((pixel >> 4) & 0x0f) * 59 + (pixel >> 8) * 30;
+	}																	
-						GDS_DrawPixel( Device, c + x, r + y, pixel >> Scale);
+	
-					}	
+#define DRAW_RGB24													\
-				}	
+	uint8_t *S = (uint8_t*) Image;									\
-			} else {
+	for (int r = 0; r < Height; r++) {								\
-				int Scale = Device->Depth - 4;
+		for (int c = 0; c < Width; c++) {							\
-				for (int r = 0; r < Height; r++) {
+			uint32_t v = *S++; v |= *S++ << 8; v |= *S++ << 16;		\
-					for (int c = 0; c < Width; c++) {
+			DrawPixel(Device, c + x, r + y, v);					\
-						int pixel = *Image++;
+		}															\
 						pixel = (pixel & 0x0f) * 11 + ((pixel >> 4) & 0x0f) * 59 + (pixel >> 8) * 30;
 						GDS_DrawPixel( Device, c + x, r + y, pixel << Scale);
 					}	
 				}	
 			}	
 			break;				
 		}
 	}	
 /****************************************************************************************
 *  Decode the embedded image into pixel lines that can be used with the rest of the logic.
 */
 void GDS_DrawRGB( struct GDS_Device* Device, uint8_t *Image, int x, int y, int Width, int Height, int RGB_Mode ) {
 	// don't do anything if driver supplies a draw function
 	if (Device->DrawRGB) {
 		Device->DrawRGB( Device, Image, x, y, Width, Height, RGB_Mode );
 		Device->Dirty = true;	
 		return;
 	}
 	// RGB type displays
 	if (Device->Mode > GDS_GRAYSCALE) {
 		// image must match the display mode!
 		if (Device->Mode != RGB_Mode) {
 			ESP_LOGE(TAG, "non-matching display & image mode %u %u", Device->Mode, RGB_Mode);
 			return;
 		}	
 		if (RGB_Mode == GDS_RGB332) {
 			DRAW_RGB(uint8_t);
 		} else if (RGB_Mode < GDS_RGB666) {
 			DRAW_RGB(uint16_t);
 		} else {
 			DRAW_RGB24;
 		}	
 		Device->Dirty = true;
 		return;
 	}
 	// set the right scaler when displaying grayscale
 	if (RGB_Mode <= GDS_GRAYSCALE) {
 		int Scale = 8 - Device->Depth;
 		DRAW_GRAYRGB(&Image,ToSelf);
 	} else if (RGB_Mode == GDS_RGB332) {
 		int Scale = 3 - Device->Depth;		
 		DRAW_GRAYRGB(&Image,ToGray332);
 	} else if (RGB_Mode < GDS_RGB666)	{
 		if (RGB_Mode == GDS_RGB565) {
 			int Scale = 6 - Device->Depth;
 			DRAW_GRAYRGB((uint16_t**)&Image,ToGray565);
 		} else if (RGB_Mode == GDS_RGB555) {
 			int Scale = 5 - Device->Depth;
 			DRAW_GRAYRGB((uint16_t**)&Image,ToGray555);
 		} else if (RGB_Mode == GDS_RGB444) {
 			int Scale = 4 - Device->Depth; 
 			DRAW_GRAYRGB((uint16_t**)&Image,ToGray444)
 		}	
 	} else {
 		if (RGB_Mode == GDS_RGB666) {
 			int Scale = 6 - Device->Depth;
 			DRAW_GRAYRGB(&Image,ToGray666);
 		} else if (RGB_Mode == GDS_RGB888) {
 			int Scale = 8 - Device->Depth;
 			DRAW_GRAYRGB(&Image,ToGray888);
 		}	
 	} 
 	Device->Dirty = true;	
 }
 /****************************************************************************************
- * Simply draw a RGB 8 bits  image (R:3,G:3,B:2) or plain grayscale
+ *  Decode the embedded image into pixel lines that can be used with the rest of the logic.
 * monochrome (0.2125 * color.r) + (0.7154 * color.g) + (0.0721 * color.b)
 * grayscale (0.3 * R) + (0.59 * G) + (0.11 * B) )
 */
-void GDS_DrawRGB8( struct GDS_Device* Device, uint8_t *Image, int x, int y, int Width, int Height, int RGB_Mode ) {
+bool GDS_DrawJPEG(struct GDS_Device* Device, uint8_t *Source, int x, int y, int Fit) {
 	if (Device->DrawRGB8) {
 		Device->DrawRGB8( Device, Image, x, y, Width, Height, RGB_Mode );
 	} else if (RGB_Mode == GDS_GRAYSCALE) {
 		// 8 bits pixels
 		int Scale = 8 - Device->Depth;
 		for (int r = 0; r < Height; r++) {
 			for (int c = 0; c < Width; c++) {
 				GDS_DrawPixel( Device, c + x, r + y, *Image++ >> Scale);
 			}	
 		}	
 	} else if (Device->Depth < 3) {
 		// 3 bits pixels to be placed 
 		int Scale = 3 - Device->Depth;
 		for (int r = 0; r < Height; r++) {
 			for (int c = 0; c < Width; c++) {
 				int pixel = *Image++;
 				pixel = ((((pixel & 0x3) * 11) << 1) + ((pixel >> 2) & 0x7) * 59 + (pixel >> 5) * 30 + 1) / 100;
 				GDS_DrawPixel( Device, c + x, r + y, pixel >> Scale);
 			}	
 		}	
 	} else {	
 		// 3 bits pixels to be placed 
 		int Scale = Device->Depth  - 3;
 		for (int r = 0; r < Height; r++) {
 			for (int c = 0; c < Width; c++) {
 				int pixel = *Image++;
 				pixel = ((((pixel & 0x3) * 11) << 1) + ((pixel >> 2) & 0x7) * 59 + (pixel >> 5) * 30 + 1) / 100;
 				GDS_DrawPixel( Device, c + x, r + y, pixel << Scale);
 			}	
 		}	
 	}
 	Device->Dirty = true;		
 }	
 //Decode the embedded image into pixel lines that can be used with the rest of the logic.
 bool GDS_DrawJPEG( struct GDS_Device* Device, uint8_t *Source, int x, int y, int Fit) {
    JDEC Decoder;
    JpegCtx Context;
 	bool Ret = false;
@@ -313,6 +417,7 @@ bool GDS_DrawJPEG( struct GDS_Device* Device, uint8_t *Source, int x, int y, int
 		Context.XMin = x - Context.XOfs;
 		Context.YMin = y - Context.YOfs;
 		Context.Mode = Device->Mode;
 		// do decompress & draw
 		Res = jd_decomp(&Decoder, OutHandlerDirect, N);
--- a/components/display/core/gds_image.h
+++ b/components/display/core/gds_image.h
@@ -15,8 +15,6 @@
 struct GDS_Device;
 enum { GDS_RGB565, GDS_RGB555, GDS_RGB444, GDS_RGB332, GDS_GRAYSCALE };
 // Fit options for GDS_DrawJPEG
 #define GDS_IMAGE_LEFT		0x00
 #define GDS_IMAGE_CENTER_X	0x01
@@ -28,8 +26,7 @@ enum { GDS_RGB565, GDS_RGB555, GDS_RGB444, GDS_RGB332, GDS_GRAYSCALE };
 #define GDS_IMAGE_FIT		0x10	// re-scale by a factor of 2^N (up to 3)
 // Width and Height can be NULL if you already know them (actual scaling is closest ^2)
-uint16_t* 	GDS_DecodeJPEG(uint8_t *Source, int *Width, int *Height, float Scale);
+void*	 	GDS_DecodeJPEG(uint8_t *Source, int *Width, int *Height, float Scale, int RGB_Mode);	// can be 8, 16 or 24 bits per pixel in return
 void	 	GDS_GetJPEGSize(uint8_t *Source, int *Width, int *Height);
-bool 		GDS_DrawJPEG( struct GDS_Device* Device, uint8_t *Source, int x, int y, int Fit);
+bool 		GDS_DrawJPEG( struct GDS_Device* Device, uint8_t *Source, int x, int y, int Fit);	
-void 		GDS_DrawRGB16( struct GDS_Device* Device, uint16_t *Image, int x, int y, int Width, int Height, int RGB_Mode );
+void 		GDS_DrawRGB( struct GDS_Device* Device, uint8_t *Image, int x, int y, int Width, int Height, int RGB_Mode );
 void 		GDS_DrawRGB8( struct GDS_Device* Device, uint8_t *Image, int x, int y, int Width, int Height, int RGB_Mode );
--- a/components/display/core/gds_private.h
+++ b/components/display/core/gds_private.h
@@ -72,6 +72,11 @@ typedef struct spi_device_t* spi_device_handle_t;
 struct GDS_Device {
 	uint8_t IF;
 	int8_t RSTPin;
 	struct {
 		int8_t Pin, Channel;
 		int PWM;	
 	} Backlight;
 	union {
 		// I2C Specific
 		struct {
@@ -80,11 +85,10 @@ struct GDS_Device {
 		// SPI specific
 		struct {
 			spi_device_handle_t SPIHandle;
 			int8_t RSTPin;
 			int8_t CSPin;
 		};
 	};	
-
+	
    // cooked text mode
 	struct {
 		int16_t Y, Space;
@@ -93,11 +97,11 @@ struct GDS_Device {
 	uint16_t Width;
    uint16_t Height;
-	uint8_t Depth;
+	uint8_t Depth, Mode;
 	uint8_t	Alloc;	
 	uint8_t* Framebuffer;
-    uint16_t FramebufferSize;
+    uint32_t FramebufferSize;
 	bool Dirty;
 	// default fonts when using direct draw	
@@ -113,28 +117,26 @@ struct GDS_Device {
 	void (*SetContrast)( struct GDS_Device* Device, uint8_t Contrast );
 	void (*DisplayOn)( struct GDS_Device* Device );
 	void (*DisplayOff)( struct GDS_Device* Device );
-	void (*SetHFlip)( struct GDS_Device* Device, bool On );
+	void (*SetLayout)( struct GDS_Device* Device, bool HFlip, bool VFlip, bool Rotate );
 	void (*SetVFlip)( struct GDS_Device* Device, bool On );
 	// must provide for depth other than 1 (vertical) and 4 (may provide for optimization)
 	void (*DrawPixelFast)( struct GDS_Device* Device, int X, int Y, int Color );
 	void (*DrawBitmapCBR)(struct GDS_Device* Device, uint8_t *Data, int Width, int Height, int Color );
 	// may provide for optimization
-	void (*DrawRGB16)( struct GDS_Device* Device, uint16_t *Image,int x, int y, int Width, int Height, int RGB_Mode );
+	void (*DrawRGB)( struct GDS_Device* Device, uint8_t *Image,int x, int y, int Width, int Height, int RGB_Mode );
 	void (*DrawRGB8)( struct GDS_Device* Device, uint8_t *Image, int x, int y, int Width, int Height, int RGB_Mode );
 	void (*ClearWindow)( struct GDS_Device* Device, int x1, int y1, int x2, int y2, int Color );
 	// interface-specific methods	
    WriteCommandProc WriteCommand;
    WriteDataProc WriteData;
-	// 16 bytes for whatever the driver wants (should be aligned as it's 32 bits)	
+	// 32 bytes for whatever the driver wants (should be aligned as it's 32 bits)	
-	uint32_t Private[4];
+	uint32_t Private[8];
 };
 bool GDS_Reset( struct GDS_Device* Device );
 bool GDS_Init( struct GDS_Device* Device );
-inline bool IsPixelVisible( struct GDS_Device* Device, int x, int y )  {
+static inline bool IsPixelVisible( struct GDS_Device* Device, int x, int y )  {
    bool Result = (
        ( x >= 0 ) &&
        ( x < Device->Width ) &&
@@ -151,9 +153,9 @@ inline bool IsPixelVisible( struct GDS_Device* Device, int x, int y )  {
    return Result;
 }
-inline void IRAM_ATTR GDS_DrawPixel1Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
+static inline void DrawPixel1Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
    uint32_t YBit = ( Y & 0x07 );
-    uint8_t* FBOffset = NULL;
+    uint8_t* FBOffset;
    /* 
     * We only need to modify the Y coordinate since the pitch
@@ -172,22 +174,48 @@ inline void IRAM_ATTR GDS_DrawPixel1Fast( struct GDS_Device* Device, int X, int
    }
 }
-inline void IRAM_ATTR GDS_DrawPixel4Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
+static inline void DrawPixel4Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
-	uint8_t* FBOffset;
+	uint8_t* FBOffset = Device->Framebuffer + ( (Y * Device->Width >> 1) + (X >> 1));
    FBOffset = Device->Framebuffer + ( (Y * Device->Width >> 1) + (X >> 1));
 	*FBOffset = X & 0x01 ? (*FBOffset & 0x0f) | ((Color & 0x0f) << 4) : ((*FBOffset & 0xf0) | (Color & 0x0f));
 }
-inline void IRAM_ATTR GDS_DrawPixelFast( struct GDS_Device* Device, int X, int Y, int Color ) {
+static inline void DrawPixel8Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
 	Device->Framebuffer[Y * Device->Width + X] = Color;
 }
 // assumes that Color is 16 bits R..RG..GB..B from MSB to LSB and FB wants 1st serialized byte to start with R
 static inline void DrawPixel16Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
 	uint16_t* FBOffset = (uint16_t*) Device->Framebuffer + Y * Device->Width + X;
 	*FBOffset = __builtin_bswap16(Color);
 }
 // assumes that Color is 18 bits RGB from MSB to LSB RRRRRRGGGGGGBBBBBB, so byte[0] is B 
 // FB is 3-bytes packets and starts with R for serialization so 0,1,2 ... = xxRRRRRR xxGGGGGG xxBBBBBB 
 static inline void DrawPixel18Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
 	uint8_t* FBOffset = Device->Framebuffer + (Y * Device->Width + X) * 3;
 	*FBOffset++ = Color >> 12; *FBOffset++ = (Color >> 6) & 0x3f; *FBOffset = Color & 0x3f;
 }
 // assumes that Color is 24 bits RGB from MSB to LSB RRRRRRRRGGGGGGGGBBBBBBBB, so byte[0] is B 
 // FB is 3-bytes packets and starts with R for serialization so 0,1,2 ... = RRRRRRRR GGGGGGGG BBBBBBBB 
 static inline void DrawPixel24Fast( struct GDS_Device* Device, int X, int Y, int Color ) {
 	uint8_t* FBOffset = Device->Framebuffer + (Y * Device->Width + X) * 3;
 	*FBOffset++ = Color >> 16; *FBOffset++ = Color >> 8; *FBOffset = Color;
 }
 static inline void IRAM_ATTR DrawPixelFast( struct GDS_Device* Device, int X, int Y, int Color ) {
    if (Device->DrawPixelFast) Device->DrawPixelFast( Device, X, Y, Color );
-	else if (Device->Depth == 4) GDS_DrawPixel4Fast( Device, X, Y, Color);
+	else if (Device->Depth == 4) DrawPixel4Fast( Device, X, Y, Color );
-	else if (Device->Depth == 1) GDS_DrawPixel1Fast( Device, X, Y, Color);
+	else if (Device->Depth == 1) DrawPixel1Fast( Device, X, Y, Color );
 	else if (Device->Depth == 16) DrawPixel16Fast( Device, X, Y, Color );	
 	else if (Device->Depth == 24 && Device->Mode == GDS_RGB666) DrawPixel18Fast( Device, X, Y, Color );	
 	else if (Device->Depth == 24 && Device->Mode == GDS_RGB888) DrawPixel24Fast( Device, X, Y, Color );	
 	else if (Device->Depth == 8) DrawPixel8Fast( Device, X, Y, Color );	
 }	
-inline void IRAM_ATTR GDS_DrawPixel( struct GDS_Device* Device, int x, int y, int Color ) {
+static inline void IRAM_ATTR DrawPixel( struct GDS_Device* Device, int x, int y, int Color ) {
    if ( IsPixelVisible( Device, x, y ) == true ) {
-        GDS_DrawPixelFast( Device, x, y, Color );
+        DrawPixelFast( Device, x, y, Color );
    }
 }
--- a/components/display/core/gds_text.c
+++ b/components/display/core/gds_text.c
@@ -35,12 +35,20 @@ static const struct GDS_FontDef *GuessFont( struct GDS_Device *Device, int FontT
 	case GDS_FONT_MEDIUM:			
 	default:		
 		return &Font_droid_sans_fallback_15x17;	
 #ifdef USE_LARGE_FONTS
 	case GDS_FONT_LARGE:	
 		return &Font_droid_sans_fallback_24x28;
 		break;		
 	case GDS_FONT_SEGMENT:			
 		if (Device->Height == 32) return &Font_Tarable7Seg_16x32;
 		else return &Font_Tarable7Seg_32x64;
 #else
 	case GDS_FONT_LARGE:	
 	case GDS_FONT_SEGMENT:			
 		ESP_LOGW(TAG, "large fonts disabled");
 		return &Font_droid_sans_fallback_15x17;
 		break;		
 #endif	
 	}
 }
@@ -99,7 +107,7 @@ bool GDS_TextLine(struct GDS_Device* Device, int N, int Pos, int Attr, char *Tex
 		int Y_min = max(0, Device->Lines[N].Y), Y_max = max(0, Device->Lines[N].Y + Device->Lines[N].Font->Height);
 		for (int c = (Attr & GDS_TEXT_CLEAR_EOL) ? X : 0; c < Device->Width; c++) 
 			for (int y = Y_min; y < Y_max; y++)
-				GDS_DrawPixelFast( Device, c, y, GDS_COLOR_BLACK );
+				DrawPixelFast( Device, c, y, GDS_COLOR_BLACK );
 	}
 	GDS_FontDrawString( Device, X, Device->Lines[N].Y, Text, GDS_COLOR_WHITE );
--- a/components/display/core/ifaces/default_if_i2c.c
+++ b/components/display/core/ifaces/default_if_i2c.c
@@ -66,13 +66,14 @@ bool GDS_I2CInit( int PortNumber, int SDA, int SCL, int Speed ) {
 * 
 * Returns true on successful init of display.
 */
-bool GDS_I2CAttachDevice( struct GDS_Device* Device, int Width, int Height, int I2CAddress, int RSTPin ) {
+bool GDS_I2CAttachDevice( struct GDS_Device* Device, int Width, int Height, int I2CAddress, int RSTPin, int BacklightPin ) {
    NullCheck( Device, return false );
    Device->WriteCommand = I2CDefaultWriteCommand;
    Device->WriteData = I2CDefaultWriteData;
    Device->Address = I2CAddress;
    Device->RSTPin = RSTPin;
 	Device->Backlight.Pin = BacklightPin;	
 	Device->IF = GDS_IF_I2C;
 	Device->Width = Width;
 	Device->Height = Height;
--- a/components/display/core/ifaces/default_if_spi.c
+++ b/components/display/core/ifaces/default_if_spi.c
@@ -34,7 +34,7 @@ bool GDS_SPIInit( int SPI, int DC ) {
    return true;
 }
-bool GDS_SPIAttachDevice( struct GDS_Device* Device, int Width, int Height, int CSPin, int RSTPin, int Speed ) {
+bool GDS_SPIAttachDevice( struct GDS_Device* Device, int Width, int Height, int CSPin, int RSTPin, int BackLightPin, int Speed ) {
    spi_device_interface_config_t SPIDeviceConfig;
    spi_device_handle_t SPIDevice;
@@ -44,12 +44,13 @@ bool GDS_SPIAttachDevice( struct GDS_Device* Device, int Width, int Height, int
 		ESP_ERROR_CHECK_NONFATAL( gpio_set_direction( CSPin, GPIO_MODE_OUTPUT ), return false );
 		ESP_ERROR_CHECK_NONFATAL( gpio_set_level( CSPin, 0 ), return false );
 	}	
-
+	
    memset( &SPIDeviceConfig, 0, sizeof( spi_device_interface_config_t ) );
    SPIDeviceConfig.clock_speed_hz = Speed > 0 ? Speed : SPI_MASTER_FREQ_8M;
    SPIDeviceConfig.spics_io_num = CSPin;
    SPIDeviceConfig.queue_size = 1;
 	SPIDeviceConfig.flags = SPI_DEVICE_NO_DUMMY;
    ESP_ERROR_CHECK_NONFATAL( spi_bus_add_device( SPIHost, &SPIDeviceConfig, &SPIDevice ), return false );
@@ -58,6 +59,7 @@ bool GDS_SPIAttachDevice( struct GDS_Device* Device, int Width, int Height, int
    Device->SPIHandle = SPIDevice;
    Device->RSTPin = RSTPin;
    Device->CSPin = CSPin;
 	Device->Backlight.Pin = BackLightPin;	
 	Device->IF = GDS_IF_SPI;
 	Device->Width = Width;
 	Device->Height = Height;
--- a/components/display/display.c
+++ b/components/display/display.c
@@ -12,7 +12,7 @@
 #include <arpa/inet.h>
 #include "esp_log.h"
 #include "globdefs.h"
-#include "config.h"
+#include "platform_config.h"
 #include "tools.h"
 #include "display.h"
 #include "gds.h"
@@ -45,34 +45,46 @@ static EXT_RAM_ATTR struct {
 	TickType_t tick;
 } displayer;
 static const char *known_drivers[] = {"SH1106",
 		"SSD1306",
 		"SSD1322",
 		"SSD1326",
 		"SSD1327",
 		"SSD1675",
 		"SSD1351",
 		"ST77xx",
 		"ILI9341",
 		NULL
 	};
 static void displayer_task(void *args);
 struct GDS_Device *display;   
-extern GDS_DetectFunc SSD1306_Detect, SSD132x_Detect, SH1106_Detect, SSD1675_Detect, SSD1322_Detect;
+extern GDS_DetectFunc SSD1306_Detect, SSD132x_Detect, SH1106_Detect, SSD1675_Detect, SSD1322_Detect, SSD1351_Detect, ST77xx_Detect;
-GDS_DetectFunc *drivers[] = { SH1106_Detect, SSD1306_Detect, SSD132x_Detect, SSD1675_Detect, SSD1322_Detect, NULL };
+GDS_DetectFunc *drivers[] = { SH1106_Detect, SSD1306_Detect, SSD132x_Detect, SSD1675_Detect, SSD1322_Detect, SSD1351_Detect, ST77xx_Detect, NULL };
 /****************************************************************************************
 * 
 */
 void display_init(char *welcome) {
 	bool init = false;
-	char *config = config_alloc_get(NVS_TYPE_STR, "display_config");
+	char *config = config_alloc_get_str("display_config", CONFIG_DISPLAY_CONFIG, "N/A");
 	if (!config) {
 		ESP_LOGI(TAG, "no display");
 		return false;
 	}	
-	int width = -1, height = -1;
+	int width = -1, height = -1, backlight_pin = -1;
 	char *p, *drivername = strstr(config, "driver");
 	if ((p = strcasestr(config, "width")) != NULL) width = atoi(strchr(p, '=') + 1);
 	if ((p = strcasestr(config, "height")) != NULL) height = atoi(strchr(p, '=') + 1);
 	if ((p = strcasestr(config, "back")) != NULL) backlight_pin = atoi(strchr(p, '=') + 1);	
 	// query drivers to see if we have a match
 	ESP_LOGI(TAG, "Trying to configure display with %s", config);
-	display = GDS_AutoDetect(drivername ? drivername : "SSD1306", drivers);
+	if (backlight_pin >= 0) {
 		struct GDS_BacklightPWM PWMConfig = { .Channel = pwm_system.base_channel++, .Timer = pwm_system.timer, .Max = pwm_system.max, .Init = false	};
 		display = GDS_AutoDetect(drivername, drivers, &PWMConfig);
 	} else {
 		display = GDS_AutoDetect(drivername, drivers, NULL);
 	}	
 	if ((p = strcasestr(config, "width")) != NULL) width = atoi(strchr(p, '=') + 1);
 	if ((p = strcasestr(config, "height")) != NULL) height = atoi(strchr(p, '=') + 1);
 	// so far so good
 	if (display && width > 0 && height > 0) {
 		int RST_pin = -1;
@@ -86,7 +98,7 @@ void display_init(char *welcome) {
 			init = true;
 			GDS_I2CInit( i2c_system_port, -1, -1, i2c_system_speed ) ;
-			GDS_I2CAttachDevice( display, width, height, address, RST_pin );
+			GDS_I2CAttachDevice( display, width, height, address, RST_pin, backlight_pin );
 			ESP_LOGI(TAG, "Display is I2C on port %u", address);
 		} else if (strstr(config, "SPI") && spi_system_host != -1) {
@@ -97,7 +109,7 @@ void display_init(char *welcome) {
 			init = true;
 			GDS_SPIInit( spi_system_host, spi_system_dc_gpio );
-			GDS_SPIAttachDevice( display, width, height, CS_pin, RST_pin, speed );
+			GDS_SPIAttachDevice( display, width, height, CS_pin, RST_pin, backlight_pin, speed );
 			ESP_LOGI(TAG, "Display is SPI host %u with cs:%d", spi_system_host, CS_pin);
 		} else {
@@ -113,8 +125,7 @@ void display_init(char *welcome) {
 		static DRAM_ATTR StaticTask_t xTaskBuffer __attribute__ ((aligned (4)));
 		static EXT_RAM_ATTR StackType_t xStack[DISPLAYER_STACK_SIZE] __attribute__ ((aligned (4)));
-		GDS_SetHFlip(display, strcasestr(config, "HFlip") ? true : false);
+		GDS_SetLayout( display, strcasestr(config, "HFlip"), strcasestr(config, "VFlip"), strcasestr(config, "rotate"));
 		GDS_SetVFlip(display, strcasestr(config, "VFlip") ? true : false);
 		GDS_SetFont(display, &Font_droid_sans_fallback_15x17 );
 		GDS_TextPos(display, GDS_FONT_MEDIUM, GDS_TEXT_CENTERED, GDS_TEXT_CLEAR | GDS_TEXT_UPDATE, welcome);
@@ -365,4 +376,23 @@ void displayer_control(enum displayer_cmd_e cmd, ...) {
 	xSemaphoreGive(displayer.mutex);
 	va_end(args);
-}
+}
 /****************************************************************************************
 *
 */
 bool display_is_valid_driver(char * driver){
 	return display_conf_get_driver_name(driver)!=NULL;
 }
 /****************************************************************************************
 *
 */
 const char *display_conf_get_driver_name(char * driver){
 	for(uint8_t i=0;known_drivers[i]!=NULL && strlen(known_drivers[i])>0;i++ ){
 		if(strcasestr(driver,known_drivers[i])){
 			return known_drivers[i];
 		}
 	}
 	return NULL;
 }
--- a/components/display/display.h
+++ b/components/display/display.h
@@ -31,6 +31,8 @@ enum displayer_time_e 	{ DISPLAYER_ELAPSED, DISPLAYER_REMAINING };
 enum display_bus_cmd_e { DISPLAY_BUS_TAKE, DISPLAY_BUS_GIVE };
 bool (*display_bus)(void *from, enum display_bus_cmd_e cmd);
 const char *display_conf_get_driver_name(char * driver);
 bool display_is_valid_driver(char * driver);
 void displayer_scroll(char *string, int speed, int pause);
 void displayer_control(enum displayer_cmd_e cmd, ...);
--- a/components/driver_bt/CMakeLists.txt
+++ b/components/driver_bt/CMakeLists.txt
@@ -1,6 +1,6 @@
-idf_component_register(SRCS "bt_app_core.c" "bt_app_sink.c" "bt_app_source.c"
+idf_component_register(	SRC_DIRS .
-                       INCLUDE_DIRS "." "../tools/"
+						INCLUDE_DIRS .
-                       REQUIRES esp_common
+						PRIV_REQUIRES services bt display console tools platform_config
-                       PRIV_REQUIRES freertos bt io nvs_flash esp32 spi_flash newlib log console pthread
+
 )
--- a/components/driver_bt/bt_app_core.c
+++ b/components/driver_bt/bt_app_core.c
@@ -6,8 +6,9 @@
   CONDITIONS OF ANY KIND, either express or implied.
 */
 #include <stdint.h>
 #include "bt_app_core.h"
 #include <stdint.h>
 #include "esp_system.h"
 #include <string.h>
 #include <stdbool.h>
--- a/components/driver_bt/bt_app_sink.c
+++ b/components/driver_bt/bt_app_sink.c
@@ -22,7 +22,7 @@
 #include "esp_a2dp_api.h"
 #include "esp_avrc_api.h"
 #include "nvs.h"
-#include "config.h"
+#include "platform_config.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "trace.h"
@@ -92,7 +92,7 @@ static void bt_volume_up(bool pressed) {
 	// volume UP/DOWN buttons are not supported by iPhone/Android
 	volume_set_by_local_host(s_volume < 127-3 ? s_volume + 3 : 127);
 	(*bt_app_a2d_cmd_cb)(BT_SINK_VOLUME, s_volume);
-	ESP_LOGI(BT_AV_TAG, "BT volume up %u", s_volume);
+	ESP_LOGD(BT_AV_TAG, "BT volume up %u", s_volume);
 }
 static void bt_volume_down(bool pressed) {
@@ -148,7 +148,7 @@ void bt_disconnect(void) {
 	displayer_control(DISPLAYER_SHUTDOWN);
 	if (s_audio == AUDIO_PLAYING) esp_avrc_ct_send_passthrough_cmd(tl++ & 0x0f, ESP_AVRC_PT_CMD_STOP, ESP_AVRC_PT_CMD_STATE_PRESSED);
 	actrls_unset();
-	ESP_LOGI(BT_AV_TAG, "forced disconnection %d", s_audio);
+	ESP_LOGD(BT_AV_TAG, "forced disconnection %d", s_audio);
 }
 /* update metadata if any */
@@ -277,7 +277,7 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
    case ESP_A2D_CONNECTION_STATE_EVT: {
        a2d = (esp_a2d_cb_param_t *)(p_param);
        uint8_t *bda = a2d->conn_stat.remote_bda;
-        ESP_LOGI(BT_AV_TAG, "A2DP connection state: %s, [%02x:%02x:%02x:%02x:%02x:%02x]",
+        ESP_LOGD(BT_AV_TAG, "A2DP connection state: %s, [%02x:%02x:%02x:%02x:%02x:%02x]",
             s_a2d_conn_state_str[a2d->conn_stat.state], bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
        if (a2d->conn_stat.state == ESP_A2D_CONNECTION_STATE_DISCONNECTED) {
            esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
@@ -290,7 +290,7 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
    }
    case ESP_A2D_AUDIO_STATE_EVT: {
        a2d = (esp_a2d_cb_param_t *)(p_param);
-        ESP_LOGI(BT_AV_TAG, "A2DP audio state: %s", s_a2d_audio_state_str[a2d->audio_stat.state]);
+        ESP_LOGD(BT_AV_TAG, "A2DP audio state: %s", s_a2d_audio_state_str[a2d->audio_stat.state]);
        if (ESP_A2D_AUDIO_STATE_STARTED == a2d->audio_stat.state) {
 			s_audio = AUDIO_CONNECTED;
@@ -320,7 +320,7 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param)
    }
    case ESP_A2D_AUDIO_CFG_EVT: {
        a2d = (esp_a2d_cb_param_t *)(p_param);
-        ESP_LOGI(BT_AV_TAG, "A2DP audio stream configuration, codec type %d", a2d->audio_cfg.mcc.type);
+        ESP_LOGD(BT_AV_TAG, "A2DP audio stream configuration, codec type %d", a2d->audio_cfg.mcc.type);
        // for now only SBC stream is supported
        if (a2d->audio_cfg.mcc.type == ESP_A2D_MCT_SBC) {
            s_sample_rate = 16000;
@@ -382,12 +382,12 @@ void bt_av_notify_evt_handler(uint8_t event_id, esp_avrc_rn_param_t *event_param
 {
    switch (event_id) {
    case ESP_AVRC_RN_TRACK_CHANGE:
-		ESP_LOGI(BT_AV_TAG, "Track changed");
+		ESP_LOGD(BT_AV_TAG, "Track changed");
        bt_av_new_track();
 		(*bt_app_a2d_cmd_cb)(BT_SINK_PROGRESS, 0, 0);
        break;
    case ESP_AVRC_RN_PLAY_STATUS_CHANGE:
-        ESP_LOGI(BT_AV_TAG, "Playback status changed: 0x%x", event_parameter->playback);
+        ESP_LOGD(BT_AV_TAG, "Playback status changed: 0x%x", event_parameter->playback);
 		if (s_audio != AUDIO_IDLE) {
 			switch (event_parameter->playback) {
 			case ESP_AVRC_PLAYBACK_PLAYING:
@@ -410,7 +410,7 @@ void bt_av_notify_evt_handler(uint8_t event_id, esp_avrc_rn_param_t *event_param
 				(*bt_app_a2d_cmd_cb)(BT_SINK_STOP);
 				break;
 			default:
-				ESP_LOGI(BT_AV_TAG, "Un-handled event");
+				ESP_LOGW(BT_AV_TAG, "Un-handled event");
 				break;
 			}	
 		} else {
@@ -433,7 +433,7 @@ static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param)
    switch (event) {
    case ESP_AVRC_CT_CONNECTION_STATE_EVT: {
        uint8_t *bda = rc->conn_stat.remote_bda;
-        ESP_LOGI(BT_RC_CT_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
+        ESP_LOGD(BT_RC_CT_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
                 rc->conn_stat.connected, bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
        if (rc->conn_stat.connected) {
@@ -446,11 +446,11 @@ static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param)
        break;
    }
    case ESP_AVRC_CT_PASSTHROUGH_RSP_EVT: {
-        ESP_LOGI(BT_RC_CT_TAG, "AVRC passthrough rsp: key_code 0x%x, key_state %d", rc->psth_rsp.key_code, rc->psth_rsp.key_state);
+        ESP_LOGD(BT_RC_CT_TAG, "AVRC passthrough rsp: key_code 0x%x, key_state %d", rc->psth_rsp.key_code, rc->psth_rsp.key_state);
        break;
    }
    case ESP_AVRC_CT_METADATA_RSP_EVT: {
-        ESP_LOGI(BT_RC_CT_TAG, "AVRC metadata rsp: attribute id 0x%x, %s", rc->meta_rsp.attr_id, rc->meta_rsp.attr_text);
+        ESP_LOGD(BT_RC_CT_TAG, "AVRC metadata rsp: attribute id 0x%x, %s", rc->meta_rsp.attr_id, rc->meta_rsp.attr_text);
 		if (rc->meta_rsp.attr_id == ESP_AVRC_MD_ATTR_PLAYING_TIME) s_metadata.duration = atoi((char*) rc->meta_rsp.attr_text);
 		else if (rc->meta_rsp.attr_id == ESP_AVRC_MD_ATTR_TITLE) strncpy(s_metadata.title, (char*) rc->meta_rsp.attr_text, METADATA_LEN);
@@ -467,11 +467,11 @@ static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param)
        break;
    }
    case ESP_AVRC_CT_REMOTE_FEATURES_EVT: {
-        ESP_LOGI(BT_RC_CT_TAG, "AVRC remote features %x, TG features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.tg_feat_flag);
+        ESP_LOGD(BT_RC_CT_TAG, "AVRC remote features %x, TG features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.tg_feat_flag);
        break;
    }
    case ESP_AVRC_CT_GET_RN_CAPABILITIES_RSP_EVT: {
-        ESP_LOGI(BT_RC_CT_TAG, "remote rn_cap: count %d, bitmask 0x%x", rc->get_rn_caps_rsp.cap_count,
+        ESP_LOGD(BT_RC_CT_TAG, "remote rn_cap: count %d, bitmask 0x%x", rc->get_rn_caps_rsp.cap_count,
                 rc->get_rn_caps_rsp.evt_set.bits);
        s_avrc_peer_rn_cap.bits = rc->get_rn_caps_rsp.evt_set.bits;
        bt_av_new_track();
@@ -487,7 +487,7 @@ static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param)
 static void volume_set_by_controller(uint8_t volume)
 {
-    ESP_LOGI(BT_RC_TG_TAG, "Volume is set by remote controller %d%%\n", (uint32_t)volume * 100 / 0x7f);
+    ESP_LOGD(BT_RC_TG_TAG, "Volume is set by remote controller %d%%\n", (uint32_t)volume * 100 / 0x7f);
    _lock_acquire(&s_volume_lock);
    s_volume = volume;
    _lock_release(&s_volume_lock);
@@ -496,7 +496,7 @@ static void volume_set_by_controller(uint8_t volume)
 static void volume_set_by_local_host(uint8_t volume)
 {
-    ESP_LOGI(BT_RC_TG_TAG, "Volume is set locally to: %d%%", (uint32_t)volume * 100 / 0x7f);
+    ESP_LOGD(BT_RC_TG_TAG, "Volume is set locally to: %d%%", (uint32_t)volume * 100 / 0x7f);
    _lock_acquire(&s_volume_lock);
    s_volume = volume;
    _lock_release(&s_volume_lock);
@@ -516,21 +516,21 @@ static void bt_av_hdl_avrc_tg_evt(uint16_t event, void *p_param)
    switch (event) {
    case ESP_AVRC_TG_CONNECTION_STATE_EVT: {
        uint8_t *bda = rc->conn_stat.remote_bda;
-        ESP_LOGI(BT_RC_TG_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
+        ESP_LOGD(BT_RC_TG_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
                 rc->conn_stat.connected, bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
        break;
    }
    case ESP_AVRC_TG_PASSTHROUGH_CMD_EVT: {
-        ESP_LOGI(BT_RC_TG_TAG, "AVRC passthrough cmd: key_code 0x%x, key_state %d", rc->psth_cmd.key_code, rc->psth_cmd.key_state);
+        ESP_LOGD(BT_RC_TG_TAG, "AVRC passthrough cmd: key_code 0x%x, key_state %d", rc->psth_cmd.key_code, rc->psth_cmd.key_state);
        break;
    }
    case ESP_AVRC_TG_SET_ABSOLUTE_VOLUME_CMD_EVT: {
-        ESP_LOGI(BT_RC_TG_TAG, "AVRC set absolute volume: %d%%", (int)rc->set_abs_vol.volume * 100/ 0x7f);
+        ESP_LOGD(BT_RC_TG_TAG, "AVRC set absolute volume: %d%%", (int)rc->set_abs_vol.volume * 100/ 0x7f);
        volume_set_by_controller(rc->set_abs_vol.volume);
        break;
    }
    case ESP_AVRC_TG_REGISTER_NOTIFICATION_EVT: {
-        ESP_LOGI(BT_RC_TG_TAG, "AVRC register event notification: %d, param: 0x%x", rc->reg_ntf.event_id, rc->reg_ntf.event_parameter);
+        ESP_LOGD(BT_RC_TG_TAG, "AVRC register event notification: %d, param: 0x%x", rc->reg_ntf.event_id, rc->reg_ntf.event_parameter);
        if (rc->reg_ntf.event_id == ESP_AVRC_RN_VOLUME_CHANGE) {
            s_volume_notify = true;
            esp_avrc_rn_param_t rn_param;
@@ -540,7 +540,7 @@ static void bt_av_hdl_avrc_tg_evt(uint16_t event, void *p_param)
        break;
    }
    case ESP_AVRC_TG_REMOTE_FEATURES_EVT: {
-        ESP_LOGI(BT_RC_TG_TAG, "AVRC remote features %x, CT features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.ct_feat_flag);
+        ESP_LOGD(BT_RC_TG_TAG, "AVRC remote features %x, CT features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.ct_feat_flag);
        break;
    }
    default:
@@ -632,15 +632,15 @@ void bt_sink_deinit(void)
 {
 	/* this still does not work, can't figure out how to stop properly this BT stack */
 	bt_app_task_shut_down();
-	ESP_LOGI(BT_AV_TAG, "bt_app_task shutdown successfully");	
+	ESP_LOGD(BT_AV_TAG, "bt_app_task shutdown successfully");
 	if (esp_bluedroid_disable() != ESP_OK) return;
-    ESP_LOGI(BT_AV_TAG, "esp_bluedroid_disable called successfully");
+    ESP_LOGD(BT_AV_TAG, "esp_bluedroid_disable called successfully");
    if (esp_bluedroid_deinit() != ESP_OK) return;
-    ESP_LOGI(BT_AV_TAG, "esp_bluedroid_deinit called successfully");
+    ESP_LOGD(BT_AV_TAG, "esp_bluedroid_deinit called successfully");
    if (esp_bt_controller_disable() != ESP_OK) return;
-    ESP_LOGI(BT_AV_TAG, "esp_bt_controller_disable called successfully");
+    ESP_LOGD(BT_AV_TAG, "esp_bt_controller_disable called successfully");
    if (esp_bt_controller_deinit() != ESP_OK) return;
-	ESP_LOGI(BT_AV_TAG, "bt stopped successfully");
+	ESP_LOGD(BT_AV_TAG, "bt stopped successfully");
 }
 static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param)
@@ -648,7 +648,7 @@ static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
    switch (event) {
    case ESP_BT_GAP_AUTH_CMPL_EVT: {
        if (param->auth_cmpl.stat == ESP_BT_STATUS_SUCCESS) {
-            ESP_LOGI(BT_AV_TAG, "authentication success: %s", param->auth_cmpl.device_name);
+            ESP_LOGD(BT_AV_TAG, "authentication success: %s", param->auth_cmpl.device_name);
            esp_log_buffer_hex(BT_AV_TAG, param->auth_cmpl.bda, ESP_BD_ADDR_LEN);
        } else {
            ESP_LOGE(BT_AV_TAG, "authentication failed, status:%d", param->auth_cmpl.stat);
@@ -658,19 +658,19 @@ static void bt_app_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
 #if (CONFIG_BT_SSP_ENABLED == true)
    case ESP_BT_GAP_CFM_REQ_EVT:
-        ESP_LOGI(BT_AV_TAG, "ESP_BT_GAP_CFM_REQ_EVT Please compare the numeric value: %d", param->cfm_req.num_val);
+        ESP_LOGD(BT_AV_TAG, "ESP_BT_GAP_CFM_REQ_EVT Please compare the numeric value: %d", param->cfm_req.num_val);
        esp_bt_gap_ssp_confirm_reply(param->cfm_req.bda, true);
        break;
    case ESP_BT_GAP_KEY_NOTIF_EVT:
-        ESP_LOGI(BT_AV_TAG, "ESP_BT_GAP_KEY_NOTIF_EVT passkey:%d", param->key_notif.passkey);
+        ESP_LOGD(BT_AV_TAG, "ESP_BT_GAP_KEY_NOTIF_EVT passkey:%d", param->key_notif.passkey);
        break;
    case ESP_BT_GAP_KEY_REQ_EVT:
-        ESP_LOGI(BT_AV_TAG, "ESP_BT_GAP_KEY_REQ_EVT Please enter passkey!");
+        ESP_LOGD(BT_AV_TAG, "ESP_BT_GAP_KEY_REQ_EVT Please enter passkey!");
        break;
 #endif
    default: {
-        ESP_LOGI(BT_AV_TAG, "event: %d", event);
+        ESP_LOGD(BT_AV_TAG, "event: %d", event);
        break;
    }
    }
--- a/components/driver_bt/bt_app_sink.h
+++ b/components/driver_bt/bt_app_sink.h
@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include "bt_app_core.h"
 typedef enum { 	BT_SINK_CONNECTED, BT_SINK_DISCONNECTED, BT_SINK_AUDIO_STARTED, BT_SINK_AUDIO_STOPPED, BT_SINK_PLAY, BT_SINK_STOP, BT_SINK_PAUSE, 
 				BT_SINK_RATE, BT_SINK_VOLUME, BT_SINK_METADATA, BT_SINK_PROGRESS } bt_sink_cmd_t;
--- a/components/driver_bt/bt_app_source.c
+++ b/components/driver_bt/bt_app_source.c
@@ -3,6 +3,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include "bt_app_core.h"
 #include "esp_log.h"
 #include "esp_bt.h"
 #include "esp_bt_device.h"
@@ -15,11 +16,10 @@
 #include "esp_wifi.h"
 #include "freertos/timers.h"
 #include "argtable3/argtable3.h"
-#include "config.h"
+#include "platform_config.h"
 #include "bt_app_core.h"
 #include "trace.h"
-static const char * TAG = "platform";
+static const char * TAG = "bt_app_source";
 extern int32_t 	output_bt_data(uint8_t *data, int32_t len);
 extern void 	output_bt_tick(void);
@@ -50,7 +50,6 @@ static const char * art_a2dp_connecting[]= {"\n",
 static void bt_app_av_state_connecting(uint16_t event, void *param);
 #define A2DP_TIMER_INIT connecting_timeout = esp_timer_get_time() +(CONFIG_A2DP_CONNECT_TIMEOUT_MS * 1000)
 #define IS_A2DP_TIMER_OVER esp_timer_get_time() >= connecting_timeout
 static void filter_inquiry_scan_result(esp_bt_gap_cb_param_t *param);
@@ -542,7 +541,15 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param)
        /* create and start heart beat timer */
        do {
            int tmr_id = 0;
-            s_tmr = xTimerCreate("connTmr", (CONFIG_A2DP_CONTROL_DELAY_MS / portTICK_RATE_MS),
+            uint16_t ctr_delay_ms=CONFIG_A2DP_CONTROL_DELAY_MS;
            char * value = config_alloc_get_default(NVS_TYPE_STR, "a2dp_ctrld", STR(CONFIG_A2DP_CONNECT_TIMEOUT_MS), 0);
 			if(value!=NULL){
 				ESP_LOGI(TAG,  "A2DP ctrl delay: %s", value);
 				ctr_delay_ms=atoi(value);
 			}
 			FREE_AND_NULL(value);
            s_tmr = xTimerCreate("connTmr", ( ctr_delay_ms/ portTICK_RATE_MS),
                               pdTRUE, (void *)tmr_id, a2d_app_heart_beat);
            xTimerStart(s_tmr, portMAX_DELAY);
        } while (0);
@@ -672,8 +679,16 @@ static void bt_app_av_state_unconnected(uint16_t event, void *param)
 			ESP_LOGI(TAG,"%s",art_a2dp_connecting[l]);
 		}
 		ESP_LOGI(TAG,"Device: %s", s_peer_bdname);
 		int64_t connecting_timeout_offset=CONFIG_A2DP_CONNECT_TIMEOUT_MS;
 		if(esp_a2d_source_connect(s_peer_bda)==ESP_OK) {
-			A2DP_TIMER_INIT;
+			char * value = config_alloc_get_default(NVS_TYPE_STR, "a2dp_ctmt", STR(CONFIG_A2DP_CONNECT_TIMEOUT_MS), 0);
 			if(value!=NULL){
 				ESP_LOGI(TAG,  "A2DP pairing timeout: %s", value);
 				connecting_timeout_offset=atoi(value);
 			}
 			FREE_AND_NULL(value);
 			connecting_timeout = esp_timer_get_time() +(connecting_timeout_offset * 1000);
 			s_a2d_state = APP_AV_STATE_CONNECTING;
 		}
 		else {
--- a/components/esp-dsp
+++ b/components/esp-dsp
--- a/components/platform_config/CMakeLists.txt
+++ b/components/platform_config/CMakeLists.txt
@@ -0,0 +1,7 @@
 idf_component_register(	SRC_DIRS . 
 						INCLUDE_DIRS . 
 						PRIV_REQUIRES   tools newlib  console esp_common freertos 
 						REQUIRES nvs_flash json
 )
--- a/components/platform_config/component.mk
+++ b/components/platform_config/component.mk
--- a/components/platform_config/nvs_utilities.c
+++ b/components/platform_config/nvs_utilities.c
@@ -10,11 +10,11 @@
 #include "driver/uart.h"
 #include "linenoise/linenoise.h"
 #include "argtable3/argtable3.h"
-#include "esp_vfs_fat.h"
+
 #include "nvs.h"
 #include "nvs_flash.h"
 #include "nvs_utilities.h"
-#include "config.h"
+#include "platform_config.h"
 const char current_namespace[] = "config";
 const char settings_partition[] = "settings";
--- a/components/platform_config/nvs_utilities.h
+++ b/components/platform_config/nvs_utilities.h
--- a/components/platform_config/platform_config.c
+++ b/components/platform_config/platform_config.c
@@ -2,16 +2,27 @@
 *  Squeezelite for esp32
 *
 *  (c) Sebastien 2019
- *  (c) Philippe G. 2019, philippe_44@outlook.com
+ *      Philippe G. 2019, philippe_44@outlook.com
- * 
+ *
- *  This software is released under the MIT License.
+ * This program is free software: you can redistribute it and/or modify
- *  https://opensource.org/licenses/MIT
+ * it under the terms of the GNU General Public License as published by
- * 
+ * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program 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.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 //#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
-#include "config.h"
+#include "platform_config.h"
 #include "nvs_utilities.h"
-
+#include "platform_esp32.h"
 #include "trace.h"
 #include <stdio.h>
 #include <string.h>
 #include "esp_system.h"
@@ -21,7 +32,7 @@
 #include "driver/uart.h"
 #include "linenoise/linenoise.h"
 #include "argtable3/argtable3.h"
-#include "esp_vfs_fat.h"
+
 #include "nvs.h"
 #include "nvs_flash.h"
 #include "nvs_utilities.h"
@@ -47,7 +58,7 @@ extern esp_err_t nvs_load_config();
 void config_raise_change(bool flag);
 cJSON_bool config_is_entry_changed(cJSON * entry);
 bool config_set_group_bit(int bit_num,bool flag);
-cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key, void * value);
+cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key,const void * value);
 static void vCallbackFunction( TimerHandle_t xTimer );
 void config_set_entry_changed_flag(cJSON * entry, cJSON_bool flag);
 #define IMPLEMENT_SET_DEFAULT(t,nt) void config_set_default_## t (const char *key, t  value){\
@@ -59,38 +70,18 @@ void config_set_entry_changed_flag(cJSON * entry, cJSON_bool flag);
 		void * pval = config_alloc_get(nt, key);\
 		if(pval!=NULL){ *value = *(t * )pval; free(pval); return ESP_OK; }\
 		return ESP_FAIL;}
 #if RECOVERY_APPLICATION==0
 static void * malloc_fn(size_t sz){
-	void * ptr = heap_caps_malloc(sz, MALLOC_CAP_SPIRAM);
+	void * ptr = is_recovery_running?malloc(sz):heap_caps_malloc(sz, MALLOC_CAP_SPIRAM);
 	if(ptr==NULL){
 		ESP_LOGE(TAG,"malloc_fn:  unable to allocate memory!");
 	}
 	return ptr;
 }
 /*
 static void * free_fn(void * ptr){
 	if(ptr!=NULL){
 		heap_caps_free(ptr);
 	}
 	else {
 		ESP_LOGW(TAG,"free_fn: Cannot free null pointer!");
 	}
 	return NULL;
 }
 */
 #endif
 void init_cJSON(){
 	static cJSON_Hooks hooks;
 	// initialize cJSON hooks it uses SPIRAM memory
 	// as opposed to IRAM
 #if RECOVERY_APPLICATION==0
 	// In squeezelite mode, allocate memory from PSRAM.  Otherwise allocate from internal RAM
 	// as recovery will lock flash access when erasing FLASH or writing to OTA partition.
 	hooks.malloc_fn=&malloc_fn;
    //hooks.free_fn=&free_fn;
 	cJSON_InitHooks(&hooks);
 #endif
 }
 void config_init(){
 	ESP_LOGD(TAG, "Creating mutex for Config");
@@ -135,7 +126,7 @@ nvs_type_t  config_get_item_type(cJSON * entry){
 }
-cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key, void * value){
+cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key,  const void * value){
 	cJSON * entry = cJSON_CreateObject();
 	double numvalue = 0;
@@ -355,21 +346,24 @@ void * config_safe_alloc_get_entry_value(nvs_type_t nvs_type, cJSON * entry){
 			char * entry_str = cJSON_PrintUnformatted(entry);
 			if(entry_str!=NULL){
 				ESP_LOGE(TAG, "requested value type string, config type is different. key: %s, value: %s, type %d, Object: \n%s",
-					entry_value->string,
+						str_or_null(entry_value->string),
-					entry_value->valuestring,
+						str_or_null(entry_value->valuestring),
-					entry_value->type,
+						entry_value->type,
-					entry_str);
+						str_or_null(entry_str));
 				free(entry_str);
 			}
 			else {
 				ESP_LOGE(TAG, "requested value type string, config type is different. key: %s, value: %s, type %d",
-					entry_value->string,
+						str_or_null(entry_value->string),
-					entry_value->valuestring,
+						str_or_null(entry_value->valuestring),
-					entry_value->type);
+						entry_value->type);
 			}
 		}
 		else {
-			value=(void *)strdup(cJSON_GetStringValue(entry_value));
+			size_t len=strlen(cJSON_GetStringValue(entry_value));
 			value=(void *)heap_caps_malloc(len+1, MALLOC_CAP_DMA);
 			memset(value,0x00,len+1);
 			memcpy(value,cJSON_GetStringValue(entry_value),len);
 			if(value==NULL){
 				char * entry_str = cJSON_PrintUnformatted(entry);
 				if(entry_str!=NULL){
@@ -389,7 +383,6 @@ void * config_safe_alloc_get_entry_value(nvs_type_t nvs_type, cJSON * entry){
 void config_commit_to_nvs(){
 	ESP_LOGI(TAG,"Committing configuration to nvs. Locking config object.");
 	ESP_LOGV(TAG,"config_commit_to_nvs. Locking config object.");
 	if(!config_lock(LOCK_MAX_WAIT/portTICK_PERIOD_MS)){
 		ESP_LOGE(TAG, "config_commit_to_nvs: Unable to lock config for commit ");
 		return ;
@@ -412,8 +405,14 @@ void config_commit_to_nvs(){
 			nvs_type_t type = config_get_entry_type(entry);
 			void * value = config_safe_alloc_get_entry_value(type, entry);
 			if(value!=NULL){
-				esp_err_t err = store_nvs_value(type,entry->string,value);
+				size_t len=strlen(entry->string);
 				char * key=(void *)heap_caps_malloc(len+1, MALLOC_CAP_DMA);
 				memset(key,0x00,len+1);
 				memcpy(key,entry->string,len);
 				esp_err_t err = store_nvs_value(type,key,value);
 				free(key);
 				free(value);
 				if(err!=ESP_OK){
 					char * entry_str = cJSON_PrintUnformatted(entry);
 					if(entry_str!=NULL){
@@ -449,6 +448,7 @@ void config_commit_to_nvs(){
 	config_raise_change(false);
 	ESP_LOGV(TAG,"config_commit_to_nvs. Releasing the lock object.");
 	config_unlock();
 	ESP_LOGI(TAG,"Done Committing configuration to nvs.");
 }
 bool config_has_changes(){
 	return  (xEventGroupGetBits(config_group) & CONFIG_NO_COMMIT_PENDING)==0;
@@ -568,7 +568,7 @@ void config_delete_key(const char *key){
 	ESP_LOGD(TAG, "Deleting nvs entry for [%s]", key);
 	if(!config_lock(LOCK_MAX_WAIT/portTICK_PERIOD_MS)){
 		ESP_LOGE(TAG, "Unable to lock config for delete");
-		return false;
+		return ;
 	}
 	esp_err_t err = nvs_open_from_partition(settings_partition, current_namespace, NVS_READWRITE, &nvs);
 	if (err == ESP_OK) {
@@ -611,9 +611,21 @@ void config_delete_key(const char *key){
 	}
 	config_unlock();
 }
 void * config_alloc_get(nvs_type_t nvs_type, const char *key) {
 	return config_alloc_get_default(nvs_type, key, NULL, 0);
 }
 void * config_alloc_get_str(const char *key, char *lead, char *fallback) {
 	if (lead && *lead) return strdup(lead);
 	char *value = config_alloc_get_default(NVS_TYPE_STR, key, NULL, 0);
 	if ((!value || !*value) && fallback) {
 		if (value) free(value);
 		value = strdup(fallback);
 	}
 	return value;
 }
 void * config_alloc_get_default(nvs_type_t nvs_type, const char *key, void * default_value, size_t blob_size) {
 	void * value = NULL;
@@ -672,7 +684,7 @@ char * config_alloc_get_json(bool bFormatted){
 	config_unlock();
 	return json_buffer;
 }
-esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, void * value){
+esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, const void * value){
 	esp_err_t result = ESP_OK;
 	if(!config_lock(LOCK_MAX_WAIT/portTICK_PERIOD_MS)){
 			ESP_LOGE(TAG, "Unable to lock config after %d ms",LOCK_MAX_WAIT);
--- a/components/platform_config/platform_config.h
+++ b/components/platform_config/platform_config.h
@@ -2,6 +2,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "nvs.h"
 #include "assert.h"
 #include "cJSON.h"
 #ifdef __cplusplus
 extern "C" {
@@ -11,7 +13,9 @@ extern "C" {
 #endif
 #define DECLARE_SET_DEFAULT(t) void config_set_default_## t (const char *key, t  value);
 #define DECLARE_GET_NUM(t) esp_err_t config_get_## t (const char *key, t *  value);
-
+#ifndef FREE_RESET
 #define FREE_RESET(p) if(p!=NULL) { free(p); p=NULL; }
 #endif
 DECLARE_SET_DEFAULT(uint8_t);
 DECLARE_SET_DEFAULT(uint16_t);
@@ -31,10 +35,13 @@ void config_commit_to_nvs();
 void config_start_timer();
 void config_init();
 void * config_alloc_get_default(nvs_type_t type, const char *key, void * default_value, size_t blob_size);
 void * config_alloc_get_str(const char *key, char *lead, char *fallback);
 void config_delete_key(const char *key);
 void config_set_default(nvs_type_t type, const char *key, void * default_value, size_t blob_size);
 void * config_alloc_get(nvs_type_t nvs_type, const char *key) ;
 bool wait_for_commit();
 char * config_alloc_get_json(bool bFormatted);
-esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, void * value);
+esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, const void * value);
 nvs_type_t  config_get_item_type(cJSON * entry);
 void * config_safe_alloc_get_entry_value(nvs_type_t nvs_type, cJSON * entry);
--- a/components/platform_console/CMakeLists.txt
+++ b/components/platform_console/CMakeLists.txt
@@ -0,0 +1,12 @@
 idf_component_register( SRCS 
 							cmd_i2ctools.c
 							cmd_nvs.c
 							cmd_ota.c
 							cmd_system.c
 							cmd_wifi.c
 							platform_console.c
 						INCLUDE_DIRS .   
 						REQUIRES nvs_flash 
 						PRIV_REQUIRES console app_update tools services spi_flash  platform_config vfs pthread wifi-manager platform_config newlib  telnet display )
 target_link_libraries(${COMPONENT_LIB}   "-Wl,--undefined=GDS_DrawPixelFast")
 target_link_libraries(${COMPONENT_LIB} ${build_dir}/esp-idf/$<TARGET_PROPERTY:RECOVERY_PREFIX>/lib$<TARGET_PROPERTY:RECOVERY_PREFIX>.a 	)
--- a/components/platform_console/app_recovery/CMakeLists.txt
+++ b/components/platform_console/app_recovery/CMakeLists.txt
@@ -0,0 +1,9 @@
 idf_component_register( SRC_DIRS .
 						INCLUDE_DIRS .   
 						PRIV_REQUIRES bootloader_support
 )
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=esp_app_desc")	
 idf_build_get_property(project_ver PROJECT_VER)
 string(SUBSTRING "${project_ver}" 0 31 PROJECT_VER_CUT)
 set_source_files_properties(recovery.c PROPERTIES COMPILE_DEFINITIONS "PROJECT_VER=\"${PROJECT_VER_CUT}\"; PROJECT_NAME=\"recovery\"")
--- a/components/platform_console/app_recovery/application_name.h
+++ b/components/platform_console/app_recovery/application_name.h
@@ -0,0 +1,2 @@
 #pragma once
 #define PROJECT_NAME "recovery"
--- a/components/platform_console/app_recovery/recovery.c
+++ b/components/platform_console/app_recovery/recovery.c
@@ -0,0 +1,36 @@
 #include <stdio.h>
 #include <string.h>
 #include "esp_err.h"
 #include "esp_app_format.h"
 extern esp_err_t process_recovery_ota(const char * bin_url, char * bin_buffer, uint32_t length);
 const __attribute__((section(".rodata_desc"))) esp_app_desc_t esp_app_desc = {
    .magic_word = ESP_APP_DESC_MAGIC_WORD,
    .version = PROJECT_VER,
    .project_name = PROJECT_NAME,
    .idf_ver = IDF_VER,
 #ifdef CONFIG_BOOTLOADER_APP_SECURE_VERSION
    .secure_version = CONFIG_BOOTLOADER_APP_SECURE_VERSION,
 #else
    .secure_version = 0,
 #endif
 #ifdef CONFIG_APP_COMPILE_TIME_DATE
    .time = __TIME__,
    .date = __DATE__,
 #else
    .time = "",
    .date = "",
 #endif
 };
 int main(int argc, char **argv){
 	return 1;
 }
 void register_squeezelite(){
 }
 esp_err_t start_ota(const char * bin_url, char * bin_buffer, uint32_t length)
 {
 		return process_recovery_ota(bin_url,bin_buffer,length);
 }
--- a/components/platform_console/app_squeezelite/CMakeLists.txt
+++ b/components/platform_console/app_squeezelite/CMakeLists.txt
@@ -0,0 +1,19 @@
 idf_build_get_property(idf_path IDF_PATH)
 idf_component_register( SRCS cmd_squeezelite.c 
 						INCLUDE_DIRS . 
 						PRIV_REQUIRES spi_flash bootloader_support  partition_table bootloader_support console codecs squeezelite newlib pthread tools platform_config display )
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=feof")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=log")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=fdopen")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=fileno")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=fstat")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=lround")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=esp_app_desc")
 idf_build_get_property(project_ver PROJECT_VER)
 string(SUBSTRING "${project_ver}" 0 31 PROJECT_VER_CUT)
 set_source_files_properties(cmd_squeezelite.c PROPERTIES COMPILE_DEFINITIONS "PROJECT_VER=\"${PROJECT_VER_CUT}\"; PROJECT_NAME=\"squeezelite\"")
--- a/components/platform_console/app_squeezelite/application_name.h
+++ b/components/platform_console/app_squeezelite/application_name.h
@@ -0,0 +1,2 @@
 #pragma once
 #define PROJECT_NAME "squeezelite"
--- a/components/platform_console/app_squeezelite/cmd_squeezelite.c
+++ b/components/platform_console/app_squeezelite/cmd_squeezelite.c
@@ -1,22 +1,45 @@
 //size_t esp_console_split_argv(char *line, char **argv, size_t argv_size);
 #include "cmd_squeezelite.h"
 #include <stdio.h>
 #include <string.h>
 #include "cmd_decl.h"
 #include "esp_log.h"
 #include "esp_console.h"
 #include "esp_pthread.h"
 #include "../cmd_system.h"
 #include "argtable3/argtable3.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/event_groups.h"
 #include "pthread.h"
 #include "platform_esp32.h"
-#include "config.h"
+#include "platform_config.h"
-
+#include "esp_app_format.h"
 extern esp_err_t process_recovery_ota(const char * bin_url, char * bin_buffer, uint32_t length);
 static const char * TAG = "squeezelite_cmd";
 #define SQUEEZELITE_THREAD_STACK_SIZE (6*1024)
 const __attribute__((section(".rodata_desc"))) esp_app_desc_t esp_app_desc = {
    .magic_word = ESP_APP_DESC_MAGIC_WORD,
    .version = PROJECT_VER,
    .project_name = PROJECT_NAME,
    .idf_ver = IDF_VER,
 #ifdef CONFIG_BOOTLOADER_APP_SECURE_VERSION
    .secure_version = CONFIG_BOOTLOADER_APP_SECURE_VERSION,
 #else
    .secure_version = 0,
 #endif
 #ifdef CONFIG_APP_COMPILE_TIME_DATE
    .time = __TIME__,
    .date = __DATE__,
 #else
    .time = "",
    .date = "",
 #endif
 };
 extern int main(int argc, char **argv);
 static int launchsqueezelite(int argc, char **argv);
 pthread_t thread_squeezelite;
@@ -69,10 +92,11 @@ static void * squeezelite_thread(){
 	ESP_LOGV(TAG ,"Freeing argv pointer");
 	free(thread_parms.argv);
 	isRunning=false;
-	ESP_LOGE(TAG, "Exited from squeezelite thread, something's wrong ... rebooting");
+	ESP_LOGE(TAG, "Exited from squeezelite thread, something's wrong ... rebooting (wait 30s for user to take action)");
 	if(!wait_for_commit()){
 		ESP_LOGW(TAG,"Unable to commit configuration. ");
 	}
 	vTaskDelay( pdMS_TO_TICKS( 30*1000 ) );
    esp_restart();
 	return NULL;
 }
@@ -126,3 +150,24 @@ void register_squeezelite(){
 	ESP_ERROR_CHECK( esp_console_cmd_register(&launch_squeezelite) );
 }
 esp_err_t start_ota(const char * bin_url, char * bin_buffer, uint32_t length)
 {
 	if(!bin_url){
 		ESP_LOGE(TAG,"missing URL parameter. Unable to start OTA");
 		return ESP_ERR_INVALID_ARG;
 	}
 	ESP_LOGW(TAG, "Called to update the firmware from url: %s",bin_url);
 	if(config_set_value(NVS_TYPE_STR, "fwurl", bin_url) != ESP_OK){
 		ESP_LOGE(TAG,"Failed to save the OTA url into nvs cache");
 		return ESP_FAIL;
 	}
 	if(!wait_for_commit()){
 		ESP_LOGW(TAG,"Unable to commit configuration. ");
 	}
 	ESP_LOGW(TAG, "Rebooting to recovery to complete the installation");
 	return guided_factory();
 	return ESP_OK;
 }
--- a/components/platform_console/cmd_decl.h
+++ b/components/platform_console/cmd_decl.h
--- a/components/platform_console/cmd_i2ctools.c
+++ b/components/platform_console/cmd_i2ctools.c
@@ -6,18 +6,20 @@
   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
   CONDITIONS OF ANY KIND, either express or implied.
 */
-#define LOG_LOCAL_LEVEL ESP_LOG_DEBUG
+//#define LOG_LOCAL_LEVEL ESP_LOG_DEBUG
 #include <stdio.h>
 #include "cmd_i2ctools.h"
 #include "argtable3/argtable3.h"
 #include "driver/i2c.h"
-#include "esp_console.h"
+#include "platform_console.h"
 #include "esp_log.h"
 #include "string.h"
 #include "stdio.h"
-#include "config.h"
+#include "platform_config.h"
 #include "accessors.h"
-
+#include "trace.h"
 #include "messaging.h"
 #include "display.h"
 #define I2C_MASTER_TX_BUF_DISABLE 0 /*!< I2C master doesn't need buffer */
 #define I2C_MASTER_RX_BUF_DISABLE 0 /*!< I2C master doesn't need buffer */
 #define WRITE_BIT I2C_MASTER_WRITE  /*!< I2C master write */
@@ -47,6 +49,7 @@ static struct {
 static struct {
    struct arg_int *chip_address;
    struct arg_int *port;
    struct arg_int *register_address;
    struct arg_int *data;
    struct arg_end *end;
@@ -251,7 +254,7 @@ const char * i2c_get_description(uint8_t address){
 static esp_err_t i2c_get_port(int port, i2c_port_t *i2c_port)
 {
    if (port >= I2C_NUM_MAX) {
-        ESP_LOGE(TAG, "Wrong port number: %d", port);
+    	log_send_messaging(MESSAGING_ERROR,"Wrong port number: %d", port);
        return ESP_FAIL;
    }
    switch (port) {
@@ -271,7 +274,7 @@ static esp_err_t i2c_master_driver_install(){
 	esp_err_t err=ESP_OK;
 	ESP_LOGD(TAG,"Installing i2c driver on port %u", i2c_port);
 	if((err=i2c_driver_install(i2c_port, I2C_MODE_MASTER, I2C_MASTER_RX_BUF_DISABLE, I2C_MASTER_TX_BUF_DISABLE, 0))!=ESP_OK){
-		ESP_LOGE(TAG,"Driver install failed! %s", esp_err_to_name(err));
+		log_send_messaging(MESSAGING_ERROR,"Driver install failed! %s", esp_err_to_name(err));
 	}
 	return err;
 }
@@ -287,9 +290,9 @@ static esp_err_t i2c_master_driver_initialize()
        .scl_pullup_en = GPIO_PULLUP_ENABLE,
        .master.clk_speed = i2c_frequency
    };
-    ESP_LOGI(TAG,"Initializing i2c driver configuration.\n   mode = I2C_MODE_MASTER, \n   scl_pullup_en = GPIO_PULLUP_ENABLE, \n   i2c port = %u, \n   sda_io_num = %u, \n   sda_pullup_en = GPIO_PULLUP_ENABLE, \n   scl_io_num = %u, \n   scl_pullup_en = GPIO_PULLUP_ENABLE, \n   master.clk_speed = %u", i2c_port, i2c_gpio_sda,i2c_gpio_scl,i2c_frequency);
+    log_send_messaging(MESSAGING_INFO,"Initializing i2c driver configuration.\n   mode = I2C_MODE_MASTER, \n   scl_pullup_en = GPIO_PULLUP_ENABLE, \n   i2c port = %u, \n   sda_io_num = %u, \n   sda_pullup_en = GPIO_PULLUP_ENABLE, \n   scl_io_num = %u, \n   scl_pullup_en = GPIO_PULLUP_ENABLE, \n   master.clk_speed = %u", i2c_port, i2c_gpio_sda,i2c_gpio_scl,i2c_frequency);
    if((err=i2c_param_config(i2c_port, &conf))!=ESP_OK){
-    	ESP_LOGE(TAG,"i2c driver config load failed. %s", esp_err_to_name(err));
+    	log_send_messaging(MESSAGING_ERROR,"i2c driver config load failed. %s", esp_err_to_name(err));
    }
    return err;
 }
@@ -299,10 +302,10 @@ esp_err_t i2c_initialize_driver_from_config(){
 	ESP_LOGD(TAG,"Initializing driver from configuration.");
 	i2c_load_configuration();
 	if(is_i2c_started(i2c_port)){
-		ESP_LOGW(TAG, "Stopping i2c driver on port %u", i2c_port);
+		log_send_messaging(MESSAGING_WARNING,"Stopping i2c driver on port %u", i2c_port);
 		//  stop the current driver instance
 		if((err=i2c_driver_delete(i2c_port))!=ESP_OK){
-			ESP_LOGE(TAG,"i2c driver delete failed. %s", esp_err_to_name(err));
+			log_send_messaging(MESSAGING_ERROR,"i2c driver delete failed. %s", esp_err_to_name(err));
 		}
 	}
 	if(err==ESP_OK){
@@ -317,24 +320,23 @@ esp_err_t i2c_initialize_driver_from_config(){
 static int do_i2c_stop(int argc, char **argv ){
-    int nerrors = arg_parse(argc, argv, (void **)&i2cstop_args);
+    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&i2cstop_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, i2cstop_args.end, argv[0]);
        return 0;
    }
    if (i2cstop_args.port->count && i2c_get_port(i2cstop_args.port->ival[0], &i2c_port) != ESP_OK) {
        return 1;
    }
-	ESP_LOGW(TAG,"Stopping i2c on port %u.",i2c_port);
+    log_send_messaging(MESSAGING_WARNING,"Stopping i2c on port %u.",i2c_port);
 	i2c_driver_delete(i2c_port);
 	return 0;
 }
 static int do_i2c_check(int argc, char **argv ){
 	i2c_port_t port=0;
-    int nerrors = arg_parse(argc, argv, (void **)&i2ccheck_args);
+    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&i2ccheck_args);
    if (nerrors != 0) {
-        arg_print_errors(stderr, i2ccheck_args.end, argv[0]);
+
        return 0;
    }
    port=i2c_port;
@@ -343,22 +345,22 @@ static int do_i2c_check(int argc, char **argv ){
        return 1;
    }
    bool started=is_i2c_started(port);
-	ESP_LOGI(TAG,"i2c is %s on port %u.", started?"started":"not started",port );
+    log_send_messaging(MESSAGING_INFO,"i2c is %s on port %u.", started?"started":"not started",port );
 	return 0;
 }
 static int do_i2c_show_display(int argc, char **argv){
 	char * config_string = (char * )config_alloc_get(NVS_TYPE_STR, "display_config") ;
 	if(config_string){
-		ESP_LOGI(TAG,"Display configuration string is : \n"
+		log_send_messaging(MESSAGING_INFO,"Display configuration string is : \n"
-					"display_config = \"%s\"",config_string);
+				"display_config = \"%s\"",config_string);
 		free(config_string);
 	}
 	else {
-		ESP_LOGW(TAG,"No display configuration found in nvs config display_config");
+		log_send_messaging(MESSAGING_WARNING,"No display configuration found in nvs config display_config");
 	}
 	char * nvs_item = config_alloc_get(NVS_TYPE_STR, "i2c_config");
 	if (nvs_item) {
-		ESP_LOGI(TAG,"I2C configuration is: %s", nvs_item);
+		log_send_messaging(MESSAGING_INFO,"I2C configuration is: %s", nvs_item);
 		free(nvs_item);
 	}
 	return 0;
@@ -367,25 +369,41 @@ static int do_i2c_show_display(int argc, char **argv){
 static int do_i2c_set_display(int argc, char **argv)
 {
 	int width=0, height=0, address=60;
 	int result = 0;
 	char * name = NULL;
 	char * driver= NULL;
 	char config_string[200]={};
-    int nerrors = arg_parse(argc, argv, (void **)&i2cdisp_args);
+	bool bHasi2cConfig = false, bHasSpiConfig=false;
    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&i2cdisp_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, i2cdisp_args.end, argv[0]);
        return 0;
    }
-	/* Check "--clear" option */
+    char * nvs_item = config_alloc_get(NVS_TYPE_STR, "i2c_config");
 	if (nvs_item && strlen(nvs_item)>0) {
 		bHasi2cConfig=true;
 	}
 	FREE_AND_NULL(nvs_item);
 	nvs_item = config_alloc_get(NVS_TYPE_STR, "spi_config");
 	if (nvs_item && strlen(nvs_item)>0) {
 		bHasSpiConfig=true;
 	}
 	FREE_AND_NULL(nvs_item);
 		/* Check "--clear" option */
 	if (i2cdisp_args.clear->count) {
-		ESP_LOGW(TAG,"Clearing display config");
+		log_send_messaging(MESSAGING_WARNING,"Display config cleared");
 		config_set_value(NVS_TYPE_STR, "display_config", "");
 		return 0;
 	}
-
+	char *buf = NULL;
-
+	size_t buf_size = 0;
-
+	FILE *f = open_memstream(&buf, &buf_size);
-
+	if (f == NULL) {
 		log_send_messaging(MESSAGING_ERROR,"Unable to open memory stream.");
 		return 0;
 	}
 	/* Check "--address" option */
 	if (i2cdisp_args.address->count) {
 		address=i2cdisp_args.address->ival[0];
@@ -396,7 +414,7 @@ static int do_i2c_set_display(int argc, char **argv)
 		width=i2cdisp_args.width->ival[0];
 	}
 	else {
-		ESP_LOGE(TAG,"Missing parameter: --width");
+		fprintf(f,"Missing parameter: --width\n");
 		nerrors ++;
 	}
@@ -405,7 +423,7 @@ static int do_i2c_set_display(int argc, char **argv)
 		height=i2cdisp_args.height->ival[0];
 	}
 	else {
-		ESP_LOGE(TAG,"Missing parameter: --height");
+		fprintf(f,"Missing parameter: --height\n");
 		nerrors ++;
 	}
 	/* Check "--name" option */
@@ -421,35 +439,53 @@ static int do_i2c_set_display(int argc, char **argv)
 	if(!name) name = strdup("I2C");
 	if(!driver) driver = strdup("SSD1306");
 	bool rotate = i2cdisp_args.rotate->count>0;
-	snprintf(config_string, sizeof(config_string),"%s:width=%i,height=%i,address=%i,driver=%s%s%s",
+	if(!display_is_valid_driver(driver)){
-				name,width,height,address,driver,rotate || i2cdisp_args.hflip->count?",HFlip":"",rotate || i2cdisp_args.vflip->count?",VFlip":"" );
+		fprintf(f,"Unsupported display driver %s\n",driver);
-	free(name);
+		nerrors++;
 	free(driver);
 	if(nerrors!=0){
 		return 0;
 	}
-	ESP_LOGI(TAG,"Updating display configuration string configuration to :\n"
+	if(strcasestr(name,"I2C") && !bHasi2cConfig){
-			"display_config = \"%s\"",config_string );
+		fprintf(f,"Please configure I2C bus first. \n");
 	}else if(strcasestr(name,"SPI") && !bHasSpiConfig){
 		fprintf(f,"Please configure SPI bus first. \n");
 	}
 	else if(!strcasestr(name,"I2C") && !strcasestr(name,"SPI")){
 		fprintf(f,"Invalid display type %s\n",name);
 	}
 	bool rotate = i2cdisp_args.rotate->count>0;
-	return config_set_value(NVS_TYPE_STR, "display_config", config_string)!=ESP_OK;
+	if(nerrors==0){
 		snprintf(config_string, sizeof(config_string),"%s:width=%i,height=%i,address=%i,driver=%s%s%s",
 				name,width,height,address,driver,rotate || i2cdisp_args.hflip->count?",HFlip":"",rotate || i2cdisp_args.vflip->count?",VFlip":"" );
 		fprintf(f,"Updating display configuration string configuration to :\n"
 				"display_config = \"%s\"",config_string );
 		result = config_set_value(NVS_TYPE_STR, "display_config", config_string)!=ESP_OK;
 	}
 	else {
 		result = 1;
 	}
 	FREE_AND_NULL(name);
 	FREE_AND_NULL(driver);
 	fflush (f);
 	log_send_messaging(nerrors>0?MESSAGING_ERROR:MESSAGING_INFO,"%s", buf);
 	fclose(f);
 	FREE_AND_NULL(buf);
 	return result;
 }
 static int do_i2cconfig_cmd(int argc, char **argv)
 {
 	esp_err_t err=ESP_OK;
 	int res=0;
-    int nerrors = arg_parse(argc, argv, (void **)&i2cconfig_args);
+	char * err_message=malloc(1);
 	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&i2cconfig_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, i2cconfig_args.end, argv[0]);
        return 0;
    }
    /* Check "--load" option */
    if (i2cconfig_args.load->count) {
-    	ESP_LOGW(TAG,"Loading i2c config");
+    	log_send_messaging(MESSAGING_WARNING,"Loading i2c config");
    	i2c_load_configuration();
    }
    else {
@@ -457,6 +493,7 @@ static int do_i2cconfig_cmd(int argc, char **argv)
 		/* Check "--port" option */
 		if (i2cconfig_args.port->count) {
 			if (i2c_get_port(i2cconfig_args.port->ival[0], &i2c_port) != ESP_OK) {
 				log_send_messaging(MESSAGING_ERROR, "Invalid port %u ",i2cconfig_args.port->ival[0]);
 				return 1;
 			}
 		}
@@ -469,7 +506,7 @@ static int do_i2cconfig_cmd(int argc, char **argv)
 			i2c_gpio_sda = i2cconfig_args.sda->ival[0];
 		}
 		else {
-			ESP_LOGE(TAG,"Missing --sda option.");
+			REALLOC_CAT(err_message,"Missing --sda option.");
 			res=1;
 		}
@@ -478,7 +515,7 @@ static int do_i2cconfig_cmd(int argc, char **argv)
 			i2c_gpio_scl = i2cconfig_args.scl->ival[0];
 		}
 		else {
-			ESP_LOGE(TAG,"Missing --scl option.");
+			REALLOC_CAT(err_message,"Missing --scl option.");
 			res=1;
 		}
    }
@@ -486,35 +523,41 @@ static int do_i2cconfig_cmd(int argc, char **argv)
 #ifdef CONFIG_SQUEEZEAMP
 	if (i2c_port == I2C_NUM_0) {
 		i2c_port = I2C_NUM_1;
-		ESP_LOGE(TAG, "can't use i2c port 0 on SqueezeAMP. Changing to port 1.");
+		log_send_messaging(MESSAGING_ERROR, "can't use i2c port 0 on SqueezeAMP. Changing to port 1.");
 	}
 #endif
 	if(!res){
-		ESP_LOGI(TAG, "Uninstall i2c driver from port %u if needed",i2c_port);
+		log_send_messaging(MESSAGING_INFO,"Uninstall i2c driver from port %u if needed",i2c_port);
 		if(is_i2c_started(i2c_port)){
 			if((err=i2c_driver_delete(i2c_port))!=ESP_OK){
-				ESP_LOGE(TAG,"i2c driver delete failed. %s", esp_err_to_name(err));
+				log_send_messaging(MESSAGING_ERROR, "i2c driver delete failed. %s", esp_err_to_name(err));
 				res = 1;
 			}
 		}
 	}
 	if(!res){
-		ESP_LOGI(TAG,"Initializing driver with config scl=%u sda=%u speed=%u port=%u",i2c_gpio_scl,i2c_gpio_sda,i2c_frequency,i2c_port);
+		log_send_messaging(MESSAGING_INFO, "Initializing driver with config scl=%u sda=%u speed=%u port=%u",i2c_gpio_scl,i2c_gpio_sda,i2c_frequency,i2c_port);
 		if((err=i2c_master_driver_initialize())==ESP_OK){
-			ESP_LOGI(TAG,"Initalize success.");
+			log_send_messaging(MESSAGING_INFO, "Initalize success.");
 			// now start the i2c driver
-			ESP_LOGI(TAG,"Starting the i2c driver.");
+			log_send_messaging(MESSAGING_INFO,"Starting the i2c driver.");
 			if((err=i2c_master_driver_install())!=ESP_OK){
-				 res=1;
+				log_send_messaging(MESSAGING_ERROR,"I2C master driver install failed. %s", esp_err_to_name(err));
 				res=1;
 			}
 			else
 			{
 				log_send_messaging(MESSAGING_INFO,"i2c driver successfully started.");
 			}
 		}
 		else {
-			ESP_LOGE(TAG,"I2C initialization failed. %s", esp_err_to_name(err));
+
 			log_send_messaging(MESSAGING_ERROR,"I2C initialization failed. %s", esp_err_to_name(err));
 			res=1;
 		}
 	}
 	if(!res && !i2cconfig_args.load->count){
-			ESP_LOGI(TAG,"Storing i2c parameters.");
+		log_send_messaging(MESSAGING_INFO,"Storing i2c parameters.");
 			i2c_config_t config={
 				.mode = I2C_MODE_MASTER,
 				.sda_io_num = i2c_gpio_sda,
@@ -525,7 +568,10 @@ static int do_i2cconfig_cmd(int argc, char **argv)
 			};
 			config_i2c_set(&config, i2c_port);
 	}
-
+	if(res){
 		log_send_messaging(MESSAGING_ERROR,"%s", err_message);
 	}
 	free(err_message);
    return res;
 }
@@ -534,9 +580,8 @@ static int do_i2cconfig_cmd(int argc, char **argv)
 static int do_i2cdump_cmd(int argc, char **argv)
 {
-    int nerrors = arg_parse(argc, argv, (void **)&i2cdump_args);
+	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&i2cdump_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, i2cdump_args.end, argv[0]);
        return 0;
    }
@@ -547,20 +592,35 @@ static int do_i2cdump_cmd(int argc, char **argv)
    if (i2cdump_args.size->count) {
        size = i2cdump_args.size->ival[0];
    }
    i2c_port_t loc_i2c_port=i2c_port;
    if (i2cset_args.port->count && i2c_get_port(i2cset_args.port->ival[0], &loc_i2c_port) != ESP_OK) {
    	return 0;
    }
    if (size != 1 && size != 2 && size != 4) {
-        ESP_LOGE(TAG, "Wrong read size. Only support 1,2,4");
+        log_send_messaging(MESSAGING_ERROR, "Wrong read size. Only support 1,2,4");
        return 1;
    }
-    esp_err_t ret = i2c_initialize_driver_from_config();
+    i2c_load_configuration();
-	if(ret!=ESP_OK) return 0;
+    if(i2c_gpio_scl==-1 ||i2c_gpio_sda ==-1){
     	log_send_messaging(MESSAGING_ERROR,"i2c set failed. i2c needs to be configured first.");
     	return 0;
    }
    char *buf = NULL;
 	size_t buf_size = 0;
 	FILE *f = open_memstream(&buf, &buf_size);
 	if (f == NULL) {
 		log_send_messaging(MESSAGING_ERROR,"Unable to open memory stream.");
 		return 0;
 	}
    uint8_t data_addr;
    uint8_t data[4];
    int32_t block[16];
-    printf("     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f"
+    fprintf(f,"\n    00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f"
           "    0123456789abcdef\r\n");
    for (int i = 0; i < 128; i += 16) {
-        printf("%02x: ", i);
+        fprintf(f,"%02x: ", i);
        for (int j = 0; j < 16; j += size) {
            fflush(stdout);
            data_addr = i + j;
@@ -575,44 +635,50 @@ static int do_i2cdump_cmd(int argc, char **argv)
            }
            i2c_master_read_byte(cmd, data + size - 1, NACK_VAL);
            i2c_master_stop(cmd);
-            esp_err_t ret = i2c_master_cmd_begin(i2c_port, cmd, 50 / portTICK_RATE_MS);
+            esp_err_t ret = i2c_master_cmd_begin(loc_i2c_port, cmd, 50 / portTICK_RATE_MS);
            i2c_cmd_link_delete(cmd);
            if (ret == ESP_OK) {
                for (int k = 0; k < size; k++) {
-                    printf("%02x ", data[k]);
+                    fprintf(f,"%02x ", data[k]);
                    block[j + k] = data[k];
                }
            } else {
                for (int k = 0; k < size; k++) {
-                    printf("XX ");
+                    fprintf(f,"XX ");
                    block[j + k] = -1;
                }
            }
        }
-        printf("   ");
+        fprintf(f,"   ");
        for (int k = 0; k < 16; k++) {
            if (block[k] < 0) {
-                printf("X");
+                fprintf(f,"X");
            }
            if ((block[k] & 0xff) == 0x00 || (block[k] & 0xff) == 0xff) {
-                printf(".");
+                fprintf(f,".");
            } else if ((block[k] & 0xff) < 32 || (block[k] & 0xff) >= 127) {
-                printf("?");
+                fprintf(f,"?");
            } else {
-                printf("%c", block[k] & 0xff);
+                fprintf(f,"%c", block[k] & 0xff);
            }
        }
-        printf("\r\n");
+        fprintf(f,"\r\n");
    }
    // Don't stop the driver;  our firmware may be using it for screen, etc
    //i2c_driver_delete(i2c_port);
 	fflush (f);
 	log_send_messaging(MESSAGING_INFO,"%s", buf);
 	fclose(f);
 	FREE_AND_NULL(buf);
    return 0;
 }
 static int do_i2cset_cmd(int argc, char **argv)
 {
-    int nerrors = arg_parse(argc, argv, (void **)&i2cset_args);
+
 	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&i2cset_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, i2cset_args.end, argv[0]);
        return 0;
    }
@@ -623,13 +689,20 @@ static int do_i2cset_cmd(int argc, char **argv)
    if (i2cset_args.register_address->count) {
        data_addr = i2cset_args.register_address->ival[0];
    }
    i2c_port_t loc_i2c_port=i2c_port;
    if (i2cset_args.port->count && i2c_get_port(i2cset_args.port->ival[0], &loc_i2c_port) != ESP_OK) {
    	return 0;
    }
    /* Check data: "-d" option */
    int len = i2cset_args.data->count;
-    i2c_master_driver_initialize();
+    i2c_load_configuration();
-	if(i2c_master_driver_install()!=ESP_OK){
+    if(i2c_gpio_scl==-1 ||i2c_gpio_sda ==-1){
-		 return 1;
+    	log_send_messaging(MESSAGING_ERROR,"i2c set failed. i2c needs to be configured first.");
-	}
+    	return 0;
    }
    i2c_cmd_handle_t cmd = i2c_cmd_link_create();
    i2c_master_start(cmd);
@@ -641,14 +714,14 @@ static int do_i2cset_cmd(int argc, char **argv)
        i2c_master_write_byte(cmd, i2cset_args.data->ival[i], ACK_CHECK_EN);
    }
    i2c_master_stop(cmd);
-    esp_err_t ret = i2c_master_cmd_begin(i2c_port, cmd, 1000 / portTICK_RATE_MS);
+    esp_err_t ret = i2c_master_cmd_begin(loc_i2c_port, cmd, 1000 / portTICK_RATE_MS);
    i2c_cmd_link_delete(cmd);
    if (ret == ESP_OK) {
-        ESP_LOGI(TAG, "Write OK");
+    	log_send_messaging(MESSAGING_INFO, "i2c Write OK");
    } else if (ret == ESP_ERR_TIMEOUT) {
-        ESP_LOGW(TAG, "Bus is busy");
+    	log_send_messaging(MESSAGING_WARNING, "i2c Bus is busy");
    } else {
-        ESP_LOGW(TAG, "Write Failed");
+    	log_send_messaging(MESSAGING_ERROR,"i2c Read failed");
    }
    // Don't stop the driver;  our firmware may be using it for screen, etc
    //i2c_driver_delete(i2c_port);
@@ -657,10 +730,8 @@ static int do_i2cset_cmd(int argc, char **argv)
 static int do_i2cget_cmd(int argc, char **argv)
 {
-	esp_err_t err=ESP_OK;
+    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&i2cget_args);
    int nerrors = arg_parse(argc, argv, (void **)&i2cget_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, i2cget_args.end, argv[0]);
        return 0;
    }
@@ -676,16 +747,24 @@ static int do_i2cget_cmd(int argc, char **argv)
    if (i2cget_args.data_length->count) {
        len = i2cget_args.data_length->ival[0];
    }
    i2c_port_t loc_i2c_port=i2c_port;
    if (i2cset_args.port->count && i2c_get_port(i2cset_args.port->ival[0], &loc_i2c_port) != ESP_OK) {
    	return 0;
    }
-    if((err=i2c_master_driver_initialize())!=ESP_OK){
+    i2c_load_configuration();
-      	ESP_LOGE(TAG,"Error initializing i2c driver. %s",esp_err_to_name(err));
+    if(i2c_gpio_scl==-1 ||i2c_gpio_sda ==-1){
-      	return 1;
+    	log_send_messaging(MESSAGING_ERROR,"i2c set failed. i2c needs to be configured first.");
-     }
+    	return 0;
-	if((err=i2c_master_driver_install())!=ESP_OK){
+    }
-		 return 1;
+	char *buf = NULL;
 	size_t buf_size = 0;
 	FILE *f = open_memstream(&buf, &buf_size);
 	if (f == NULL) {
 		log_send_messaging(MESSAGING_ERROR,"Unable to open memory stream.");
 		return 0;
 	}
    i2c_cmd_handle_t cmd = i2c_cmd_link_create();
    i2c_master_start(cmd);
    uint8_t *data = malloc(len);
@@ -700,26 +779,32 @@ static int do_i2cget_cmd(int argc, char **argv)
    }
    i2c_master_read_byte(cmd, data + len - 1, NACK_VAL);
    i2c_master_stop(cmd);
-    esp_err_t ret = i2c_master_cmd_begin(i2c_port, cmd, 1000 / portTICK_RATE_MS);
+    esp_err_t ret = i2c_master_cmd_begin(loc_i2c_port, cmd, 1000 / portTICK_RATE_MS);
    i2c_cmd_link_delete(cmd);
    if (ret == ESP_OK) {
        for (int i = 0; i < len; i++) {
-            printf("0x%02x ", data[i]);
+            fprintf(f,"0x%02x ", data[i]);
            if ((i + 1) % 16 == 0) {
-                printf("\r\n");
+                fprintf(f,"\r\n");
            }
        }
        if (len % 16) {
-            printf("\r\n");
+            fprintf(f,"\r\n");
        }
    } else if (ret == ESP_ERR_TIMEOUT) {
-        ESP_LOGW(TAG, "Bus is busy");
+    	log_send_messaging(MESSAGING_WARNING, "i2c Bus is busy");
    } else {
-        ESP_LOGW(TAG, "Read failed");
+    	log_send_messaging(MESSAGING_ERROR,"i2c Read failed");
    }
    free(data);
    // Don't stop the driver;  our firmware may be using it for screen, etc
    //i2c_driver_delete(i2c_port);
 	fflush (f);
 	log_send_messaging(MESSAGING_INFO,"%s", buf);
 	fclose(f);
 	FREE_AND_NULL(buf);
    return 0;
 }
@@ -727,57 +812,100 @@ static int do_i2cdetect_cmd(int argc, char **argv)
 {
 	uint8_t matches[128]={};
 	int last_match=0;
-	esp_err_t ret = i2c_initialize_driver_from_config();
+	esp_err_t ret = ESP_OK;
-	if(ret!=ESP_OK) return 0;
+    i2c_load_configuration();
    if(i2c_gpio_scl==-1 ||i2c_gpio_sda ==-1){
    	log_send_messaging(MESSAGING_ERROR,"i2c set failed. i2c needs to be configured first.");
    	return 0;
    }
    i2c_port_t loc_i2c_port=i2c_port;
    if (i2cset_args.port->count && i2c_get_port(i2cset_args.port->ival[0], &loc_i2c_port) != ESP_OK) {
    	return 0;
    }
    uint8_t address;
-    printf("     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f\r\n");
+    char *buf = NULL;
 	size_t buf_size = 0;
 	FILE *f = open_memstream(&buf, &buf_size);
 	if (f == NULL) {
 		log_send_messaging(MESSAGING_ERROR,"Unable to open memory stream.");
 		return 0;
 	}
    fprintf(f,"\n     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f\r\n");
    for (int i = 0; i < 128 ; i += 16) {
-        printf("%02x: ", i);
+        fprintf(f,"%02x: ", i);
        for (int j = 0; j < 16 ; j++) {
            fflush(stdout);
            address = i + j;
            i2c_cmd_handle_t cmd = i2c_cmd_link_create();
            i2c_master_start(cmd);
            i2c_master_write_byte(cmd, (address << 1) | WRITE_BIT, ACK_CHECK_EN);
            i2c_master_stop(cmd);
-            ret = i2c_master_cmd_begin(i2c_port, cmd, 50 / portTICK_RATE_MS);
+            ret = i2c_master_cmd_begin(loc_i2c_port, cmd, 50 / portTICK_RATE_MS);
            i2c_cmd_link_delete(cmd);
            if (ret == ESP_OK) {
-                printf("%02x ", address);
+                fprintf(f,"%02x ", address);
                matches[++last_match-1] = address;
            } else if (ret == ESP_ERR_TIMEOUT) {
-                printf("UU ");
+                fprintf(f,"UU ");
            } else {
-                printf("-- ");
+                fprintf(f,"-- ");
            }
        }
-        printf("\r\n");
+        fprintf(f,"\r\n");
    }
    if(last_match) {
-    	printf("\r\n------------------------------------------------------------------------------------"
+    	fprintf(f,"\r\n------------------------------------------------------------------------------------"
    		   "\r\nDetected the following devices (names provided by https://i2cdevices.org/addresses).");
 		for(int i=0;i<last_match;i++){
 			//printf("%02x = %s\r\n", matches[i], i2c_get_description(matches[i]));
-			printf("\r\n%u [%02xh]- %s", matches[i], matches[i], i2c_get_description(matches[i]));
+			fprintf(f,"\r\n%u [%02xh]- %s", matches[i], matches[i], i2c_get_description(matches[i]));
 		}
-		printf("\r\n------------------------------------------------------------------------------------\r\n");
+		fprintf(f,"\r\n------------------------------------------------------------------------------------\r\n");
    }
 	fflush (f);
 	log_send_messaging(MESSAGING_INFO,"%s", buf);
 	fclose(f);
 	FREE_AND_NULL(buf);
    return 0;
 }
 cJSON * i2c_set_display_cb(){
 	cJSON * values = cJSON_CreateObject();
 	const display_config_t * conf= config_display_get();
 	if(conf){
 		cJSON_AddNumberToObject(values,"address",conf->address);
 		cJSON_AddNumberToObject(values,"width",conf->width);
 		cJSON_AddNumberToObject(values,"height",conf->height);
 		cJSON_AddStringToObject(values,"type",conf->type);
 		cJSON_AddStringToObject(values,"driver",conf->drivername);
 		cJSON_AddBoolToObject(values,"hf",conf->hflip);
 		cJSON_AddBoolToObject(values,"vf",conf->vflip);
 		if(conf->vflip && conf->hflip){
 			cJSON_AddBoolToObject(values,"rotate",true);
 		}
 		else {
 			cJSON_AddBoolToObject(values,"rotate",false);
 		}
 	}
 	return values;
 }
 static void register_i2c_set_display(){
 	i2cdisp_args.address = arg_int0("a", "address", "<n>", "Set the device address, default 60");
 	i2cdisp_args.width = arg_int0("w", "width", "<n>", "Set the display width");
 	i2cdisp_args.height = arg_int0("h", "height", "<n>", "Set the display height");
-	i2cdisp_args.name = arg_str0("t", "type", "<I2C|SPI>", "Set the display type. default I2C");
+	i2cdisp_args.name = arg_str0("t", "type", "<I2C|SPI>", "Display type, I2C or SPI. Default I2C");
 	i2cdisp_args.driver = arg_str0("d", "driver", "<string>", "Set the display driver name. Default SSD1306");
-	i2cdisp_args.clear = arg_litn(NULL, "clear", 0, 1, "clear configuration and return");
+	i2cdisp_args.clear = arg_lit0(NULL, "clear", "clear configuration and return");
-	i2cdisp_args.hflip = arg_litn(NULL, "hf", 0, 1, "Flip picture horizontally");
+	i2cdisp_args.hflip = arg_lit0(NULL, "hf", "Flip picture horizontally");
-	i2cdisp_args.vflip = arg_litn(NULL, "vf", 0, 1, "Flip picture vertically");
+	i2cdisp_args.vflip = arg_lit0(NULL, "vf", "Flip picture vertically");
-	i2cdisp_args.rotate = arg_litn("r", "rotate", 0, 1, "Rotate the picture 180 deg");
+	i2cdisp_args.rotate = arg_lit0("r", "rotate", "Rotate the picture 180 deg");
 	i2cdisp_args.end = arg_end(8);
 	const esp_console_cmd_t i2c_set_display= {
 	 		.command = "setdisplay",
@@ -794,6 +922,8 @@ static void register_i2c_set_display(){
 			.func = &do_i2c_show_display,
 			.argtable = NULL
 	};
 	cmd_to_json_with_cb(&i2c_set_display,&i2c_set_display_cb);
 	cmd_to_json(&i2c_show_display);
 	ESP_ERROR_CHECK(esp_console_cmd_register(&i2c_set_display));
 	ESP_ERROR_CHECK(esp_console_cmd_register(&i2c_show_display));
 }
@@ -806,6 +936,7 @@ static void register_i2cdectect(void)
        .func = &do_i2cdetect_cmd,
        .argtable = NULL
    };
    cmd_to_json(&i2cdetect_cmd);
    ESP_ERROR_CHECK(esp_console_cmd_register(&i2cdetect_cmd));
 }
@@ -822,15 +953,17 @@ static void register_i2cget(void)
        .func = &do_i2cget_cmd,
        .argtable = &i2cget_args
    };
    cmd_to_json(&i2cget_cmd);
    ESP_ERROR_CHECK(esp_console_cmd_register(&i2cget_cmd));
 }
 static void register_i2cset(void)
 {
    i2cset_args.chip_address = arg_int1("c", "chip", "<chip_addr>", "Specify the address of the chip on that bus");
    i2cset_args.register_address = arg_int0("r", "register", "<register_addr>", "Specify the address on that chip to read from");
    i2cset_args.data = arg_intn(NULL, NULL, "<data>", 0, 256, "Specify the data to write to that data address");
    i2cset_args.port = arg_intn("p","port","<n>",0,1,"Specify the i2c port (0|2)");
    i2cset_args.end = arg_end(2);
    const esp_console_cmd_t i2cset_cmd = {
        .command = "i2cset",
@@ -839,11 +972,13 @@ static void register_i2cset(void)
        .func = &do_i2cset_cmd,
        .argtable = &i2cset_args
    };
    cmd_to_json(&i2cset_cmd);
    ESP_ERROR_CHECK(esp_console_cmd_register(&i2cset_cmd));
 }
 static void register_i2cdump(void)
 {
    i2cdump_args.chip_address = arg_int1("c", "chip", "<chip_addr>", "Specify the address of the chip on that bus");
@@ -856,6 +991,7 @@ static void register_i2cdump(void)
        .func = &do_i2cdump_cmd,
        .argtable = &i2cdump_args
    };
    cmd_to_json(&i2cdump_cmd);
    ESP_ERROR_CHECK(esp_console_cmd_register(&i2cdump_cmd));
 }
@@ -870,12 +1006,13 @@ static void register_i2ccheck(){
        .func = &do_i2c_check,
        .argtable = &i2ccheck_args
    };
    cmd_to_json(&cmd);
    ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
 }
 static void register_i2cstop(){
-	i2cstop_args.port = arg_int0("p", "port", "<0|1>", "Set the I2C bus port number");
+	i2cstop_args.port = arg_int0("p", "port", "<0|1>", "I2C bus port number");
 	i2cstop_args.end = arg_end(2);
    const esp_console_cmd_t i2cconfig_cmd = {
@@ -885,16 +1022,27 @@ static void register_i2cstop(){
        .func = &do_i2c_stop,
        .argtable = &i2cstop_args
    };
    cmd_to_json(&i2cconfig_cmd);
    ESP_ERROR_CHECK(esp_console_cmd_register(&i2cconfig_cmd));
 }
 cJSON * i2config_cb(){
 	cJSON * values = cJSON_CreateObject();
 	int i2c_port;
 	const i2c_config_t * i2c= config_i2c_get(&i2c_port);
 	cJSON_AddNumberToObject(values,"scl",i2c->scl_io_num);
 	cJSON_AddNumberToObject(values,"sda",i2c->sda_io_num);
 	cJSON_AddNumberToObject(values,"freq",i2c->master.clk_speed);
 	cJSON_AddNumberToObject(values,"port",i2c_port);
 	return values;
 }
 static void register_i2cconfig(void)
 {
-    i2cconfig_args.port = arg_int0("p", "port", "<0|1>", "Set the I2C bus port number");
+    i2cconfig_args.port = arg_int0("p", "port", "0|1", "Set the I2C bus port number");
-    i2cconfig_args.freq = arg_int0("f", "freq", "<Hz>", "Set the frequency(Hz) of I2C bus. e.g. 100000");
+    i2cconfig_args.freq = arg_int0("f", "freq", "int", "Set the frequency(Hz) of I2C bus. e.g. 100000");
-    i2cconfig_args.sda = arg_int0("d", "sda", "<gpio>", "Set the gpio for I2C SDA. e.g. 19");
+    i2cconfig_args.sda = arg_int0("d", "sda", "int", "Set the gpio for I2C SDA. e.g. 19");
-    i2cconfig_args.scl = arg_int0("c", "scl", "<gpio>", "Set the gpio for I2C SCL. e.g. 18");
+    i2cconfig_args.scl = arg_int0("c", "scl", "int", "Set the gpio for I2C SCL. e.g. 18");
-    i2cconfig_args.load = arg_litn("l", "load", 0, 1, "load existing configuration and return");
+    i2cconfig_args.load = arg_lit0("l", "load", "load existing configuration and return");
    i2cconfig_args.end = arg_end(4);
    const esp_console_cmd_t i2cconfig_cmd = {
        .command = "i2cconfig",
@@ -903,6 +1051,7 @@ static void register_i2cconfig(void)
        .func = &do_i2cconfig_cmd,
        .argtable = &i2cconfig_args
    };
    cmd_to_json_with_cb(&i2cconfig_cmd,&i2config_cb);
    ESP_ERROR_CHECK(esp_console_cmd_register(&i2cconfig_cmd));
 }
--- a/components/platform_console/cmd_i2ctools.h
+++ b/components/platform_console/cmd_i2ctools.h
--- a/components/platform_console/cmd_nvs.c
+++ b/components/platform_console/cmd_nvs.c
@@ -25,7 +25,8 @@ extern "C" {
 #include "cmd_nvs.h"
 #include "nvs.h"
 #include "nvs_utilities.h"
-
+#include "platform_console.h"
 #include "messaging.h"
 static const char *ARG_TYPE_STR = "type can be: i8, u8, i16, u16 i32, u32 i64, u64, str, blob";
@@ -70,7 +71,7 @@ static esp_err_t store_blob(nvs_handle nvs, const char *key, const char *str_val
    size_t blob_len = str_len / 2;
    if (str_len % 2) {
-        ESP_LOGE(TAG, "Blob data must contain even number of characters");
+    	log_send_messaging(MESSAGING_ERROR, "Blob data must contain even number of characters");
        return ESP_ERR_NVS_TYPE_MISMATCH;
    }
@@ -88,7 +89,7 @@ static esp_err_t store_blob(nvs_handle nvs, const char *key, const char *str_val
        } else if (ch >= 'a' && ch <= 'f') {
            value = ch - 'a' + 10;
        } else {
-            ESP_LOGE(TAG, "Blob data contain invalid character");
+        	log_send_messaging(MESSAGING_ERROR, "Blob data contain invalid character");
            free(blob);
            return ESP_ERR_NVS_TYPE_MISMATCH;
        }
@@ -187,10 +188,10 @@ static esp_err_t set_value_in_nvs(const char *key, const char *str_type, const c
    }
    if (err == ESP_OK) {
-    	ESP_LOGI(TAG, "Set value ok. Committing '%s'", key);
+    	log_send_messaging(MESSAGING_INFO, "Set value ok. Committing '%s'", key);
        err = nvs_commit(nvs);
        if (err == ESP_OK) {
-            ESP_LOGI(TAG, "Value stored under key '%s'", key);
+        	log_send_messaging(MESSAGING_INFO, "Value stored under key '%s'", key);
        }
    }
@@ -218,51 +219,51 @@ static esp_err_t get_value_from_nvs(const char *key, const char *str_type)
        int8_t value;
        err = nvs_get_i8(nvs, key, &value);
        if (err == ESP_OK) {
-            printf("Value associated with key '%s' is %d \n", key, value);
+        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %d \n", key, value);
        }
    } else if (type == NVS_TYPE_U8) {
        uint8_t value;
        err = nvs_get_u8(nvs, key, &value);
        if (err == ESP_OK) {
-            printf("Value associated with key '%s' is %u \n", key, value);
+        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %u \n", key, value);
        }
    } else if (type == NVS_TYPE_I16) {
        int16_t value;
        err = nvs_get_i16(nvs, key, &value);
        if (err == ESP_OK) {
-            printf("Value associated with key '%s' is %d \n", key, value);
+        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %d \n", key, value);
        }
    } else if (type == NVS_TYPE_U16) {
        uint16_t value;
        if ((err = nvs_get_u16(nvs, key, &value)) == ESP_OK) {
-            printf("Value associated with key '%s' is %u", key, value);
+        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %u", key, value);
        }
    } else if (type == NVS_TYPE_I32) {
        int32_t value;
        if ((err = nvs_get_i32(nvs, key, &value)) == ESP_OK) {
-            printf("Value associated with key '%s' is %d \n", key, value);
+        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %d \n", key, value);
        }
    } else if (type == NVS_TYPE_U32) {
        uint32_t value;
        if ((err = nvs_get_u32(nvs, key, &value)) == ESP_OK) {
-            printf("Value associated with key '%s' is %u \n", key, value);
+        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %u \n", key, value);
        }
    } else if (type == NVS_TYPE_I64) {
        int64_t value;
        if ((err = nvs_get_i64(nvs, key, &value)) == ESP_OK) {
-            printf("Value associated with key '%s' is %lld \n", key, value);
+        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %lld \n", key, value);
        }
    } else if (type == NVS_TYPE_U64) {
        uint64_t value;
        if ( (err = nvs_get_u64(nvs, key, &value)) == ESP_OK) {
-            printf("Value associated with key '%s' is %llu \n", key, value);
+        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %llu \n", key, value);
        }
    } else if (type == NVS_TYPE_STR) {
        size_t len=0;
        if ( (err = nvs_get_str(nvs, key, NULL, &len)) == ESP_OK) {
            char *str = (char *)malloc(len);
            if ( (err = nvs_get_str(nvs, key, str, &len)) == ESP_OK) {
-                printf("String associated with key '%s' is %s \n", key, str);
+            	log_send_messaging(MESSAGING_INFO,"String associated with key '%s' is %s \n", key, str);
            }
            free(str);
        }
@@ -271,7 +272,7 @@ static esp_err_t get_value_from_nvs(const char *key, const char *str_type)
        if ( (err = nvs_get_blob(nvs, key, NULL, &len)) == ESP_OK) {
            char *blob = (char *)malloc(len);
            if ( (err = nvs_get_blob(nvs, key, blob, &len)) == ESP_OK) {
-                printf("Blob associated with key '%s' is %d bytes long: \n", key, len);
+            	log_send_messaging(MESSAGING_INFO,"Blob associated with key '%s' is %d bytes long: \n", key, len);
                print_blob(blob, len);
            }
            free(blob);
@@ -292,7 +293,7 @@ static esp_err_t erase(const char *key)
        if (err == ESP_OK) {
            err = nvs_commit(nvs);
            if (err == ESP_OK) {
-                ESP_LOGI(TAG, "Value with key '%s' erased", key);
+            	log_send_messaging(MESSAGING_INFO, "Value with key '%s' erased", key);
            }
        }
        nvs_close(nvs);
@@ -313,7 +314,7 @@ static esp_err_t erase_all(const char *name)
        }
    }
-    ESP_LOGI(TAG, "Namespace '%s' was %s erased", name, (err == ESP_OK) ? "" : "not");
+    log_send_messaging(MESSAGING_INFO, "Namespace '%s' was %s erased", name, (err == ESP_OK) ? "" : "not");
    nvs_close(nvs);
    return ESP_OK;
 }
@@ -321,22 +322,19 @@ static esp_err_t erase_all(const char *name)
 static int set_value(int argc, char **argv)
 {
 	ESP_LOGD(TAG, "%s %u - Parsing keys ",__func__,__LINE__);
-    int nerrors = arg_parse(argc, argv, (void **) &set_args);
+    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&set_args);
    if (nerrors != 0) {
    	ESP_LOGE(TAG, "%s %u - Error Parsing keys ",__func__,__LINE__);
        arg_print_errors(stderr, set_args.end, argv[0]);
        return 1;
    }
    const char *key = set_args.key->sval[0];
    const char *type = set_args.type->sval[0];
    const char *values = set_args.value->sval[0];
-    ESP_LOGI(TAG, "Setting '%s' (type %s)", key,type);
+    log_send_messaging(MESSAGING_INFO, "Setting '%s' (type %s)", key,type);
    esp_err_t err = set_value_in_nvs(key, type, values);
    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s", esp_err_to_name(err));
+    	log_send_messaging(MESSAGING_ERROR, "%s", esp_err_to_name(err));
        return 1;
    }
@@ -346,9 +344,8 @@ static int set_value(int argc, char **argv)
 static int get_value(int argc, char **argv)
 {
-    int nerrors = arg_parse(argc, argv, (void **) &get_args);
+	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&get_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, get_args.end, argv[0]);
        return 1;
    }
@@ -358,7 +355,7 @@ static int get_value(int argc, char **argv)
    esp_err_t err = get_value_from_nvs(key, type);
    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s", esp_err_to_name(err));
+    	log_send_messaging(MESSAGING_ERROR, "%s", esp_err_to_name(err));
        return 1;
    }
@@ -367,9 +364,8 @@ static int get_value(int argc, char **argv)
 static int erase_value(int argc, char **argv)
 {
-    int nerrors = arg_parse(argc, argv, (void **) &erase_args);
+	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&erase_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, erase_args.end, argv[0]);
        return 1;
    }
@@ -378,7 +374,7 @@ static int erase_value(int argc, char **argv)
    esp_err_t err = erase(key);
    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s", esp_err_to_name(err));
+    	log_send_messaging(MESSAGING_ERROR, "%s", esp_err_to_name(err));
        return 1;
    }
@@ -387,9 +383,8 @@ static int erase_value(int argc, char **argv)
 static int erase_namespace(int argc, char **argv)
 {
-    int nerrors = arg_parse(argc, argv, (void **) &erase_all_args);
+	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&erase_all_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, erase_all_args.end, argv[0]);
        return 1;
    }
@@ -397,7 +392,7 @@ static int erase_namespace(int argc, char **argv)
    esp_err_t err = erase_all(name);
    if (err != ESP_OK) {
-        ESP_LOGE(TAG, "%s", esp_err_to_name(err));
+    	log_send_messaging(MESSAGING_ERROR, "%s", esp_err_to_name(err));
        return 1;
    }
@@ -416,11 +411,11 @@ static int erase_wifi_manager(int argc, char **argv)
 	}
 	nvs_close(nvs);
 	if (err != ESP_OK) {
-		ESP_LOGE(TAG, "wifi manager configuration was not erase. %s", esp_err_to_name(err));
+		log_send_messaging(MESSAGING_ERROR,  "wifi manager configuration was not erase. %s", esp_err_to_name(err));
 		return 1;
 	}
 	else {
-		ESP_LOGW(TAG, "Wifi manager configuration was erased");
+		log_send_messaging(MESSAGING_WARNING,  "Wifi manager configuration was erased");
 	}
 	return 0;
 }
@@ -432,7 +427,7 @@ static int list(const char *part, const char *name, const char *str_type)
    nvs_iterator_t it = nvs_entry_find(part, NULL, type);
    if (it == NULL) {
-        ESP_LOGE(TAG, "No such enty was found");
+    	log_send_messaging(MESSAGING_ERROR, "No such enty was found");
        return 1;
    }
@@ -441,7 +436,7 @@ static int list(const char *part, const char *name, const char *str_type)
        nvs_entry_info(it, &info);
        it = nvs_entry_next(it);
-        printf("namespace '%s', key '%s', type '%s' \n",
+        log_send_messaging(MESSAGING_INFO, "namespace '%s', key '%s', type '%s' \n",
               info.namespace_name, info.key, type_to_str(info.type));
    } while (it != NULL);
@@ -453,9 +448,8 @@ static int list_entries(int argc, char **argv)
    list_args.namespace->sval[0] = "";
    list_args.type->sval[0] = "";
-    int nerrors = arg_parse(argc, argv, (void **) &list_args);
+    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&list_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, list_args.end, argv[0]);
        return 1;
    }
--- a/components/platform_console/cmd_nvs.h
+++ b/components/platform_console/cmd_nvs.h
--- a/components/platform_console/cmd_ota.c
+++ b/components/platform_console/cmd_ota.c
@@ -25,6 +25,8 @@
 #include "soc/rtc_cntl_reg.h"
 #include "esp32/rom/uart.h"
 #include "sdkconfig.h"
 #include "platform_console.h"
 #include "messaging.h"
 static const char * TAG = "ota";
 extern esp_err_t start_ota(const char * bin_url);
@@ -35,9 +37,8 @@ static struct {
 /* 'heap' command prints minumum heap size */
 static int perform_ota_update(int argc, char **argv)
 {
-    int nerrors = arg_parse(argc, argv, (void **) &ota_args);
+	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&ota_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, ota_args.end, argv[0]);
        return 1;
    }
--- a/components/platform_console/cmd_ota.h
+++ b/components/platform_console/cmd_ota.h
--- a/components/platform_console/cmd_system.c
+++ b/components/platform_console/cmd_system.c
@@ -6,7 +6,7 @@
   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
   CONDITIONS OF ANY KIND, either express or implied.
 */
-#define LOG_LOCAL_LEVEL ESP_LOG_INFO
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -26,9 +26,12 @@
 #include "esp_partition.h"
 #include "esp_ota_ops.h"
 #include "platform_esp32.h"
-#include "config.h"
+#include "platform_config.h"
 #include "esp_sleep.h"
 #include "driver/uart.h"            // for the uart driver access
 #include "messaging.h"				  
 #include "platform_console.h"
 #ifdef CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS
 #define WITH_TASKS_INFO 1
@@ -37,6 +40,7 @@
 static const char * TAG = "cmd_system";
 static void register_setbtsource();
 static void register_free();
 static void register_heap();
 static void register_version();
@@ -45,18 +49,21 @@ static void register_deep_sleep();
 static void register_light_sleep();
 static void register_factory_boot();
 static void register_restart_ota();
 static void register_update_certs();
 #if WITH_TASKS_INFO
 static void register_tasks();
 #endif
-
+extern BaseType_t wifi_manager_task;
 void register_system()
 {
 	register_setbtsource();
    register_free();
    register_heap();
    register_version();
    register_restart();
    register_deep_sleep();
    register_light_sleep();
    register_update_certs();
    register_factory_boot();
    register_restart_ota();
 #if WITH_TASKS_INFO
@@ -69,17 +76,19 @@ static int get_version(int argc, char **argv)
 {
    esp_chip_info_t info;
    esp_chip_info(&info);
-    printf("IDF Version:%s\r\n", esp_get_idf_version());
+    log_send_messaging(MESSAGING_INFO,
-    printf("Chip info:\r\n");
+    "IDF Version:%s\r\n"
-    printf("\tmodel:%s\r\n", info.model == CHIP_ESP32 ? "ESP32" : "Unknow");
+    "Chip info:\r\n"
-    printf("\tcores:%d\r\n", info.cores);
+    "\tmodel:%s\r\n"
-    printf("\tfeature:%s%s%s%s%d%s\r\n",
+    "\tcores:%d\r\n"
-           info.features & CHIP_FEATURE_WIFI_BGN ? "/802.11bgn" : "",
+    "\tfeature:%s%s%s%s%d%s\r\n"
-           info.features & CHIP_FEATURE_BLE ? "/BLE" : "",
+    "\trevision number:%d\r\n",
-           info.features & CHIP_FEATURE_BT ? "/BT" : "",
+		esp_get_idf_version(), info.model == CHIP_ESP32 ? "ESP32" : "Unknow", info.cores,
-           info.features & CHIP_FEATURE_EMB_FLASH ? "/Embedded-Flash:" : "/External-Flash:",
+		info.features & CHIP_FEATURE_WIFI_BGN ? "/802.11bgn" : "",
-           spi_flash_get_chip_size() / (1024 * 1024), " MB");
+		info.features & CHIP_FEATURE_BLE ? "/BLE" : "",
-    printf("\trevision number:%d\r\n", info.revision);
+		info.features & CHIP_FEATURE_BT ? "/BT" : "",
 		info.features & CHIP_FEATURE_EMB_FLASH ? "/Embedded-Flash:" : "/External-Flash:",
 		spi_flash_get_chip_size() / (1024 * 1024), " MB", info.revision);
    return 0;
 }
@@ -91,6 +100,7 @@ static void register_version()
        .hint = NULL,
        .func = &get_version,
    };
    cmd_to_json(&cmd);
    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
 }
@@ -99,38 +109,38 @@ static void register_version()
 esp_err_t guided_boot(esp_partition_subtype_t partition_subtype)
 {
-#if RECOVERY_APPLICATION
+if(is_recovery_running){
 	if(partition_subtype ==ESP_PARTITION_SUBTYPE_APP_FACTORY){
-		ESP_LOGW(TAG,"RECOVERY application is already active");
+		log_send_messaging(MESSAGING_WARNING,"RECOVERY application is already active");
 		if(!wait_for_commit()){
-			ESP_LOGW(TAG,"Unable to commit configuration. ");
+			log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
 		}
-		ESP_LOGW(TAG, "Restarting after tx complete");
+		
-		uart_wait_tx_done(UART_NUM_1, 500 / portTICK_RATE_MS);
+		vTaskDelay(750/ portTICK_PERIOD_MS);
 		esp_restart();
 		return ESP_OK;
 	}
-#else
+}
 else {
 	if(partition_subtype !=ESP_PARTITION_SUBTYPE_APP_FACTORY){
-		ESP_LOGW(TAG,"SQUEEZELITE application is already active");
+		log_send_messaging(MESSAGING_WARNING,"SQUEEZELITE application is already active");
 		if(!wait_for_commit()){
-			ESP_LOGW(TAG,"Unable to commit configuration. ");
+			log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
 		}
-		ESP_LOGW(TAG, "Restarting after tx complete");
+		
-		uart_wait_tx_done(UART_NUM_1, 500 / portTICK_RATE_MS);
+		vTaskDelay(750/ portTICK_PERIOD_MS);
 		esp_restart();
 		return ESP_OK;
 	}
-#endif
+}
 	esp_err_t err = ESP_OK;
 	bool bFound=false;
-    ESP_LOGI(TAG, "Looking for partition type %u",partition_subtype);
+    log_send_messaging(MESSAGING_INFO, "Looking for partition type %u",partition_subtype);
    const esp_partition_t *partition;
 	esp_partition_iterator_t it = esp_partition_find(ESP_PARTITION_TYPE_APP, partition_subtype, NULL);
 	if(it == NULL){
-		ESP_LOGE(TAG,"Unable initialize partition iterator!");
+		log_send_messaging(MESSAGING_ERROR,"Reboot failed. Cannot iterate through partitions");
 		set_status_message(ERROR, "Reboot failed. Cannot iterate through partitions");
 	}
 	else
 	{
@@ -139,33 +149,31 @@ esp_err_t guided_boot(esp_partition_subtype_t partition_subtype)
 		ESP_LOGD(TAG, "Releasing partition iterator");
 		esp_partition_iterator_release(it);
 		if(partition != NULL){
-			ESP_LOGI(TAG, "Found application partition %s sub type %u", partition->label,partition_subtype);
+			log_send_messaging(MESSAGING_INFO, "Found application partition %s sub type %u", partition->label,partition_subtype);
 			err=esp_ota_set_boot_partition(partition);
 			if(err!=ESP_OK){
 				ESP_LOGE(TAG,"Unable to set partition as active for next boot. %s",esp_err_to_name(err));
 				bFound=false;
-				set_status_message(ERROR, "Unable to select partition for reboot.");
+				log_send_messaging(MESSAGING_ERROR,"Unable to select partition for reboot: %s",esp_err_to_name(err));
 			}
 			else{
-				ESP_LOGW(TAG, "Application partition %s sub type %u is selected for boot", partition->label,partition_subtype);
+				log_send_messaging(MESSAGING_WARNING, "Application partition %s sub type %u is selected for boot", partition->label,partition_subtype);
 				bFound=true;
-				set_status_message(WARNING, "Rebooting!");
+				messaging_post_message(MESSAGING_WARNING,MESSAGING_CLASS_SYSTEM,"Reboot failed. Cannot iterate through partitions");
 			}
 		}
 		else
 		{
-			ESP_LOGE(TAG,"partition type %u not found!  Unable to reboot to recovery.",partition_subtype);
+			log_send_messaging(MESSAGING_ERROR,"partition type %u not found!  Unable to reboot to recovery.",partition_subtype);
-			set_status_message(ERROR, "Partition not found.");
+
 		}
 		ESP_LOGD(TAG, "Yielding to other processes");
 		taskYIELD();
 		if(bFound) {
-			ESP_LOGW(TAG,"Configuration %s changes. ",config_has_changes()?"has":"does not have");
+			log_send_messaging(MESSAGING_WARNING,"Configuration %s changes. ",config_has_changes()?"has":"does not have");
 			if(!wait_for_commit()){
-				ESP_LOGW(TAG,"Unable to commit configuration. ");
+				log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
 			}
-			ESP_LOGW(TAG, "Restarting after tx complete");
+			vTaskDelay(750/ portTICK_PERIOD_MS);
 			uart_wait_tx_done(UART_NUM_1, 500 / portTICK_RATE_MS);
 			esp_restart();
 		}
 	}
@@ -175,47 +183,46 @@ esp_err_t guided_boot(esp_partition_subtype_t partition_subtype)
 static int restart(int argc, char **argv)
 {
-	ESP_LOGW(TAG, "\n\nPerforming a simple restart to the currently active partition.");
+	log_send_messaging(MESSAGING_WARNING, "\n\nPerforming a simple restart to the currently active partition.");
 	if(!wait_for_commit()){
-		ESP_LOGW(TAG,"Unable to commit configuration. ");
+		log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
 	}
-	ESP_LOGW(TAG, "Restarting after tx complete");
+    vTaskDelay(750/ portTICK_PERIOD_MS);
    uart_wait_tx_done(UART_NUM_1, 500 / portTICK_RATE_MS);
    esp_restart();
    return 0;
 }
 void simple_restart()
 {
-	ESP_LOGW(TAG,"\n\n Called to perform a simple system reboot.");
+	log_send_messaging(MESSAGING_WARNING,"\n\n Called to perform a simple system reboot.");
 	if(!wait_for_commit()){
-		ESP_LOGW(TAG,"Unable to commit configuration. ");
+		log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
 	}
-	ESP_LOGW(TAG, "Restarting after tx complete");
+											   
-	uart_wait_tx_done(UART_NUM_1, 500 / portTICK_RATE_MS);
+	vTaskDelay(750/ portTICK_PERIOD_MS);
    esp_restart();
 }
 esp_err_t guided_restart_ota(){
-	ESP_LOGW(TAG,"\n\nCalled for a reboot to OTA Application");
+	log_send_messaging(MESSAGING_WARNING,"\n\nCalled for a reboot to OTA Application");
    guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0);
 	return ESP_FAIL; // return fail.  This should never return... we're rebooting!
 }
 esp_err_t guided_factory(){
-	ESP_LOGW(TAG,"\n\nCalled for a reboot to recovery application");
+	log_send_messaging(MESSAGING_WARNING,"\n\nCalled for a reboot to recovery application");
 	guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY);
 	return ESP_FAIL; // return fail.  This should never return... we're rebooting!
 }
 static int restart_factory(int argc, char **argv)
 {
-	ESP_LOGW(TAG, "Executing guided boot into recovery");
+	log_send_messaging(MESSAGING_WARNING, "Executing guided boot into recovery");
 	guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY);
 	return 0; // return fail.  This should never return... we're rebooting!
 }
 static int restart_ota(int argc, char **argv)
 {
-	ESP_LOGW(TAG, "Executing guided boot into ota app 0");
+	log_send_messaging(MESSAGING_WARNING, "Executing guided boot into ota app 0");
 	guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0);
 	return 0; // return fail.  This should never return... we're rebooting!
 }
@@ -227,6 +234,7 @@ static void register_restart()
        .hint = NULL,
        .func = &restart,
    };
    cmd_to_json(&cmd);
    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
 }
 static void register_restart_ota()
@@ -237,6 +245,7 @@ static void register_restart_ota()
        .hint = NULL,
        .func = &restart_ota,
    };
    cmd_to_json(&cmd);
    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
 }
@@ -248,16 +257,102 @@ static void register_factory_boot()
        .hint = NULL,
        .func = &restart_factory,
    };
    cmd_to_json(&cmd);
    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
 }
 /** 'free' command prints available heap memory */
 static int free_mem(int argc, char **argv)
 {
-    printf("%d\n", esp_get_free_heap_size());
+	log_send_messaging(MESSAGING_INFO,"%d", esp_get_free_heap_size());
    return 0;
 }
 /*
 static struct {
    struct arg_str *a2dp_dev_name;
    struct arg_str *a2dp_sink_name;
    struct arg_str *wakeup_gpio_level;
    struct arg_str *bt_sink_pin;
    struct arg_str *enable_bt_sink;
    struct arg_end *end;
 } set_btsource_args;
 */
 //static int do_set_btsource(int argc, char **argv)
 //{
 //	a2dp_dev_name;
 //	a2dp_sink_name;
 //	wakeup_gpio_level;
 //	bt_sink_pin;
 //	enable_bt_sink;
 //	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&deep_sleep_args);
 //    if (nerrors != 0) {
 //        return 1;
 //    }
 //    if (deep_sleep_args.wakeup_time->count) {
 //        uint64_t timeout = 1000ULL * deep_sleep_args.wakeup_time->ival[0];
 //        log_send_messaging(MESSAGING_INFO, "Enabling timer wakeup, timeout=%lluus", timeout);
 //        ESP_ERROR_CHECK( esp_sleep_enable_timer_wakeup(timeout) );
 //    }
 //    if (deep_sleep_args.wakeup_gpio_num->count) {
 //        int io_num = deep_sleep_args.wakeup_gpio_num->ival[0];
 //        if (!rtc_gpio_is_valid_gpio(io_num)) {
 //        	log_send_messaging(MESSAGING_ERROR, "GPIO %d is not an RTC IO", io_num);
 //            return 1;
 //        }
 //        int level = 0;
 //        if (deep_sleep_args.wakeup_gpio_level->count) {
 //            level = deep_sleep_args.wakeup_gpio_level->ival[0];
 //            if (level != 0 && level != 1) {
 //            	log_send_messaging(MESSAGING_ERROR, "Invalid wakeup level: %d", level);
 //                return 1;
 //            }
 //        }
 //        log_send_messaging(MESSAGING_INFO, "Enabling wakeup on GPIO%d, wakeup on %s level",
 //                 io_num, level ? "HIGH" : "LOW");
 //
 //        ESP_ERROR_CHECK( esp_sleep_enable_ext1_wakeup(1ULL << io_num, level) );
 //    }
 //    rtc_gpio_isolate(GPIO_NUM_12);
 //    esp_deep_sleep_start();
 //return 0;
 //}
 static void register_setbtsource(){
 //	a2dp_dev_name;
 //	a2dp_sink_name;
 //	wakeup_gpio_level;
 //	bt_sink_pin;
 //	enable_bt_sink;
 //
 //    set_btsource_args.wakeup_time =
 //        arg_int0("t", "time", "<t>", "Wake up time, ms");
 //    set_btsource_args.wakeup_gpio_num =
 //        arg_int0(NULL, "io", "<n>",
 //                 "If specified, wakeup using GPIO with given number");
 //    set_btsource_args.wakeup_gpio_level =
 //        arg_int0(NULL, "io_level", "<0|1>", "GPIO level to trigger wakeup");
 //    set_btsource_args.end = arg_end(3);
 //
 //    const esp_console_cmd_t cmd = {
 //        .command = "deep_sleep",
 //        .help = "Enter deep sleep mode. "
 //        "Two wakeup modes are supported: timer and GPIO. "
 //        "If no wakeup option is specified, will sleep indefinitely.",
 //        .hint = NULL,
 //        .func = &do_set_btsource,
 //        .argtable = &set_btsource_args
 //    };
 //    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
 }
 static void register_free()
 {
    const esp_console_cmd_t cmd = {
@@ -266,6 +361,7 @@ static void register_free()
        .hint = NULL,
        .func = &free_mem,
    };
    cmd_to_json(&cmd);
    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
 }
@@ -273,7 +369,7 @@ static void register_free()
 static int heap_size(int argc, char **argv)
 {
    uint32_t heap_size = heap_caps_get_minimum_free_size(MALLOC_CAP_DEFAULT);
-    ESP_LOGI(TAG, "min heap size: %u", heap_size);
+    log_send_messaging(MESSAGING_INFO, "min heap size: %u", heap_size);
    return 0;
 }
@@ -281,10 +377,11 @@ static void register_heap()
 {
    const esp_console_cmd_t heap_cmd = {
        .command = "heap",
-        .help = "Get minimum size of free heap memory that was available during program execution",
+        .help = "Get minimum size of free heap memory found during execution",
        .hint = NULL,
        .func = &heap_size,
    };
    cmd_to_json(&heap_cmd);
    ESP_ERROR_CHECK( esp_console_cmd_register(&heap_cmd) );
 }
@@ -297,16 +394,16 @@ static int tasks_info(int argc, char **argv)
    const size_t bytes_per_task = 40; /* see vTaskList description */
    char *task_list_buffer = malloc(uxTaskGetNumberOfTasks() * bytes_per_task);
    if (task_list_buffer == NULL) {
-        ESP_LOGE(TAG, "failed to allocate buffer for vTaskList output");
+    	log_send_messaging(MESSAGING_ERROR, "failed to allocate buffer for vTaskList output");
        return 1;
    }
-    fputs("Task Name\tStatus\tPrio\tHWM\tTask#", stdout);
+    log_send_messaging(MESSAGING_INFO,"Task Name\tStatus\tPrio\tHWM\tTask#"
 #ifdef CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID
-    fputs("\tAffinity", stdout);
+    "\tAffinity"
 #endif
-    fputs("\n", stdout);
+    "\n");
    vTaskList(task_list_buffer);
-    fputs(task_list_buffer, stdout);
+    log_send_messaging(MESSAGING_INFO,"%s", task_list_buffer);
    free(task_list_buffer);
    return 0;
 }
@@ -324,6 +421,24 @@ static void register_tasks()
 #endif // WITH_TASKS_INFO
 extern esp_err_t update_certificates(bool force);
 static int force_update_cert(int argc, char **argv){
 	return update_certificates(true)==ESP_OK;
 }
 static void register_update_certs()
 {
    const esp_console_cmd_t cmd = {
        .command = "update_certificates",
        .help = "Force updating the certificates from binary",
        .hint = NULL,
        .func = &force_update_cert,
    };
    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
 }
 /** 'deep_sleep' command puts the chip into deep sleep mode */
 static struct {
@@ -336,31 +451,30 @@ static struct {
 static int deep_sleep(int argc, char **argv)
 {
-    int nerrors = arg_parse(argc, argv, (void **) &deep_sleep_args);
+	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&deep_sleep_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, deep_sleep_args.end, argv[0]);
        return 1;
    }
    if (deep_sleep_args.wakeup_time->count) {
        uint64_t timeout = 1000ULL * deep_sleep_args.wakeup_time->ival[0];
-        ESP_LOGI(TAG, "Enabling timer wakeup, timeout=%lluus", timeout);
+        log_send_messaging(MESSAGING_INFO, "Enabling timer wakeup, timeout=%lluus", timeout);
        ESP_ERROR_CHECK( esp_sleep_enable_timer_wakeup(timeout) );
    }
    if (deep_sleep_args.wakeup_gpio_num->count) {
        int io_num = deep_sleep_args.wakeup_gpio_num->ival[0];
        if (!rtc_gpio_is_valid_gpio(io_num)) {
-            ESP_LOGE(TAG, "GPIO %d is not an RTC IO", io_num);
+        	log_send_messaging(MESSAGING_ERROR, "GPIO %d is not an RTC IO", io_num);
            return 1;
        }
        int level = 0;
        if (deep_sleep_args.wakeup_gpio_level->count) {
            level = deep_sleep_args.wakeup_gpio_level->ival[0];
            if (level != 0 && level != 1) {
-                ESP_LOGE(TAG, "Invalid wakeup level: %d", level);
+            	log_send_messaging(MESSAGING_ERROR, "Invalid wakeup level: %d", level);
                return 1;
            }
        }
-        ESP_LOGI(TAG, "Enabling wakeup on GPIO%d, wakeup on %s level",
+        log_send_messaging(MESSAGING_INFO, "Enabling wakeup on GPIO%d, wakeup on %s level",
                 io_num, level ? "HIGH" : "LOW");
        ESP_ERROR_CHECK( esp_sleep_enable_ext1_wakeup(1ULL << io_num, level) );
@@ -403,30 +517,29 @@ static struct {
 static int light_sleep(int argc, char **argv)
 {
-    int nerrors = arg_parse(argc, argv, (void **) &light_sleep_args);
+	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&light_sleep_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, light_sleep_args.end, argv[0]);
        return 1;
    }
    esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
    if (light_sleep_args.wakeup_time->count) {
        uint64_t timeout = 1000ULL * light_sleep_args.wakeup_time->ival[0];
-        ESP_LOGI(TAG, "Enabling timer wakeup, timeout=%lluus", timeout);
+        log_send_messaging(MESSAGING_INFO, "Enabling timer wakeup, timeout=%lluus", timeout);
        ESP_ERROR_CHECK( esp_sleep_enable_timer_wakeup(timeout) );
    }
    int io_count = light_sleep_args.wakeup_gpio_num->count;
    if (io_count != light_sleep_args.wakeup_gpio_level->count) {
-        ESP_LOGE(TAG, "Should have same number of 'io' and 'io_level' arguments");
+    	log_send_messaging(MESSAGING_INFO,  "Should have same number of 'io' and 'io_level' arguments");
        return 1;
    }
    for (int i = 0; i < io_count; ++i) {
        int io_num = light_sleep_args.wakeup_gpio_num->ival[i];
        int level = light_sleep_args.wakeup_gpio_level->ival[i];
        if (level != 0 && level != 1) {
-            ESP_LOGE(TAG, "Invalid wakeup level: %d", level);
+        	log_send_messaging(MESSAGING_ERROR, "Invalid wakeup level: %d", level);
            return 1;
        }
-        ESP_LOGI(TAG, "Enabling wakeup on GPIO%d, wakeup on %s level",
+        log_send_messaging(MESSAGING_INFO,  "Enabling wakeup on GPIO%d, wakeup on %s level",
                 io_num, level ? "HIGH" : "LOW");
        ESP_ERROR_CHECK( gpio_wakeup_enable(io_num, level ? GPIO_INTR_HIGH_LEVEL : GPIO_INTR_LOW_LEVEL) );
@@ -434,13 +547,13 @@ static int light_sleep(int argc, char **argv)
    if (io_count > 0) {
        ESP_ERROR_CHECK( esp_sleep_enable_gpio_wakeup() );
    }
-    if (CONFIG_CONSOLE_UART_NUM <= UART_NUM_1) {
+    if (CONFIG_ESP_CONSOLE_UART_NUM <= UART_NUM_1) {
-        ESP_LOGI(TAG, "Enabling UART wakeup (press ENTER to exit light sleep)");
+    	log_send_messaging(MESSAGING_INFO,  "Enabling UART wakeup (press ENTER to exit light sleep)");
-        ESP_ERROR_CHECK( uart_set_wakeup_threshold(CONFIG_CONSOLE_UART_NUM, 3) );
+        ESP_ERROR_CHECK( uart_set_wakeup_threshold(CONFIG_ESP_CONSOLE_UART_NUM, 3) );
-        ESP_ERROR_CHECK( esp_sleep_enable_uart_wakeup(CONFIG_CONSOLE_UART_NUM) );
+        ESP_ERROR_CHECK( esp_sleep_enable_uart_wakeup(CONFIG_ESP_CONSOLE_UART_NUM) );
    }
    fflush(stdout);
-    uart_tx_wait_idle(CONFIG_CONSOLE_UART_NUM);
+    uart_tx_wait_idle(CONFIG_ESP_CONSOLE_UART_NUM);
    esp_light_sleep_start();
    esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
    const char *cause_str;
@@ -458,7 +571,7 @@ static int light_sleep(int argc, char **argv)
        cause_str = "unknown";
        printf("%d\n", cause);
    }
-    ESP_LOGI(TAG, "Woke up from: %s", cause_str);
+    log_send_messaging(MESSAGING_INFO, "Woke up from: %s", cause_str);
    return 0;
 }
--- a/components/platform_console/cmd_system.h
+++ b/components/platform_console/cmd_system.h
--- a/components/platform_console/cmd_wifi.c
+++ b/components/platform_console/cmd_wifi.c
@@ -34,10 +34,12 @@
 #include "led.h"
 extern bool bypass_wifi_manager;
 #define JOIN_TIMEOUT_MS (10000)
 #include "platform_console.h"
 extern EventGroupHandle_t wifi_event_group;
 extern const int CONNECTED_BIT;
-static const char * TAG = "cmd_wifi";
+//static const char * TAG = "cmd_wifi";
 /** Arguments used by 'join' function */
 static struct {
    struct arg_int *timeout;
@@ -46,6 +48,11 @@ static struct {
    struct arg_end *end;
 } join_args;
 // todo: implement access point config - cmd_to_json(&i2cdetect_cmd);
 ///** Arguments used by 'join' function */
 //static struct {
 //    struct arg_int *autoconnect;
@@ -123,9 +130,8 @@ static bool wifi_join(const char *ssid, const char *pass, int timeout_ms)
    return (bits & CONNECTED_BIT) != 0;
 }
-
+//static int set_auto_connect(int argc, char **argv)
-static int set_auto_connect(int argc, char **argv)
+//{
 {
 //    int nerrors = arg_parse(argc, argv, (void **) &join_args);
 //    if (nerrors != 0) {
 //        arg_print_errors(stderr, join_args.end, argv[0]);
@@ -147,13 +153,13 @@ static int set_auto_connect(int argc, char **argv)
 //        return 1;
 //    }
 //    ESP_LOGI(__func__, "Connected");
-    return 0;
+//    return 0;
-}
+//}
 static int connect(int argc, char **argv)
 {
-    int nerrors = arg_parse(argc, argv, (void **) &join_args);
+	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&join_args);
    if (nerrors != 0) {
        arg_print_errors(stderr, join_args.end, argv[0]);
        return 1;
    }
    ESP_LOGI(__func__, "Connecting to '%s'",
--- a/components/platform_console/cmd_wifi.h
+++ b/components/platform_console/cmd_wifi.h
--- a/components/platform_console/component.mk
+++ b/components/platform_console/component.mk
@@ -8,6 +8,5 @@
 #
 COMPONENT_ADD_INCLUDEDIRS := .
 CFLAGS += 	-I$(COMPONENT_PATH)/../squeezelite-ota
 COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/components/tools/
 COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/main
--- a/components/platform_console/platform_console.c
+++ b/components/platform_console/platform_console.c
@@ -0,0 +1,410 @@
 /* Console example
 This example code is in the Public Domain (or CC0 licensed, at your option.)
 Unless required by applicable law or agreed to in writing, this
 software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 CONDITIONS OF ANY KIND, either express or implied.
 */
 #include "platform_console.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "esp_log.h"
 #include "esp_console.h"
 #include "esp_vfs_dev.h"
 #include "driver/uart.h"
 #include "linenoise/linenoise.h"
 #include "argtable3/argtable3.h"
 #include "nvs.h" 
 #include "nvs_flash.h"
 #include "pthread.h"
 #include "platform_esp32.h"
 #include "cmd_decl.h"
 #include "trace.h"
 #include "platform_config.h"
 #include "telnet.h" 
 #include "messaging.h"
 #include "config.h"
 pthread_t thread_console;
 static void * console_thread();
 void console_start();
 static const char * TAG = "console";
 extern bool bypass_wifi_manager;
 extern void register_squeezelite();
 /* Prompt to be printed before each line.
 * This can be customized, made dynamic, etc.
 */
 const char* prompt = LOG_COLOR_I "squeezelite-esp32> " LOG_RESET_COLOR;
 const char* recovery_prompt = LOG_COLOR_E "recovery-squeezelite-esp32> " LOG_RESET_COLOR;
 /* Console command history can be stored to and loaded from a file.
 * The easiest way to do this is to use FATFS filesystem on top of
 * wear_levelling library.
 */
 #define MOUNT_PATH "/data"
 #define HISTORY_PATH MOUNT_PATH "/history.txt"
 void run_command(char * line);
 #define ADD_TO_JSON(o,t,n) if (t->n) cJSON_AddStringToObject(o,QUOTE(n),t->n);
 #define ADD_PARMS_TO_CMD(o,t,n) { cJSON * parms = ParmsToJSON(&t.n->hdr); if(parms) cJSON_AddItemToObject(o,QUOTE(n),parms); }
 cJSON * cmdList;
 cJSON * values_fn_list;
 cJSON * get_cmd_list(){
 	cJSON * element;
 	cJSON * values=cJSON_CreateObject();
 	cJSON * list = cJSON_CreateObject();
 	cJSON_AddItemReferenceToObject(list,"commands",cmdList);
 	cJSON_AddItemToObject(list,"values",values);
 	cJSON_ArrayForEach(element,cmdList){
 		cJSON * name = cJSON_GetObjectItem(element,"name");
 		cJSON * vals_fn = cJSON_GetObjectItem(values_fn_list,cJSON_GetStringValue(name));
 		if(vals_fn!=NULL ){
 			parm_values_fn_t *parm_values_fn = (parm_values_fn_t *)strtoul(cJSON_GetStringValue(vals_fn), NULL, 16);;
 			if(parm_values_fn){
 				cJSON_AddItemToObject(values,cJSON_GetStringValue(name),parm_values_fn());
 			}
 		}
 	}
 	return list;
 }
 struct arg_end *getParmsEnd(struct arg_hdr * * argtable){
 	if(!argtable) return NULL;
 	struct arg_hdr * *table = (struct arg_hdr * *)argtable;
 	int tabindex = 0;
 	while (!(table[tabindex]->flag & ARG_TERMINATOR))
 	{
 		tabindex++;
 	}
 	return (struct arg_end *)table[tabindex];
 }
 cJSON * ParmsToJSON(struct arg_hdr * * argtable){
 	if(!argtable) return NULL;
 	cJSON * arg_list = cJSON_CreateArray();
 	struct arg_hdr * *table = (struct arg_hdr * *)argtable;
 	int tabindex = 0;
 	while (!(table[tabindex]->flag & ARG_TERMINATOR))
 	{
 		cJSON * entry = cJSON_CreateObject();
 		ADD_TO_JSON(entry,table[tabindex],datatype);
 		ADD_TO_JSON(entry,table[tabindex],glossary);
 		ADD_TO_JSON(entry,table[tabindex],longopts);
 		ADD_TO_JSON(entry,table[tabindex],shortopts);
 		cJSON_AddBoolToObject(entry, "checkbox", (table[tabindex]->flag & ARG_HASOPTVALUE)==0 && (table[tabindex]->flag & ARG_HASVALUE)==0);
 		cJSON_AddBoolToObject(entry, "hasvalue", table[tabindex]->flag & ARG_HASVALUE);
 		cJSON_AddItemToArray(arg_list, entry);
 		tabindex++;
 	}
 	return arg_list;
 }
 esp_err_t cmd_to_json(const esp_console_cmd_t *cmd){
 	return cmd_to_json_with_cb(cmd, NULL);
 }
 esp_err_t cmd_to_json_with_cb(const esp_console_cmd_t *cmd, parm_values_fn_t parm_values_fn){
 	if(!cmdList){
 		cmdList=cJSON_CreateArray();
 	}
 	if(!values_fn_list){
 		values_fn_list=cJSON_CreateObject();
 	}
    if (cmd->command == NULL) {
        return ESP_ERR_INVALID_ARG;
    }
    if (strchr(cmd->command, ' ') != NULL) {
        return ESP_ERR_INVALID_ARG;
    }
    cJSON * jsoncmd = cJSON_CreateObject();
    ADD_TO_JSON(jsoncmd,cmd,help);
    ADD_TO_JSON(jsoncmd,cmd,hint);
 	if(parm_values_fn){
 		char addr[11]={0};
 		snprintf(addr,sizeof(addr),"%lx",(unsigned long)parm_values_fn);
 		cJSON_AddStringToObject(values_fn_list,cmd->command,addr);
 	}
 	cJSON_AddBoolToObject(jsoncmd,"hascb",parm_values_fn!=NULL);
    if(cmd->argtable){
    	cJSON_AddItemToObject(jsoncmd,"argtable",ParmsToJSON(cmd->argtable));
    }
    if (cmd->hint) {
    	cJSON_AddStringToObject(jsoncmd, "hint", cmd->hint);
    }
    else if (cmd->argtable) {
        /* Generate hint based on cmd->argtable */
        char *buf = NULL;
        size_t buf_size = 0;
        FILE *f = open_memstream(&buf, &buf_size);
        if (f != NULL) {
            arg_print_syntax(f, cmd->argtable, NULL);
            fflush(f);
            fclose(f);
        }
        cJSON_AddStringToObject(jsoncmd, "hint", buf);
        FREE_AND_NULL(buf);
    }
    cJSON_AddStringToObject(jsoncmd, "name", cmd->command);
    char * b=cJSON_Print(jsoncmd);
    if(b){
    	ESP_LOGD(TAG,"Adding command table %s",b);
    	free(b);
    }
    cJSON_AddItemToArray(cmdList, jsoncmd);
    return ESP_OK;
 }
 int arg_parse_msg(int argc, char **argv, struct arg_hdr ** args){
    int nerrors = arg_parse(argc, argv, (void **)args);
    if (nerrors != 0) {
    	char *buf = NULL;
 		size_t buf_size = 0;
 		FILE *f = open_memstream(&buf, &buf_size);
 		if (f != NULL) {
 			arg_print_errors(f, getParmsEnd(args), argv[0]);
 			fflush (f);
 			log_send_messaging(MESSAGING_ERROR,"%s", buf);
 		}
        fclose(f);
        FREE_AND_NULL(buf);
    }
    return nerrors;
 }
 void process_autoexec(){
 	int i=1;
 	char autoexec_name[21]={0};
 	char * autoexec_value=NULL;
 	uint8_t autoexec_flag=0;
 	char * str_flag = config_alloc_get(NVS_TYPE_STR, "autoexec");
 	if(!bypass_wifi_manager){
 		ESP_LOGW(TAG, "Processing autoexec commands while wifi_manager active.  Wifi related commands will be ignored.");
 	}
 	if(is_recovery_running){
 		ESP_LOGD(TAG, "Processing autoexec commands in recovery mode.  Squeezelite commands will be ignored.");
 	}
 	if(str_flag !=NULL ){
 		autoexec_flag=atoi(str_flag);
 		ESP_LOGI(TAG,"autoexec is set to %s auto-process", autoexec_flag>0?"perform":"skip");
 		if(autoexec_flag == 1) {
 			do {
 				snprintf(autoexec_name,sizeof(autoexec_name)-1,"autoexec%u",i++);
 				ESP_LOGD(TAG,"Getting command name %s", autoexec_name);
 				autoexec_value= config_alloc_get(NVS_TYPE_STR, autoexec_name);
 				if(autoexec_value!=NULL ){
 					if(!bypass_wifi_manager && strstr(autoexec_value, "join ")!=NULL ){
 						ESP_LOGW(TAG,"Ignoring wifi join command.");
 					}
 					else if(is_recovery_running && !strstr(autoexec_value, "squeezelite " ) ){
 						ESP_LOGW(TAG,"Ignoring command. ");
 					}
 					else {
 						ESP_LOGI(TAG,"Running command %s = %s", autoexec_name, autoexec_value);
 						run_command(autoexec_value);
 					}
 					ESP_LOGD(TAG,"Freeing memory for command %s name", autoexec_name);
 					free(autoexec_value);
 				}
 				else {
 					ESP_LOGD(TAG,"No matching command found for name %s", autoexec_name);
 					break;
 				}
 			} while(1);
 		}
 		free(str_flag);
 	}
 	else
 	{
 		ESP_LOGD(TAG,"No matching command found for name autoexec.");
 	}
 }
 void initialize_console() {
 	/* Disable buffering on stdin */
 	setvbuf(stdin, NULL, _IONBF, 0);
 	/* Minicom, screen, idf_monitor send CR when ENTER key is pressed */
 	esp_vfs_dev_uart_set_rx_line_endings(ESP_LINE_ENDINGS_CR);
 	/* Move the caret to the beginning of the next line on '\n' */
 	esp_vfs_dev_uart_set_tx_line_endings(ESP_LINE_ENDINGS_CRLF);
 	/* Configure UART. Note that REF_TICK is used so that the baud rate remains
 	 * correct while APB frequency is changing in light sleep mode.
 	 */
 	const uart_config_t uart_config = { .baud_rate =
 			CONFIG_CONSOLE_UART_BAUDRATE, .data_bits = UART_DATA_8_BITS,
 			.parity = UART_PARITY_DISABLE, .stop_bits = UART_STOP_BITS_1,
 			.use_ref_tick = true };
 	ESP_ERROR_CHECK(uart_param_config(CONFIG_ESP_CONSOLE_UART_NUM, &uart_config));
 	/* Install UART driver for interrupt-driven reads and writes */
 	ESP_ERROR_CHECK( uart_driver_install(CONFIG_ESP_CONSOLE_UART_NUM, 256, 0, 0, NULL, 0));
 	/* Tell VFS to use UART driver */
 	esp_vfs_dev_uart_use_driver(CONFIG_ESP_CONSOLE_UART_NUM);
 	/* Initialize the console */
 	esp_console_config_t console_config = { .max_cmdline_args = 22,
 			.max_cmdline_length = 600,
 #if CONFIG_LOG_COLORS
 			.hint_color = atoi(LOG_COLOR_CYAN)
 #endif
 			};
 	ESP_ERROR_CHECK(esp_console_init(&console_config));
 	/* Configure linenoise line completion library */
 	/* Enable multiline editing. If not set, long commands will scroll within
 	 * single line.
 	 */
 	linenoiseSetMultiLine(1);
 	/* Tell linenoise where to get command completions and hints */
 	linenoiseSetCompletionCallback(&esp_console_get_completion);
 	linenoiseSetHintsCallback((linenoiseHintsCallback*) &esp_console_get_hint);
 	/* Set command history size */
 	linenoiseHistorySetMaxLen(100);
 	/* Load command history from filesystem */
 	//linenoiseHistoryLoad(HISTORY_PATH);
 }
 void console_start() {
 	if(!is_serial_suppressed()){
 		initialize_console();
 	}
 	else {
 		/* Initialize the console */
 		esp_console_config_t console_config = { .max_cmdline_args = 22,
 				.max_cmdline_length = 600,
 	#if CONFIG_LOG_COLORS
 				.hint_color = atoi(LOG_COLOR_CYAN)
 	#endif
 				};
 		ESP_ERROR_CHECK(esp_console_init(&console_config));
 	}
 	/* Register commands */
 	esp_console_register_help_command();
 	register_system();
 	register_nvs();
 	register_wifi();
 	if(!is_recovery_running){
 		register_squeezelite();
 	}
 	else {
 		register_ota_cmd();
 	}
 	register_i2ctools();
 	if(!is_serial_suppressed()){
 		printf("\n");
 		if(is_recovery_running){
 			printf("****************************************************************\n"
 			"RECOVERY APPLICATION\n"
 			"This mode is used to flash Squeezelite into the OTA partition\n"
 			"****\n\n");
 		}
 		printf("Type 'help' to get the list of commands.\n"
 		"Use UP/DOWN arrows to navigate through command history.\n"
 		"Press TAB when typing command name to auto-complete.\n"
 		"\n");
 		if(!is_recovery_running){
 			printf("To automatically execute lines at startup:\n"
 					"\tSet NVS variable autoexec (U8) = 1 to enable, 0 to disable automatic execution.\n"
 					"\tSet NVS variable autoexec[1~9] (string)to a command that should be executed automatically\n");
 		}
 		printf("\n\n");
 		/* Figure out if the terminal supports escape sequences */
 		int probe_status = linenoiseProbe();
 		if (probe_status) { /* zero indicates success */
 			printf("\n****************************\n"
 					"Your terminal application does not support escape sequences.\n"
 					"Line editing and history features are disabled.\n"
 					"On Windows, try using Putty instead.\n"
 					"****************************\n");
 			linenoiseSetDumbMode(1);
 	#if CONFIG_LOG_COLORS
 			/* Since the terminal doesn't support escape sequences,
 			 * don't use color codes in the prompt.
 			 */
 			if(is_recovery_running){
 				recovery_prompt=  "recovery-squeezelite-esp32>";
 			}
 			prompt = "squeezelite-esp32> ";
 	#endif //CONFIG_LOG_COLORS
 		}
 		esp_pthread_cfg_t cfg = esp_pthread_get_default_config();
 		cfg.thread_name= "console";
 		cfg.inherit_cfg = true;
 		if(is_recovery_running){
 			prompt = recovery_prompt;
 			cfg.stack_size = 4096 ;
 		}
 		esp_pthread_set_cfg(&cfg);
 		pthread_attr_t attr;
 		pthread_attr_init(&attr);
 		pthread_create(&thread_console, &attr, console_thread, NULL);
 		pthread_attr_destroy(&attr);   	
 	} 
 	else if(!is_recovery_running){
 		process_autoexec();
 	}
 }
 void run_command(char * line){
 	/* Try to run the command */
 	int ret;
 	esp_err_t err = esp_console_run(line, &ret);
 	if (err == ESP_ERR_NOT_FOUND) {
 		ESP_LOGE(TAG,"Unrecognized command: %s", line);
 	} else if (err == ESP_ERR_INVALID_ARG) {
 		// command was empty
 	} else if (err == ESP_OK && ret != ESP_OK) {
 		ESP_LOGW(TAG,"Command returned non-zero error code: 0x%x (%s)", ret,
 				esp_err_to_name(err));
 	} else if (err != ESP_OK) {
 		ESP_LOGE(TAG,"Internal error: %s", esp_err_to_name(err));
 	}
 }
 static void * console_thread() {
 	if(!is_recovery_running){
 		process_autoexec();
 	}
 	/* Main loop */
 	while (1) {
 		/* Get a line using linenoise.
 		 * The line is returned when ENTER is pressed.
 		 */
 		char* line = linenoise(prompt);
 		if (line == NULL) { /* Ignore empty lines */
 			continue;
 		}
 		/* Add the command to the history */
 		linenoiseHistoryAdd(line);
 		/* Save command history to filesystem */
 		linenoiseHistorySave(HISTORY_PATH);
 		printf("\n");
 		run_command(line);
 		/* linenoise allocates line buffer on the heap, so need to free it */
 		linenoiseFree(line);
 		taskYIELD();
 	}
 	return NULL;
 }
--- a/components/platform_console/platform_console.h
+++ b/components/platform_console/platform_console.h
@@ -7,12 +7,17 @@
   CONDITIONS OF ANY KIND, either express or implied.
 */
 #pragma once
-
+#include "esp_console.h"
 #include "argtable3/argtable3.h"
 #include "cJSON.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-
+typedef cJSON * parm_values_fn_t(void);
-
+esp_err_t cmd_to_json(const esp_console_cmd_t *cmd);
 esp_err_t cmd_to_json_with_cb(const esp_console_cmd_t *cmd, parm_values_fn_t parm_values_fn);
 int arg_parse_msg(int argc, char **argv, struct arg_hdr ** args);
 cJSON * get_cmd_list();
 #ifdef __cplusplus
 }
 #endif
--- a/components/raop/CMakeLists.txt
+++ b/components/raop/CMakeLists.txt
@@ -0,0 +1,10 @@
 idf_component_register(SRC_DIRS .    
 						INCLUDE_DIRS .   
 						PRIV_REQUIRES newlib freertos pthread platform_config mdns services codecs tools display
 )
 set_source_files_properties(raop.c
    PROPERTIES COMPILE_FLAGS
    -Wno-misleading-indentation
 )
--- a/components/raop/component.mk
+++ b/components/raop/component.mk
@@ -7,7 +7,9 @@
 # please read the SDK documents if you need to do this.
 #
-CFLAGS += -fstack-usage \
+CFLAGS += -fstack-usage\
-	-I$(COMPONENT_PATH)/../tools	\
+	-I$(PROJECT_PATH)/components/tools	\
-	-I$(COMPONENT_PATH)/../codecs/inc/alac \
+	-I$(PROJECT_PATH)/components/codecs/inc/alac \
 	-I$(PROJECT_PATH)/main/	
 COMPONENT_ADD_INCLUDEDIRS := .
 COMPONENT_SRCDIRS := . 
--- a/components/raop/raop.c
+++ b/components/raop/raop.c
--- a/components/raop/raop_sink.c
+++ b/components/raop/raop_sink.c
@@ -6,12 +6,13 @@
 #include "mdns.h"
 #include "nvs.h"
 #include "tcpip_adapter.h"
 // IDF-V4++ #include "esp_netif.h"
 #include "esp_log.h"
 #include "esp_console.h"
 #include "esp_pthread.h"
 #include "esp_system.h"
 #include "freertos/timers.h"
-#include "config.h"
+#include "platform_config.h"
 #include "raop.h"
 #include "audio_controls.h"
 #include "display.h"
--- a/components/raop/rtp.c
+++ b/components/raop/rtp.c
--- a/components/raop/util.c
+++ b/components/raop/util.c
@@ -14,6 +14,7 @@
 #include <iphlpapi.h>
 #else
 #include "tcpip_adapter.h"
 // IDF-V4++ #include "esp_netif.h"
 #include <ctype.h>
 #endif
@@ -404,7 +405,7 @@ bool http_parse(int sock, char *method, key_data_t *rkd, char **body, int *len)
 	}
 	if (*len) {
-		int size = 0;
+		int size = 0;
 		*body = malloc(*len + 1);
 		while (*body && size < *len) {
@@ -578,7 +579,8 @@ void free_metadata(struct metadata_s *metadata)
 	NFREE(metadata->remote_title);
 }
-
+
 /*----------------------------------------------------------------------------*/
 int _fprintf(FILE *file, ...)
 {
--- a/components/services/CMakeLists.txt
+++ b/components/services/CMakeLists.txt
@@ -1,6 +1,7 @@
-idf_component_register(SRCS "led.c" "audio_controls.c" "buttons.c" "services.c" "monitor.c"INCLUDE_DIRS 
+idf_component_register(SRC_DIRS .
-						INCLUDE_DIRS . ../tools/
+						INCLUDE_DIRS . ${IDF_PATH}/components/driver
-                   
+						REQUIRES json tools platform_config display 
 )
--- a/components/services/accessors.c
+++ b/components/services/accessors.c
@@ -11,11 +11,14 @@
 #include "driver/gpio.h"
 #include "driver/i2c.h"
 #include "driver/spi_master.h"
-#include "config.h"
+#include "platform_config.h"
 #include "accessors.h"
 #include "globdefs.h"
 #include "display.h"
 static const char *TAG = "services";
 static const char *i2c_name="I2C";
 static const char *spi_name="SPI";
 #define min(a,b) (((a) < (b)) ? (a) : (b))
@@ -34,6 +37,38 @@ esp_err_t config_i2c_set(const i2c_config_t * config, int port){
 	return ESP_OK;
 }
 /****************************************************************************************
 * 
 */
 const display_config_t * config_display_get(){
 	static display_config_t dstruct;
 	char *config = config_alloc_get(NVS_TYPE_STR, "display_config");
 	if (!config) {
 		return NULL;
 	}
 	char * p=NULL;
 	if ((p = strcasestr(config, "driver")) != NULL){
 		dstruct.drivername = display_conf_get_driver_name(strchr(p, '=') + 1);
 	}
 	dstruct.drivername=dstruct.drivername?dstruct.drivername:"SSD1306";
 	if ((p = strcasestr(config, "width")) != NULL) dstruct.width = atoi(strchr(p, '=') + 1);
 	if ((p = strcasestr(config, "height")) != NULL) dstruct.height = atoi(strchr(p, '=') + 1);
 	if ((p = strcasestr(config, "reset")) != NULL) dstruct.RST_pin = atoi(strchr(p, '=') + 1);
 	dstruct.i2c_system_port=i2c_system_port;
 	if (strstr(config, "I2C") ) dstruct.type=i2c_name;
 	if ((p = strcasestr(config, "address")) != NULL) dstruct.address = atoi(strchr(p, '=') + 1);
 	if (strstr(config, "SPI") ) dstruct.type=spi_name;
 	if ((p = strcasestr(config, "cs")) != NULL) dstruct.CS_pin = atoi(strchr(p, '=') + 1);
 	if ((p = strcasestr(config, "speed")) != NULL) dstruct.speed = atoi(strchr(p, '=') + 1);
 	dstruct.hflip= strcasestr(config, "HFlip") ? true : false;
 	dstruct.vflip= strcasestr(config, "VFlip") ? true : false;
 	dstruct.rotate= strcasestr(config, "rotate") ? true : false;
 	return &dstruct;
 }
 /****************************************************************************************
 * 
 */
@@ -75,7 +110,7 @@ const spi_bus_config_t * config_spi_get(spi_host_device_t * spi_host) {
        .quadhd_io_num = -1
    };
-	nvs_item = config_alloc_get(NVS_TYPE_STR, "spi_config");
+	nvs_item = config_alloc_get_str("spi_config", CONFIG_SPI_CONFIG, NULL);
 	if (nvs_item) {
 		if ((p = strcasestr(nvs_item, "data")) != NULL) spi.mosi_io_num = atoi(strchr(p, '=') + 1);
 		if ((p = strcasestr(nvs_item, "clk")) != NULL) spi.sclk_io_num = atoi(strchr(p, '=') + 1);
@@ -104,4 +139,4 @@ void parse_set_GPIO(void (*cb)(int gpio, char *value)) {
 	} while (p++);
 	free(nvs_item);
-}	
+}	
--- a/components/services/accessors.h
+++ b/components/services/accessors.h
@@ -11,7 +11,21 @@
 #include "esp_system.h"
 #include "driver/i2c.h"
 #include "driver/spi_master.h"
-
+typedef struct {
 	int width;
 	int height;
 	int RST_pin;
 	int i2c_system_port;
 	int address;
 	int CS_pin;
 	int speed;
 	const char *drivername;
 	const char *type;
 	bool hflip;
 	bool vflip;
 	bool rotate;
 } display_config_t;
 const display_config_t * config_display_get();
 esp_err_t 					config_i2c_set(const i2c_config_t * config, int port);
 const i2c_config_t * 		config_i2c_get(int * i2c_port);
 const spi_bus_config_t * 	config_spi_get(spi_host_device_t * spi_host);
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1,2 @@`
							`#pragma once`
							`#define PROJECT_NAME "recovery"`
		`@@ -0,0 +1,2 @@`
							`#pragma once`
							`#define PROJECT_NAME "squeezelite"`