typo in config - release

.cproject

@@ -3,13 +3,383 @@
     	
     <storageModule moduleId="org.eclipse.cdt.core.settings">
         		
-        <cconfiguration id="org.eclipse.cdt.core.default.config.959280881">
+        <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348">
             			
-            <storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="org.eclipse.cdt.core.default.config.959280881" moduleId="org.eclipse.cdt.core.settings" name="Configuration">
+            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348" moduleId="org.eclipse.cdt.core.settings" name="Default">
+                				
+                <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>
             			
@@ -19,14 +389,190 @@
         	
     </storageModule>
     	
-    <storageModule moduleId="org.eclipse.cdt.core.pathentry">
+    <storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
+    	
+    <storageModule moduleId="cdtBuildSystem" version="4.0.0">
         		
-        <pathentry excluding="**/CMakeFiles/**" kind="out" path="build"/>
+        <project id="squeezelite-esp32-merge.null.1711307563" name="squeezelite-esp32-merge"/>
         	
     </storageModule>
     	
     <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
     	
-    <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+    <storageModule moduleId="refreshScope" versionNumber="2">
+        		
+        <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>

.github/workflows/CrossBuild.yml

@@ -1,156 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-name: Cross-Build
-
-on:
-  push:
-    branches-ignore: [ master ]
-  pull_request:
-    branches-ignore: [ master ]
-
-jobs:
-  job1:
-    name: Build Number
-    runs-on: ubuntu-latest
-    outputs:
-      build_number: ${{ steps.buildnumber.outputs.build_number }}
-    steps:
-    - name: Generate common build number
-      id: buildnumber
-      uses: einaregilsson/build-number@v3
-      with:
-        token: ${{secrets.github_token}}
-  build:
-    runs-on: ubuntu-latest
-    needs: job1
-    strategy:
-      max-parallel: 1
-      matrix:
-        node: [I2S-4MFlash, SqueezeAmp]
-        depth: [16, 32]
-    steps:
-    - name: Set target name
-      run: |
-        echo "TARGET_BUILD_NAME=${{ matrix.node }}" >> $GITHUB_ENV
-        echo "build_version_prefix=1." >> $GITHUB_ENV
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 15
-        submodules: true
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v2
-      with:
-        path: |
-          build
-          /var/lib/docker
-        key: ${{ runner.os }}-${{ matrix.node }}-${{ matrix.depth }}
-    - name: Set build parameters
-      run: |
-        git update-index --chmod=+x ./server_certs/getcert.sh
-        cd server_certs;./getcert.sh;cat github.pem;cd ..
-        shopt -s nocasematch
-        branch_name="${GITHUB_REF//refs\/heads\//}"
-        branch_name="${branch_name//[^a-zA-Z0-9\-~!@_\.]/}"
-        BUILD_NUMBER=${{ needs.job1.outputs.build_number }}
-        echo "BUILD_NUMBER=${BUILD_NUMBER}" >> $GITHUB_ENV
-        tag="${TARGET_BUILD_NAME}.${{matrix.depth}}.${BUILD_NUMBER}.${branch_name}"
-        echo "tag=${tag}" >> $GITHUB_ENV
-        last_commit="$(git log --pretty=format:'%s' --max-count=1)"
-        if [[ "$last_commit" =~ .*"Release".* ]]; then echo "release_flag=1" >> $GITHUB_ENV; else echo "release_flag=0" >> $GITHUB_ENV; fi
-        name="1.${BUILD_NUMBER}-${{matrix.depth}}#v4.0#${TARGET_BUILD_NAME}#${branch_name}"
-        artifact_prefix="squeezelite-esp32-${branch_name}-${TARGET_BUILD_NAME}-${{matrix.depth}}-${build_version_prefix}${BUILD_NUMBER}"
-        artifact_file_name="${artifact_prefix}.zip"
-        artifact_bin_file_name="${artifact_prefix}.bin"
-        echo "name=${name}" >> $GITHUB_ENV
-        echo "last_commit=${last_commit}" >> $GITHUB_ENV
-        echo "artifact_file_name=${artifact_file_name}" >> $GITHUB_ENV
-        echo "PROJECT_VER=${TARGET_BUILD_NAME}-${{ steps.buildnumber.outputs.build_number }} " >> $GITHUB_ENV
-        echo "artifact_bin_file_name=${artifact_bin_file_name}" >> $GITHUB_ENV
-        description=""
-        description=${description}$'------------------------------\n### Revision Log\n\n'
-        description="$description$(git log --pretty=format:'%h %s (%cI) <%an>' --abbrev-commit --max-count=15 | sed --r 's/(^[\*]+)/\\\1/g') "        
-        echo 'description<<~EOD' >> $GITHUB_ENV
-        echo ${description}>> $GITHUB_ENV
-        echo '~EOD' >> $GITHUB_ENV        
-        echo ####### 
-        echo ####### Environment
-        echo ####### 
-        env
-        echo ####### 
-        echo ####### GITHUB ENV
-        echo ####### 
-        cat $GITHUB_ENV
-    - name: Build the firmware
-      run: |
-        env | grep "artifact\|tag\|GITHUB\|version\|NUMBER\|TARGET" >${TARGET_BUILD_NAME}-env.txt
-        echo "${tag}" >version.txt
-        docker pull sle118/idf:release-v4.0 
-        docker info 
-        docker run --env-file=${TARGET_BUILD_NAME}-env.txt  -v $PWD:/project -w /project sle118/idf:release-v4.0 /bin/bash -c "cp build-scripts/${TARGET_BUILD_NAME}-sdkconfig.defaults sdkconfig  && idf.py build -DDEPTH=${{ matrix.depth }} -DBUILD_NUMBER=${BUILD_NUMBER}-${{ matrix.depth }} && zip -r build_output.zip build && zip build/${artifact_file_name} partitions*.csv build/*.bin build/bootloader/bootloader.bin build/partition_table/partition-table.bin build/flash_project_args build/size_*.txt"
-    # - name: Build Mock firmware
-    #   run: |
-    #     mkdir -p build
-    #     cd build
-    #     mkdir -p partition_table
-    #     mkdir -p bootloader
-    #     echo "mock content"> squeezelite.bin
-    #     echo "mock content"> recovery.bin
-    #     echo "mock content"> ./bootloader/bootloader.bin
-    #     echo "mock content"> ./partition_table/partition-table.bin 
-    #     echo "mock content"> flash_project_args 
-    #     echo "mock content"> size_comp1.txt
-    #     echo "mock content"> size_comp2.txt
-    #     echo "mock content"> ../partitions.csv
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ env.artifact_file_name }}
-        path: |
-          build/*.bin
-          build/bootloader/bootloader.bin
-          build/partition_table/partition-table.bin 
-          build/flash_project_args 
-          build/size_comp1.txt
-          build/size_comp2.txt
-          partitions.csv
-          sdkconfig
-          server_certs/github.pem
-          build_output.zip
-    - uses: actions/upload-artifact@v2
-      with:
-        name: ${{ env.artifact_bin_file_name }}
-        path: |
-          build/squeezelite.bin
-    - name: Create Release
-      if: env.release_flag == 1     
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-      with:
-        tag_name: ${{ env.tag }}
-        release_name: ${{ env.name }}
-        body: ${{ env.description }}
-        draft: false
-        prerelease: true
-    - name: Upload Release Asset - Squeezelite binary file
-      if: env.release_flag == 1         
-      id: upload-release-asset 
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-        asset_path: build/squeezelite.bin
-        asset_name: ${{ env.artifact_bin_file_name }}
-        asset_content_type: application/octet-stream        
-    - name: Upload Release Asset - Zip file
-      if: env.release_flag == 1         
-      id: upload-release-asset-zip
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-        asset_path: build/${{ env.artifact_file_name }}
-        asset_name: ${{ env.artifact_file_name }}
-        asset_content_type: application/octet-stream                

.github/workflows/codeql-analysis.yml

@@ -1,67 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master-cmake ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master-cmake ]
-  schedule:
-    - cron: '19 12 * * 4'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'cpp', 'javascript', 'python']
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.gitignore

@@ -65,38 +65,5 @@ libs/
 
 /cdump.cmd
 /_*
-squeezelite-esp32-jsonblob.zip
-/flash_cmd.txt
-/writeSequeezeEsp.bat
-/writeSequeezeEsp.sh
-all_releases.json
-alltags.txt
-releases.json
 sdkconfig
-
-.vscode/c_cpp_properties.json
-
-.vscode/launch.json
-
-.vscode/settings.json
-
-.vscode/tasks.json
-
-components/wifi-manager/.project
-
-components/wifi-manager/.settings/.jsdtscope
-
-components/wifi-manager/.settings/org.eclipse.wst.jsdt.ui.superType.container
-
-components/wifi-manager/.settings/org.eclipse.wst.jsdt.ui.superType.name
-
-components/wifi-manager/res/backup/
-
-*.code-workspace
-
-test/.vscode/
-
-node_modules/*
-esp-dsp/
-
-
+squeezelite-esp32-jsonblob.zip

.gitmodules

@@ -2,6 +2,6 @@
 	path = components/telnet/libtelnet
 	url = https://github.com/seanmiddleditch/libtelnet
 	branch = develop
-[submodule "components/esp-dsp"]
-	path = components/esp-dsp
-	url = https://github.com/philippe44/esp-dsp.git
+[submodule "esp-dsp"]
+	path = esp-dsp
+	url = https://github.com/philippe44/esp-dsp

.project

@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>squeezelite-esp32-idfv4</name>
+	<name>squeezelite-esp32</name>
 	<comment></comment>
 	<projects>
+		<project>esp-idf</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.cdt.core.cBuilder</name>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.cdt.core.cnature</nature>
 		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>com.espressif.idf.core.idfNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>

.settings/.gitignore

@@ -0,0 +1 @@
+/org.eclipse.ltk.core.refactoring.prefs

.settings/language.settings.xml

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

.settings/org.eclipse.cdt.core.prefs

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

CMakeLists.txt

@@ -1,14 +1,3 @@
 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)
-add_definitions(-DMODEL_NAME=SqueezeESP32)
-if(NOT DEFINED DEPTH)
-	set(DEPTH "16")
-endif()	
-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_DEBUG)
+project(squeezelite-esp32)

Dockerfile

@@ -18,6 +18,8 @@ RUN wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a
 RUN tar -xzf xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
 RUN rm xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
 
+# Patch I2S in esp-idf
+RUN cp /workspace/squeezelite-esp32/idf-patch/i2s.c /workspace/esp-idf/components/driver/i2s.c
 RUN rm -r /workspace/squeezelite-esp32
 RUN mkdir /workspace/squeezelite-esp32
 

Makefile

@@ -10,13 +10,9 @@
 
 
 #recovery: PROJECT_NAME:=recovery.$(PROJECT_CONFIG_TARGET)
-#recovery: EXTRA_CPPFLAGS+=-DRECOVERY_APPLICATION=1
+#recovery: CPPFLAGS+=-DRECOVERY_APPLICATION=1
 
 PROJECT_NAME?=squeezelite
-EXTRA_CPPFLAGS+=  -I$(PROJECT_PATH)/main 
-
-#/-Wno-error=maybe-uninitialized 
+EXTRA_COMPONENT_DIRS := esp-dsp
 include $(IDF_PATH)/make/project.mk 
-
-# for future gcc version, this could be needed: CPPFLAGS+= -Wno-error=format-overflow -Wno-error=stringop-truncation
-
+CPPFLAGS+= -Wno-error=maybe-uninitialized

README.md

@@ -1,102 +1,34 @@
-![Cross-Build](https://github.com/sle118/squeezelite-esp32/workflows/Cross-Build/badge.svg?branch=master-cmake)
 # Squeezelite-esp32
-## What is this
-Squeezelite-esp32 is an audio software suite made to run on espressif's ESP32 wifi (b/g/n) and bluetooth chipset. It offers the following capabilities
-
-- Stream your local music and connect to all major on-line music providers (Spotify, Deezer, Tidal, Qobuz) using [Logitech Media Server - a.k.a LMS](https://forums.slimdevices.com/) and enjoy multi-room audio synchronization. LMS can be extended by numerous plugins and can be controlled using a Web browser or dedicated applications (iPhone, Android). It can also send audio to UPnP, Sonos, ChromeCast and AirPlay speakers/devices.
-- Stream from a Bluetooth device (iPhone, Android)
-- Stream from an AirPlay controller (iPhone, iTunes ...) and enjoy synchronization multiroom as well (although it's AirPlay 1 only)
-
-Depending on the hardware connected to the ESP32, you can send audio to a local DAC, to SPDIF or to a Bluetooth speaker. The bare minimum required hardware is a WROVER module with 4MB of Flash and 4MB of PSRAM (https://www.espressif.com/en/products/modules/esp32). With that module standalone, just apply power and you can stream to a Bluetooth speaker. You can also send audio to most I2S DAC as well as to SPDIF receivers using just a cable or an optical transducer.
-
-But squeezelite-esp32 is highly extensible and you can add
-
-- Buttons and Rotary Encoder and map/combine them to various functions (play, pause, volume, next ...)
-- IR receiver (no pullup resistor or capacitor needed, just the 38kHz receiver)
-- Monochrome, GrayScale or Color displays using SPI or I2C (supported drivers are SH1106, SSD1306, SSD1322, SSD1326/7, SSD1351, ST7735, ST7789 and ILI9341).
-- Ethernet using a Microchip LAN8720 with RMII interface or Davicom DM9051 over SPI.
-
-Other features include
-
- - Resampling 
- - 10-bands equalizer
- - Automatic initial setup using any WiFi device 
- - Full web interface for further configuration/management
- - Firmware over-the-air update 
-
-To control the equalizer or use the display on LMS, a new player model is required and this is provided through a plugin that is part of LMS' 3rd party repositories
-
-## Performances 
-*(opinions presented here so I = @philippe44)*
-The main build of squeezelite-esp32 is a 16 bits internal core with all calculations in 32 bits or float precision. This is a design choice I've made to preserve CPU performances (it is already stretching a lot the esp32 chipset) and optimize memory usage as we only have 4MB of usable RAM. Some might correctly comment that the WROVER module have 8MB of RAM, but the processor is only able to address 4MB and the remaining 4MB must be paginated by smaller blocks and I don't have patience to that. 
-
-Now, when I did the porting of squeezelite to esp32, I've also made the core 16 or 32 bits compatible at compile-time. So far, it works in 32 bits but less tests have been done. You can chose to compile it in 32 bits mode. I'm not very interested above 16 bits samples because it does not bring anything (I have an engineering background in theory of information). 
-
-| Capability                 |16 bits|32 bits| comment         						          |	
-|----------------------------|-------|-------|--------------------------------------------------------------------|
-| max sampling rate          |  192k |  96k  | 192k is very challenging, especially when combined with display    |
-| max bit depth              |  16   |  24   | 24 bits are truncated in 16 bits mode                              | 
-| spdif			     |16 bits|20 bits|		                                                          |
-| mp3, aac, opus, ogg/vorbis |  48k  |  48k  |		                                                          |
-| alac, flac, ogg/flac       |  96k  |  96k  | 		                                                          |
-| pcm, wav, aif              |  192k |  96k  |		                                                          |
-| equalizer                  |   Y   |   N   | 48kHz max (after resampling) - equalization skipped on >48k tracks |
-| resampling                 |   Y   |   N   |		                                                          |
-| cross-fade                 |  10s  |  <5s  | depends on buffer size and sampling rate		                  |
-
-The esp32 must run at 240 MHz, with Quad-SPI I/O at 80 MHz and a clock of 40 Mhz. Still, it's a lot to run, especially knowing that it has a serial Flash and PSRAM, so kudos to Espressif for their chipset optimization. Now, to have all the decoding, resampling, equalizing, gain, display, spectrum/vu is a very (very) delicate equilibrium between use of internal /external RAM, tasks priorities and buffer handling. It is not perfect and the more you push the system to the limit, the higher the risk that some files would not play (see below). In general, the display will always have the lowest priority and you'll notice slowdown in scrolling and VU/Spectrum refresh rates. Now, even display thread has some critical section and impacts the capabilities. For example, a 16 bits-depth color display with low SPI speed might prevent 24/96 flac to work but still work with pcm 24/96
-
-In 16 bits mode, although 192 kHz is reported as max rate, it's highly recommended to limit reported sampling rate to 96k (-Z 96000). Note that some high-speed 24/96k on-line streams might stutter because of TCP/IP stack performances. It is usually due to the fact that the server sends small packets of data and the esp32 cannot receive encoded audio fast enough, regardless of task priority settings (I've tried to tweak that a fair bit). The best option in that case is to let LMS proxy the stream as it will provide larger chunks and a "smoother" stream that can then be handled.
-
-Note as well that some codecs consume more CPU than others or have not been optimized as much. I've done my best to tweak these, but that level of optimization includes writing some assembly which is painful. One very demanding codec is AAC when files are encoded with SBR. It allows reconstruction of upper part of spectrum and thus higher sampling rate, but the codec spec is such that this is optional, you can decode simply lower band and accept lower sampling rate - See the AAC_DISABLE_SBR option below.
-## Supported Hardware
-Any esp32-based hardware with at least 4MB of flash and 4MB of PSRAM will be capable of running squeezelite-esp32 and there are various boards that include such chip. A few are mentionned below, but any should work. You can find various help & instructions [here](https://forums.slimdevices.com/showthread.php?112697-ANNOUNCE-Squeezelite-ESP32-(dedicated-thread))
-
-**For the sake of clarity, WROOM modules DO NOT work as they don't include PSRAM. Some designs might add it externally, but it's (very) unlikely.**
-### Raw WROVER module
-Per above description, a [WROVER module](https://www.espressif.com/en/products/modules/esp32) is enough to run Squeezelite-esp32, but that requires a bit of tinkering to extend it to have analogue audio or hardware buttons (e.g.) 
-
-Please note that when sending to a Bluetooth speaker (source), only 44.1 kHz can be used, so you either let LMS do the resampling, but you must make sure it only sends 44.1kHz tracks or enable internal resampling (using -R) option. If you connect a DAC, choice of sample rates will depends on its capabilities. See below for more details.
-
-Most DAC will work out-of-the-box with simply an I2S connection, but some require specific commands to be sent using I2C. See DAC option below to understand how to send these dedicated commands. There is build-in support for TAS575x, TAS5780, TAS5713 and AC101 DAC.
+## Supported Hardware 
 ### SqueezeAMP
-This is the main hardware companion of Squeezelite-esp32 and has been developped together. Details on capabilities can be found [here](https://forums.slimdevices.com/showthread.php?110926-pre-ANNOUNCE-SqueezeAMP-and-SqueezeliteESP32) and [here](https://github.com/philippe44/SqueezeAMP).
+Works with the SqueezeAMP see [here](https://forums.slimdevices.com/showthread.php?110926-pre-ANNOUNCE-SqueezeAMP-and-SqueezeliteESP32) and [here](https://github.com/philippe44/SqueezeAMP).
 
 if you want to rebuild, use the `squeezelite-esp32-SqueezeAmp-sdkconfig.defaults` configuration file.
 
-NB: You can use the pre-build binaries SqueezeAMP4MBFlash which has all the hardware I/O set properly. You can also use the generic binary I2S4MBFlash in which case the NVS parameters shall be set to get the exact same behavior
+NB: You can use the pre-build binaries SqueezeAMP4MBFlash/SqueezeAMP8MBFlash which has all the hardware I/O set properly. You can also use the generic binary I2S4MBFlash in which case the NVS parameters shall be set to get the exact same behavior
 - set_GPIO: 12=green,13=red,34=jack,2=spkfault
 - batt_config: channel=7,scale=20.24
 - dac_config: model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14:0
 - spdif_config: bck=33,ws=25,do=15
 
 ### ESP32-A1S
-Works with [ESP32-A1S](https://docs.ai-thinker.com/esp32-a1s) module that includes audio codec and headset output. You still need to use a demo board like [this](https://www.aliexpress.com/item/4001060963585.html) or an external amplifier if you want direct speaker connection. Note that there is a version with AC101 codec and another one with ES8388 (see below)
+Works with [ESP32-A1S](https://docs.ai-thinker.com/esp32-a1s) module that includes audio codec and headset output. You still need to use a demo board like [this](https://www.aliexpress.com/item/4000765857347.html?spm=2114.12010615.8148356.11.5d963cd0j669ns) or an external amplifier if you want direct speaker connection. 
 
-The board shown above has the following IO set
+The board showed above has the following IO set
 - amplifier: GPIO21
 - key2: GPIO13, key3: GPIO19, key4: GPIO23, key5: GPIO18, key6: GPIO5 (to be confirmed with dip switches)
-- key1: not sure, using GPIO36 in a matrix
+- key1: not sure, something with GPIO36
 - jack insertion: GPIO39 (inserted low)
-- D4 -> GPIO22 used for green LED (active low)
-- D5 -> GPIO19 (muxed with key3)
-- The IO connector also brings GPIO5, GPIO18, GPIO19, GPIO21, GPIO22 and GPIO23 (don't forget it's muxed with keys!)
-- The JTAG connector uses GPIO 12, 13, 14 and 15 (see dip switch) but these are also used for SD-card (and GPIO13 is key2 as well)
-- It's always possible to re-use GPIOO (download at boot) and GPIO1/GPIO3 which are RX/TX of UART0 but you'll lose trace
-
-(note that some GPIO need pullups)
+- LED: GPIO22 (active low)
+(note that GPIO need pullups)
 
 So a possible config would be
 - set_GPIO: 21=amp,22=green:0,39=jack:0
+- dac_config: model=AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32
 - a button mapping: 
 ```
 [{"gpio":5,"normal":{"pressed":"ACTRLS_TOGGLE"}},{"gpio":18,"pull":true,"shifter_gpio":5,"normal":{"pressed":"ACTRLS_VOLUP"}, "shifted":{"pressed":"ACTRLS_NEXT"}}, {"gpio":23,"pull":true,"shifter_gpio":5,"normal":{"pressed":"ACTRLS_VOLDOWN"},"shifted":{"pressed":"ACTRLS_PREV"}}]
 ```
-for AC101
-- dac_config: model=AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32
- 
-for ES8388
-- dac_config: model=ES8388,bck=5,ws=25,do=26,sda=18,scl=23,i2c=16
 ### T-WATCH2020 by LilyGo
 This is a fun [smartwatch](http://www.lilygo.cn/prod_view.aspx?TypeId=50036&Id=1290&FId=t3:50036:3) based on ESP32. It has a 240x240 ST7789 screen and onboard audio. Not very useful to listen to anything but it works. This is an example of a device that requires an I2C set of commands for its dac (see below). There is a build-option if you decide to rebuild everything by yourself, otherwise the I2S default option works with the following parameters
 
@@ -134,31 +66,26 @@ The NVS parameter "i2c_config" set the i2c's gpio used for generic purpose (e.g.
 ```
 sda=<gpio>,scl=<gpio>[,port=0|1][,speed=<speed>]
 ```
-<strong>Please note that you can not use the same GPIO or port as the DAC</strong>
 ### SPI
-The esp32 has 4 SPI sub-systems, one is unaccessible so numbering is 0..2 and SPI0 is reserved for Flash/PSRAM. The NVS parameter "spi_config" set the spi's gpio used for generic purpose (e.g. display). Leave it blank to disable SPI usage. The DC parameter is needed for displays. Syntax is
+The NVS parameter "spi_config" set the spi's gpio used for generic purpose (e.g. display). Leave it blank to disable SPI usage. The DC parameter is needed for displays. Syntax is
 ```
-data|mosi=<gpio>,clk=<gpio>[,dc=<gpio>][,host=1|2][,miso=<gpio>]
+data=<gpio>,clk=<gpio>[,dc=<gpio>][,host=1|2]
 ``` 
-Default "host" is 1. The "miso" parameter is only used when SPI bus is to be shared with other peripheral (e.g. ethernet, see below), otherwise it can be omitted. Note that "data" can also be named "mosi". 
 ### DAC/I2S
-The NVS parameter "dac_config" set the gpio used for i2s communication with your DAC. You can define the defaults at compile time but nvs parameter takes precedence except for SqueezeAMP and A1S where these are forced at runtime. Syntax is
+The NVS parameter "dac_config" set the gpio used for i2s communication with your DAC. You can define the defaults at compile time but nvs parameter takes precedence except for SqueezeAMP and A1S where these are forced at runtime. If your DAC also requires i2c, then you must go the re-compile route. Syntax is
 ```
-bck=<gpio>,ws=<gpio>,do=<gpio>[,mck][,mute=<gpio>[:0|1][,model=TAS57xx|TAS5713|AC101|I2S][,sda=<gpio>,scl=gpio[,i2c=<addr>]]
+bck=<gpio>,ws=<gpio>,do=<gpio>[,mute=<gpio>[:0|1][,model=TAS57xx|TAS5713|AC101|I2S][,sda=<gpio>,scl=gpio[,i2c=<addr>]]
 ```
-if "model" is not set or is not recognized, then default "I2S" is used. The option "mck" is used for some codecs that require a master clock (although they should not). Only GPIO0 can be used as MCLK and be aware that this cannot coexit with RMII Ethernet (see ethernet section below). I2C parameters are optional and only needed if your DAC requires an I2C control (See 'dac_controlset' below). Note that "i2c" parameters are decimal, hex notation is not allowed.
+if "model" is not set or is not recognized, then default "I2S" is used. I2C parameters are optional an only needed if your dac requires an I2C control (See 'dac_controlset' below). Note that "i2c" parameters are decimal, hex notation is not allowed.
 
-So far, TAS57xx, TAS5713, AC101, WM8978 and ES8388 are recognized models where the proper init sequence/volume/power controls are sent. For other codecs that might require an I2C commands, please use the parameter "dac_controlset" that allows definition of simple commands to be sent over i2c for init, power on and off using a JSON syntax:
+The parameter "dac_controlset" allows definition of simple commands to be sent over i2c for init, power on and off using a JSON syntax:
 ```
 { init: [ {"reg":<register>,"val":<value>,"mode":<nothing>|"or"|"and"}, ... {{"reg":<register>,"val":<value>,"mode":<nothing>|"or"|"and"} ],
   poweron: [ {"reg":<register>,"val":<value>,"mode":<nothing>|"or"|"and"}, ... {{"reg":<register>,"val":<value>,"mode":<nothing>|"or"|"and"} ],
   poweroff: [ {"reg":<register>,"val":<value>,"mode":<nothing>|"or"|"and"}, ... {{"reg":<register>,"val":<value>,"mode":<nothing>|"or"|"and"} ] }
 ```
-This is standard JSON notation, so if you are not familiar with it, Google is your best friend. Be aware that the '...' means you can have as many entries as you want, it's not part of the syntax. Every section is optional, but it does not make sense to set i2c in the 'dac_config' parameter and not setting anything here. The parameter 'mode' allows to *or* the register with the value or to *and* it. Don't set 'mode' if you simply want to write. **Note that all values must be decimal**. You can use a validator like [this](https://jsonlint.com) to verify your syntax
+This is standard JSON notation, so if you are not familiar with it, Google is your best friend. Be aware that the '...' means you can have as many entries as you want, it's not part of the syntax. Every section is optional, but it does not make sense to set i2c in the 'dac_config' parameter and not setting anything here. The parameter 'mode' allows to *or* the register with the value or to *and* it. Don't set 'mode' if you simply want to write. **Note that all values must be decimal**
 
-NB: For specific builds (all except I2S), all this is ignored. For know codecs, the built-in sequences can be overwritten using dac_controlset
-
-<strong>Please note that you can not use the same GPIO or port as the I2C</strong>
 ### SPDIF
 The NVS parameter "spdif_config" sets the i2s's gpio needed for SPDIF. 
 
@@ -170,42 +97,27 @@ Leave it blank to disable SPDIF usage, you can also define them at compile time
 ```
 bck=<gpio>,ws=<gpio>,do=<gpio>
 ```
-NB: For well-known configuration, this is ignored
-
-To optimize speed, a bit-manipulation trick is used and as a result, the bit depth is limited to 20 bits, even in 32 bits mode. As said before, this is more than enough for any human ear. In theory, it could be extended up to 23 bits but I don't see the need. Now, you can also get SPDIF using a specialized chip that offers a I2S interface like a DAC but spits out SPDIF (optical and coax). Refers to DAC chapter then.
-
-If you want coax, you can also use a poor-man's trick to generate signal from a 3.3V GPIO. All that does is dividing the 3.3V to generate a 0.6V peak-to-peak and then remove DC
-```
-                          100nF
-GPIO  ----210ohm-----------||---- coax S/PDIF signal out
-                    |
-                  110ohm
-                    |
-Ground -------------------------- coax signal ground
-```
 ### Display
 The NVS parameter "display_config" sets the parameters for an optional display. Syntax is
 ```
-I2C,width=<pixels>,height=<pixels>[address=<i2c_address>][,reset=<gpio>][,HFlip][,VFlip][driver=SSD1306|SSD1326[:1|4]|SSD1327|SH1106]
-SPI,width=<pixels>,height=<pixels>,cs=<gpio>[,back=<gpio>][,reset=<gpio>][,speed=<speed>][,HFlip][,VFlip][driver=SSD1306|SSD1322|SSD1326[:1|4]|SSD1327|SH1106|SSD1675|ST7735|ST7789|ILI9341[:16|18][,rotate]]
+I2C,width=<pixels>,height=<pixels>[address=<i2c_address>][,HFlip][,VFlip][driver=SSD1306|SSD1326[:1|4]|SSD1327|SH1106]
+SPI,width=<pixels>,height=<pixels>,cs=<gpio>[,back=<gpio>][,speed=<speed>][,HFlip][,VFlip][driver=SSD1306|SSD1322|SSD1326[:1|4]|SSD1327|SH1106|SSD1675|ST7735|ST7789[,rotate]]
 ```
 - back: a LED backlight used by some older devices (ST7735). It is PWM controlled for brightness
-- reset: some display have a reset pin that is should normally be pulled up if unused
 - VFlip and HFlip are optional can be used to change display orientation
 - rotate: for non-square *drivers*, move to portrait mode. Note that *width* and *height* must be inverted then
 - Default speed is 8000000 (8MHz) but SPI can work up to 26MHz or even 40MHz
 - SH1106 is 128x64 monochrome I2C/SPI [here]((https://www.waveshare.com/wiki/1.3inch_OLED_HAT))
 - SSD1306 is 128x32 monochrome I2C/SPI [here](https://www.buydisplay.com/i2c-blue-0-91-inch-oled-display-module-128x32-arduino-raspberry-pi)
-- SSD1322 is 256x64 grayscale 16-levels SPI in multiple sizes [here](https://www.buydisplay.com/oled-display/oled-display-module?resolution=159) - it is very nice
-- SSD1326 is 256x32 monochrome or grayscale 16-levels SPI [here](https://www.aliexpress.com/item/32833603664.html?spm=a2g0o.productlist.0.0.2d19776cyQvsBi&algo_pvid=c7a3db92-e019-4095-8a28-dfdf0a087f98&algo_expid=c7a3db92-e019-4095-8a28-dfdf0a087f98-1&btsid=0ab6f81e15955375483301352e4208&ws_ab_test=searchweb0_0,searchweb201602_,searchweb201603_)
-- SSD1327 is 128x128 16-level grayscale SPI [here](https://www.amazon.com/gp/product/B079N1LLG8/ref=ox_sc_act_title_1?smid=A1N6DLY3NQK2VM&psc=1) - artwork can be up to 96x96 with vertical vu-meter/spectrum
+- SSD1322 is 128x128 16-level grayscale SPI [here](https://www.amazon.com/gp/product/B079N1LLG8/ref=ox_sc_act_title_1?smid=A1N6DLY3NQK2VM&psc=1) - artwork can be up to 96x96 with vertical vu-meter/spectrum
 - SSD1351 is 128x128 65k/262k color SPI [here](https://www.waveshare.com/product/displays/lcd-oled/lcd-oled-3/1.5inch-rgb-oled-module.htm)
+- SSD1326 is 256x32 monochrome or grayscale 16-levels SPI [here](https://www.aliexpress.com/item/32833603664.html?spm=a2g0o.productlist.0.0.2d19776cyQvsBi&algo_pvid=c7a3db92-e019-4095-8a28-dfdf0a087f98&algo_expid=c7a3db92-e019-4095-8a28-dfdf0a087f98-1&btsid=0ab6f81e15955375483301352e4208&ws_ab_test=searchweb0_0,searchweb201602_,searchweb201603_)
+- SSD1327 is 256x64 grayscale 16-levels SPI in multiple sizes [here](https://www.buydisplay.com/oled-display/oled-display-module?resolution=159) - it is very nice
 - SSD1675 is an e-ink paper and is experimental as e-ink is really not suitable for LMS du to its very low refresh rate
 - ST7735 is a 128x160 65k color SPI [here](https://www.waveshare.com/product/displays/lcd-oled/lcd-oled-3/1.8inch-lcd-module.htm). This needs a backlight control
 - ST7789 is a 240x320 65k (262k not enabled) color SPI [here](https://www.waveshare.com/product/displays/lcd-oled/lcd-oled-3/2inch-lcd-module.htm). It also exist with 240x240 displays. See **rotate** for use in portrait mode
-- ILI9341 is another 240x320 65k (262k capable) color SPI. I've not used it much, the driver it has been provided by one external contributor to the project
 
-You can tweak how the vu-meter and spectrum analyzer are displayed, as well as size of artwork through a dedicated menu in player's settings (don't forget to add the plugin).
+To use the display on LMS, add repository https://raw.githubusercontent.com/sle118/squeezelite-esp32/master/plugin/repo.xml. You will then be able to tweak how the vu-meter and spectrum analyzer are displayed, as well as size of artwork. You can also install the excellent plugin "Music Information Screen" which is super useful to tweak the layout.
 
 The NVS parameter "metadata_config" sets how metadata is displayed for AirPlay and Bluetooth. Syntax is
 ```
@@ -244,14 +156,12 @@ Syntax is:
 ```
 <gpio>=Vcc|GND|amp[:1|0]|ir|jack[:0|1]|green[:0|1]|red[:0|1]|spkfault[:0|1][,<repeated sequence for next GPIO>]
 ```
-You can define the defaults for jack, spkfault leds at compile time but nvs parameter takes precedence except for well-known configurations where these are forced at runtime.
-**Note that gpio 36 and 39 are input only and cannot use interrupt. When set to jack or speaker fault, a 100ms polling checks their value but that's expensive**
+You can define the defaults for jack, spkfault leds at compile time but nvs parameter takes precedence except for SqueezeAMP where these are forced at runtime.
 ### LED 
 See §**set_GPIO** for how to set the green and red LEDs. In addition, their brightness can be controlled using the "led_brigthness" parameter. The syntax is
 ```
 [green=0..100][,red=0..100]
 ```
-NB: For well-known configuration, this is ignored
 ### Rotary Encoder
 One rotary encoder is supported, quadrature shift with press. Such encoders usually have 2 pins for encoders (A and B), and common C that must be set to ground and an optional SW pin for press. A, B and SW must be pulled up, so automatic pull-up is provided by ESP32, but you can add your own resistors. A bit of filtering on A and B (~470nF) helps for debouncing which is not made by software. 
 
@@ -262,21 +172,18 @@ There is also the possibility to use 'knobonly' option (exclusive with 'volume'
 - double press is 'Back' (Left in LMS's terminology). 
 - a quick left-right movement on the encoder is 'Pause' 
 
-The speed of double click (or left-right) can be set using the optional parameter of 'knobonly'. This is not a perfect solution, and other ideas are welcome. Be aware that the longer you set double click speed, the less responsive the interface will be. The reason is that I need to wait for that delay before deciding if it's a single or double click. It can also make menu navigation "hesitations" being easily interpreted as 'Pause'
+The speed of double click (or left-right) can be set using the optional parameter of 'knobonly'. This is not a perfect solution, and other ideas are welcome. Be aware that the longer you set double click speed, the less responsive the interface will be. The reason is that I need to wait for that delay before deciding if it's a single or double click. It can also make menu navigation "hesitations" being easoly interpreted as 'Pause'
 
 Use parameter rotary_config with the following syntax:
 
 ```
-A=<gpio>,B=<gpio>[,SW=gpio>[[,knobonly[=<ms>]]|[[,volume][,longpress]]]]
+A=<gpio>,B=<gpio>[,SW=gpio>[[,knobonly[=<ms>]|[,volume][,longpress]]
 ```
 
 HW note: all gpio used for rotary have internal pull-up so normally there is no need to provide Vcc to the encoder. Nevertheless if the encoder board you're using also has its own pull-up that are stronger than ESP32's ones (which is likely the case), then there will be crosstalk between gpio, so you must bring Vcc. Look at your board schematic and you'll understand that these board pull-up create a "winning" pull-down when any other pin is grounded. 
 
-The SW gpio is optional, you can re-affect it to a pure button if you prefer but the volume, longpress and knobonly options make little sense as the missing switch plays an important role in these modes. You could still have the "volume" mode, but you won't be able to use it for *anything* expect volume up and down. So be aware that the use of syntax [] is a bit misleading hereabove.
-
 See also the "IMPORTANT NOTE" on the "Buttons" section and remember that when 'lms_ctrls_raw' (see below) is activated, none of these knobonly,volume,longpress options apply, raw button codes (not actions) are simply sent to LMS
 
-**Note that gpio 36 and 39 are input only and cannot use interrupt, so they cannot be set to A or B. When using them for SW, a 100ms polling is used which is expensive**
 ### Buttons
 Buttons are described using a JSON string with the following syntax
 ```
@@ -311,11 +218,10 @@ Where (all parameters are optionals except gpio)
 Where \<action\> is either the name of another configuration to load (remap) or one amongst
 
 ```
-ACTRLS_NONE, ACTRLS_POWER, ACTRLS_VOLUP, ACTRLS_VOLDOWN, ACTRLS_TOGGLE, ACTRLS_PLAY, 
+ACTRLS_NONE, ACTRLS_VOLUP, ACTRLS_VOLDOWN, ACTRLS_TOGGLE, ACTRLS_PLAY, 
 ACTRLS_PAUSE, ACTRLS_STOP, ACTRLS_REW, ACTRLS_FWD, ACTRLS_PREV, ACTRLS_NEXT, 
-BCTRLS_UP, BCTRLS_DOWN, BCTRLS_LEFT, BCTRLS_RIGHT, 
-BCTRLS_PS1, BCTRLS_PS2, BCTRLS_PS3, BCTRLS_PS4, BCTRLS_PS5, BCTRLS_PS6,
-KNOB_LEFT, KNOB_RIGHT, KNOB_PUSH,	
+BCTRLS_UP, BCTRLS_DOWN, BCTRLS_LEFT, BCTRLS_RIGHT,
+KNOB_LEFT, KNOB_RIGHT, KNOB_PUSH
 ```
 				
 One you've created such a string, use it to fill a new NVS parameter with any name below 16(?) characters. You can have as many of these configs as you can. Then set the config parameter "actrls_config" with the name of your default config
@@ -367,94 +273,99 @@ Below is a difficult but functional 2-buttons interface for your decoding pleasu
 
 The benefit of the "raw" mode is that you can build a player which is as close as possible to a Boom (e.g.) but you can't use the remapping function nor longress or shift logics to do your own mapping when you have a limited set of buttons. In 'raw' mode, all you really need to define is the mapping between the gpio and the button. As far as LMS is concerned, any other option in these JSON payloads does not matter. Now, when you use BT or AirPlay, the full JSON construct described above fully applies, so the shift, longpress, remapping options still work. 
 
-**Be aware that when using non "raw" mode, the CLI (Command Line Interface) of LMS is used and *must* be available without password**
-
 There is no good or bad option, it's your choice. Use the NVS parameter "lms_ctrls_raw" to change that option
-	
-**Note that gpio 36 and 39 are input only and cannot use interrupt. When using them for a button, a 100ms polling is started which is expensive. Long press is also likely to not work very well**
-### Ethernet (coming soon)
-Wired ethernet is supported by esp32 with various options but squeezelite is only supporting a Microchip LAN8720 with a RMII interface like [this](https://www.aliexpress.com/item/32858432526.html) or Davicom DM9051 over SPI like [that](https://www.amazon.com/dp/B08JLFWX9Z).
-	
-#### RMII (LAN8720)	
-- RMII PHY wiring is fixed and can not be changed
 
-| GPIO   | RMII Signal | Notes        |
-| ------ | ----------- | ------------ |
-| GPIO21 | TX_EN       | EMAC_TX_EN   |
-| GPIO19 | TX0         | EMAC_TXD0    |
-| GPIO22 | TX1         | EMAC_TXD1    |
-| GPIO25 | RX0         | EMAC_RXD0    |
-| GPIO26 | RX1         | EMAC_RXD1    |
-| GPIO27 | CRS_DV      | EMAC_RX_DRV  |
-
-- SMI (Serial Management Interface) wiring is not fixed and you can change it either in the configuration or using "eth_config" parameter with the following syntax:
-```
-model=lan8720,mdc=<gpio>,mdio=<gpio>[,rst=<gpio>]
-```
-Connecting a reset pin for the LAN8720 is optional but recommended to avoid that GPIO0 (50MHz input clock) locks the esp32 in download mode at boot time.
-- Clock
-	
-The APLL of the esp32 is required for the audio codec, so we **need** a LAN8720 that provides a 50MHz clock. That clock **must** be connected to GPIO0, there is no alternative. This means that if your DAC requires an MCLK, then you are out of luck. It is not possible to have both to work together. There might be some workaround using CLK_OUT2 and GPIO3, but I don't have time for this.
-#### SPI (DM9051)
-Ethernet over SPI is supported as well and requires less GPIOs but is obvsiously slower. Another benefit is that the SPI bus can be shared with the display, but it's also possible to have a dedicated SPI interface. The esp32 has 4 SPI sub-systems, one is unaccessible so numbering is 0..2 and SPI0 is reserved for Flash/PSRAM. The "eth_config" parameter syntax becomes:
-```
-model=dm9051,cs=<gpio>,speed=<clk_in_Hz>,intr=<gpio>[,host=<-1|1|2>][,rst=<gpio>][,mosi=<gpio>,miso=<gpio>,clk=<gpio>]
-```
-- To use the system SPI, shared with display (see spi_config) "host" must be set to -1. Any other value will reserve the SPI interface (careful of conflict with spi_config). The default "host" is 2 to avoid conflicting wiht default "spi_config" settings.
-- When not using system SPI, "mosi" for data out, "miso" for data in and "clk" **must** be set
-- The esp32 has a special I/O multiplexer for faster speed (up to 80 MHz) but that requires using specific GPIOs, which depends on SPI bus (See [here](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/spi_master.html) for more details)
-
-| Pin Name | SPI2 | SPI3 |
-| -------- | ---- | ---- |		
-| CS0*     |  15  |  5   |
-| SCLK	   |  14  |  18  |
-| MISO	   |  12  |  19  |
-| MOSI	   |  13  |  23  |
-	
-** THIS IS NOT AVAILABLE YET, SO MORE TO COME ON HOW TO USE WIRED ETHERNET***
 ### Battery / ADC
-The NVS parameter "bat_config" sets the ADC1 channel used to measure battery/DC voltage. The "atten" value attenuates the input voltage to the ADC input (the read value maintains a 0-1V rage) where: 0=no attenuation(0..800mV), 1=2.5dB attenuation(0..1.1V), 2=6dB attenuation(0..1.35V), 3=11dB attenuation(0..2.6V). Scale is a float ratio applied to every sample of the 12 bits ADC. A measure is taken every 10s and an average is made every 5 minutes (not a sliding window). Syntax is
+The NVS parameter "bat_config" sets the ADC1 channel used to measure battery/DC voltage. Scale is a float ratio applied to every sample of the 12 bits ADC. A measure is taken every 10s and an average is made every 5 minutes (not a sliding window). Syntax is
 ```
-channel=0..7,scale=<scale>,cells=<2|3>[,atten=<0|1|2|3>]
+channel=0..7,scale=<scale>
 ```
-NB: Set parameter to empty to disable battery reading. For well-known configuration, this is ignored (except for SqueezeAMP where number of cells is required)
+NB: Set parameter to empty to disable battery reading
+## Setting up ESP-IDF
+### Docker
+You can use docker to build squeezelite-esp32  
+First you need to build the Docker container:
+```
+docker build -t esp-idf .
+```
+Then you need to run the container:
+```
+docker run -i -t -v `pwd`:/workspace/squeezelite-esp32 esp-idf
+```
+The above command will mount this repo into the docker container and start a bash terminal
+for you to then follow the below build steps
+
+### Manual Install of ESP-IDF
+<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
+
+## Building Squeezelite-esp32
+MOST IMPORTANT: create the right default config file
+- make defconfig
+(Note: You can also copy over config files from the build-scripts folder to ./sdkconfig)
+Then adapt the config file to your wifi/BT/I2C device (can also be done on the command line)
+- make menuconfig
+Then
+
+```
+# Build recovery.bin, bootloader.bin, ota_data_initial.bin, partitions.bin  
+# force appropriate 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="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
-## Setup WiFi
+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". 
 - Once connected, navigate to 192.168.4.1 
 - Wait for the list of access points visible from the device to populate in the web page.
 - Choose an access point and enter any credential as needed
 - Once connection is established, note down the address the device received; this is the address you will use to configure it going forward 
 
-## Setup squeezelite command line (optional)
+2/ setup squeezelite command line (optional)
 
 At this point, the device should have disabled its built-in access point and should be connected to a known WiFi network.
 - navigate to the address that was noted in step #1
-- Using the list of predefined options, choose the mode in which you want squeezelite to start
+- Using the list of predefined options, hoose the mode in which you want squeezelite to start
 - Generate the command
 - Add or change any additional command line option (for example player name, etc)
 - Activate squeezelite execution: this tells the device to automatiaclly run the command at start
 - Update the configuration
 - click on the "start toggle" button. This will force a reboot. 
-- The toggle switch should be set to 'ON' to ensure that squeezelite is active after booting (you might have to fiddle with it a few times)
-- You can enable accessto  NVS parameters under 'credits'
+- The toggle switch should be set to 'ON' to ensure that squeezelite is active after booting
 
-## Monitor
-
-In addition of the esp-idf serial link monitor option, you can also enable a telnet server (see NVS parameters) where you'll have access to a ton of logs of what's happening inside the WROVER.
-
-## Update Squeezelite
+3/ Updating Squeezelite
 - From the firmware tab, click on "Check for Updates"
 - Look for updated binaries
 - Select a line
 - Click on "Flash!"
 - The system will reboot into recovery mode (if not already in that mode), wipe the squeezelite partition and download/flash the selected version 
-- You can choose a local file or have a local webserver
 
-## Recovery
+3/ Recovery
 - From the firmware tab, click on the "Recovery" button. This will reboot the ESP32 into recovery, where additional configuration options are available from the NVS editor
 
-## Additional configuration notes (from the Web UI)
+# Additional command line notes, configured from the http configuration
 The squeezelite options are very similar to the regular Linux ones. Differences are :
 
 	- the output is -o ["BT -n '<sinkname>' "] | [I2S]
@@ -470,46 +381,12 @@ See squeezlite command line, but keys options are
 	- Z <rate> : tell LMS what is the max sample rate supported before LMS resamples
 	- R (see above)
 	- r "<minrate>-<maxrate>"
-	- C <sec> : set timeout to switch off amp gpio
-	- W : activate WAV and AIFF header parsing
-# Building everything yourself
-## Setting up ESP-IDF
-### Docker
-You can use docker to build squeezelite-esp32 (optional) 
-First you need to build the Docker container:
-```
-docker build -t esp-idf .
-```
-Then you need to run the container:
-```
-docker run -i -t -v `pwd`:/workspace/squeezelite-esp32 esp-idf
-```
-The above command will mount this repo into the docker container and start a bash terminal
-for you to then follow the below build steps
 
-### Manual Install of ESP-IDF
-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/ or see here https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/windows-setup.html for a direct install. 
-
-**Use the esp-idf 4.0 https://github.com/espressif/esp-idf/tree/release/v4.0 and a recent add esp-dsp (after 08/2020)**
-
-## Building Squeezelite-esp32
-When initially cloning the repo, make sure you do it recursively. For example: `git clone --recursive https://github.com/sle118/squeezelite-esp32.git`
-	
-Don't forget to choose one of the config files in build_scripts/ and rename it sdkconfig.defaults or sdkconfig as many important WiFi/BT options are set there. **The codecs libraries will not be rebuilt by these scripts (it's a tedious process - see below)**
-
-Create and tweak your config using `idf.py menuconfig` then build binaries using `idf.py all`. It will build the recovery and the application (squeezelite). then use `idf.py flash` to write everything. Otherwise, if you just want to download squeezelite, do (assuming you have set ESPPORT (e.g. COM10) and ESPBAUD (e.g. 921600)
-```
-<path_to_your_python>/python.exe <path_to_your_esptool>/esptool.py -p %ESPPORT% -b %ESPBAUD% --before default_reset --after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 80m 0x150000 build/squeezelite.bin
-```
-Use `idf.py monitor` to monitor the application (see esp-idf documentation)
-
-Note: You can use `idf.py build -DDEPTH=32` to build the 32 bits version and add the `-DVERSION=<your_version>` to add a custom version name (it will be 0.0-<your_version>). If you want to change the whole version string, see squeezelite.h. You can also disable the SBR extension of AAC codecs as it consumes a lot of CPU and might overload the esp32. Use `-DAAC_DISABLE_SBR=1` for that
-
-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`
-### Rebuild codecs (highly recommended to NOT try that)
+## Additional misc notes to do you build
+- as of this writing, ESP-IDF has a bug int he way the PLL values are calculated for i2s, so you *must* use the i2s.c file in the patch directory
 - for codecs libraries, add -mlongcalls if you want to rebuild them, but you should not (use the provided ones in codecs/lib). if you really want to rebuild them, open an issue
 - libmad, libflac (no esp's version), libvorbis (tremor - not esp's version), alac work
-- libfaad does not really support real time, but if you want to try (but using helixaac is a better option)
+- libfaad does not really support real time, but if you want to try
 	- -O3 -DFIXED_POINT -DSMALL_STACK
 	- change ac_link in configure and case ac_files, remove ''
 	- compiler but in cfft.c and cffti1, must disable optimization using
@@ -521,8 +398,22 @@ If you have already cloned the repository and you are getting compile errors on
 	- per mad & few others, edit configure and change $ac_link to add -c (faking link)
 	- change ac_files to remove ''
 	- add DEPS_CFLAGS and DEPS_LIBS to avoid pkg-config to be required
-	- stack consumption can be very high with some codec variants, so set NONTHREADSAFE_PSEUDOSTACK and GLOBAL_STACK_SIZE=48000 and unset VAR_ARRAYS in config.h
-- libmad has been patched to avoid using a lot of stack and is not provided here. There is an issue with sync detection in 1.15.1b from where the original stack patch was done but since a few fixes have been made wrt sync detection. This 1.15.1b-10 found on debian fixes the issue where mad thinks it has reached sync but has not and so returns a wrong sample rate. It comes at the expense of 8KB (!) of code where a simple check in squeezelite/mad.c that next_frame[0] is 0xff and next_frame[1] & 0xf0 is 0xf0 does the trick ...
+	- stack consumption can be very high with some codec variants, so set NONTHREADSAFE_PSEUDOSTACK and GLOBAL_STACK_SIZE=32000 and unset VAR_ARRAYS in config.h
+- better use helixaac			
+- set IDF_PATH=/home/esp-idf
+- set ESPPORT=COM9
+- update flash partition size
+- other compiler #define
+	- use no resampling or set RESAMPLE (soxr) or set RESAMPLE16 for fast fixed 16 bits resampling
+	- use LOOPBACK (mandatory)
+	- use BYTES_PER_FRAME=4 (8 is not fully functionnal)
+	- LINKALL (mandatory)
+	- NO_FAAD unless you want to us faad, which currently overloads the CPU
+	- TREMOR_ONLY (mandatory)
+- When initially cloning the repo, make sure you do it recursively. For example: 
+	- git clone --recursive https://github.com/sle118/squeezelite-esp32.git
+- 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
+
+
 
-# Footnotes
-(1) SPDIF is made by tricking the I2S bus but this consumes a fair bit of CPU as it multiplies by four the throughput on the i2s bus. To optimize some computation, the parity of the spdif frames must always be 0, so at least one bit has to be available to force it. As SPDIF samples are 20+4 bits length maximum, the LSB is used for that purpose, so the bit 24 is randomly toggling. It does not matter for 16 bits samples but it has been chosen to truncate the last 4 bits for 24 bits samples. I'm sure that some smart dude can further optimize spdif_convert() and use the user bit instead. You're welcome to do a PR but, as said above, I (philippe44) am not interested by 24 bits mental illness :-) and I've already made an effort to provide 20 bits which already way more what's needed :-)

TODO

@@ -1,5 +1,4 @@
 - 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
-- libflac in lpc.c can be unrolled - that gains 43k of code, at the expense of 4% CPU
+AirPlay

alltags.txt

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

build-scripts/SqueezeAmp-sdkconfig.defaults

@@ -1,832 +0,0 @@
-#
-# 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
-
-# SqueezeAMP defaults
-CONFIG_SQUEEZEAMP=y
-CONFIG_JACK_LOCKED=y
-CONFIG_BAT_LOCKED=y
-CONFIG_I2C_LOCKED=y
-CONFIG_LED_LOCKED=y
-CONFIG_DISPLAY_CONFIG=""
-CONFIG_I2C_CONFIG=""
-CONFIG_SPI_CONFIG=""
-CONFIG_SET_GPIO=""
-CONFIG_ROTARY_ENCODER=""
-CONFIG_LED_GREEN_GPIO=12
-CONFIG_LED_GREEN_GPIO_LEVEL=0
-CONFIG_LED_RED_GPIO=13
-CONFIG_LED_RED_GPIO_LEVEL=0
-CONFIG_JACK_GPIO=34
-CONFIG_JACK_GPIO_LEVEL=0
-CONFIG_SPKFAULT_GPIO=2
-CONFIG_SPKFAULT_GPIO_LEVEL=0
-CONFIG_BAT_CHANNEL=7
-CONFIG_BAT_SCALE="20.24"
-CONFIG_I2S_NUM=0
-CONFIG_SPDIF_NUM=0
-CONFIG_SPDIF_CONFIG="bck=33,ws=25,do=15"
-CONFIG_DAC_CONFIG="model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14:0"
-CONFIG_MUTE_GPIO_LEVEL=-1
-CONFIG_PROJECT_NAME="SqueezeAmp"
-CONFIG_FW_PLATFORM_NAME="SqueezeAmp"
-CONFIG_RELEASE_API="https://api.github.com/repos/sle118/squeezelite-esp32/releases"
-CONFIG_SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
-#
-# 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_BASIC_I2C_BT is not set
-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_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 -W"
-# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
-CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
-# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
-# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
-CONFIG_COMPILER_CXX_EXCEPTIONS=y
-CONFIG_COMPILER_CXX_EXCEPTIONS_EMG_POOL_SIZE=0
-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 is not set
-CONFIG_BT_STACK_NO_LOG=n
-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=y
-CONFIG_SPI_MASTER_ISR_IN_IRAM=y
-CONFIG_SPI_SLAVE_IN_IRAM=y
-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 is not set
-# 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_SW_COEXIST_PREFERENCE_BALANCE=y
-CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_VALUE=2
-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_AMPDU_TX_ENABLED is not set
-# CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED is not set
-
-
-
-
-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 is not set
-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=y
-# CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE is not set
-CONFIG_ESP32_ENABLE_COREDUMP=y
-CONFIG_ESP32_CORE_DUMP_MAX_TASKS_NUM=64
-CONFIG_ESP32_CORE_DUMP_UART_DELAY=0
-# 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_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="SqueezeAMP"
-# 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_IP_REASSEMBLY is not set
-CONFIG_LWIP_IP6_REASSEMBLY=y
-CONFIG_LWIP_IP4_REASSEMBLY=y
-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_SSL_MAX_CONTENT_LEN=16384
-# CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
-# 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=y
-CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
-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 is not set
-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_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=y
-# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
-# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
-CONFIG_CXX_EXCEPTIONS=y
-CONFIG_CXX_EXCEPTIONS_EMG_POOL_SIZE=0
-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_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_SW_COEXIST_PREFERENCE_BALANCE=y
-CONFIG_SW_COEXIST_PREFERENCE_VALUE=2
-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

build_flash_cmd.sh

@@ -1,113 +0,0 @@
-#!/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
-

components/audio/CMakeLists.txt

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

components/audio/link_helper.c

@@ -1,3 +0,0 @@
-void dummy_obj() {
-	return;
-}

components/cmd_i2c/CMakeLists.txt

@@ -0,0 +1,5 @@
+set(COMPONENT_SRCS "cmd_i2ctools.c")
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+set(COMPONENT_REQUIRES console spi_flash)
+
+register_component()

components/cmd_i2c/component.mk

@@ -0,0 +1,4 @@
+#
+# Main Makefile. This is basically the same as a component makefile.
+#
+COMPONENT_ADD_INCLUDEDIRS := .

components/cmd_nvs/CMakeLists.txt

@@ -0,0 +1,7 @@
+set(COMPONENT_ADD_INCLUDEDIRS .)
+
+set(COMPONENT_SRCS "cmd_nvs.c")
+
+set(COMPONENT_REQUIRES console nvs_flash)
+
+register_component()

components/cmd_nvs/cmd_nvs.c

@@ -25,8 +25,7 @@ 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";
@@ -71,7 +70,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) {
-    	log_send_messaging(MESSAGING_ERROR, "Blob data must contain even number of characters");
+        ESP_LOGE(TAG, "Blob data must contain even number of characters");
         return ESP_ERR_NVS_TYPE_MISMATCH;
     }
 
@@ -89,7 +88,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 {
-        	log_send_messaging(MESSAGING_ERROR, "Blob data contain invalid character");
+            ESP_LOGE(TAG, "Blob data contain invalid character");
             free(blob);
             return ESP_ERR_NVS_TYPE_MISMATCH;
         }
@@ -188,10 +187,10 @@ static esp_err_t set_value_in_nvs(const char *key, const char *str_type, const c
     }
 
     if (err == ESP_OK) {
-    	log_send_messaging(MESSAGING_INFO, "Set value ok. Committing '%s'", key);
+    	ESP_LOGI(TAG, "Set value ok. Committing '%s'", key);
         err = nvs_commit(nvs);
         if (err == ESP_OK) {
-        	log_send_messaging(MESSAGING_INFO, "Value stored under key '%s'", key);
+            ESP_LOGI(TAG, "Value stored under key '%s'", key);
         }
     }
 
@@ -219,51 +218,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) {
-        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %d \n", key, value);
+            printf("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) {
-        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %u \n", key, value);
+            printf("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) {
-        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %d \n", key, value);
+            printf("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) {
-        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %u", key, value);
+            printf("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) {
-        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %d \n", key, value);
+            printf("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) {
-        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %u \n", key, value);
+            printf("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) {
-        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %lld \n", key, value);
+            printf("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) {
-        	log_send_messaging(MESSAGING_INFO,"Value associated with key '%s' is %llu \n", key, value);
+            printf("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) {
-            	log_send_messaging(MESSAGING_INFO,"String associated with key '%s' is %s \n", key, str);
+                printf("String associated with key '%s' is %s \n", key, str);
             }
             free(str);
         }
@@ -272,7 +271,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) {
-            	log_send_messaging(MESSAGING_INFO,"Blob associated with key '%s' is %d bytes long: \n", key, len);
+                printf("Blob associated with key '%s' is %d bytes long: \n", key, len);
                 print_blob(blob, len);
             }
             free(blob);
@@ -293,7 +292,7 @@ static esp_err_t erase(const char *key)
         if (err == ESP_OK) {
             err = nvs_commit(nvs);
             if (err == ESP_OK) {
-            	log_send_messaging(MESSAGING_INFO, "Value with key '%s' erased", key);
+                ESP_LOGI(TAG, "Value with key '%s' erased", key);
             }
         }
         nvs_close(nvs);
@@ -314,7 +313,7 @@ static esp_err_t erase_all(const char *name)
         }
     }
 
-    log_send_messaging(MESSAGING_INFO, "Namespace '%s' was %s erased", name, (err == ESP_OK) ? "" : "not");
+    ESP_LOGI(TAG, "Namespace '%s' was %s erased", name, (err == ESP_OK) ? "" : "not");
     nvs_close(nvs);
     return ESP_OK;
 }
@@ -322,19 +321,22 @@ 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_msg(argc, argv,(struct arg_hdr **)&set_args);
+    int nerrors = arg_parse(argc, argv, (void **) &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];
-    cmd_send_messaging(argv[0],MESSAGING_INFO, "Setting '%s' (type %s)", key,type);
+    ESP_LOGI(TAG, "Setting '%s' (type %s)", key,type);
     esp_err_t err = set_value_in_nvs(key, type, values);
 
     if (err != ESP_OK) {
-    	cmd_send_messaging(argv[0],MESSAGING_ERROR, "%s", esp_err_to_name(err));
+        ESP_LOGE(TAG, "%s", esp_err_to_name(err));
         return 1;
     }
 
@@ -344,8 +346,9 @@ static int set_value(int argc, char **argv)
 
 static int get_value(int argc, char **argv)
 {
-	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&get_args);
+    int nerrors = arg_parse(argc, argv, (void **) &get_args);
     if (nerrors != 0) {
+        arg_print_errors(stderr, get_args.end, argv[0]);
         return 1;
     }
 
@@ -355,7 +358,7 @@ static int get_value(int argc, char **argv)
     esp_err_t err = get_value_from_nvs(key, type);
 
     if (err != ESP_OK) {
-    	cmd_send_messaging(argv[0],MESSAGING_ERROR, "%s", esp_err_to_name(err));
+        ESP_LOGE(TAG, "%s", esp_err_to_name(err));
         return 1;
     }
 
@@ -364,8 +367,9 @@ static int get_value(int argc, char **argv)
 
 static int erase_value(int argc, char **argv)
 {
-	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&erase_args);
+    int nerrors = arg_parse(argc, argv, (void **) &erase_args);
     if (nerrors != 0) {
+        arg_print_errors(stderr, erase_args.end, argv[0]);
         return 1;
     }
 
@@ -374,7 +378,7 @@ static int erase_value(int argc, char **argv)
     esp_err_t err = erase(key);
 
     if (err != ESP_OK) {
-    	cmd_send_messaging(argv[0],MESSAGING_ERROR, "%s", esp_err_to_name(err));
+        ESP_LOGE(TAG, "%s", esp_err_to_name(err));
         return 1;
     }
 
@@ -383,8 +387,9 @@ static int erase_value(int argc, char **argv)
 
 static int erase_namespace(int argc, char **argv)
 {
-	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&erase_all_args);
+    int nerrors = arg_parse(argc, argv, (void **) &erase_all_args);
     if (nerrors != 0) {
+        arg_print_errors(stderr, erase_all_args.end, argv[0]);
         return 1;
     }
 
@@ -392,7 +397,7 @@ static int erase_namespace(int argc, char **argv)
 
     esp_err_t err = erase_all(name);
     if (err != ESP_OK) {
-    	cmd_send_messaging(argv[0],MESSAGING_ERROR, "%s", esp_err_to_name(err));
+        ESP_LOGE(TAG, "%s", esp_err_to_name(err));
         return 1;
     }
 
@@ -411,11 +416,11 @@ static int erase_wifi_manager(int argc, char **argv)
 	}
 	nvs_close(nvs);
 	if (err != ESP_OK) {
-		cmd_send_messaging(argv[0],MESSAGING_ERROR,  "wifi manager configuration was not erase. %s", esp_err_to_name(err));
+		ESP_LOGE(TAG, "wifi manager configuration was not erase. %s", esp_err_to_name(err));
 		return 1;
 	}
 	else {
-		cmd_send_messaging(argv[0],MESSAGING_WARNING,  "Wifi manager configuration was erased");
+		ESP_LOGW(TAG, "Wifi manager configuration was erased");
 	}
 	return 0;
 }
@@ -427,7 +432,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) {
-    	log_send_messaging(MESSAGING_ERROR, "No such enty was found");
+        ESP_LOGE(TAG, "No such enty was found");
         return 1;
     }
 
@@ -436,7 +441,7 @@ static int list(const char *part, const char *name, const char *str_type)
         nvs_entry_info(it, &info);
         it = nvs_entry_next(it);
 
-        log_send_messaging(MESSAGING_INFO, "namespace '%s', key '%s', type '%s' \n",
+        printf("namespace '%s', key '%s', type '%s' \n",
                info.namespace_name, info.key, type_to_str(info.type));
     } while (it != NULL);
 
@@ -448,8 +453,9 @@ static int list_entries(int argc, char **argv)
     list_args.namespace->sval[0] = "";
     list_args.type->sval[0] = "";
 
-    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&list_args);
+    int nerrors = arg_parse(argc, argv, (void **) &list_args);
     if (nerrors != 0) {
+        arg_print_errors(stderr, list_args.end, argv[0]);
         return 1;
     }
 

components/cmd_nvs/component.mk

@@ -8,5 +8,6 @@
 #
 
 COMPONENT_ADD_INCLUDEDIRS := .
+CFLAGS += 	-I$(COMPONENT_PATH)/../squeezelite-ota
 COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/components/tools/
 COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/main

components/cmd_system/CMakeLists.txt

@@ -0,0 +1,7 @@
+set(COMPONENT_ADD_INCLUDEDIRS .)
+
+set(COMPONENT_SRCS "cmd_system.c")
+
+set(COMPONENT_REQUIRES console spi_flash)
+
+register_component()

components/cmd_system/cmd_system.c

@@ -0,0 +1,489 @@
+/* Console example — various system commands
+
+   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.
+*/
+#define LOG_LOCAL_LEVEL ESP_LOG_INFO
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include "esp_log.h"
+#include "esp_console.h"
+#include "esp_system.h"
+#include "esp_spi_flash.h"
+#include "driver/rtc_io.h"
+#include "driver/uart.h"
+#include "argtable3/argtable3.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "soc/rtc_cntl_reg.h"
+#include "esp32/rom/uart.h"
+#include "cmd_system.h"
+#include "sdkconfig.h"
+#include "esp_partition.h"
+#include "esp_ota_ops.h"
+#include "platform_esp32.h"
+#include "config.h"
+#include "esp_sleep.h"
+#include "driver/uart.h"            // for the uart driver access
+
+#ifdef CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS
+#define WITH_TASKS_INFO 1
+#endif
+
+
+static const char * TAG = "cmd_system";
+
+static void register_free();
+static void register_heap();
+static void register_version();
+static void register_restart();
+static void register_deep_sleep();
+static void register_light_sleep();
+static void register_factory_boot();
+static void register_restart_ota();
+#if WITH_TASKS_INFO
+static void register_tasks();
+#endif
+
+void register_system()
+{
+    register_free();
+    register_heap();
+    register_version();
+    register_restart();
+    register_deep_sleep();
+    register_light_sleep();
+    register_factory_boot();
+    register_restart_ota();
+#if WITH_TASKS_INFO
+    register_tasks();
+#endif
+}
+
+/* 'version' command */
+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());
+    printf("Chip info:\r\n");
+    printf("\tmodel:%s\r\n", info.model == CHIP_ESP32 ? "ESP32" : "Unknow");
+    printf("\tcores:%d\r\n", info.cores);
+    printf("\tfeature:%s%s%s%s%d%s\r\n",
+           info.features & CHIP_FEATURE_WIFI_BGN ? "/802.11bgn" : "",
+           info.features & CHIP_FEATURE_BLE ? "/BLE" : "",
+           info.features & CHIP_FEATURE_BT ? "/BT" : "",
+           info.features & CHIP_FEATURE_EMB_FLASH ? "/Embedded-Flash:" : "/External-Flash:",
+           spi_flash_get_chip_size() / (1024 * 1024), " MB");
+    printf("\trevision number:%d\r\n", info.revision);
+    return 0;
+}
+
+static void register_version()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "version",
+        .help = "Get version of chip and SDK",
+        .hint = NULL,
+        .func = &get_version,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/** 'restart' command restarts the program */
+
+
+esp_err_t guided_boot(esp_partition_subtype_t partition_subtype)
+{
+#if RECOVERY_APPLICATION
+	if(partition_subtype ==ESP_PARTITION_SUBTYPE_APP_FACTORY){
+		ESP_LOGW(TAG,"RECOVERY application is already active");
+		if(!wait_for_commit()){
+			ESP_LOGW(TAG,"Unable to commit configuration. ");
+		}
+		ESP_LOGW(TAG, "Restarting after tx complete");
+		uart_wait_tx_done(UART_NUM_1, 500 / portTICK_RATE_MS);
+		esp_restart();
+		return ESP_OK;
+	}
+#else
+	if(partition_subtype !=ESP_PARTITION_SUBTYPE_APP_FACTORY){
+		ESP_LOGW(TAG,"SQUEEZELITE application is already active");
+		if(!wait_for_commit()){
+			ESP_LOGW(TAG,"Unable to commit configuration. ");
+		}
+		ESP_LOGW(TAG, "Restarting after tx complete");
+		uart_wait_tx_done(UART_NUM_1, 500 / portTICK_RATE_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);
+    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!");
+		set_status_message(ERROR, "Reboot failed. Cannot iterate through partitions");
+	}
+	else
+	{
+		ESP_LOGD(TAG, "Found partition. Getting info.");
+		partition = (esp_partition_t *) esp_partition_get(it);
+		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);
+			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.");
+			}
+			else{
+				ESP_LOGW(TAG, "Application partition %s sub type %u is selected for boot", partition->label,partition_subtype);
+				bFound=true;
+				set_status_message(WARNING, "Rebooting!");
+			}
+		}
+		else
+		{
+			ESP_LOGE(TAG,"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");
+			if(!wait_for_commit()){
+				ESP_LOGW(TAG,"Unable to commit configuration. ");
+			}
+			ESP_LOGW(TAG, "Restarting after tx complete");
+			uart_wait_tx_done(UART_NUM_1, 500 / portTICK_RATE_MS);
+			esp_restart();
+		}
+	}
+
+	return ESP_OK;
+}
+
+static int restart(int argc, char **argv)
+{
+	ESP_LOGW(TAG, "\n\nPerforming a simple restart to the currently active partition.");
+	if(!wait_for_commit()){
+		ESP_LOGW(TAG,"Unable to commit configuration. ");
+	}
+	ESP_LOGW(TAG, "Restarting after tx complete");
+    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.");
+	if(!wait_for_commit()){
+		ESP_LOGW(TAG,"Unable to commit configuration. ");
+	}
+
+	ESP_LOGW(TAG, "Restarting after tx complete");
+	uart_wait_tx_done(UART_NUM_1, 500 / portTICK_RATE_MS);
+    esp_restart();
+}
+
+esp_err_t guided_restart_ota(){
+	ESP_LOGW(TAG,"\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");
+	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");
+	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");
+	guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0);
+	return 0; // return fail.  This should never return... we're rebooting!
+}
+static void register_restart()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "restart",
+        .help = "Software reset of the chip",
+        .hint = NULL,
+        .func = &restart,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+static void register_restart_ota()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "restart_ota",
+        .help = "Selects the ota app partition to boot from and performa a software reset of the chip",
+        .hint = NULL,
+        .func = &restart_ota,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+static void register_factory_boot()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "recovery",
+        .help = "Resets and boot to recovery (if available)",
+        .hint = NULL,
+        .func = &restart_factory,
+    };
+    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());
+    return 0;
+}
+
+static void register_free()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "free",
+        .help = "Get the current size of free heap memory",
+        .hint = NULL,
+        .func = &free_mem,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/* 'heap' command prints minumum heap size */
+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);
+    return 0;
+}
+
+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",
+        .hint = NULL,
+        .func = &heap_size,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&heap_cmd) );
+
+}
+
+/** 'tasks' command prints the list of tasks and related information */
+#if WITH_TASKS_INFO
+
+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");
+        return 1;
+    }
+    fputs("Task Name\tStatus\tPrio\tHWM\tTask#", stdout);
+#ifdef CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID
+    fputs("\tAffinity", stdout);
+#endif
+    fputs("\n", stdout);
+    vTaskList(task_list_buffer);
+    fputs(task_list_buffer, stdout);
+    free(task_list_buffer);
+    return 0;
+}
+
+static void register_tasks()
+{
+    const esp_console_cmd_t cmd = {
+        .command = "tasks",
+        .help = "Get information about running tasks",
+        .hint = NULL,
+        .func = &tasks_info,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+#endif // WITH_TASKS_INFO
+
+/** 'deep_sleep' command puts the chip into deep sleep mode */
+
+static struct {
+    struct arg_int *wakeup_time;
+    struct arg_int *wakeup_gpio_num;
+    struct arg_int *wakeup_gpio_level;
+    struct arg_end *end;
+} deep_sleep_args;
+
+
+static int deep_sleep(int argc, char **argv)
+{
+    int nerrors = arg_parse(argc, argv, (void **) &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);
+        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);
+            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);
+                return 1;
+            }
+        }
+        ESP_LOGI(TAG, "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();
+}
+
+static void register_deep_sleep()
+{
+    deep_sleep_args.wakeup_time =
+        arg_int0("t", "time", "<t>", "Wake up time, ms");
+    deep_sleep_args.wakeup_gpio_num =
+        arg_int0(NULL, "io", "<n>",
+                 "If specified, wakeup using GPIO with given number");
+    deep_sleep_args.wakeup_gpio_level =
+        arg_int0(NULL, "io_level", "<0|1>", "GPIO level to trigger wakeup");
+    deep_sleep_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 = &deep_sleep,
+        .argtable = &deep_sleep_args
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
+/** 'light_sleep' command puts the chip into light sleep mode */
+
+static struct {
+    struct arg_int *wakeup_time;
+    struct arg_int *wakeup_gpio_num;
+    struct arg_int *wakeup_gpio_level;
+    struct arg_end *end;
+} light_sleep_args;
+
+static int light_sleep(int argc, char **argv)
+{
+    int nerrors = arg_parse(argc, argv, (void **) &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);
+        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");
+        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);
+            return 1;
+        }
+        ESP_LOGI(TAG, "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) );
+    }
+    if (io_count > 0) {
+        ESP_ERROR_CHECK( esp_sleep_enable_gpio_wakeup() );
+    }
+    if (CONFIG_CONSOLE_UART_NUM <= UART_NUM_1) {
+        ESP_LOGI(TAG, "Enabling UART wakeup (press ENTER to exit light sleep)");
+        ESP_ERROR_CHECK( uart_set_wakeup_threshold(CONFIG_CONSOLE_UART_NUM, 3) );
+        ESP_ERROR_CHECK( esp_sleep_enable_uart_wakeup(CONFIG_CONSOLE_UART_NUM) );
+    }
+    fflush(stdout);
+    uart_tx_wait_idle(CONFIG_CONSOLE_UART_NUM);
+    esp_light_sleep_start();
+    esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
+    const char *cause_str;
+    switch (cause) {
+    case ESP_SLEEP_WAKEUP_GPIO:
+        cause_str = "GPIO";
+        break;
+    case ESP_SLEEP_WAKEUP_UART:
+        cause_str = "UART";
+        break;
+    case ESP_SLEEP_WAKEUP_TIMER:
+        cause_str = "timer";
+        break;
+    default:
+        cause_str = "unknown";
+        printf("%d\n", cause);
+    }
+    ESP_LOGI(TAG, "Woke up from: %s", cause_str);
+    return 0;
+}
+
+static void register_light_sleep()
+{
+    light_sleep_args.wakeup_time =
+        arg_int0("t", "time", "<t>", "Wake up time, ms");
+    light_sleep_args.wakeup_gpio_num =
+        arg_intn(NULL, "io", "<n>", 0, 8,
+                 "If specified, wakeup using GPIO with given number");
+    light_sleep_args.wakeup_gpio_level =
+        arg_intn(NULL, "io_level", "<0|1>", 0, 8, "GPIO level to trigger wakeup");
+    light_sleep_args.end = arg_end(3);
+
+    const esp_console_cmd_t cmd = {
+        .command = "light_sleep",
+        .help = "Enter light sleep mode. "
+        "Two wakeup modes are supported: timer and GPIO. "
+        "Multiple GPIO pins can be specified using pairs of "
+        "'io' and 'io_level' arguments. "
+        "Will also wake up on UART input.",
+        .hint = NULL,
+        .func = &light_sleep,
+        .argtable = &light_sleep_args
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+

components/cmd_system/component.mk

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

components/codecs/CMakeLists.txt

@@ -1,28 +0,0 @@
-idf_component_register(
-	   INCLUDE_DIRS . ./inc inc/alac inc/FLAC inc/helix-aac inc/mad inc/ogg inc/opus inc/opusfile inc/resample16 inc/soxr inc/vorbis
-)
-
-if (DEFINED AAC_DISABLE_SBR)
-add_prebuilt_library(libhelix-aac 	lib/libhelix-aac.a ) 
-else ()
-add_prebuilt_library(libhelix-aac 	lib/libhelix-aac-sbr.a ) 
-endif()
-
-add_prebuilt_library(libmad 		lib/libmad.a)
-add_prebuilt_library(libFLAC 		lib/libFLAC.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(libresample16 	lib/libresample16.a ) 
-add_prebuilt_library(libopusfile 	lib/libopusfile.a ) 
-add_prebuilt_library(libopus 		lib/libopus.a ) 
-
-target_link_libraries(${COMPONENT_LIB} INTERFACE libmad)
-target_link_libraries(${COMPONENT_LIB} INTERFACE libFLAC)
-target_link_libraries(${COMPONENT_LIB} INTERFACE libhelix-aac)
-target_link_libraries(${COMPONENT_LIB} INTERFACE libvorbisidec)
-target_link_libraries(${COMPONENT_LIB} INTERFACE libogg)
-target_link_libraries(${COMPONENT_LIB} INTERFACE libalac)
-target_link_libraries(${COMPONENT_LIB} INTERFACE libresample16)
-target_link_libraries(${COMPONENT_LIB} INTERFACE libopusfile)
-target_link_libraries(${COMPONENT_LIB} INTERFACE libopus)

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"

components/codecs/inc/alac/alac_wrapper.h

@@ -19,7 +19,7 @@ extern "C" {
 
 struct alac_codec_s *alac_create_decoder(int magic_cookie_size, unsigned char *magic_cookie,
 								unsigned char *sample_size, unsigned *sample_rate,
-								unsigned char *channels, unsigned int *block_size);
+								unsigned char *channels);
 void alac_delete_decoder(struct alac_codec_s *codec);
 bool alac_to_pcm(struct alac_codec_s *codec, unsigned char* input,
 				 unsigned char *output, char channels, unsigned *out_frames);

components/config/config.c

@@ -2,27 +2,16 @@
  *  Squeezelite for esp32
  *
  *  (c) Sebastien 2019
- *      Philippe G. 2019, philippe_44@outlook.com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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/>.
- *
+ *  (c) Philippe G. 2019, philippe_44@outlook.com
+ * 
+ *  This software is released under the MIT License.
+ *  https://opensource.org/licenses/MIT
+ * 
  */
 //#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
-#include "platform_config.h"
+#include "config.h"
 #include "nvs_utilities.h"
-#include "platform_esp32.h"
-#include "trace.h"
+
 #include <stdio.h>
 #include <string.h>
 #include "esp_system.h"
@@ -32,7 +21,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"
@@ -58,7 +47,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,const void * value);
+cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key, 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){\
@@ -70,18 +59,38 @@ 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 = is_recovery_running?malloc(sz):heap_caps_malloc(sz, MALLOC_CAP_SPIRAM);
+	void * ptr = 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");
@@ -126,7 +135,7 @@ nvs_type_t  config_get_item_type(cJSON * entry){
 }
 
 
-cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key,  const void * value){
+cJSON * config_set_value_safe(nvs_type_t nvs_type, const char *key, void * value){
 	cJSON * entry = cJSON_CreateObject();
 
 	double numvalue = 0;
@@ -346,24 +355,21 @@ 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",
-						str_or_null(entry_value->string),
-						str_or_null(entry_value->valuestring),
-						entry_value->type,
-						str_or_null(entry_str));
+					entry_value->string,
+					entry_value->valuestring,
+					entry_value->type,
+					entry_str);
 				free(entry_str);
 			}
 			else {
 				ESP_LOGE(TAG, "requested value type string, config type is different. key: %s, value: %s, type %d",
-						str_or_null(entry_value->string),
-						str_or_null(entry_value->valuestring),
-						entry_value->type);
+					entry_value->string,
+					entry_value->valuestring,
+					entry_value->type);
 			}
 		}
 		else {
-			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);
+			value=(void *)strdup(cJSON_GetStringValue(entry_value));
 			if(value==NULL){
 				char * entry_str = cJSON_PrintUnformatted(entry);
 				if(entry_str!=NULL){
@@ -383,6 +389,7 @@ 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 ;
@@ -405,14 +412,8 @@ 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){
-				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);
+				esp_err_t err = store_nvs_value(type,entry->string,value);
 				free(value);
-
 				if(err!=ESP_OK){
 					char * entry_str = cJSON_PrintUnformatted(entry);
 					if(entry_str!=NULL){
@@ -448,7 +449,6 @@ 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 ;
+		return false;
 	}
 	esp_err_t err = nvs_open_from_partition(settings_partition, current_namespace, NVS_READWRITE, &nvs);
 	if (err == ESP_OK) {
@@ -684,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, const void * value){
+esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, 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);

components/config/config.h

@@ -2,8 +2,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "nvs.h"
-#include "assert.h"
-#include "cJSON.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,9 +11,7 @@ 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);
@@ -35,13 +31,11 @@ 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) ;
+void * config_alloc_get_str(const char *key, char *lead, char *fallback);
 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, 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);
+esp_err_t config_set_value(nvs_type_t nvs_type, const char *key, void * value);
 

components/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 "platform_config.h"
+#include "config.h"
 
 const char current_namespace[] = "config";
 const char settings_partition[] = "settings";

components/display/CMakeLists.txt

@@ -1,10 +1,6 @@
-idf_component_register(SRC_DIRS . core core/ifaces  fonts
-						INCLUDE_DIRS . fonts core
-						REQUIRES platform_config tools esp_common
-						PRIV_REQUIRES services freertos driver           
+idf_component_register(SRCS "led.c" "audio_controls.c" "buttons.c" "services.c" "monitor.c"INCLUDE_DIRS 
+						INCLUDE_DIRS . ../tools/
+                   
 )
 
-set_source_files_properties(display.c
-    PROPERTIES COMPILE_FLAGS
-   -Wno-format-overflow
-)
+

components/display/ILI9341.c

@@ -1,341 +0,0 @@
-/**
- * Copyright (c) 2017-2018 Tara Keeling
- *				 2020 Philippe G.
- *				 2021 Mumpf and Harry1999
- * 
- * 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 MADCTL_MX  0x40
-#define TFT_RGB_BGR  0x08
-
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-
-static char TAG[] = "ILI9341";
-
-enum { ILI9341, ILI9341_24 };	//ILI9341_24 for future use...
-
-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) * (r - FirstRow + 1) * 4 < 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;
-	ESP_LOGI(TAG, "SetLayout 197 HFlip=%d VFlip=%d Rotate=%d (1=true)", HFlip, VFlip, Rotate);
-	//        D/CX RDX WRX D17-8 D7 D6 D5 D4 D3  D2 D1 D0 HEX
-	//Command   0   1   ↑    XX  0  0  1  1  0   1  1  0  36h
-	//Parameter 1   1   ↑    XX  MY MX MV ML BGR MH 0  0  00
-	//Orientation 0: MADCtl = 0x80  =   1000 0000 (MY=1)
-	if ((Device->Height)>(Device->Width)){		//Resolution = 320x240
-		Private->MADCtl = (1 << 7);				// 0x80 = default (no Rotation an no Flip)
-		if (HFlip) {							//Flip Horizontal
-			int a = Private->MADCtl;
-			Private->MADCtl = (a ^ (1 << 7));
-		}
-		if (Rotate) {							//Rotate 180 degr.
-			int a = Private->MADCtl;
-			a = (a ^ (1 << 7));
-			Private->MADCtl = (a ^ (1 << 6));
-		}
-		if (VFlip) {							//Flip Vertical
-			int a = Private->MADCtl;
-			Private->MADCtl = (a ^ (1 << 6));
-		}
-	} else {									//Resolution = 240x320
-		Private->MADCtl = (1 << 5);				// 0x20 = default (no Rotation an no Flip)
-		if (HFlip) {							//Flip Horizontal
-			int a = Private->MADCtl;
-			Private->MADCtl = (a ^ (1 << 6));
-		}
-		if (Rotate) {							//Rotate 180 degr.
-			int a = Private->MADCtl;
-			a = (a ^ (1 << 7));
-			Private->MADCtl = (a ^ (1 << 6));
-		}
-		if (VFlip) {							//Flip Vertical
-			int a = Private->MADCtl;
-			Private->MADCtl = (a ^ (1 << 7));
-		}
-	}
-
-	ESP_LOGI(TAG, "SetLayout 255 Private->MADCtl=%hhu", Private->MADCtl);
-
-	Device->WriteCommand( Device, 0x36 );
-	WriteByte( Device, Private->MADCtl );
-
-#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 ); }	//DISPON =0x29
-static void DisplayOff( struct GDS_Device* Device ) { Device->WriteCommand( Device, 0x28 ); }	//DISPOFF=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;	// 0x00 value means the lowest brightness and 0xFF value means the highest brightness.
-}
-
-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, "ILI9341 with bit default-depth %u, page %u, iRAM %p", Device->Depth, Private->PageSize, Private->iRAM);
-	
-	// Sleepout + Booster
-	Device->WriteCommand( Device, 0x11 );
-			
-	// set flip modes & contrast
-	GDS_SetContrast( Device, 0x7f );
-	Device->SetLayout( Device, false, false, false );
-	
-	// set screen depth (16/18) *** INTERFACE PIXEL FORMAT: 0x66=18 bit; 0x55=16 bit
-	Device->WriteCommand( Device, 0x3A );
-	if (Private->Model == ILI9341_24) WriteByte( Device, Device->Depth == 24 ? 0x66 : 0x55 );
-	else WriteByte( Device, Device->Depth == 24 ? 0x66 : 0x55 );
-
-	ESP_LOGI(TAG, "ILI9341_Init 312 device-depth %u, 0x66/0x55=0x%X", Device->Depth, Device->Depth == 24 ? 0x66 : 0x55);
-
-	// no Display Inversion (INVOFF=0x20 INVON=0x21)
-	Device->WriteCommand( Device, 0x20 );
-
-	//Gamma Correction: Enable next two line and enabel one of the Test0x Section... or build you own 15 Parameter...
-	Device->WriteCommand( Device, 0xF2 ); WriteByte( Device, 0x03 );	// 3Gamma Function: Disable = default (0x02), Enable (0x03)
-	Device->WriteCommand( Device, 0x26 ); WriteByte( Device, 0x01 );	// Gamma curve selected (0x01, 0x02, 0x04, 0x08) - A maximum of 4 fixed gamma curves can be selected
-	//Gamma Correction Test01
-	Device->WriteCommand( Device, 0xE0 );								// Positive Gamma Correction (15 Parameter)
-	WriteByte( Device, 0x0F ); WriteByte( Device, 0x31 ); WriteByte( Device, 0x2B ); WriteByte( Device, 0x0C ); WriteByte( Device, 0x0E );
-	WriteByte( Device, 0x08 ); WriteByte( Device, 0x4E ); WriteByte( Device, 0xF1 ); WriteByte( Device, 0x37 ); WriteByte( Device, 0x07 );
-	WriteByte( Device, 0x10 ); WriteByte( Device, 0x03 ); WriteByte( Device, 0x0E ); WriteByte( Device, 0x09 ); WriteByte( Device, 0x00 );
-	Device->WriteCommand( Device, 0xE1 ); 								// Negative Gamma Correction (15 Parameter)
-	WriteByte( Device, 0x00 ); WriteByte( Device, 0x0E ); WriteByte( Device, 0x14 ); WriteByte( Device, 0x03 ); WriteByte( Device, 0x11 );
-	WriteByte( Device, 0x07 ); WriteByte( Device, 0x31 ); WriteByte( Device, 0xC1 ); WriteByte( Device, 0x48 ); WriteByte( Device, 0x08 );
-	WriteByte( Device, 0x0F ); WriteByte( Device, 0x0C ); WriteByte( Device, 0x31 ); WriteByte( Device, 0x36 ); WriteByte( Device, 0x0F );
-	 
-	// gone with the wind
-	Device->DisplayOn( Device );
-	Device->Update( Device );
-
-	return true;
-}	
-
-static const struct GDS_Device ILI9341_X = {
-	.DisplayOn = DisplayOn, .DisplayOff = DisplayOff,
-	.SetLayout = SetLayout,
-	.Update = Update16, .Init = Init,
-	.Mode = GDS_RGB565, .Depth = 16,
-};		
-
-struct GDS_Device* ILI9341_Detect(char *Driver, struct GDS_Device* Device) {
-	uint8_t Model;
-	int Depth=16;		// 16bit colordepth
-	
-	if (strcasestr(Driver, "ILI9341")) Model = ILI9341;
-	else if (strcasestr(Driver, "ILI9341_24")) Model = ILI9341_24;	//for future use...
-	else return NULL;
-		
-	if (!Device) Device = calloc(1, sizeof(struct GDS_Device));
-		
-	*Device = ILI9341_X;	
-	sscanf(Driver, "%*[^:]:%u", &Depth);		// NVS-Parameter driver=ILI9341[:16|18]
-	struct PrivateSpace* Private = (struct PrivateSpace*) Device->Private;
-	Private->Model = Model;
-		ESP_LOGI(TAG, "ILI9341_Detect 391 Driver= %s   Depth=%d", Driver, Depth);
-
-	if (Depth == 18) {
-		Device->Mode = GDS_RGB888;
-		Device->Depth = 24;
-		Device->Update = Update24;
-	} 	
-	
-	if (Model == ILI9341_24) Device->SetContrast = SetContrast;
-
-	return Device;
-}

components/display/SSD1322.c

@@ -147,28 +147,23 @@ static bool Init( struct GDS_Device* Device ) {
 	Private->ReMap = 0;
 	Device->SetLayout( Device, false, false, false);
 	
-	// set Display Enhancement
-    Device->WriteCommand( Device, 0xB4 );
-	WriteDataByte( Device, 0xA0 );
-	WriteDataByte( Device, 0xB5 );
-	
 	// set Clocks
     Device->WriteCommand( Device, 0xB3 );
-	WriteDataByte( Device, 0xB2 ); // 0x91 seems to be common but is too slow for 5.5'
+	WriteDataByte( Device, 0x91 );
 	
 	// set MUX
 	Device->WriteCommand( Device, 0xCA );
 	WriteDataByte( Device, Device->Height - 1 );
 	
-	// phase 1 & 2 period
+	// phase 1 & 2 period (needed?)	
 	Device->WriteCommand( Device, 0xB1 );
-	WriteDataByte( Device, 0xE3 );	// 0xE2 was recommended
+	WriteDataByte( Device, 0xE2 );
 	
-	// set pre-charge V 
+	// set pre-charge V (needed?°)
 	Device->WriteCommand( Device, 0xBB );
-	WriteDataByte( Device, 0x0F); // 0x1F causes column interferences 
+	WriteDataByte( Device, 0x1F );
 	
-	// set COM deselect voltage
+	// set COM deselect voltage (needed?)
 	Device->WriteCommand( Device, 0xBE );
 	WriteDataByte( Device, 0x07 );
 	

components/display/ST77xx.c

@@ -90,7 +90,7 @@ static void Update16( struct GDS_Device* Device ) {
 			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;
+				if (optr - Private->iRAM < PAGE_BLOCK && i < LastRow) continue;
 				Device->WriteData(Device, Private->iRAM, optr - Private->iRAM);
 				optr = Private->iRAM;
 			}
@@ -157,7 +157,7 @@ static void Update24( struct GDS_Device* Device ) {
 			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;
+				if (optr - Private->iRAM < PAGE_BLOCK && i < LastRow) continue;
 				Device->WriteData(Device, Private->iRAM, optr - Private->iRAM);
 				optr = Private->iRAM;
 			}	

components/display/core/gds.c

@@ -238,9 +238,9 @@ void GDS_SetContrast( struct GDS_Device* Device, uint8_t Contrast ) {
 	
 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 ? Device->Width : 0; }
-int	GDS_GetHeight( struct GDS_Device* Device ) { return Device ? Device->Height : 0; }
-int	GDS_GetDepth( struct GDS_Device* Device ) { return Device ? Device->Depth : 0; }
-int	GDS_GetMode( struct GDS_Device* Device ) { return Device ? Device->Mode : 0; }
+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 ); }

components/display/core/gds_text.c

@@ -35,20 +35,12 @@ 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	
 	}
 }
 

components/display/core/ifaces/default_if_i2c.c

@@ -35,7 +35,7 @@ static bool I2CDefaultWriteData( struct GDS_Device* Device, const uint8_t* Data,
 bool GDS_I2CInit( int PortNumber, int SDA, int SCL, int Speed ) {
 	I2CPortNumber = PortNumber;
 	
-	I2CWait = pdMS_TO_TICKS( Speed ? (250 * 250000) / Speed : 250 );
+	I2CWait = pdMS_TO_TICKS( Speed ? Speed / 4000 : 100 );
 	
 	if (SDA != -1 && SCL != -1) {
 		i2c_config_t Config = { 0 };

components/display/display.c

@@ -12,7 +12,7 @@
 #include <arpa/inet.h>
 #include "esp_log.h"
 #include "globdefs.h"
-#include "platform_config.h"
+#include "config.h"
 #include "tools.h"
 #include "display.h"
 #include "gds.h"
@@ -45,23 +45,11 @@ static EXT_RAM_ATTR struct {
 	TickType_t tick;
 } displayer;
 
-static const char *known_drivers[] = {"SH1106",
-		"SSD1306",
-		"SSD1322",
-		"SSD1326",
-		"SSD1327",
-		"SSD1675",
-		"SSD1351",
-		"ST7735",
-		"ST7789",
-		"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, SSD1351_Detect, ST77xx_Detect, ILI9341_Detect;
-GDS_DetectFunc *drivers[] = { SH1106_Detect, SSD1306_Detect, SSD132x_Detect, SSD1675_Detect, SSD1322_Detect, SSD1351_Detect, ST77xx_Detect, ILI9341_Detect, NULL };
+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, SSD1351_Detect, ST77xx_Detect, NULL };
 
 /****************************************************************************************
  * 
@@ -84,8 +72,8 @@ void display_init(char *welcome) {
 		display = GDS_AutoDetect(drivername, drivers, &PWMConfig);
 	} else {
 		display = GDS_AutoDetect(drivername, drivers, NULL);
-	}
-
+	}	
+		
 	// so far so good
 	if (display && width > 0 && height > 0) {
 		int RST_pin = -1;
@@ -135,7 +123,7 @@ void display_init(char *welcome) {
 		displayer.by = 2;
 		displayer.pause = 3600;
 		displayer.speed = 33;
-		displayer.task = xTaskCreateStatic( (TaskFunction_t) displayer_task, "common_displayer", DISPLAYER_STACK_SIZE, NULL, ESP_TASK_PRIO_MIN + 1, xStack, &xTaskBuffer);
+		displayer.task = xTaskCreateStatic( (TaskFunction_t) displayer_task, "displayer_thread", DISPLAYER_STACK_SIZE, NULL, ESP_TASK_PRIO_MIN + 1, xStack, &xTaskBuffer);
 		
 		// set lines for "fixed" text mode
 		GDS_TextSetFontAuto(display, 1, GDS_FONT_LINE_1, -3);
@@ -377,47 +365,4 @@ void displayer_control(enum displayer_cmd_e cmd, ...) {
 	
 	xSemaphoreGive(displayer.mutex);
 	va_end(args);
-}
-
-/****************************************************************************************
- *
- */
-bool display_is_valid_driver(const char * driver){
-	return display_conf_get_driver_name(driver)!=NULL;
-}
-
-/****************************************************************************************
- *
- */
-const char *display_conf_get_driver_name(const 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;
-}
-
-/****************************************************************************************
- *
- */
-char * display_get_supported_drivers(void){
-	int total_size = 1;
-	char * supported_drivers=NULL;
-	const char * separator = "|";
-	int separator_len = strlen(separator);
-
-	for(uint8_t i=0;known_drivers[i]!=NULL && strlen(known_drivers[i])>0;i++ ){
-		total_size += strlen(known_drivers[i])+separator_len;
-	}
-	total_size+=2;
-	supported_drivers = malloc(total_size);
-	memset(supported_drivers,0x00,total_size);
-	strcat(supported_drivers,"<");
-	for(uint8_t i=0;known_drivers[i]!=NULL && strlen(known_drivers[i])>0;i++ ){
-		supported_drivers = strcat(supported_drivers,known_drivers[i]);
-		supported_drivers = strcat(supported_drivers,separator);
-	}
-	strcat(supported_drivers,">");
-	return supported_drivers;
-}
+}

components/display/display.h

@@ -10,7 +10,6 @@
 
 #include "gds.h"
 
-
 /* 
  The displayer is not thread-safe and the caller must ensure use its own 
  mutexes if it wants something better. Especially, text() line() and draw()
@@ -32,11 +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(const char * driver);
-bool display_is_valid_driver(const char * driver);
 
 void displayer_scroll(char *string, int speed, int pause);
 void displayer_control(enum displayer_cmd_e cmd, ...);
 void displayer_metadata(char *artist, char *album, char *title);
 void displayer_timer(enum displayer_time_e mode, int elapsed, int duration);
-char * display_get_supported_drivers(void);

components/driver_bt/CMakeLists.txt

@@ -1,6 +1,6 @@
-idf_component_register(	SRC_DIRS .
-						INCLUDE_DIRS .
-						PRIV_REQUIRES services bt display console tools platform_config
-
+idf_component_register(SRCS "bt_app_core.c" "bt_app_sink.c" "bt_app_source.c"
+                       INCLUDE_DIRS "." "../tools/"
+                       REQUIRES esp_common
+                       PRIV_REQUIRES freertos bt io nvs_flash esp32 spi_flash newlib log console pthread
 )
 

components/driver_bt/bt_app_core.c

@@ -6,8 +6,8 @@
    CONDITIONS OF ANY KIND, either express or implied.
 */
 
-#include "bt_app_core.h"
 #include <stdint.h>
+#include "bt_app_core.h"
 #include "esp_system.h"
 #include <string.h>
 #include <stdbool.h>

components/driver_bt/bt_app_core.h

@@ -15,29 +15,9 @@
 #include <stdio.h>
 
 #define BT_APP_CORE_TAG                   "BT_APP_CORE"
+
 #define BT_APP_SIG_WORK_DISPATCH          (0x01)
 
-/* A2DP global state */
-enum {
-    APP_AV_STATE_IDLE,
-    APP_AV_STATE_DISCOVERING,
-    APP_AV_STATE_DISCOVERED,
-    APP_AV_STATE_UNCONNECTED,
-    APP_AV_STATE_CONNECTING,
-    APP_AV_STATE_CONNECTED,
-    APP_AV_STATE_DISCONNECTING,
-};
-
-/* sub states of APP_AV_STATE_CONNECTED */
-enum {
-    APP_AV_MEDIA_STATE_IDLE,
-    APP_AV_MEDIA_STATE_STARTING,
-    APP_AV_MEDIA_STATE_STARTED,
-    APP_AV_MEDIA_STATE_STOPPING,
-	APP_AV_MEDIA_STATE_WAIT_DISCONNECT
-};
-extern int bt_app_source_get_a2d_state();
-extern int bt_app_source_get_media_state();
 /**
  * @brief     handler for the dispatched work
  */

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 "platform_config.h"
+#include "config.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "trace.h"
@@ -62,15 +62,14 @@ static void bt_av_hdl_a2d_evt(uint16_t event, void *p_param);
 static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param);
 /* avrc TG event handler */
 static void bt_av_hdl_avrc_tg_evt(uint16_t event, void *p_param);
-static void volume_set_by_local_host(int value, bool is_step);
-static void bt_av_notify_evt_handler(uint8_t event_id, esp_avrc_rn_param_t *event_parameter);
+static void volume_set_by_local_host(uint8_t volume);
 
 static const char *s_a2d_conn_state_str[] = {"Disconnected", "Connecting", "Connected", "Disconnecting"};
 static const char *s_a2d_audio_state_str[] = {"Suspended", "Stopped", "Started"};
 static esp_avrc_rn_evt_cap_mask_t s_avrc_peer_rn_cap;
 
 static _lock_t s_volume_lock;
-static int s_volume, abs_volume, sink_volume;
+static uint8_t s_volume = 0;
 static bool s_volume_notify;
 static enum { AUDIO_IDLE, AUDIO_CONNECTED, AUDIO_PLAYING } s_audio = AUDIO_IDLE;
 
@@ -90,14 +89,16 @@ static EXT_RAM_ATTR struct {
 
 static void bt_volume_up(bool pressed) {
 	if (!pressed) return;
-	volume_set_by_local_host(+3, true);
+	// 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_LOGD(BT_AV_TAG, "BT volume up %u", s_volume);
+	ESP_LOGI(BT_AV_TAG, "BT volume up %u", s_volume);
 }
 
 static void bt_volume_down(bool pressed) {
 	if (!pressed) return;
-	volume_set_by_local_host(-3, true);
+	// volume UP/DOWN buttons are not supported by iPhone/Android
+	volume_set_by_local_host(s_volume > 3 ? s_volume - 3 : 0);
 	(*bt_app_a2d_cmd_cb)(BT_SINK_VOLUME, s_volume);
 }
 
@@ -133,14 +134,12 @@ static void bt_next(bool pressed) {
 }
 
 const static actrls_t controls = {
-	NULL, // power
 	bt_volume_up, bt_volume_down,	// volume up, volume down
 	bt_toggle, bt_play,	// toggle, play
 	bt_pause, bt_stop,	// pause, stop
 	NULL, NULL,			// rew, fwd
 	bt_prev, bt_next,	// prev, next
 	NULL, NULL, NULL, NULL, // left, right, up, down
-	NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6
 	bt_volume_down, bt_volume_up, bt_toggle// knob left, knob_right, knob push
 };
 
@@ -149,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_LOGD(BT_AV_TAG, "forced disconnection %d", s_audio);
+	ESP_LOGI(BT_AV_TAG, "forced disconnection %d", s_audio);
 }
 
 /* update metadata if any */
@@ -278,14 +277,12 @@ 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_LOGD(BT_AV_TAG, "A2DP connection state: %s, [%02x:%02x:%02x:%02x:%02x:%02x]",
+        ESP_LOGI(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);
 			(*bt_app_a2d_cmd_cb)(BT_SINK_DISCONNECTED);
         } else if (a2d->conn_stat.state == ESP_A2D_CONNECTION_STATE_CONNECTED){
-			abs_volume = -1;
-			s_volume = sink_volume;
             esp_bt_gap_set_scan_mode(ESP_BT_NON_CONNECTABLE, ESP_BT_NON_DISCOVERABLE);
 			(*bt_app_a2d_cmd_cb)(BT_SINK_CONNECTED);
         }
@@ -293,13 +290,10 @@ 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_LOGD(BT_AV_TAG, "A2DP audio state: %s", s_a2d_audio_state_str[a2d->audio_stat.state]);
+        ESP_LOGI(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;
-
-			// send memorized volume for devices that can't do absolute volume
-			(*bt_app_a2d_cmd_cb)(BT_SINK_VOLUME, s_volume);
 			
 			// verify that we can take control
 			if ((*bt_app_a2d_cmd_cb)(BT_SINK_AUDIO_STARTED, s_sample_rate)) {
@@ -326,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_LOGD(BT_AV_TAG, "A2DP audio stream configuration, codec type %d", a2d->audio_cfg.mcc.type);
+        ESP_LOGI(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;
@@ -384,16 +378,16 @@ static void bt_av_play_pos_changed(void)
     }
 }
 
-static void bt_av_notify_evt_handler(uint8_t event_id, esp_avrc_rn_param_t *event_parameter)
+void bt_av_notify_evt_handler(uint8_t event_id, esp_avrc_rn_param_t *event_parameter)
 {
     switch (event_id) {
     case ESP_AVRC_RN_TRACK_CHANGE:
-		ESP_LOGD(BT_AV_TAG, "Track changed");
+		ESP_LOGI(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_LOGD(BT_AV_TAG, "Playback status changed: 0x%x", event_parameter->playback);
+        ESP_LOGI(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:
@@ -416,7 +410,7 @@ static void bt_av_notify_evt_handler(uint8_t event_id, esp_avrc_rn_param_t *even
 				(*bt_app_a2d_cmd_cb)(BT_SINK_STOP);
 				break;
 			default:
-				ESP_LOGW(BT_AV_TAG, "Un-handled event");
+				ESP_LOGI(BT_AV_TAG, "Un-handled event");
 				break;
 			}	
 		} else {
@@ -439,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_LOGD(BT_RC_CT_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
+        ESP_LOGI(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) {
@@ -452,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_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);
+        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);
         break;
     }
     case ESP_AVRC_CT_METADATA_RSP_EVT: {
-        ESP_LOGD(BT_RC_CT_TAG, "AVRC metadata rsp: attribute id 0x%x, %s", rc->meta_rsp.attr_id, rc->meta_rsp.attr_text);
+        ESP_LOGI(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);
@@ -473,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_LOGD(BT_RC_CT_TAG, "AVRC remote features %x, TG features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.tg_feat_flag);
+        ESP_LOGI(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_LOGD(BT_RC_CT_TAG, "remote rn_cap: count %d, bitmask 0x%x", rc->get_rn_caps_rsp.cap_count,
+        ESP_LOGI(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();
@@ -493,29 +487,20 @@ static void bt_av_hdl_avrc_ct_evt(uint16_t event, void *p_param)
 
 static void volume_set_by_controller(uint8_t volume)
 {
-	// do not modified NVS volume
+    ESP_LOGI(BT_RC_TG_TAG, "Volume is set by remote controller %d%%\n", (uint32_t)volume * 100 / 0x7f);
     _lock_acquire(&s_volume_lock);
-    s_volume = abs_volume = (volume * 100) / 127;
+    s_volume = volume;
     _lock_release(&s_volume_lock);
-	(*bt_app_a2d_cmd_cb)(BT_SINK_VOLUME, s_volume);
+	(*bt_app_a2d_cmd_cb)(BT_SINK_VOLUME, volume);
 }
 
-static void volume_set_by_local_host(int value, bool is_step)
+static void volume_set_by_local_host(uint8_t volume)
 {
-	_lock_acquire(&s_volume_lock);
-	s_volume = is_step ? s_volume + value : value;
-	if (s_volume > 127) s_volume = 127;
-	else if (s_volume < 0) s_volume = 0;	
-	if (abs_volume >= 0) abs_volume = s_volume;
-	else sink_volume = s_volume;
-	_lock_release(&s_volume_lock);
+    ESP_LOGI(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);
 
-	// volume has been set by controller, do not store it in NVS	
-	if (abs_volume < 0) {
-		char p[4];
-		config_set_value(NVS_TYPE_STR, "bt_sink_volume", itoa(s_volume, p, 10));					
-	}
-	
     if (s_volume_notify) {
         esp_avrc_rn_param_t rn_param;
         rn_param.volume = s_volume;
@@ -531,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_LOGD(BT_RC_TG_TAG, "AVRC conn_state evt: state %d, [%02x:%02x:%02x:%02x:%02x:%02x]",
+        ESP_LOGI(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_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);
+        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);
         break;
     }
     case ESP_AVRC_TG_SET_ABSOLUTE_VOLUME_CMD_EVT: {
-        ESP_LOGD(BT_RC_TG_TAG, "AVRC set absolute volume: %d%%", (rc->set_abs_vol.volume * 100) / 127);
+        ESP_LOGI(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_LOGD(BT_RC_TG_TAG, "AVRC register event notification: %d, param: 0x%x", rc->reg_ntf.event_id, rc->reg_ntf.event_parameter);
+        ESP_LOGI(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;
@@ -555,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_LOGD(BT_RC_TG_TAG, "AVRC remote features %x, CT features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.ct_feat_flag);
+        ESP_LOGI(BT_RC_TG_TAG, "AVRC remote features %x, CT features %x", rc->rmt_feats.feat_mask, rc->rmt_feats.ct_feat_flag);
         break;
     }
     default:
@@ -572,7 +557,7 @@ void bt_sink_init(bt_cmd_vcb_t cmd_cb, bt_data_cb_t data_cb)
 	cmd_handler_chain = cmd_cb;
   	bt_app_a2d_data_cb = data_cb;
 	
-    esp_bt_controller_mem_release(ESP_BT_MODE_BLE);
+    ESP_ERROR_CHECK(esp_bt_controller_mem_release(ESP_BT_MODE_BLE));
 
     esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
     if ((err = esp_bt_controller_init(&bt_cfg)) != ESP_OK) {
@@ -608,10 +593,6 @@ void bt_sink_init(bt_cmd_vcb_t cmd_cb, bt_data_cb_t data_cb)
     esp_bt_gap_set_security_param(param_type, &iocap, sizeof(uint8_t));
 #endif
 
-	char *item = config_alloc_get_default(NVS_TYPE_STR, "bt_sink_volume", "127", 0);
-	sink_volume = atol(item);
-	free(item);
-
     /*
      * Set default parameters for Legacy Pairing
      */
@@ -645,24 +626,21 @@ void bt_sink_init(bt_cmd_vcb_t cmd_cb, bt_data_cb_t data_cb)
     	esp_pin_code[3]='4';
     }
     esp_bt_gap_set_pin(pin_type, strlen(pin_code), esp_pin_code);
-	free(pin_code);
 }
 
 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_LOGD(BT_AV_TAG, "bt_app_task shutdown successfully");
+	ESP_LOGI(BT_AV_TAG, "bt_app_task shutdown successfully");	
 	if (esp_bluedroid_disable() != ESP_OK) return;
-	// this disable has a sleep timer BTA_DISABLE_DELAY in bt_target.h and 
-	// if we don't wait for it then disable crashes... don't know why
-	vTaskDelay(2*200 / portTICK_PERIOD_MS);	
-    ESP_LOGD(BT_AV_TAG, "esp_bluedroid_disable called successfully");
+    ESP_LOGI(BT_AV_TAG, "esp_bluedroid_disable called successfully");
     if (esp_bluedroid_deinit() != ESP_OK) return;
-    ESP_LOGD(BT_AV_TAG, "esp_bluedroid_deinit called successfully");
+    ESP_LOGI(BT_AV_TAG, "esp_bluedroid_deinit called successfully");
     if (esp_bt_controller_disable() != ESP_OK) return;
-    ESP_LOGD(BT_AV_TAG, "esp_bt_controller_disable called successfully");
+    ESP_LOGI(BT_AV_TAG, "esp_bt_controller_disable called successfully");
     if (esp_bt_controller_deinit() != ESP_OK) return;
-	ESP_LOGD(BT_AV_TAG, "bt stopped successfully");
+	ESP_LOGI(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)
@@ -670,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_LOGD(BT_AV_TAG, "authentication success: %s", param->auth_cmpl.device_name);
+            ESP_LOGI(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);
@@ -680,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_LOGD(BT_AV_TAG, "ESP_BT_GAP_CFM_REQ_EVT Please compare the numeric value: %d", param->cfm_req.num_val);
+        ESP_LOGI(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_LOGD(BT_AV_TAG, "ESP_BT_GAP_KEY_NOTIF_EVT passkey:%d", param->key_notif.passkey);
+        ESP_LOGI(BT_AV_TAG, "ESP_BT_GAP_KEY_NOTIF_EVT passkey:%d", param->key_notif.passkey);
         break;
     case ESP_BT_GAP_KEY_REQ_EVT:
-        ESP_LOGD(BT_AV_TAG, "ESP_BT_GAP_KEY_REQ_EVT Please enter passkey!");
+        ESP_LOGI(BT_AV_TAG, "ESP_BT_GAP_KEY_REQ_EVT Please enter passkey!");
         break;
 #endif
 
     default: {
-        ESP_LOGD(BT_AV_TAG, "event: %d", event);
+        ESP_LOGI(BT_AV_TAG, "event: %d", event);
         break;
     }
     }

components/driver_bt/bt_app_sink.h

@@ -11,7 +11,6 @@
 
 #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;
 				

components/platform_config/CMakeLists.txt

@@ -1,7 +0,0 @@
-idf_component_register(	SRC_DIRS . 
-						INCLUDE_DIRS . 
-						PRIV_REQUIRES tools newlib console esp_common freertos 
-						REQUIRES nvs_flash json
-)
-
-

components/platform_console/CMakeLists.txt

@@ -1,13 +0,0 @@
-idf_component_register( SRCS 
-							cmd_i2ctools.c
-							cmd_nvs.c
-							cmd_ota.c
-							cmd_system.c
-							cmd_wifi.c
-							platform_console.c
-							cmd_config.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 squeezelite)
-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 	)

components/platform_console/app_recovery/CMakeLists.txt

@@ -1,10 +0,0 @@
-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)
-message("******************* ${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}\"")

components/platform_console/app_recovery/application_name.h

@@ -1,6 +0,0 @@
-#pragma once
-#include "sdkconfig.h"
-#ifndef CONFIG_PROJECT_NAME
-#pragma message "Defaulting project name."
-#define CONFIG_PROJECT_NAME "Squeezelite-ESP32"
-#endif

components/platform_console/app_recovery/recovery.c

@@ -1,38 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "application_name.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 = CONFIG_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);
-}

components/platform_console/app_squeezelite/CMakeLists.txt

@@ -1,20 +0,0 @@
-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)
-message("******************* ${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}\" ")
-
-

components/platform_console/app_squeezelite/application_name.h

@@ -1,6 +0,0 @@
-#pragma once
-#include "sdkconfig.h"
-#ifndef CONFIG_PROJECT_NAME
-#pragma message "Defaulting project name."
-#define CONFIG_PROJECT_NAME "Squeezelite-ESP32"
-#endif

components/platform_console/cmd_system.c

@@ -1,858 +0,0 @@
-/* Console example — various system commands
-
-   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 <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include "esp_log.h"
-#include "esp_console.h"
-#include "esp_system.h"
-#include "esp_spi_flash.h"
-#include "driver/rtc_io.h"
-#include "driver/uart.h"
-#include "argtable3/argtable3.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "soc/rtc_cntl_reg.h"
-#include "esp32/rom/uart.h"
-#include "cmd_system.h"
-#include "sdkconfig.h"
-#include "esp_partition.h"
-#include "esp_ota_ops.h"
-#include "platform_esp32.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"
-#include "trace.h"
-#ifdef CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS
-#pragma message("Runtime stats enabled")
-#define WITH_TASKS_INFO 1
-#else 
-#pragma message("Runtime stats disabled")
-#endif
-static struct {
-	struct arg_str *scanmode;
-	struct arg_end *end;
-} wifi_parms_arg;
-static struct {
-	struct arg_str *name;
-	struct arg_end *end;
-} name_args;
-static struct {
- 	struct arg_lit *btspeaker;
- 	struct arg_lit *airplay;
- 	struct arg_str *telnet;
-#if WITH_TASKS_INFO    
- 	struct arg_lit *stats;
-#endif  
-    struct arg_end *end;
-} set_services_args;
-static const char * TAG = "cmd_system";
-
-//static void register_setbtsource();
-static void register_free();
-static void register_setdevicename();
-static void register_heap();
-static void register_version();
-static void register_restart();
-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();
-static void register_set_services();
-static void register_set_wifi_parms();
-#if WITH_TASKS_INFO
-static void register_tasks();
-#endif
-extern BaseType_t wifi_manager_task;
-void register_system()
-{
-    register_set_wifi_parms();
-//	register_setbtsource();
-    register_free();
-    register_set_services();
-    register_heap();
-    register_setdevicename();
-    register_version();
-    register_restart();
-    register_deep_sleep();
-    register_light_sleep();
-    register_update_certs();
-    register_factory_boot();
-    register_restart_ota();
-#if WITH_TASKS_INFO
-    register_tasks();
-#endif
-}
-
-/* 'version' command */
-static int get_version(int argc, char **argv)
-{
-    esp_chip_info_t info;
-    esp_chip_info(&info);
-    cmd_send_messaging(argv[0],MESSAGING_INFO,
-    "IDF Version:%s\r\n"
-    "Chip info:\r\n"
-    "\tmodel:%s\r\n"
-    "\tcores:%d\r\n"
-    "\tfeature:%s%s%s%s%d%s\r\n"
-    "\trevision number:%d\r\n",
-		esp_get_idf_version(), info.model == CHIP_ESP32 ? "ESP32" : "Unknow", info.cores,
-		info.features & CHIP_FEATURE_WIFI_BGN ? "/802.11bgn" : "",
-		info.features & CHIP_FEATURE_BLE ? "/BLE" : "",
-		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;
-}
-
-static void register_version()
-{
-    const esp_console_cmd_t cmd = {
-        .command = "version",
-        .help = "Get version of chip and SDK",
-        .hint = NULL,
-        .func = &get_version,
-    };
-    cmd_to_json(&cmd);
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-
-esp_err_t guided_boot(esp_partition_subtype_t partition_subtype)
-{
-    if(is_recovery_running){
-        if(partition_subtype ==ESP_PARTITION_SUBTYPE_APP_FACTORY){
-            log_send_messaging(MESSAGING_WARNING,"RECOVERY application is already active");
-            if(!wait_for_commit()){
-                log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
-            }
-            
-            vTaskDelay(750/ portTICK_PERIOD_MS);
-            esp_restart();
-            return ESP_OK;
-        }
-    }
-    else {
-        if(partition_subtype !=ESP_PARTITION_SUBTYPE_APP_FACTORY){
-            log_send_messaging(MESSAGING_WARNING,"SQUEEZELITE application is already active");
-            if(!wait_for_commit()){
-                log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
-            }
-            
-            vTaskDelay(750/ portTICK_PERIOD_MS);
-            esp_restart();
-            return ESP_OK;
-        }
-    }
-	esp_err_t err = ESP_OK;
-	bool bFound=false;
-    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){
-		log_send_messaging(MESSAGING_ERROR,"Reboot failed. Cannot iterate through partitions");
-	}
-	else
-	{
-		ESP_LOGD(TAG, "Found partition. Getting info.");
-		partition = (esp_partition_t *) esp_partition_get(it);
-		ESP_LOGD(TAG, "Releasing partition iterator");
-		esp_partition_iterator_release(it);
-		if(partition != NULL){
-			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){
-				bFound=false;
-				log_send_messaging(MESSAGING_ERROR,"Unable to select partition for reboot: %s",esp_err_to_name(err));
-			}
-			else{
-                bFound=true;
-			}
-		}
-		else
-		{
-			log_send_messaging(MESSAGING_ERROR,"partition type %u not found!  Unable to reboot to recovery.",partition_subtype);
-
-		}
-		ESP_LOGD(TAG, "Yielding to other processes");
-		taskYIELD();
-		if(bFound) {
-			if(!wait_for_commit()){
-				log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration changes. ");
-			}
-			vTaskDelay(750/ portTICK_PERIOD_MS);
-			esp_restart();
-		}
-	}
-
-	return ESP_OK;
-}
-
-static int restart(int argc, char **argv)
-{
-	log_send_messaging(MESSAGING_WARNING, "\n\nPerforming a simple restart to the currently active partition.");
-	if(!wait_for_commit()){
-		cmd_send_messaging(argv[0],MESSAGING_WARNING,"Unable to commit configuration. ");
-	}
-    vTaskDelay(750/ portTICK_PERIOD_MS);
-    esp_restart();
-    return 0;
-}
-
-void simple_restart()
-{
-	log_send_messaging(MESSAGING_WARNING,"System reboot requested.");
-	if(!wait_for_commit()){
-		log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
-	}
-
-											   
-	vTaskDelay(750/ portTICK_PERIOD_MS);
-    esp_restart();
-}
-
-esp_err_t guided_restart_ota(){
-	log_send_messaging(MESSAGING_WARNING,"System reboot to Application requested");
-    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(){
-	log_send_messaging(MESSAGING_WARNING,"System reboot to recovery requested");
-	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)
-{
-	cmd_send_messaging(argv[0],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)
-{
-	cmd_send_messaging(argv[0],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!
-}
-static void register_restart()
-{
-    const esp_console_cmd_t cmd = {
-        .command = "restart",
-        .help = "Reboot system",
-        .hint = NULL,
-        .func = &restart,
-    };
-    cmd_to_json(&cmd);
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-static void register_restart_ota()
-{
-    const esp_console_cmd_t cmd = {
-        .command = "restart_ota",
-        .help = "Reboot system to Squeezelite",
-        .hint = NULL,
-        .func = &restart_ota,
-    };
-    cmd_to_json(&cmd);
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-
-static void register_factory_boot()
-{
-    const esp_console_cmd_t cmd = {
-        .command = "recovery",
-        .help = "Reboot system to Recovery",
-        .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)
-{
-	cmd_send_messaging(argv[0],MESSAGING_INFO,"%d", esp_get_free_heap_size());
-    return 0;
-}
-
-
-static void register_free()
-{
-    const esp_console_cmd_t cmd = {
-        .command = "free",
-        .help = "Get the current size of free heap memory",
-        .hint = NULL,
-        .func = &free_mem,
-    };
-    cmd_to_json(&cmd);
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-
-/* 'heap' command prints minumum heap size */
-static int heap_size(int argc, char **argv)
-{
-    uint32_t heap_size = heap_caps_get_minimum_free_size(MALLOC_CAP_DEFAULT);
-    cmd_send_messaging(argv[0],MESSAGING_INFO, "min heap size: %u", heap_size);
-    return 0;
-}
-cJSON * setdevicename_cb(){
-	char * default_host_name = config_alloc_get_str("host_name",NULL,"Squeezelite");
-	cJSON * values = cJSON_CreateObject();
-	cJSON_AddStringToObject(values,"name",default_host_name);
-	free(default_host_name);
-	return values;
-}
-static int setnamevar(char * nvsname, FILE *f, char * value){
-	esp_err_t err=ESP_OK;
-	if((err=config_set_value(NVS_TYPE_STR, nvsname, value))!=ESP_OK){
-		fprintf(f,"Unable to set %s=%s. %s\n",nvsname,value,esp_err_to_name(err));
-	}
-	return err==ESP_OK?0:1;
-}
-typedef enum {
-    SCANNING,
-    PROCESSING_NAME
-} scanstate_t;
-int set_squeezelite_player_name(FILE * f,const char * name){
-	char * nvs_config= config_alloc_get(NVS_TYPE_STR, "autoexec1");
-	char **argv = NULL;
-    esp_err_t err=ESP_OK;
-    int nerrors=0;
-    bool bFoundParm=false;
-    scanstate_t state=SCANNING;
-    char * newCommandLine = NULL;
-    char * parm = " -n ";
-    char * cleaned_name = strdup(name);
-    for(char * p=cleaned_name;*p!='\0';p++){
-        if(*p == ' '){
-            *p='_'; // no spaces allowed
-        }
-    }
-	if(nvs_config && strlen(nvs_config)>0){
-        // allocate enough memory to hold the new command line
-        size_t cmdLength = strlen(nvs_config) + strlen(cleaned_name) + strlen(parm) +1 ;
-        newCommandLine = malloc(cmdLength);
-        memset(newCommandLine,0x00, cmdLength);
-		ESP_LOGD(TAG,"Parsing command %s",nvs_config);
-		argv = (char **) calloc(22, sizeof(char *));
-		if (argv == NULL) {
-			FREE_AND_NULL(nvs_config);
-			return 1;
-		}
-		size_t argc = esp_console_split_argv(nvs_config, argv,22);
-		for(int i=0;i<argc;i++) {
-            if(i>0){
-                strcat(newCommandLine," ");
-            }
-            switch (state)
-            {
-            case SCANNING:
-                strcat(newCommandLine,argv[i]);
-                if(strcasecmp(argv[i],"--name")==0 || strcasecmp(argv[i],"-n")==0 ){
-                    state = PROCESSING_NAME;
-                }
-                break;
-            case PROCESSING_NAME:
-                bFoundParm=true;
-                strcat(newCommandLine,cleaned_name);
-                state = SCANNING;
-                break;
-            
-            default:
-                break;
-            }
-        }
-        if(!bFoundParm){
-            strcat(newCommandLine,parm);
-            strcat(newCommandLine,name);
-        }
-        fprintf(f,"Squeezelite player name changed to %s\n",newCommandLine);
-        if((err=config_set_value(NVS_TYPE_STR, "autoexec1",newCommandLine))!=ESP_OK){
-            nerrors++;
-            fprintf(f,"Failed updating squeezelite command. %s", esp_err_to_name(err));
-        }
-		
-	}
-
-	FREE_AND_NULL(nvs_config);
-	FREE_AND_NULL(argv);
-	free(cleaned_name);
-	return nerrors;
-	
-}
-static int setdevicename(int argc, char **argv)
-{
-	char * name = NULL;
-    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&name_args);
-    if (nerrors != 0) {
-        return 1;
-    }
-
-	/* Check "--name" option */
-	if (name_args.name->count) {
-		name=strdup(name_args.name->sval[0]);
-	}
-	else {
-		cmd_send_messaging(argv[0],MESSAGING_ERROR,"Name must be specified.");
-		return 1;
-	}
-
-	char *buf = NULL;
-	size_t buf_size = 0;
-	FILE *f = open_memstream(&buf, &buf_size);
-	if (f == NULL) {
-		cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.");
-		return 1;
-	}
-	nerrors+=setnamevar("a2dp_dev_name", f, name);
-	nerrors+=setnamevar("airplay_name", f, name);
-	nerrors+=setnamevar("ap_ssid", f, name);
-	nerrors+=setnamevar("bt_name", f, name);
-	nerrors+=setnamevar("host_name", f, name);
-    nerrors+=set_squeezelite_player_name(f, name);
-	if(nerrors==0){
-		fprintf(f,"Device name changed to %s\n",name);
-	}
-	if(!nerrors ){
-		fprintf(f,"Done.\n");
-	}
-	FREE_AND_NULL(name);
-	fflush (f);
-	cmd_send_messaging(argv[0],nerrors>0?MESSAGING_ERROR:MESSAGING_INFO,"%s", buf);
-	fclose(f);
-	FREE_AND_NULL(buf);
-	return nerrors;
-
-}
-
-static void register_heap()
-{
-    const esp_console_cmd_t heap_cmd = {
-        .command = "heap",
-        .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) );
-
-}
-
-
-static void register_setdevicename()
-{
-	char * default_host_name = config_alloc_get_str("host_name",NULL,"Squeezelite");
-	name_args.name = arg_str0("n", "name", default_host_name, "New Name");
-	name_args.end = arg_end(8);
-	const esp_console_cmd_t set_name= {
-	 		.command = CFG_TYPE_SYST("name"),
-			.help="Device Name",
-			.hint = NULL,
-			.func = &setdevicename,
-			.argtable = &name_args
-	};
-	cmd_to_json_with_cb(&set_name,&setdevicename_cb);
-	ESP_ERROR_CHECK(esp_console_cmd_register(&set_name));
-}
-/** 'tasks' command prints the list of tasks and related information */
-#if WITH_TASKS_INFO
-
-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) {
-    	cmd_send_messaging(argv[0],MESSAGING_ERROR, "failed to allocate buffer for vTaskList output");
-        return 1;
-    }
-    cmd_send_messaging(argv[0],MESSAGING_INFO,"Task Name\tStatus\tPrio\tHWM\tTask#"
-#ifdef CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID
-    "\tAffinity"
-#endif
-    "\n");
-    vTaskList(task_list_buffer);
-    cmd_send_messaging(argv[0],MESSAGING_INFO,"%s", task_list_buffer);
-    free(task_list_buffer);
-    return 0;
-}
-
-static void register_tasks()
-{
-    const esp_console_cmd_t cmd = {
-        .command = "tasks",
-        .help = "Get information about running tasks",
-        .hint = NULL,
-        .func = &tasks_info,
-    };
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-
-#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);
-}
-
-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 {
-    struct arg_int *wakeup_time;
-    struct arg_int *wakeup_gpio_num;
-    struct arg_int *wakeup_gpio_level;
-    struct arg_end *end;
-} deep_sleep_args;
-
-
-static int deep_sleep(int argc, char **argv)
-{
-	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];
-        cmd_send_messaging(argv[0],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)) {
-        	cmd_send_messaging(argv[0],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) {
-            	cmd_send_messaging(argv[0],MESSAGING_ERROR, "Invalid wakeup level: %d", level);
-                return 1;
-            }
-        }
-        cmd_send_messaging(argv[0],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; // this code will never run. deep sleep will cause the system to restart
-}
-
-static void register_deep_sleep()
-{
-    deep_sleep_args.wakeup_time =
-        arg_int0("t", "time", "<t>", "Wake up time, ms");
-    deep_sleep_args.wakeup_gpio_num =
-        arg_int0(NULL, "io", "<n>",
-                 "If specified, wakeup using GPIO with given number");
-    deep_sleep_args.wakeup_gpio_level =
-        arg_int0(NULL, "io_level", "<0|1>", "GPIO level to trigger wakeup");
-    deep_sleep_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 = &deep_sleep,
-        .argtable = &deep_sleep_args
-    };
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-static int enable_disable(FILE * f,char * nvs_name, struct arg_lit *arg){
-	esp_err_t err = config_set_value(NVS_TYPE_STR, nvs_name, arg->count>0?"Y":"N");
-	const char * name = arg->hdr.longopts?arg->hdr.longopts:arg->hdr.glossary;
-
-	if(err!=ESP_OK){
-		fprintf(f,"Error %s %s. %s\n",arg->count>0?"Enabling":"Disabling", name, esp_err_to_name(err));
-	}
-	else {
-		fprintf(f,"%s %s\n",arg->count>0?"Enabled":"Disabled",name);
-	}
-	return err;
-}
-static int do_configure_wifi(int argc, char **argv){
-    esp_err_t err = ESP_OK;
-    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&wifi_parms_arg);
-    if (nerrors != 0) {
-        return 1;
-    }
-	char *buf = NULL;
-	size_t buf_size = 0;
-	FILE *f = open_memstream(&buf, &buf_size);
-	if (f == NULL) {
-		cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.");
-		return 1;
-	}
-    
-    if(wifi_parms_arg.scanmode->count>0){
-        if(strcasecmp(wifi_parms_arg.scanmode->sval[0],"Comprehensive") == 0){
-            err = config_set_value(NVS_TYPE_STR, "wifi_smode", "A");
-        } 
-        else {
-            err = config_set_value(NVS_TYPE_STR, "wifi_smode", "F");
-        }
-        if(err!=ESP_OK){
-            nerrors++;
-            fprintf(f,"Error setting wifi scan mode to %s. %s\n",wifi_parms_arg.scanmode->sval[0], esp_err_to_name(err));
-        }
-        else {
-            fprintf(f,"Wifi Scan Mode changed to %s\n",wifi_parms_arg.scanmode->sval[0]);
-        }
-    }
-	if(!nerrors ){
-		fprintf(f,"Done.\n");
-	}
-	fflush (f);
-	cmd_send_messaging(argv[0],nerrors>0?MESSAGING_ERROR:MESSAGING_INFO,"%s", buf);
-	fclose(f);
-	FREE_AND_NULL(buf);
-	return nerrors;
-}
-static int do_set_services(int argc, char **argv)
-{
-    esp_err_t err = ESP_OK;
-    int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&set_services_args);
-    if (nerrors != 0) {
-        return 1;
-    }
-	char *buf = NULL;
-	size_t buf_size = 0;
-	FILE *f = open_memstream(&buf, &buf_size);
-	if (f == NULL) {
-		cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.");
-		return 1;
-	}
-
-	nerrors += enable_disable(f,"enable_airplay",set_services_args.airplay);
-	nerrors += enable_disable(f,"enable_bt_sink",set_services_args.btspeaker);
-
-    if(set_services_args.telnet->count>0){
-        if(strcasecmp(set_services_args.telnet->sval[0],"Disabled") == 0){
-            err = config_set_value(NVS_TYPE_STR, "telnet_enable", "N");
-        } 
-        else if(strcasecmp(set_services_args.telnet->sval[0],"Telnet Only") == 0){
-            err = config_set_value(NVS_TYPE_STR, "telnet_enable", "Y");
-        }
-        else if(strcasecmp(set_services_args.telnet->sval[0],"Telnet and Serial") == 0){
-            err = config_set_value(NVS_TYPE_STR, "telnet_enable", "D");
-        }
-        
-        if(err!=ESP_OK){
-            nerrors++;
-            fprintf(f,"Error setting telnet service to %s. %s\n",set_services_args.telnet->sval[0], esp_err_to_name(err));
-        }
-        else {
-            fprintf(f,"Telnet service changed to %s\n",set_services_args.telnet->sval[0]);
-        }
-    }
-
-#if WITH_TASKS_INFO    
-	nerrors += enable_disable(f,"stats",set_services_args.stats);
-#endif
-	if(!nerrors ){
-		fprintf(f,"Done.\n");
-	}
-	fflush (f);
-	cmd_send_messaging(argv[0],nerrors>0?MESSAGING_ERROR:MESSAGING_INFO,"%s", buf);
-	fclose(f);
-	FREE_AND_NULL(buf);
-	return nerrors;
-}
-
-cJSON * configure_wifi_cb(){
-	cJSON * values = cJSON_CreateObject();
-	char * p=NULL;
-
-    if ((p = config_alloc_get(NVS_TYPE_STR, "wifi_smode")) != NULL) {
-        cJSON_AddStringToObject(values,"scanmode",strcasecmp(p,"a") == 0 ?"Comprehensive":"Fast");
-        FREE_AND_NULL(p);
-	}
-    return values;
-}
-
-
-
-cJSON * set_services_cb(){
-	cJSON * values = cJSON_CreateObject();
-	char * p=NULL;
-	if ((p = config_alloc_get(NVS_TYPE_STR, "enable_bt_sink")) != NULL) {
-		cJSON_AddBoolToObject(values,"BT_Speaker",strcmp(p,"1") == 0 || strcasecmp(p,"y") == 0);
-		FREE_AND_NULL(p);
-	}
-	if ((p = config_alloc_get(NVS_TYPE_STR, "enable_airplay")) != NULL) {
-		cJSON_AddBoolToObject(values,"AirPlay",strcmp(p,"1") == 0 || strcasecmp(p,"y") == 0);
-		FREE_AND_NULL(p);
-	}
-	if ((p = config_alloc_get(NVS_TYPE_STR, "telnet_enable")) != NULL) {
-        if(strcasestr("YX",p)!=NULL){
-		    cJSON_AddStringToObject(values,"telnet","Telnet Only");
-        }
-        else if(strcasestr("D",p)!=NULL){
-            cJSON_AddStringToObject(values,"telnet","Telnet and Serial");
-        }
-        else {
-            cJSON_AddStringToObject(values,"telnet","Disabled");
-        }
-
-		FREE_AND_NULL(p);
-	}
-#if WITH_TASKS_INFO        
-	if((p = config_alloc_get_default(NVS_TYPE_STR, "stats", "n", 0))!=NULL){
-		cJSON_AddBoolToObject(values,"stats",(*p == '1' || *p == 'Y' || *p == 'y')) ;
-	}
-#endif
-	return values;
-}
-
-static void register_set_services(){
-	set_services_args.airplay = arg_lit0(NULL, "AirPlay", "AirPlay");
-	set_services_args.btspeaker = arg_lit0(NULL, "BT_Speaker", "Bluetooth Speaker");
-	set_services_args.telnet= arg_str0("t", "telnet","Disabled|Telnet Only|Telnet and Serial","Telnet server. Use only for troubleshooting");
-#if WITH_TASKS_INFO    
-	set_services_args.stats= arg_lit0(NULL, "stats", "System Statistics. Use only for troubleshooting");
-#endif    
-    set_services_args.end=arg_end(2);
-	const esp_console_cmd_t cmd = {
-        .command = CFG_TYPE_SYST("services"),
-        .help = "Services",
-		.argtable = &set_services_args,
-        .hint = NULL,
-        .func = &do_set_services,
-    };
-	cmd_to_json_with_cb(&cmd,&set_services_cb);
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-
-static void register_set_wifi_parms(){
-	wifi_parms_arg.scanmode = arg_str0(NULL, "scanmode", "Fast|Comprehensive","Sets the WiFi Scan Mode. Use Comprehensive where more than one AP has the same name on different channels. This will ensure that the AP with the strongest signal is chosen.");
-	wifi_parms_arg.end=arg_end(2);
-	const esp_console_cmd_t cmd = {
-        .command = CFG_TYPE_SYST("wifi"),
-        .help = "WiFi",
-		.argtable = &wifi_parms_arg,
-        .hint = NULL,
-        .func = &do_configure_wifi,
-    };
-	cmd_to_json_with_cb(&cmd,&configure_wifi_cb);
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-/** 'light_sleep' command puts the chip into light sleep mode */
-
-static struct {
-    struct arg_int *wakeup_time;
-    struct arg_int *wakeup_gpio_num;
-    struct arg_int *wakeup_gpio_level;
-    struct arg_end *end;
-} light_sleep_args;
-
-static int light_sleep(int argc, char **argv)
-{
-	int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&light_sleep_args);
-    if (nerrors != 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];
-        cmd_send_messaging(argv[0],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) {
-    	cmd_send_messaging(argv[0],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) {
-        	cmd_send_messaging(argv[0],MESSAGING_ERROR, "Invalid wakeup level: %d", level);
-            return 1;
-        }
-        cmd_send_messaging(argv[0],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) );
-    }
-    if (io_count > 0) {
-        ESP_ERROR_CHECK( esp_sleep_enable_gpio_wakeup() );
-    }
-    if (CONFIG_ESP_CONSOLE_UART_NUM <= UART_NUM_1) {
-    	cmd_send_messaging(argv[0],MESSAGING_INFO,  "Enabling UART wakeup (press ENTER to exit light sleep)");
-        ESP_ERROR_CHECK( uart_set_wakeup_threshold(CONFIG_ESP_CONSOLE_UART_NUM, 3) );
-        ESP_ERROR_CHECK( esp_sleep_enable_uart_wakeup(CONFIG_ESP_CONSOLE_UART_NUM) );
-    }
-    fflush(stdout);
-    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;
-    switch (cause) {
-    case ESP_SLEEP_WAKEUP_GPIO:
-        cause_str = "GPIO";
-        break;
-    case ESP_SLEEP_WAKEUP_UART:
-        cause_str = "UART";
-        break;
-    case ESP_SLEEP_WAKEUP_TIMER:
-        cause_str = "timer";
-        break;
-    default:
-        cause_str = "unknown";
-        printf("%d\n", cause);
-    }
-    cmd_send_messaging(argv[0],MESSAGING_INFO, "Woke up from: %s", cause_str);
-    return 0;
-}
-
-static void register_light_sleep()
-{
-    light_sleep_args.wakeup_time =
-        arg_int0("t", "time", "<t>", "Wake up time, ms");
-    light_sleep_args.wakeup_gpio_num =
-        arg_intn(NULL, "io", "<n>", 0, 8,
-                 "If specified, wakeup using GPIO with given number");
-    light_sleep_args.wakeup_gpio_level =
-        arg_intn(NULL, "io_level", "<0|1>", 0, 8, "GPIO level to trigger wakeup");
-    light_sleep_args.end = arg_end(3);
-
-    const esp_console_cmd_t cmd = {
-        .command = "light_sleep",
-        .help = "Enter light sleep mode. "
-        "Two wakeup modes are supported: timer and GPIO. "
-        "Multiple GPIO pins can be specified using pairs of "
-        "'io' and 'io_level' arguments. "
-        "Will also wake up on UART input.",
-        .hint = NULL,
-        .func = &light_sleep,
-        .argtable = &light_sleep_args
-    };
-    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
-}
-

components/platform_console/platform_console.c

@@ -1,418 +0,0 @@
-/* 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"
-esp_err_t 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 && (table[tabindex]->longopts || table[tabindex]->shortopts) );
-		cJSON_AddBoolToObject(entry, "remark", (table[tabindex]->flag & ARG_HASOPTVALUE)==0 && (table[tabindex]->flag & ARG_HASVALUE)==0 && (!table[tabindex]->longopts && !table[tabindex]->shortopts));
-		cJSON_AddBoolToObject(entry, "hasvalue", table[tabindex]->flag & ARG_HASVALUE);
-		cJSON_AddNumberToObject(entry,"mincount",table[tabindex]->mincount);
-		cJSON_AddNumberToObject(entry,"maxcount",table[tabindex]->maxcount);
-		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);
-			cmd_send_messaging(argv[0],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 = 28,
-			.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 = 28,
-				.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_config_cmd();
-	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();
-	}
-
-}
-esp_err_t 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 && ret != ESP_OK) {
-		ESP_LOGW(TAG,"Command returned in error");
-		err = ESP_FAIL;
-	} else if (err != ESP_OK) {
-		ESP_LOGE(TAG,"Internal error: %s", esp_err_to_name(err));
-	}
-	return 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;
-}
-

components/platform_console/platform_console.h

@@ -1,28 +0,0 @@
-/* Console example — declarations of command registration functions.
-
-   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.
-*/
-#pragma once
-#include "esp_console.h"
-#include "argtable3/argtable3.h"
-#include "cJSON.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define CFG_TYPE_HW(a)     "cfg-hw-" a
-#define CFG_TYPE_AUDIO(a)     "cfg-audio-" a
-#define CFG_TYPE_SYST(a)   "cfg-syst-" a
-#define CFG_TYPE_FW(a)     "cfg-fw-" a
-#define CFG_TYPE_GEN(a)    "cfg-gen-" a
-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

components/platform_console/test/CMakeLists.txt

@@ -1,3 +0,0 @@
-idf_component_register(SRCS "test_system.c"
-                    INCLUDE_DIRS "."
-                    REQUIRES unity tools console json platform_console platform_config )

components/platform_console/test/test_system.c

@@ -1,189 +0,0 @@
-/* test_mean.c: Implementation of a testable component.
-
-   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 <limits.h>
-#include "unity.h"
-#include "platform_console.h"
-#include "platform_esp32.h"
-#include "platform_config.h"
-#include "string.h"
-struct arg_lit *arglit;
-struct arg_int *argint;
-struct arg_str *argstr;
-struct arg_end *end;
-
-extern int is_output_gpio(struct arg_int * gpio, FILE * f, int * gpio_out, bool mandatory);
-extern void initialize_console();
-extern esp_err_t run_command(char * line);
-static char *buf = NULL;
-static char * s_tmp_line_buf=NULL;
-static size_t buf_size = 0;
-static FILE * f;
-static size_t argc=1;
-static char ** argv=NULL;
-static bool config_initialized=false;
-void init_console(){
-    if(config_initialized) return;
-    initialize_console();
-    config_initialized=true;
-}
-
-/****************************************************************************************
- * 
- */
-void open_mem_stream_file(){
-	f = open_memstream(&buf, &buf_size);
-}
-
-/****************************************************************************************
- * 
- */
-void close_flush_all(void * argtable, int count,bool print){
-    fflush (f);
-    if(print){
-        printf("%s", buf);
-    }
-    fclose(f);
-    free(buf);
-    arg_freetable(argtable,count);
-    free(argv);   
-}
-
-/****************************************************************************************
- * 
- */
-int alloc_split_command_line(char * cmdline){
-    argv = (char **) calloc(22, sizeof(char *));
-    if(!s_tmp_line_buf){
-        s_tmp_line_buf= calloc(strlen(cmdline), 1);
-    }
-    strlcpy(s_tmp_line_buf, cmdline, 22);
-    argc = esp_console_split_argv(s_tmp_line_buf, argv,22);
-
-    return 0;
-}
-
-/****************************************************************************************
- * 
- */
-int alloc_split_parse_command_line(char * cmdline, void ** args){
-    alloc_split_command_line(cmdline);
-    return arg_parse(argc, argv,args);
-}
-
-/****************************************************************************************
- * 
- */
-TEST_CASE("Invalid GPIO detected", "[config][ui]")
-{
-    char * cmdline =  "test -i 55\n";
-    void *argtable[] = {
-        argint = arg_int1("i","int","<gpio>","GPIO number"),
-        end  = arg_end(6)
-    };
-    open_mem_stream_file();
-    alloc_split_parse_command_line(cmdline, &argtable);
-    int out_val = 0;
-    TEST_ASSERT_EQUAL_INT_MESSAGE(1,is_output_gpio(argtable[0], f, &out_val, true),"Invalid GPIO not detected");
-    TEST_ASSERT_EQUAL_INT_MESSAGE(-1,out_val,"GPIO Should be set to -1");
-    fflush (f);
-    TEST_ASSERT_EQUAL_STRING_MESSAGE("Invalid int gpio: [55] is not a GPIO\n",buf,"Invalid GPIO message wrong");
-    close_flush_all(argtable,sizeof(argtable)/sizeof(argtable[0]),false);
-}
-
-/****************************************************************************************
- * 
- */
-TEST_CASE("Input Only GPIO detected", "[config][ui]")
-{
-    char * cmdline =  "test -i 35\n";
-    void *argtable[] = {
-        argint = arg_int1("i","int","<gpio>","GPIO number"),
-        end  = arg_end(6)
-    };
-    open_mem_stream_file();
-    alloc_split_parse_command_line(cmdline, &argtable);
-    int out_val = 0;
-    TEST_ASSERT_EQUAL_INT_MESSAGE(1,is_output_gpio(argtable[0], f, &out_val, true),"Input only GPIO not detected");
-    TEST_ASSERT_EQUAL_INT_MESSAGE(-1,out_val,"GPIO Should be set to -1");
-    fflush (f);
-    TEST_ASSERT_EQUAL_STRING_MESSAGE("Invalid int gpio: [35] has input capabilities only\n",buf,"Missing GPIO message wrong");
-    close_flush_all(argtable,sizeof(argtable)/sizeof(argtable[0]),false);
-}
-
-/****************************************************************************************
- * 
- */
-TEST_CASE("Valid GPIO Processed", "[config][ui]")
-{
-    char * cmdline =  "test -i 33\n";
-    void *argtable[] = {
-        argint = arg_int1("i","int","<gpio>","GPIO number"),
-        end  = arg_end(6)
-    };
-    open_mem_stream_file();
-    alloc_split_parse_command_line(cmdline, &argtable);
-    int out_val = 0;
-    TEST_ASSERT_EQUAL_INT_MESSAGE(0,is_output_gpio(argtable[0], f, &out_val, true),"Valid GPIO not recognized");
-    TEST_ASSERT_EQUAL_INT_MESSAGE(33,out_val,"GPIO Should be set to 33");
-    fflush (f);
-    TEST_ASSERT_EQUAL_STRING_MESSAGE("",buf,"Valid GPIO shouldn't produce a message");
-    close_flush_all(argtable,sizeof(argtable)/sizeof(argtable[0]),false);
-}
-
-/****************************************************************************************
- * 
- */
-TEST_CASE("Missing mandatory GPIO detected", "[config][ui]")
-{
-    char * cmdline =  "test \n";
-    void *argtable[] = {
-        argint = arg_int1("i","int","<gpio>","GPIO number"),
-        end  = arg_end(6)
-    };
-    open_mem_stream_file();
-    alloc_split_parse_command_line(cmdline, &argtable);
-    int out_val = 0;
-    TEST_ASSERT_EQUAL_INT_MESSAGE(1,is_output_gpio(argtable[0], f, &out_val, true),"Missing GPIO not detected");
-    fflush (f);
-    TEST_ASSERT_EQUAL_STRING_MESSAGE("Missing: int\n",buf,"Missing GPIO parameter message wrong");
-    TEST_ASSERT_EQUAL_INT_MESSAGE(-1,out_val,"GPIO Should be set to -1");
-    close_flush_all(argtable,sizeof(argtable)/sizeof(argtable[0]),false);
-}
-/****************************************************************************************
- * 
- */
-TEST_CASE("Missing mandatory parameter detected", "[config][ui]")
-{
-    char * cmdline =  "test \n";
-    void *argtable[] = {
-        argint = arg_int1("i","int","<gpio>","GPIO number"),
-        end  = arg_end(6)
-    };
-    open_mem_stream_file();
-    alloc_split_parse_command_line(cmdline, &argtable);
-    int out_val = 0;
-    TEST_ASSERT_EQUAL_INT_MESSAGE(1,is_output_gpio(argtable[0], f, &out_val, true),"Missing parameter not detected");
-    fflush (f);
-    TEST_ASSERT_EQUAL_STRING_MESSAGE("Missing: int\n",buf,"Missing parameter message wrong");
-    TEST_ASSERT_EQUAL_INT_MESSAGE(-1,out_val,"GPIO Should be set to -1");
-    close_flush_all(argtable,sizeof(argtable)/sizeof(argtable[0]),false);
-}
-/****************************************************************************************
- * 
- */
-TEST_CASE("dac config command", "[config_cmd]")
-{
-    config_set_value(NVS_TYPE_STR, "dac_config", "");
-    esp_err_t err=run_command("cfg-hw-dac\n");
-    char * nvs_value =  config_alloc_get_str("dac_config", NULL,NULL);
-    TEST_ASSERT_NOT_NULL(nvs_value);
-    TEST_ASSERT_EQUAL_MESSAGE(ESP_OK,err,"Running command failed");
-    free(nvs_value);
-}

components/raop/CMakeLists.txt

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

components/raop/component.mk

@@ -7,9 +7,7 @@
 # please read the SDK documents if you need to do this.
 #
 
-CFLAGS += -fstack-usage\
-	-I$(PROJECT_PATH)/components/tools	\
-	-I$(PROJECT_PATH)/components/codecs/inc/alac \
+CFLAGS += -fstack-usage \
+	-I$(COMPONENT_PATH)/../tools	\
+	-I$(COMPONENT_PATH)/../codecs/inc/alac \
 	-I$(PROJECT_PATH)/main/	
-COMPONENT_ADD_INCLUDEDIRS := .
-COMPONENT_SRCDIRS := . 

components/raop/raop.c

@@ -196,7 +196,7 @@ struct raop_ctx_s *raop_create(struct in_addr host, char *name,
 	id[63] = '\0';
 	ctx->svc = mdnsd_register_svc(ctx->svr, id, "_raop._tcp.local", ctx->port, NULL, (const char**) txt);
 	pthread_create(&ctx->thread, NULL, &rtsp_thread, ctx);
-
+
 #else
 	LOG_INFO("starting mDNS with %s", id);
 	ESP_ERROR_CHECK( mdns_service_add(id, "_raop", "_tcp", ctx->port, txt, sizeof(txt) / sizeof(mdns_txt_item_t)) );
@@ -228,6 +228,7 @@ void raop_delete(struct raop_ctx_s *ctx) {
 	ctx->running = false;
 
 	// wake-up thread by connecting socket, needed for freeBSD
+	sock = socket(AF_INET, SOCK_STREAM, 0);
 	getsockname(ctx->sock, (struct sockaddr *) &addr, &nlen);
 	connect(sock, (struct sockaddr*) &addr, sizeof(addr));
 	closesocket(sock);
@@ -246,17 +247,14 @@ void raop_delete(struct raop_ctx_s *ctx) {
 	}
 
 	// stop broadcasting devices
-	mdns_service_remove(ctx->svr, ctx->svc);
-	mdnsd_stop(ctx->svr);
-#else 
-	// then the RTSP task
 	mdns_service_remove(ctx->svr, ctx->svc);
-	ctx->running = false;
-	
 	mdnsd_stop(ctx->svr);
 #else 
 	// then the RTSP task
 	ctx->joiner = xTaskGetCurrentTaskHandle();
+	ctx->running = false;
+
+	ulTaskNotifyTake(pdFALSE, portMAX_DELAY);
 	vTaskDelete(ctx->thread);
 	heap_caps_free(ctx->xTaskBuffer);
 
@@ -518,7 +516,7 @@ static bool handle_rtsp(raop_ctx_t *ctx, int sock)
 		if ((buf = kd_lookup(headers, "Active-Remote")) != NULL) strcpy(ctx->active_remote.id, buf);
 
 #ifdef WIN32	
-		ctx->active_remote.handle = init_mDNS(false, ctx->host);
+		ctx->active_remote.handle = init_mDNS(false, ctx->host);
 		pthread_create(&ctx->active_remote.thread, NULL, &search_remote, ctx);
 #else
 		ctx->active_remote.running = true;
@@ -755,7 +753,7 @@ static void search_remote(void *args) {
 
 		mdns_query_results_free(results);
 	}
-
+
 	// can't use xNotifyGive as it seems LWIP is using it as well
 	xSemaphoreGive(ctx->active_remote.destroy_mutex);
 	vTaskSuspend(NULL);

components/raop/raop_sink.c

@@ -6,13 +6,12 @@
 #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 "platform_config.h"
+#include "config.h"
 #include "raop.h"
 #include "audio_controls.h"
 #include "display.h"
@@ -25,11 +24,6 @@
 #define CONFIG_AIRPLAY_NAME		"ESP32-AirPlay"
 #endif
 
-static EXT_RAM_ATTR struct raop_cb_s {
-	raop_cmd_vcb_t cmd;
-	raop_data_cb_t data;
-} raop_cbs;
-
 log_level	raop_loglevel = lINFO;
 log_level	util_loglevel;
 
@@ -86,14 +80,12 @@ static void raop_next(bool pressed) {
 }
 
 const static actrls_t controls = {
-	NULL,								// power
 	raop_volume_up, raop_volume_down,	// volume up, volume down
 	raop_toggle, raop_play,				// toggle, play
 	raop_pause, raop_stop,				// pause, stop
 	NULL, NULL,							// rew, fwd
 	raop_prev, raop_next,				// prev, next
 	NULL, NULL, NULL, NULL, // left, right, up, down
-	NULL, NULL, NULL, NULL, NULL, NULL, // pre1-6
 	raop_volume_down, raop_volume_up, raop_toggle// knob left, knob_right, knob push
 };
 
@@ -155,27 +147,17 @@ void raop_sink_deinit(void) {
 }	
 
 /****************************************************************************************
- * Airplay sink startup
+ * Airplay sink initialization
  */
-static bool raop_sink_start(raop_cmd_vcb_t cmd_cb, raop_data_cb_t data_cb) {
-    const char *hostname = NULL;
+void raop_sink_init(raop_cmd_vcb_t cmd_cb, raop_data_cb_t data_cb) {
+    const char *hostname;
 	char sink_name[64-6] = CONFIG_AIRPLAY_NAME;
-	tcpip_adapter_ip_info_t ipInfo = { }; 
+	tcpip_adapter_ip_info_t ipInfo; 
 	struct in_addr host;
-	tcpip_adapter_if_t ifs[] = { TCPIP_ADAPTER_IF_ETH, TCPIP_ADAPTER_IF_STA, TCPIP_ADAPTER_IF_AP };
    	
 	// get various IP info
-	for (int i = 0; i < sizeof(ifs) / sizeof(tcpip_adapter_if_t); i++) 
-		if (tcpip_adapter_get_ip_info(ifs[i], &ipInfo) == ESP_OK && ipInfo.ip.addr != IPADDR_ANY) {
-			tcpip_adapter_get_hostname(ifs[i], &hostname);			
-			break;
-		}
-	
-	if (!hostname) {
-		LOG_INFO( "no hostname/IP found, can't start AirPlay");
-		return false;
-	}
-	
+	tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ipInfo);
+	tcpip_adapter_get_hostname(TCPIP_ADAPTER_IF_STA, &hostname);
 	host.s_addr = ipInfo.ip.addr;
 
     // initialize mDNS
@@ -183,7 +165,7 @@ static bool raop_sink_start(raop_cmd_vcb_t cmd_cb, raop_data_cb_t data_cb) {
     ESP_ERROR_CHECK( mdns_hostname_set(hostname) );
         
     char * sink_name_buffer= (char *)config_alloc_get(NVS_TYPE_STR,"airplay_name");
-    if (sink_name_buffer != NULL){
+    if(sink_name_buffer != NULL){
     	memset(sink_name, 0x00, sizeof(sink_name));
     	strncpy(sink_name,sink_name_buffer,sizeof(sink_name)-1 );
     	free(sink_name_buffer);
@@ -196,30 +178,6 @@ static bool raop_sink_start(raop_cmd_vcb_t cmd_cb, raop_data_cb_t data_cb) {
     esp_read_mac(mac, ESP_MAC_WIFI_STA);
 	cmd_handler_chain = cmd_cb;
 	raop = raop_create(host, sink_name, mac, 0, cmd_handler, data_cb);
-	
-	return true;
-}
-
-/****************************************************************************************
- * Airplay sink timer handler
- */
-static void raop_start_handler( TimerHandle_t xTimer ) {
-	if (raop_sink_start(raop_cbs.cmd, raop_cbs.data)) {
-		xTimerDelete(xTimer, portMAX_DELAY);
-	}	
-}	
-
-/****************************************************************************************
- * Airplay sink initialization
- */
-void raop_sink_init(raop_cmd_vcb_t cmd_cb, raop_data_cb_t data_cb) {
-	if (!raop_sink_start(cmd_cb, data_cb)) {
-		raop_cbs.cmd = cmd_cb;
-		raop_cbs.data = data_cb;
-		TimerHandle_t timer = xTimerCreate("raopStart", 5000 / portTICK_RATE_MS, pdTRUE, NULL, raop_start_handler);
-		xTimerStart(timer, portMAX_DELAY);
-		LOG_INFO( "Delaying AirPlay start");		
-	}	
 }
 
 /****************************************************************************************

components/raop/rtp.c

@@ -168,7 +168,7 @@ static void 	rtp_thread_func(void *arg);
 #endif	
 
 /*---------------------------------------------------------------------------*/
-static struct alac_codec_s* alac_init(int fmtp[32]) {
+static struct alac_codec_s* alac_init(int fmtp[32]) {
 	struct alac_codec_s *alac;
 	unsigned sample_rate;
 	unsigned char sample_size, channels;
@@ -196,7 +196,7 @@ static struct alac_codec_s* alac_init(int fmtp[32]) {
 	config.maxRun = htons(fmtp[8]);
 	config.maxFrameBytes = htonl(fmtp[9]);
 	config.avgBitRate = htonl(fmtp[10]);
-	config.sampleRate = htonl(fmtp[11]);
+	config.sampleRate = htonl(fmtp[11]);
 
 	alac = alac_create_decoder(sizeof(config), (unsigned char*) &config, &sample_size, &sample_rate, &channels);
 	if (!alac) {

components/raop/util.c

@@ -14,7 +14,6 @@
 #include <iphlpapi.h>
 #else
 #include "tcpip_adapter.h"
-// IDF-V4++ #include "esp_netif.h"
 #include <ctype.h>
 #endif
 
@@ -405,7 +404,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) {
@@ -579,8 +578,7 @@ void free_metadata(struct metadata_s *metadata)
 	NFREE(metadata->remote_title);
 }
 
-
-/*----------------------------------------------------------------------------*/
+
 /*----------------------------------------------------------------------------*/
 
 int _fprintf(FILE *file, ...)

components/services/CMakeLists.txt

@@ -1,7 +1,6 @@
-idf_component_register(SRC_DIRS .
-						INCLUDE_DIRS .  ${IDF_PATH}/components/driver
-						REQUIRES json tools platform_config display
-						PRIV_REQUIRES soc esp32 squeezelite
+idf_component_register(SRCS "led.c" "audio_controls.c" "buttons.c" "services.c" "monitor.c"INCLUDE_DIRS 
+						INCLUDE_DIRS . ../tools/
+                   
 )
 
 

components/services/accessors.c

@@ -11,441 +11,27 @@
 #include "driver/gpio.h"
 #include "driver/i2c.h"
 #include "driver/spi_master.h"
-#include "platform_config.h"
+#include "config.h"
 #include "accessors.h"
 #include "globdefs.h"
-#include "display.h"
-#include "display.h"
-#include "cJSON.h"
-#include "driver/gpio.h"
-#include "stdbool.h"
-#include "driver/adc.h"
-#include "esp_attr.h"
-#include "soc/spi_periph.h"
-#include "esp_err.h"
-#include "soc/rtc.h"
-#include "sdkconfig.h"
-#include "soc/efuse_periph.h"
-#include "driver/gpio.h"
-#include "driver/spi_common_internal.h"
-#include "esp32/rom/efuse.h"
-#include "adac.h"
-#include "trace.h"
-#include "monitor.h"
-#include "messaging.h"
-
 
 static const char *TAG = "services";
-const char *i2c_name_type="I2C";
-const char *spi_name_type="SPI";
-cJSON * gpio_list=NULL;
+
 #define min(a,b) (((a) < (b)) ? (a) : (b))
-#ifndef QUOTE
-	#define QUOTE(name) #name
-#endif
-#ifndef STR
-	#define STR(macro)  QUOTE(macro)
-#endif
-
-bool are_statistics_enabled(){
-#if defined(CONFIG_FREERTOS_USE_TRACE_FACILITY) &&  defined (CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS)
-	return true;
-#endif
-	return false;
-}
-
-
-/****************************************************************************************
- * 
- */
-static char * config_spdif_get_string(){
-	return config_alloc_get_str("spdif_config", CONFIG_SPDIF_CONFIG, "bck=" STR(CONFIG_SPDIF_BCK_IO)
-											  ",ws=" STR(CONFIG_SPDIF_WS_IO) ",do=" STR(CONFIG_SPDIF_DO_IO));
-}
-
-/****************************************************************************************
- * 
- */
-static char * get_dac_config_string(){
-	return config_alloc_get_str("dac_config", CONFIG_DAC_CONFIG, "model=i2s,bck=" STR(CONFIG_I2S_BCK_IO)
-											",ws=" STR(CONFIG_I2S_WS_IO) ",do=" STR(CONFIG_I2S_DO_IO)
-											",sda=" STR(CONFIG_I2C_SDA) ",scl=" STR(CONFIG_I2C_SCL)
-											",mute=" STR(CONFIG_MUTE_GPIO));
-}
-
-/****************************************************************************************
- * 
- */
-bool is_dac_config_locked(){
-#if ( defined CONFIG_DAC_CONFIG )
-	if(strlen(CONFIG_DAC_CONFIG) > 0){
-		return true;
-	}
-#endif
-#if defined(CONFIG_I2S_BCK_IO) && CONFIG_I2S_BCK_IO>0		
-	return true;
-#endif
-	return false;
-}
-
-/****************************************************************************************
- * 
- */
-bool is_spdif_config_locked(){
-#if ( defined CONFIG_SPDIF_CONFIG )
-	if(strlen(CONFIG_SPDIF_CONFIG) > 0){
-		return true;
-	}
-#endif
-#if defined(CONFIG_SPDIF_BCK_IO) && CONFIG_SPDIF_BCK_IO>0		
-	return true;
-#endif
-	return false;
-}
-
-/****************************************************************************************
- * Set pin from config string
- */
-static void set_i2s_pin(char *config, i2s_pin_config_t *pin_config) {
-	char *p;
-	pin_config->bck_io_num = pin_config->ws_io_num = pin_config->data_out_num = pin_config->data_in_num = -1; 				
-	if ((p = strcasestr(config, "bck")) != NULL) pin_config->bck_io_num = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(config, "ws")) != NULL) pin_config->ws_io_num = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(config, "do")) != NULL) pin_config->data_out_num = atoi(strchr(p, '=') + 1);
-}
-
-/****************************************************************************************
- * Get i2s config structure from config string
- */
-const i2s_platform_config_t * config_get_i2s_from_str(char * dac_config ){
-	static EXT_RAM_ATTR i2s_platform_config_t i2s_dac_pin = {
-		.i2c_addr = -1,
-		.sda= -1,
-		.scl = -1,
-		.mute_gpio = -1,
-		.mute_level = -1
-	};
-	set_i2s_pin(dac_config, &i2s_dac_pin.pin);
-	strcpy(i2s_dac_pin.model, "i2s");
-	char * p=NULL;
-
-	if ((p = strcasestr(dac_config, "i2c")) != NULL) i2s_dac_pin.i2c_addr = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(dac_config, "sda")) != NULL) i2s_dac_pin.sda = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(dac_config, "scl")) != NULL) i2s_dac_pin.scl = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(dac_config, "model")) != NULL) sscanf(p, "%*[^=]=%31[^,]", i2s_dac_pin.model);
-	if ((p = strcasestr(dac_config, "mute")) != NULL) {
-		char mute[8] = "";
-		sscanf(p, "%*[^=]=%7[^,]", mute);
-		i2s_dac_pin.mute_gpio = atoi(mute);
-		if ((p = strchr(mute, ':')) != NULL) i2s_dac_pin.mute_level = atoi(p + 1);
-	}	
-	return &i2s_dac_pin;
-}
-
-/****************************************************************************************
- * Get eth config structure from config string
- */
-const eth_config_t * config_get_eth_from_str(char * eth_config ){
-	static EXT_RAM_ATTR eth_config_t eth_pin = {
-		.rmii = false,
-		.model = "",
-	};
-	char * p=NULL;
-
-	if ((p = strcasestr(eth_config, "model")) != NULL) sscanf(p, "%*[^=]=%15[^,]", eth_pin.model);
-	if ((p = strcasestr(eth_config, "mdc")) != NULL) eth_pin.mdc = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(eth_config, "mdio")) != NULL) eth_pin.mdio = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(eth_config, "rst")) != NULL) eth_pin.rst = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(eth_config, "mosi")) != NULL) eth_pin.mosi = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(eth_config, "miso")) != NULL) eth_pin.miso = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(eth_config, "intr")) != NULL) eth_pin.intr = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(eth_config, "cs")) != NULL) eth_pin.cs = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(eth_config, "speed")) != NULL) eth_pin.speed = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(eth_config, "clk")) != NULL) eth_pin.clk = atoi(strchr(p, '=') + 1);
-	if ((p = strcasestr(eth_config, "host")) != NULL) eth_pin.host = atoi(strchr(p, '=') + 1);
-	
-	if (strcasestr(eth_pin.model, "lan8720")) eth_pin.rmii = true;
-	
-	return &eth_pin;
-}
-
-/****************************************************************************************
- * Get spdif config structure 
- */
-const i2s_platform_config_t * config_spdif_get( ){
-	char * spdif_config = config_spdif_get_string();
-	static EXT_RAM_ATTR i2s_platform_config_t i2s_dac_config;
-	memcpy(&i2s_dac_config, config_get_i2s_from_str(spdif_config), sizeof(i2s_dac_config));
-	free(spdif_config);
-	return &i2s_dac_config;
-}
-
-/****************************************************************************************
- * Get dac config structure 
- */
-const i2s_platform_config_t * config_dac_get(){
-	char * spdif_config = get_dac_config_string();
-	static EXT_RAM_ATTR i2s_platform_config_t i2s_dac_config;
-	memcpy(&i2s_dac_config, config_get_i2s_from_str(spdif_config), sizeof(i2s_dac_config));
-	free(spdif_config);
-	return &i2s_dac_config;
-}
-
-/****************************************************************************************
- * Get ethernet config structure 
- */
-const eth_config_t * config_eth_get( ){
-	char * config = config_alloc_get_str("eth_config", CONFIG_ETH_CONFIG, "rst=" STR(CONFIG_ETH_PHY_RST_IO) 
-#if defined(CONFIG_ETH_LAN8720)	
-										 ",model=lan8720"
-#elif defined(CONFIG_ETH_DM9051)									
-										 ",model=dm9051"
-#endif										 
-										 ",mdc=" STR(CONFIG_ETH_MDC_IO) ",mdio=" STR(CONFIG_ETH_MDIO_IO) 
-										 ",host=" STR(CONFIG_ETH_SPI_HOST) ",cs=" STR(CONFIG_ETH_SPI_CS_IO)
-										 ",mosi=" STR(CONFIG_ETH_SPI_MOSI_IO) ",miso=" STR(CONFIG_ETH_SPI_MISO_IO) 
-										 ",intr=" STR(CONFIG_ETH_SPI_INTR_IO)
-										 ",clk=" STR(CONFIG_ETH_SPI_CLK_IO) ",speed=" STR(CONFIG_ETH_SPI_SPEED) );
-	static EXT_RAM_ATTR eth_config_t eth_config;
-	ESP_LOGD(TAG, "Ethernet config string %s", config);	
-	memcpy(&eth_config, config_get_eth_from_str(config), sizeof(eth_config));
-	free(config);
-	return &eth_config;
-}
 
 /****************************************************************************************
  * 
  */
 esp_err_t config_i2c_set(const i2c_config_t * config, int port){
 	int buffer_size=255;
-	esp_err_t err=ESP_OK;
 	char * config_buffer=calloc(buffer_size,1);
 	if(config_buffer)  {
-		snprintf(config_buffer,buffer_size,"scl=%u,sda=%u,speed=%u,port=%u",config->scl_io_num,config->sda_io_num,config->master.clk_speed,port);
-		log_send_messaging(MESSAGING_INFO,"Updating I2C configuration to %s",config_buffer);
-		err = config_set_value(NVS_TYPE_STR, "i2c_config", config_buffer);
-		if(err!=ESP_OK){
-			log_send_messaging(MESSAGING_ERROR,"Error: %s",esp_err_to_name(err));
-		}		
+		snprintf(config_buffer,buffer_size,"scl=%u sda=%u speed=%u port=%u",config->scl_io_num,config->sda_io_num,config->master.clk_speed,port);
+		ESP_LOGI(TAG,"Updating i2c configuration to %s",config_buffer);
+		config_set_value(NVS_TYPE_STR, "i2c_config", config_buffer);
 		free(config_buffer);
 	}
-	return err;
-}
-
-/****************************************************************************************
- * 
- */
-esp_err_t config_rotary_set(rotary_struct_t * config){
-	int buffer_size=512;
-	esp_err_t err=ESP_OK;
-	char * config_buffer=calloc(buffer_size,1);
-	char * config_buffer2=calloc(buffer_size,1);	
-	if(config_buffer && config_buffer2)  {
-		snprintf(config_buffer,buffer_size,"A=%i,B=%i",config->A, config->B);
-		if(config->SW >=0 ){
-			snprintf(config_buffer2,buffer_size,"%s,SW=%i",config_buffer,config->SW);
-			strcpy(config_buffer,config_buffer2);
-		}
-		if(config->knobonly){
-			strncat(config_buffer,",knobonly",buffer_size);
-			if(config->timer>0){
-				snprintf(config_buffer2,buffer_size,"%s=%i",config_buffer,config->timer);
-				strcpy(config_buffer,config_buffer2);
-			}
-		}
-		if(config->volume_lock){
-			strncat(config_buffer,",volume",buffer_size);
-		}
-		if(config->longpress){
-			strncat(config_buffer,",longpress",buffer_size);
-		}
-			log_send_messaging(MESSAGING_INFO,"Updating rotary configuration to %s",config_buffer);
-		err = config_set_value(NVS_TYPE_STR, "rotary_config", config_buffer);
-		if(err!=ESP_OK){
-			log_send_messaging(MESSAGING_ERROR,"Error: %s",esp_err_to_name(err));
-		}
-	} 
-	else {
-		err = ESP_ERR_NO_MEM;
-	}
-	FREE_AND_NULL(config_buffer);
-	FREE_AND_NULL(config_buffer2);	
-	return err;	
-}
-
-/****************************************************************************************
- * 
- */
-esp_err_t config_display_set(const display_config_t * config){
-	int buffer_size=512;
-	esp_err_t err=ESP_OK;
-	char * config_buffer=calloc(buffer_size,1);
-	char * config_buffer2=calloc(buffer_size,1);
-	if(config_buffer && config_buffer2)  {
-		snprintf(config_buffer,buffer_size,"%s,width=%i,height=%i",config->type,config->width,config->height);
-		if(strcasecmp("I2C",config->type)==0){
-			if(config->address>0 ){
-				snprintf(config_buffer2,buffer_size,"%s,address=%i",config_buffer,config->address);
-				strcpy(config_buffer,config_buffer2);
-			}
-		}
-		else {
-			if(config->CS_pin >=0 ){
-				snprintf(config_buffer2,buffer_size,"%s,cs=%i",config_buffer,config->CS_pin);
-				strcpy(config_buffer,config_buffer2);
-			}		
-		}
-		if(config->RST_pin >=0 ){
-			snprintf(config_buffer2,buffer_size,"%s,reset=%i",config_buffer,config->RST_pin);
-			strcpy(config_buffer,config_buffer2);
-		}		
-// I2C,width=<pixels>,height=<pixels>[address=<i2c_address>][,reset=<gpio>][,HFlip][,VFlip][driver=SSD1306|SSD1326[:1|4]|SSD1327|SH1106]
-// SPI,width=<pixels>,height=<pixels>,cs=<gpio>[,back=<gpio>][,reset=<gpio>][,speed=<speed>][,HFlip][,VFlip][driver=SSD1306|SSD1322|SSD1326[:1|4]|SSD1327|SH1106|SSD1675|ST7735|ST7789[,rotate]]		
-		if(config->back >=0 ){
-			snprintf(config_buffer2,buffer_size,"%s,back=%i",config_buffer,config->back);
-			strcpy(config_buffer,config_buffer2);
-		}
-		if(config->speed >0 && strcasecmp("SPI",config->type)==0){
-			snprintf(config_buffer2,buffer_size,"%s,speed=%i",config_buffer,config->speed);
-			strcpy(config_buffer,config_buffer2);
-		}
-		snprintf(config_buffer2,buffer_size,"%s,driver=%s%s%s%s",config_buffer,config->drivername,config->hflip?",HFlip":"",config->vflip?",VFlip":"",config->rotate?",rotate":"");
-		strcpy(config_buffer,config_buffer2);
-		log_send_messaging(MESSAGING_INFO,"Updating display configuration to %s",config_buffer);
-		err = config_set_value(NVS_TYPE_STR, "display_config", config_buffer);
-		if(err!=ESP_OK){
-			log_send_messaging(MESSAGING_ERROR,"Error: %s",esp_err_to_name(err));
-		}
-	} 
-	else {
-		err = ESP_ERR_NO_MEM;
-	}
-	FREE_AND_NULL(config_buffer);
-	FREE_AND_NULL(config_buffer2);	
-	return err;
-}
-
-/****************************************************************************************
- * 
- */
-esp_err_t config_i2s_set(const i2s_platform_config_t * config, const char * nvs_name){
-	int buffer_size=255;
-	esp_err_t err=ESP_OK;
-	char * config_buffer=calloc(buffer_size,1);
-	char * config_buffer2=calloc(buffer_size,1);
-	if(config_buffer && config_buffer2)  {
-		snprintf(config_buffer,buffer_size,"model=%s,bck=%u,ws=%u,do=%u",config->model,config->pin.bck_io_num,config->pin.ws_io_num,config->pin.data_out_num);
-		if(config->mute_gpio>=0){
-			snprintf(config_buffer2,buffer_size,"%s,mute=%u:%u",config_buffer,config->mute_gpio,config->mute_level);
-			strcpy(config_buffer,config_buffer2);
-		}
-		if(config->sda>=0){
-			snprintf(config_buffer2,buffer_size,"%s,sda=%u,scl=%u",config_buffer,config->sda,config->scl);
-			strcpy(config_buffer,config_buffer2);
-		}
-		if(config->i2c_addr>0){
-			snprintf(config_buffer2,buffer_size,"%s,i2c=%u",config_buffer,config->i2c_addr);
-			strcpy(config_buffer,config_buffer2);
-		}
-		log_send_messaging(MESSAGING_INFO,"Updating dac configuration to %s",config_buffer);
-		err = config_set_value(NVS_TYPE_STR, nvs_name, config_buffer);
-		if(err!=ESP_OK){
-			log_send_messaging(MESSAGING_ERROR,"Error: %s",esp_err_to_name(err));
-		}
-	} 
-	else {
-		err = ESP_ERR_NO_MEM;
-	}
-	FREE_AND_NULL(config_buffer);
-	FREE_AND_NULL(config_buffer2);	
-	return err;
-}
-
-/****************************************************************************************
- * 
- */
-esp_err_t config_spdif_set(const i2s_platform_config_t * config){
-	int buffer_size=255;
-	esp_err_t err=ESP_OK;
-	char * config_buffer=calloc(buffer_size,1);
-	if(config_buffer )  {
-		snprintf(config_buffer,buffer_size,"bck=%u,ws=%u,do=%u",config->pin.bck_io_num,config->pin.ws_io_num,config->pin.data_out_num);
-		log_send_messaging(MESSAGING_INFO,"Updating SPDIF configuration to %s",config_buffer);
-		err = config_set_value(NVS_TYPE_STR, "spdif_config", config_buffer);
-		if(err!=ESP_OK){
-			log_send_messaging(MESSAGING_ERROR,"Error: %s",esp_err_to_name(err));
-		}		
-	} 
-	else {
-		err = ESP_ERR_NO_MEM;
-	}
-	FREE_AND_NULL(config_buffer);
-	return err;
-}
-
-/****************************************************************************************
- *
- */
-esp_err_t config_spi_set(const spi_bus_config_t * config, int host, int dc){
-	int buffer_size=255;
-	esp_err_t err = ESP_OK;
-	char * config_buffer=calloc(buffer_size,1);
-	if(config_buffer)  {
-		snprintf(config_buffer,buffer_size,"data=%u,clk=%u,dc=%u,host=%u,miso=%d",config->mosi_io_num,config->sclk_io_num,dc,host,config->miso_io_num);
-		log_send_messaging(MESSAGING_INFO,"Updating SPI configuration to %s",config_buffer);
-		err = config_set_value(NVS_TYPE_STR, "spi_config", config_buffer);
-		if(err!=ESP_OK){
-			log_send_messaging(MESSAGING_ERROR,"Error: %s",esp_err_to_name(err));
-		}		
-		free(config_buffer);
-	}
-	return err;
-}
-
-/****************************************************************************************
- * 
- */
-const display_config_t * config_display_get(){
-	static display_config_t dstruct = {
-		.back = -1,
-		.CS_pin = -1,
-		.RST_pin = -1,
-		.depth = -1,
-		.address = 0,
-		.drivername = NULL,
-		.height = 0,
-		.width = 0,
-		.vflip = false,
-		.hflip = false,
-		.type = NULL,
-		.speed = 0,
-		.rotate = false
-	};
-	char *config = config_alloc_get(NVS_TYPE_STR, "display_config");
-	if (!config) {
-		return NULL;
-	}
-
-	char * p=NULL;
-
-	if ((p = strcasestr(config, "driver")) != NULL){
-		sscanf(p, "%*[^:]:%u", &dstruct.depth);
-		dstruct.drivername = display_conf_get_driver_name(strchr(p, '=') + 1);
-	}
-	
-	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);
-	if (strstr(config, "I2C") ) dstruct.type=i2c_name_type;
-	if ((p = strcasestr(config, "address")) != NULL) dstruct.address = atoi(strchr(p, '=') + 1);
-	if (strstr(config, "SPI") ) dstruct.type=spi_name_type;
-	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);
-	if ((p = strcasestr(config, "back")) != NULL) dstruct.back = 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;
+	return ESP_OK;
 }
 
 /****************************************************************************************
@@ -472,96 +58,16 @@ const i2c_config_t * config_i2c_get(int * i2c_port) {
 		if ((p = strcasestr(nvs_item, "port")) != NULL) i2c_system_port = atoi(strchr(p, '=') + 1);
 		free(nvs_item);
 	}
-	if(i2c_port) {
-#ifdef CONFIG_I2C_LOCKED
-		*i2c_port= I2C_NUM_1;
-#else
-		*i2c_port=i2c_system_port;
-#endif		
-	}
+	if(i2c_port) *i2c_port=i2c_system_port;
 	return &i2c;
 }
 
-/****************************************************************************************
- * 
- */
-const gpio_with_level_t * get_gpio_struct_member(const char * nvs_item, const char * name){
-	static gpio_with_level_t gpio_member={
-		.gpio=-1,
-		.level=0
-	};
-	if(!nvs_item) return &gpio_member;
-	const char * p=nvs_item;
-	char type[20]={0};
-	int match=0;
-	do {
-		if ((match=sscanf(p, "%d=%19[^,:]:%d", &gpio_member.gpio, type,&gpio_member.level)) >0 && (GPIO_IS_VALID_GPIO(gpio_member.gpio) ||  gpio_member.gpio==GPIO_NUM_NC) && strcasestr(type,name)){
-            return &gpio_member;
-		}
-		p = strchr(p, ',');
-	} while (p++);
-	gpio_member.gpio=-1;
-	gpio_member.level=0;
-    return &gpio_member;
-}
-
-#define HANDLE_GPIO_STRUCT_MEMBER(name,fixval) memcpy(&gpio_struct.name, get_gpio_struct_member(nvs_item, QUOTE(name)), sizeof(gpio_struct.name)); gpio_struct.name.fixed=fixval
-#define ADD_GPIO_STRUCT_MEMBER_TO_ARRAY(array,structvar,name,type) if(((set_GPIO_struct_t *)structvar)->name.gpio>=0){cJSON_AddItemToArray(array,get_gpio_entry(QUOTE(name),type,((set_GPIO_struct_t *)structvar)->name.gpio, ((set_GPIO_struct_t *)structvar)->name.fixed));}
-/****************************************************************************************
- * 
- */
-const set_GPIO_struct_t * get_gpio_struct(){
-	static set_GPIO_struct_t gpio_struct;
-	char * nvs_item=config_alloc_get(NVS_TYPE_STR, "set_GPIO");
-#ifdef CONFIG_LED_GREEN_GPIO_LEVEL
-		gpio_struct.green.level = CONFIG_LED_GREEN_GPIO_LEVEL;
-#endif
-#ifdef CONFIG_LED_GREEN_GPIO
-		gpio_struct.green.gpio = CONFIG_LED_GREEN_GPIO;
-#endif
-#ifdef CONFIG_LED_RED_GPIO_LEVEL
-		gpio_struct.green.level = CONFIG_LED_RED_GPIO_LEVEL;
-#endif
-#ifdef CONFIG_LED_RED_GPIO
-		gpio_struct.red.gpio = CONFIG_LED_RED_GPIO;
-#endif	
-	if(nvs_item){
-		HANDLE_GPIO_STRUCT_MEMBER(amp,false);
-#ifndef CONFIG_LED_LOCKED
-		HANDLE_GPIO_STRUCT_MEMBER(green,false);
-		HANDLE_GPIO_STRUCT_MEMBER(red,false);
-#endif
-		HANDLE_GPIO_STRUCT_MEMBER(jack,false);
-		HANDLE_GPIO_STRUCT_MEMBER(spkfault,false);
-		HANDLE_GPIO_STRUCT_MEMBER(vcc,false);
-		HANDLE_GPIO_STRUCT_MEMBER(gnd,false);
-		HANDLE_GPIO_STRUCT_MEMBER(ir,false);
-		free(nvs_item);
-	}
-
-#ifdef CONFIG_LED_LOCKED
-		gpio_struct.red.fixed=true;
-		gpio_struct.green.fixed=true;
-#endif	
-#ifdef CONFIG_JACK_LOCKED 
-		gpio_struct.jack.gpio=CONFIG_JACK_GPIO;
-		gpio_struct.jack.fixed=true;
-		gpio_struct.jack.level=CONFIG_JACK_GPIO_LEVEL;
-#endif
-#ifdef CONFIG_SPKFAULT_LOCKED
-		gpio_struct.spkfault.gpio=CONFIG_SPKFAULT_GPIO;
-		gpio_struct.spkfault.fixed=true;
-		gpio_struct.spkfault.level=CONFIG_SPKFAULT_GPIO_LEVEL;
-#endif
-	return &gpio_struct;	
-}
-
 /****************************************************************************************
  * 
  */
 const spi_bus_config_t * config_spi_get(spi_host_device_t * spi_host) {
 	char *nvs_item, *p;
-	static EXT_RAM_ATTR spi_bus_config_t spi = {
+	static spi_bus_config_t spi = {
 		.mosi_io_num = -1,
         .sclk_io_num = -1,
         .miso_io_num = -1,
@@ -572,8 +78,6 @@ const spi_bus_config_t * config_spi_get(spi_host_device_t * spi_host) {
 	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, "mosi")) != NULL) spi.mosi_io_num = atoi(strchr(p, '=') + 1);
-		if ((p = strcasestr(nvs_item, "miso")) != NULL) spi.miso_io_num = atoi(strchr(p, '=') + 1);
 		if ((p = strcasestr(nvs_item, "clk")) != NULL) spi.sclk_io_num = atoi(strchr(p, '=') + 1);
 		if ((p = strcasestr(nvs_item, "dc")) != NULL) spi_system_dc_gpio = atoi(strchr(p, '=') + 1);
 		if ((p = strcasestr(nvs_item, "host")) != NULL) spi_system_host = atoi(strchr(p, '=') + 1);
@@ -600,418 +104,4 @@ void parse_set_GPIO(void (*cb)(int gpio, char *value)) {
 	} while (p++);
 	
 	free(nvs_item);
-}	
-
-/****************************************************************************************
- * 
- */
-const rotary_struct_t * config_rotary_get() {
-
-	static rotary_struct_t rotary={  .A = -1, .B = -1, .SW = -1, .longpress = false, .knobonly=false,.timer=0,.volume_lock=false};
-	char *config = config_alloc_get_default(NVS_TYPE_STR, "rotary_config", NULL, 0);
-	if (config && *config) {
-		char *p;
-		
-		// parse config
-		if ((p = strcasestr(config, "A")) != NULL) rotary.A = atoi(strchr(p, '=') + 1);
-		if ((p = strcasestr(config, "B")) != NULL) rotary.B = atoi(strchr(p, '=') + 1);
-		if ((p = strcasestr(config, "SW")) != NULL) rotary.SW = atoi(strchr(p, '=') + 1);
-		if ((p = strcasestr(config, "knobonly")) != NULL) {
-			p = strchr(p, '=');
-			rotary.knobonly = true;
-			rotary.timer = p ? atoi(p + 1) : 350;
-			rotary.longpress = false;
-		} else {
-			rotary.knobonly = false;
-			rotary.timer = 0;
-			if ((p = strcasestr(config, "volume")) != NULL) rotary.volume_lock = true;
-			if ((p = strcasestr(config, "longpress")) != NULL) rotary.longpress = true;
-		}	
-		free(config);
-	}
-	return &rotary;
-}
-
-/****************************************************************************************
- *
- */
-cJSON * get_gpio_entry(const char * name, const char * prefix, int gpio, bool fixed){
-	cJSON * entry = cJSON_CreateObject();
-	cJSON_AddNumberToObject(entry,"gpio",gpio);
-	cJSON_AddStringToObject(entry,"name",name);
-	cJSON_AddStringToObject(entry,"group",prefix);
-	cJSON_AddBoolToObject(entry,"fixed",fixed);
-	return entry;
-}
-
-/****************************************************************************************
- *
- */
-cJSON * add_gpio_for_value(cJSON * list,const char * name,int gpio, const char * prefix, bool fixed){
-	cJSON * llist = list?list:cJSON_CreateArray();
-	if(GPIO_IS_VALID_GPIO(gpio) && gpio>0){
-		cJSON_AddItemToArray(llist,get_gpio_entry(name,prefix,gpio,fixed));
-	}
-	return llist;
-}
-
-/****************************************************************************************
- *
- */
-cJSON * add_gpio_for_name(cJSON * list,const char * nvs_entry,const char * name, const char * prefix, bool fixed){
-	cJSON * llist = list?list:cJSON_CreateArray();
-	char *p;
-	int gpioNum=0;
-	if ((p = strcasestr(nvs_entry, name)) != NULL) {
-		gpioNum = atoi(strchr(p, '=') + 1);
-		if(gpioNum>=0){
-			cJSON_AddItemToArray(llist,get_gpio_entry(name,prefix,gpioNum,fixed));
-		}
-	}
-	return llist;
-}
-
-/****************************************************************************************
- *
- */
-cJSON * get_GPIO_nvs_list(cJSON * list) {
-	cJSON * ilist = list?list:cJSON_CreateArray();
-	const set_GPIO_struct_t * gpios = get_gpio_struct();
-	ADD_GPIO_STRUCT_MEMBER_TO_ARRAY(ilist,gpios,vcc,"other");
-	ADD_GPIO_STRUCT_MEMBER_TO_ARRAY(ilist,gpios,gnd,"other");
-	ADD_GPIO_STRUCT_MEMBER_TO_ARRAY(ilist,gpios,amp,"other");
-	ADD_GPIO_STRUCT_MEMBER_TO_ARRAY(ilist,gpios,ir,"other");
-	ADD_GPIO_STRUCT_MEMBER_TO_ARRAY(ilist,gpios,jack,"other");
-	ADD_GPIO_STRUCT_MEMBER_TO_ARRAY(ilist,gpios,green,"other");
-	ADD_GPIO_STRUCT_MEMBER_TO_ARRAY(ilist,gpios,red,"other");
-	ADD_GPIO_STRUCT_MEMBER_TO_ARRAY(ilist,gpios,spkfault,"other");
-	return ilist;
-}
-
-/****************************************************************************************
- *
- */
-cJSON * get_DAC_GPIO(cJSON * list){
-	cJSON * llist = list;
-	if(!llist){
-		llist = cJSON_CreateArray();
-	}	
-	const i2s_platform_config_t * i2s_config= config_dac_get();
-	if(i2s_config->pin.bck_io_num>=0){
-		cJSON_AddItemToArray(llist,get_gpio_entry("bck","dac",i2s_config->pin.bck_io_num,is_dac_config_locked()));
-		cJSON_AddItemToArray(llist,get_gpio_entry("ws","dac",i2s_config->pin.ws_io_num,is_dac_config_locked()));
-		cJSON_AddItemToArray(llist,get_gpio_entry("do","dac",i2s_config->pin.data_out_num,is_dac_config_locked()));
-		if(i2s_config->sda>=0){
-			cJSON_AddItemToArray(llist,get_gpio_entry("sda","dac",i2s_config->sda,is_dac_config_locked()));
-			cJSON_AddItemToArray(llist,get_gpio_entry("scl","dac",i2s_config->scl,is_dac_config_locked()));
-		}
-		if(i2s_config->mute_gpio>=0){
-			cJSON_AddItemToArray(llist,get_gpio_entry("mute","dac",i2s_config->mute_gpio,is_dac_config_locked()));
-		}
-	}
-	return llist;
-}
-
-/****************************************************************************************
- *
- */
-cJSON * get_Display_GPIO(cJSON * list){
-	cJSON * llist = list;
-	if(!llist){
-		llist = cJSON_CreateArray();
-	}	
-	const display_config_t * config= config_display_get();
-	if(config->back >=0){
-		cJSON_AddItemToArray(llist,get_gpio_entry("backlight","display",config->back,false));
-	}
-	if(config->CS_pin >=0){
-		cJSON_AddItemToArray(llist,get_gpio_entry("CS","display",config->CS_pin,false));
-	}	
-	if(config->RST_pin >=0){
-		cJSON_AddItemToArray(llist,get_gpio_entry("reset","display",config->RST_pin,false));
-	}
-	return llist;
-}
-/****************************************************************************************
- *
- */
-cJSON * get_I2C_GPIO(cJSON * list){
-	cJSON * llist = list;
-	if(!llist){
-		llist = cJSON_CreateArray();
-	}	
-	int port=0;
-	const i2c_config_t * i2c_config = config_i2c_get(&port);
-	if(i2c_config->scl_io_num>=0){
-		cJSON_AddItemToArray(llist,get_gpio_entry("scl","i2c",i2c_config->scl_io_num,false));
-		cJSON_AddItemToArray(llist,get_gpio_entry("sda","i2c",i2c_config->sda_io_num,false));
-	}
-	return llist;
-}
-
-/****************************************************************************************
- *
- */
-cJSON * get_SPI_GPIO(cJSON * list){
-	cJSON * llist = list;
-	if(!llist){
-		llist = cJSON_CreateArray();
-	}	
-	spi_host_device_t spi_host;
-	const spi_bus_config_t * spi_config = config_spi_get(&spi_host);
-	
-	if(spi_config->miso_io_num>=0){
-		cJSON_AddItemToArray(llist,get_gpio_entry("data","spi",spi_config->miso_io_num,false));
-		cJSON_AddItemToArray(llist,get_gpio_entry("data","clk",spi_config->sclk_io_num,false));
-	}
-	if(spi_system_dc_gpio>0){
-		cJSON_AddItemToArray(llist,get_gpio_entry("data","dc",spi_system_dc_gpio,false));
-	}
-	return llist;
-}
-
-/****************************************************************************************
- *
- */
-cJSON * get_SPDIF_GPIO(cJSON * list, bool fixed){
-	cJSON * llist = list?list:cJSON_CreateArray();
-	char * spdif_config = config_spdif_get_string();
-	if(spdif_config){
-		llist = add_gpio_for_name(llist,spdif_config,"bck", "spdif", fixed);
-		llist = add_gpio_for_name(llist,spdif_config,"ws",  "spdif", fixed);
-		llist = add_gpio_for_name(llist,spdif_config,"do",  "spdif", fixed);
-		free(spdif_config);	
-	}	
-	return llist;
-}
-
-/****************************************************************************************
- *
- */
-cJSON * get_Rotary_GPIO(cJSON * list){
-	cJSON * llist = list?list:cJSON_CreateArray();
-
-	const rotary_struct_t *rotary= config_rotary_get();
-	add_gpio_for_value(llist,"A",rotary->A, "rotary", false);
-	add_gpio_for_value(llist,"B",rotary->B, "rotary", false);
-	add_gpio_for_value(llist,"SW",rotary->SW, "rotary", false);
-	return llist;
-}
-
-/****************************************************************************************
- *
- */
-esp_err_t get_gpio_structure(cJSON * gpio_entry, gpio_entry_t ** gpio){
-	esp_err_t err = ESP_OK;
-	*gpio = malloc(sizeof(gpio_entry_t));
-	cJSON * val = cJSON_GetObjectItem(gpio_entry,"gpio");
-	if(val){
-		(*gpio)->gpio= (int)val->valuedouble;
-	} else {
-		ESP_LOGE(TAG,"gpio pin not found");
-		err=ESP_FAIL;
-	}
-	val = cJSON_GetObjectItem(gpio_entry,"name");
-	if(val){
-		(*gpio)->name= strdup(cJSON_GetStringValue(val));
-	} else {
-		ESP_LOGE(TAG,"gpio name value not found");
-		err=ESP_FAIL;
-	}
-	val = cJSON_GetObjectItem(gpio_entry,"group");
-	if(val){
-		(*gpio)->group= strdup(cJSON_GetStringValue(val));
-	} else {
-		ESP_LOGE(TAG,"gpio group value not found");
-		err=ESP_FAIL;
-	}
-	val = cJSON_GetObjectItem(gpio_entry,"fixed");
-	if(val){
-		(*gpio)->fixed= cJSON_IsTrue(val);
-	} else {
-		ESP_LOGE(TAG,"gpio fixed indicator not found");
-		err=ESP_FAIL;
-	}
-
-	return err;
-}
-
-/****************************************************************************************
- *
- */
-esp_err_t free_gpio_entry( gpio_entry_t ** gpio) {
-	if(* gpio){
-		free((* gpio)->name);
-		free((* gpio)->group);
-		free(* gpio);
-		* gpio=NULL;
-		return ESP_OK;
-	}
-	return ESP_FAIL;
-}
-
-/****************************************************************************************
- *
- */
-gpio_entry_t * get_gpio_by_no(int gpionum, bool refresh){
-	cJSON * gpio_header=NULL;
-	gpio_entry_t * gpio=NULL;
-	get_gpio_list(refresh);
-	cJSON_ArrayForEach(gpio_header,gpio_list)
-	{
-		if(get_gpio_structure(gpio_header, &gpio)==ESP_OK && gpio->gpio==gpionum){
-			ESP_LOGD(TAG,"Found GPIO: %s=%d %s", gpio->name,gpio->gpio,gpio->fixed?"(FIXED)":"(VARIABLE)");
-		}
-	}
-	return gpio;
-}
-
-/****************************************************************************************
- *
- */
-gpio_entry_t * get_gpio_by_name(char * name,char * group, bool refresh){
-	cJSON * gpio_header=NULL;
-	gpio_entry_t * gpio=NULL;
-	get_gpio_list(refresh);
-	cJSON_ArrayForEach(gpio_header,gpio_list)
-	{
-		if(get_gpio_structure(gpio_header, &gpio)==ESP_OK && strcasecmp(gpio->name,name)&& strcasecmp(gpio->group,group)){
-			ESP_LOGD(TAG,"Found GPIO: %s=%d %s", gpio->name,gpio->gpio,gpio->fixed?"(FIXED)":"(VARIABLE)");
-		}
-	}
-	return gpio;
-}
-
-#ifndef PICO_PSRAM_CLK_IO
-#define PICO_PSRAM_CLK_IO          6
-#endif
-#ifndef PSRAM_SPIQ_SD0_IO
-#define PSRAM_SPIQ_SD0_IO          7
-#define PSRAM_SPID_SD1_IO          8
-#define PSRAM_SPIWP_SD3_IO         10
-#define PSRAM_SPIHD_SD2_IO         9
-#define FLASH_HSPI_CLK_IO          14
-#define FLASH_HSPI_CS_IO           15
-#define PSRAM_HSPI_SPIQ_SD0_IO     12
-#define PSRAM_HSPI_SPID_SD1_IO     13
-#define PSRAM_HSPI_SPIWP_SD3_IO    2
-#define PSRAM_HSPI_SPIHD_SD2_IO    4
-#endif
-
-
-cJSON * get_psram_gpio_list(cJSON * list){
-	const char * psram_dev = "psram";
-	const char * flash_dev = "flash";
-	const char * clk = "clk";
-	const char * cs = "cs";
-	const char * spiq_sd0_io="spiq_sd0_io"; 
-	const char * spid_sd1_io = "spid_sd1_io";
-	const char * spiwp_sd3_io = "spiwp_sd3_io";
-	const char * spihd_sd2_io = "spihd_sd2_io";
-	cJSON * llist=list;
-	
-    uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
-    uint32_t pkg_ver = chip_ver & 0x7;
-    if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5) {
-        rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
-        if (cfg.tieh != RTC_VDDSDIO_TIEH_1_8V) {
-            return llist;
-        }
-        cJSON_AddItemToArray(list,get_gpio_entry(clk,psram_dev,CONFIG_D2WD_PSRAM_CLK_IO,true));
-        cJSON_AddItemToArray(list,get_gpio_entry(cs,psram_dev,CONFIG_D2WD_PSRAM_CS_IO,true));
-    } else if ((pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) || (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)) {
-        rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
-        if (cfg.tieh != RTC_VDDSDIO_TIEH_3_3V) {
-            return llist;
-        }
-		cJSON_AddItemToArray(list,get_gpio_entry(clk,psram_dev,PICO_PSRAM_CLK_IO,true));
-        cJSON_AddItemToArray(list,get_gpio_entry(cs,psram_dev,CONFIG_PICO_PSRAM_CS_IO,true));
-    } else if ((pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ6) || (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ5)){
-		cJSON_AddItemToArray(list,get_gpio_entry(clk,psram_dev,CONFIG_D0WD_PSRAM_CLK_IO,true));
-        cJSON_AddItemToArray(list,get_gpio_entry(cs,psram_dev,CONFIG_D0WD_PSRAM_CS_IO,true));
-    } else {
-        ESP_LOGW(TAG, "Cant' determine GPIOs for PSRAM chip id: %d", pkg_ver);
-		cJSON_AddItemToArray(list,get_gpio_entry(clk,psram_dev,-1,true));
-        cJSON_AddItemToArray(list,get_gpio_entry(cs,psram_dev,-1,true));
-    }
-
-    const uint32_t spiconfig = ets_efuse_get_spiconfig();
-    if (spiconfig == EFUSE_SPICONFIG_SPI_DEFAULTS) {
-		cJSON_AddItemToArray(list,get_gpio_entry(spiq_sd0_io,psram_dev,PSRAM_SPIQ_SD0_IO,true));
-		cJSON_AddItemToArray(list,get_gpio_entry(spid_sd1_io,psram_dev,PSRAM_SPID_SD1_IO,true));
-		cJSON_AddItemToArray(list,get_gpio_entry(spiwp_sd3_io,psram_dev,PSRAM_SPIWP_SD3_IO,true));
-		cJSON_AddItemToArray(list,get_gpio_entry(spihd_sd2_io,psram_dev,PSRAM_SPIHD_SD2_IO,true));
-    } else if (spiconfig == EFUSE_SPICONFIG_HSPI_DEFAULTS) {
-		cJSON_AddItemToArray(list,get_gpio_entry(spiq_sd0_io,psram_dev,PSRAM_HSPI_SPIQ_SD0_IO,true));
-		cJSON_AddItemToArray(list,get_gpio_entry(spid_sd1_io,psram_dev,PSRAM_HSPI_SPID_SD1_IO,true));
-		cJSON_AddItemToArray(list,get_gpio_entry(spiwp_sd3_io,psram_dev,PSRAM_HSPI_SPIWP_SD3_IO,true));
-		cJSON_AddItemToArray(list,get_gpio_entry(spihd_sd2_io,psram_dev,PSRAM_HSPI_SPIHD_SD2_IO,true));
-    } else {
-		cJSON_AddItemToArray(list,get_gpio_entry(spiq_sd0_io,psram_dev,EFUSE_SPICONFIG_RET_SPIQ(spiconfig),true));
-		cJSON_AddItemToArray(list,get_gpio_entry(spid_sd1_io,psram_dev,EFUSE_SPICONFIG_RET_SPID(spiconfig),true));
-		cJSON_AddItemToArray(list,get_gpio_entry(spihd_sd2_io,psram_dev,EFUSE_SPICONFIG_RET_SPIHD(spiconfig),true));
-        // If flash mode is set to QIO or QOUT, the WP pin is equal the value configured in bootloader.
-        // If flash mode is set to DIO or DOUT, the WP pin should config it via menuconfig.
-        #if CONFIG_ESPTOOLPY_FLASHMODE_QIO || CONFIG_FLASHMODE_QOUT
-		cJSON_AddItemToArray(list,get_gpio_entry(spiwp_sd3_io,psram_dev,CONFIG_BOOTLOADER_SPI_WP_PIN,true));
-        #else
-		cJSON_AddItemToArray(list,get_gpio_entry(spiwp_sd3_io,psram_dev,CONFIG_SPIRAM_SPIWP_SD3_PIN,true));
-        #endif
-	}
-    if (spiconfig == EFUSE_SPICONFIG_SPI_DEFAULTS) {
-		cJSON_AddItemToArray(list,get_gpio_entry(clk,flash_dev,SPI_IOMUX_PIN_NUM_CLK,true));
-		cJSON_AddItemToArray(list,get_gpio_entry(cs,flash_dev,SPI_IOMUX_PIN_NUM_CS,true));
-    } else if (spiconfig == EFUSE_SPICONFIG_HSPI_DEFAULTS) {
-		cJSON_AddItemToArray(list,get_gpio_entry(clk,flash_dev,FLASH_HSPI_CLK_IO,true));
-		cJSON_AddItemToArray(list,get_gpio_entry(cs,flash_dev,FLASH_HSPI_CS_IO,true));
-    } else {
-		cJSON_AddItemToArray(list,get_gpio_entry(clk,flash_dev,EFUSE_SPICONFIG_RET_SPICLK(spiconfig),true));
-		cJSON_AddItemToArray(list,get_gpio_entry(cs,flash_dev,EFUSE_SPICONFIG_RET_SPICS0(spiconfig),true));
-	}
-    return llist;	
-}
-
-/****************************************************************************************
- *
- */
-cJSON * get_gpio_list(bool refresh) {
-	gpio_num_t gpio_num;
-	if(gpio_list && !refresh){
-		return gpio_list;
-	}
-	
-	if(gpio_list){
-		cJSON_Delete(gpio_list);
-	}
-	gpio_list= cJSON_CreateArray();
-	
-#ifndef CONFIG_BAT_LOCKED
-	char *bat_config = config_alloc_get_default(NVS_TYPE_STR, "bat_config", NULL, 0);
-	if (bat_config) {
-		char *p;
-		int channel;
-		if ((p = strcasestr(bat_config, "channel") ) != NULL) {
-			channel = atoi(strchr(p, '=') + 1);
-			if(channel != -1){
-				if(adc1_pad_get_io_num(channel,&gpio_num )==ESP_OK){
-					cJSON_AddItemToArray(gpio_list,get_gpio_entry("bat","other",gpio_num,false));
-				}
-			}
-		}
-		free(bat_config);
-	}
-#else
-		if(adc1_pad_get_io_num(CONFIG_BAT_CHANNEL,&gpio_num )==ESP_OK){
-			cJSON_AddItemToArray(gpio_list,get_gpio_entry("bat","other",gpio_num,true));
-		}
-#endif
-	gpio_list=get_GPIO_nvs_list(gpio_list);
-	gpio_list=get_SPDIF_GPIO(gpio_list,is_spdif_config_locked());
-	gpio_list=get_Rotary_GPIO(gpio_list);
-	gpio_list=get_Display_GPIO(gpio_list);
-	gpio_list=get_SPI_GPIO(gpio_list);
-	gpio_list=get_I2C_GPIO(gpio_list);
-	gpio_list=get_DAC_GPIO(gpio_list);
-	gpio_list=get_psram_gpio_list(gpio_list);
-	return gpio_list;
-}
+}	

components/services/accessors.h

@@ -10,98 +10,9 @@
 
 #include "esp_system.h"
 #include "driver/i2c.h"
-#include "driver/i2s.h"
 #include "driver/spi_master.h"
-extern const char *i2c_name_type;
-extern const char *spi_name_type;
-typedef struct {
-	int width;
-	int height;
-	int address;
-	int RST_pin;
-	bool hflip;
-	bool vflip;
-	const char *drivername;
-	int CS_pin;
-	int speed;
-	int back;
-	int depth;
-	const char *type;
-	bool rotate;
-} display_config_t;
 
-typedef struct {
-	bool rmii;
-	char model[16];
-	int rst;
-	int mdc, mdio;
-	int host;
-	int cs, mosi, miso, intr, clk;
-	int speed;
-} eth_config_t;
-
-typedef struct {
-	i2s_pin_config_t pin;
-	char model[32];
-	int mute_gpio;
-	int mute_level;
-	int i2c_addr;
-	int sda;
-	int scl;
-} i2s_platform_config_t;
-
-typedef struct {
-	int gpio;
-	int level;
-	bool fixed;
-} gpio_with_level_t;
-
-typedef struct {
-	gpio_with_level_t vcc;
-	gpio_with_level_t gnd;
-	gpio_with_level_t amp;
-	gpio_with_level_t ir;
-	gpio_with_level_t jack;
-	gpio_with_level_t green;
-	gpio_with_level_t red;
-	gpio_with_level_t spkfault;	
-} set_GPIO_struct_t;
-
-typedef struct {
-	int A;
-	int B;
-	int SW;
-	bool knobonly;
-	bool volume_lock;
-	bool longpress;
-	int timer;
-} rotary_struct_t;
-
-typedef struct {
-	bool fixed;
-	char * name;
-	char * group;
-	int gpio;
-} gpio_entry_t;
-
-const display_config_t * 	config_display_get();
-const eth_config_t * 		config_eth_get( );
-esp_err_t 					config_display_set(const display_config_t * config);
 esp_err_t 					config_i2c_set(const i2c_config_t * config, int port);
-esp_err_t 					config_i2s_set(const i2s_platform_config_t * config, const char * nvs_name);
-esp_err_t 					config_spi_set(const spi_bus_config_t * config, int host, int dc);
 const i2c_config_t * 		config_i2c_get(int * i2c_port);
 const spi_bus_config_t * 	config_spi_get(spi_host_device_t * spi_host);
 void 						parse_set_GPIO(void (*cb)(int gpio, char *value));
-const i2s_platform_config_t * 	config_dac_get();
-const i2s_platform_config_t * 	config_spdif_get( );
-esp_err_t 					config_spdif_set(const i2s_platform_config_t * config);
-bool 						is_spdif_config_locked();
-esp_err_t 					free_gpio_entry( gpio_entry_t ** gpio);
-gpio_entry_t * 				get_gpio_by_name(char * name,char * group, bool refresh);
-gpio_entry_t * 				get_gpio_by_no(int gpionum, bool refresh);
-cJSON * 					get_gpio_list(bool refresh);
-bool 						is_dac_config_locked();
-bool 						are_statistics_enabled();
-const rotary_struct_t * 	config_rotary_get();
-esp_err_t 					config_rotary_set(rotary_struct_t * rotary);

components/services/audio_controls.c

@@ -17,7 +17,7 @@
 #include "esp_log.h"
 #include "cJSON.h"
 #include "buttons.h"
-#include "platform_config.h"
+#include "config.h"
 #include "accessors.h"
 #include "audio_controls.h"
 
@@ -55,12 +55,10 @@ static const actrls_config_map_t actrls_config_map[] =
 		};
 
 // BEWARE: the actions below need to stay aligned with the corresponding enum to properly support json parsing
-//   along with the actrls_t controls in LMS_controls, bt_sink and raop_sink
 #define EP(x) [x] = #x  /* ENUM PRINT */
-static const char * actrls_action_s[ ] = { EP(ACTRLS_POWER),EP(ACTRLS_VOLUP),EP(ACTRLS_VOLDOWN),EP(ACTRLS_TOGGLE),EP(ACTRLS_PLAY),
+static const char * actrls_action_s[ ] = { EP(ACTRLS_VOLUP),EP(ACTRLS_VOLDOWN),EP(ACTRLS_TOGGLE),EP(ACTRLS_PLAY),
 									EP(ACTRLS_PAUSE),EP(ACTRLS_STOP),EP(ACTRLS_REW),EP(ACTRLS_FWD),EP(ACTRLS_PREV),EP(ACTRLS_NEXT),
 									EP(BCTRLS_UP),EP(BCTRLS_DOWN),EP(BCTRLS_LEFT),EP(BCTRLS_RIGHT), 
-									EP(BCTRLS_PS1),EP(BCTRLS_PS2),EP(BCTRLS_PS3),EP(BCTRLS_PS4),EP(BCTRLS_PS5),EP(BCTRLS_PS6),
 									EP(KNOB_LEFT),EP(KNOB_RIGHT),EP(KNOB_PUSH),
 									""} ;
 									

components/services/audio_controls.h

@@ -11,10 +11,9 @@
 #include "buttons.h"
 
 // BEWARE: this is the index of the array of action below (change actrls_action_s as well!)
-typedef enum { 	ACTRLS_NONE = -1, ACTRLS_POWER,ACTRLS_VOLUP, ACTRLS_VOLDOWN, ACTRLS_TOGGLE, ACTRLS_PLAY, 
+typedef enum { 	ACTRLS_NONE = -1, ACTRLS_VOLUP, ACTRLS_VOLDOWN, ACTRLS_TOGGLE, ACTRLS_PLAY, 
 				ACTRLS_PAUSE, ACTRLS_STOP, ACTRLS_REW, ACTRLS_FWD, ACTRLS_PREV, ACTRLS_NEXT, 
 				BCTRLS_UP, BCTRLS_DOWN, BCTRLS_LEFT, BCTRLS_RIGHT, 
-				BCTRLS_PS1,BCTRLS_PS2,BCTRLS_PS3,BCTRLS_PS4,BCTRLS_PS5,BCTRLS_PS6,
 				KNOB_LEFT, KNOB_RIGHT, KNOB_PUSH,
 				ACTRLS_REMAP, ACTRLS_MAX 
 		} actrls_action_e;

components/services/battery.c

@@ -16,7 +16,7 @@
 #include "esp_log.h"
 #include "driver/adc.h"
 #include "battery.h"
-#include "platform_config.h"
+#include "config.h"
 
 /* 
  There is a bug in esp32 which causes a spurious interrupt on gpio 36/39 when
@@ -33,29 +33,15 @@ static struct {
 	int channel;
 	float sum, avg, scale;
 	int count;
-	int cells, attenuation;
 	TimerHandle_t timer;
-} battery = {
-	.channel = CONFIG_BAT_CHANNEL,
-	.cells = 2,
-	.attenuation = ADC_ATTEN_DB_0,
-};	
+} battery;
 
 /****************************************************************************************
  * 
  */
-float battery_value_svc(void) {
-	return battery.avg;
+int battery_value_svc(void) {
+	 return battery.avg;
  }
- 
-/****************************************************************************************
- * 
- */
-uint8_t battery_level_svc(void) {
-	// TODO: this is vastly incorrect
-	int level = battery.avg ? (battery.avg - (3.0 * battery.cells)) / ((4.2 - 3.0) * battery.cells) * 100 : 0;
-	return level < 100 ? level : 100;
-}
 
 /****************************************************************************************
  * 
@@ -73,31 +59,29 @@ static void battery_callback(TimerHandle_t xTimer) {
  * 
  */
 void battery_svc_init(void) {
+	battery.channel = CONFIG_BAT_CHANNEL;
 #ifdef CONFIG_BAT_SCALE	
 	battery.scale = atof(CONFIG_BAT_SCALE);
 #endif	
 
+#ifndef CONFIG_BAT_LOCKED
 	char *nvs_item = config_alloc_get_default(NVS_TYPE_STR, "bat_config", "n", 0);
 	if (nvs_item) {
-		char *p;		
-#ifndef CONFIG_BAT_LOCKED		
+		char *p;
 		if ((p = strcasestr(nvs_item, "channel")) != NULL) battery.channel = atoi(strchr(p, '=') + 1);
 		if ((p = strcasestr(nvs_item, "scale")) != NULL) battery.scale = atof(strchr(p, '=') + 1);
-		if ((p = strcasestr(nvs_item, "atten")) != NULL) battery.attenuation = atoi(strchr(p, '=') + 1);
-#endif		
-		if ((p = strcasestr(nvs_item, "cells")) != NULL) battery.cells = atof(strchr(p, '=') + 1);		
 		free(nvs_item);
 	}	
+#endif	
 
 	if (battery.channel != -1) {
+		ESP_LOGI(TAG, "Battery measure channel: %u, scale %f", battery.channel, battery.scale);
+	
 		adc1_config_width(ADC_WIDTH_BIT_12);
-		adc1_config_channel_atten(battery.channel, battery.attenuation);
-
-		battery.avg = adc1_get_raw(battery.channel) * battery.scale / 4095.0;    
+		adc1_config_channel_atten(battery.channel, ADC_ATTEN_DB_0);
+    
 		battery.timer = xTimerCreate("battery", BATTERY_TIMER / portTICK_RATE_MS, pdTRUE, NULL, battery_callback);
 		xTimerStart(battery.timer, portMAX_DELAY);
-		
-		ESP_LOGI(TAG, "Battery measure channel: %u, scale %f, cells %u, avg %.2fV", battery.channel, battery.scale, battery.cells, battery.avg);		
 	} else {
 		ESP_LOGI(TAG, "No battery");
 	}	

components/services/buttons.c

@@ -25,6 +25,8 @@
 #include "rotary_encoder.h"
 #include "globdefs.h"
 
+bool gpio36_39_used;
+
 static const char * TAG = "buttons";
 
 static int n_buttons = 0;
@@ -47,15 +49,7 @@ static EXT_RAM_ATTR struct button_s {
 	TimerHandle_t timer;
 } buttons[MAX_BUTTONS];
 
-// can't use EXT_RAM_ATTR for initialized structure
 static struct {
-	int gpio, level;
-	struct button_s *button;
-} polled_gpio[] = { {36, -1, NULL}, {39, -1, NULL}, {-1, -1, NULL} };
-
-static TimerHandle_t polled_timer;
-
-static EXT_RAM_ATTR struct {
 	QueueHandle_t queue;
 	void *client;
 	rotary_encoder_info_t info;
@@ -63,7 +57,7 @@ static EXT_RAM_ATTR struct {
 	rotary_handler handler;
 } rotary;
 
-static EXT_RAM_ATTR struct {
+static struct {
 	RingbufHandle_t rb;
 	infrared_handler handler;
 } infrared;
@@ -82,7 +76,7 @@ static void common_task_init(void) {
 	
 	if (!common_queue_set) {
 		common_queue_set = xQueueCreateSet(BUTTON_QUEUE_LEN + 1);
-		xTaskCreateStatic( (TaskFunction_t) buttons_task, "buttons_thread", BUTTON_STACK_SIZE, NULL, ESP_TASK_PRIO_MIN + 2, xStack, &xTaskBuffer);
+		xTaskCreateStatic( (TaskFunction_t) buttons_task, "buttons_thread", BUTTON_STACK_SIZE, NULL, ESP_TASK_PRIO_MIN + 1, xStack, &xTaskBuffer);
 	}
  }	
 
@@ -123,22 +117,6 @@ static void buttons_timer( TimerHandle_t xTimer ) {
 	}
 }
 
-/****************************************************************************************
- * Buttons polling timer
- */
-static void buttons_polling( TimerHandle_t xTimer ) {
-	for (int i = 0; polled_gpio[i].gpio != -1; i++) {
-		if (!polled_gpio[i].button) continue;
-		
-		int level = gpio_get_level(polled_gpio[i].gpio);
-	
-		if (level != polled_gpio[i].level) {
-			polled_gpio[i].level = level;
-			buttons_timer(polled_gpio[i].button->timer);
-		}	
-	}	
-}
-
 /****************************************************************************************
  * Tasks that calls the appropriate functions when buttons are pressed
  */
@@ -274,29 +252,14 @@ void button_create(void *client, int gpio, int type, bool pull, int debounce, bu
 		}
 	}
 	
+	// nasty ESP32 bug: fire-up constantly INT on GPIO 36/39 if ADC1, AMP, Hall used which WiFi does when PS is activated
+	if (gpio == 36 || gpio == 39) gpio36_39_used = true;
+	
 	// and initialize level ...
 	buttons[n_buttons].level = gpio_get_level(gpio);
-	
-	// nasty ESP32 bug: fire-up constantly INT on GPIO 36/39 if ADC1, AMP, Hall used which WiFi does when PS is activated
-	for (int i = 0; polled_gpio[i].gpio != -1; i++) if (polled_gpio[i].gpio == gpio) {
-		if (!polled_timer) {
-			polled_timer = xTimerCreate("buttonsPolling", 100 / portTICK_RATE_MS, pdTRUE, polled_gpio, buttons_polling);		
-			xTimerStart(polled_timer, portMAX_DELAY);
-		}	
-		
-		polled_gpio[i].button = buttons + n_buttons;					
-		polled_gpio[i].level = gpio_get_level(gpio);
-		ESP_LOGW(TAG, "creating polled gpio %u, level %u", gpio, polled_gpio[i].level);		
-		
-		gpio = -1;
-		break;
-	}
-	
-	// only create timers and ISR is this is not a polled gpio
-	if (gpio != -1) {
-		gpio_isr_handler_add(gpio, gpio_isr_handler, (void*) &buttons[n_buttons]);
-		gpio_intr_enable(gpio);
-	}	
+
+	gpio_isr_handler_add(gpio, gpio_isr_handler, (void*) &buttons[n_buttons]);
+	gpio_intr_enable(gpio);
 
 	n_buttons++;
 }	
@@ -374,8 +337,7 @@ static void rotary_button_handler(void *id, button_event_e event, button_press_e
  * Create rotary encoder
  */
 bool create_rotary(void *id, int A, int B, int SW, int long_press, rotary_handler handler) {
-	// nasty ESP32 bug: fire-up constantly INT on GPIO 36/39 if ADC1, AMP, Hall used which WiFi does when PS is activated
-	if (A == -1 || B == -1 || A == 36 || A == 39 || B == 36 || B == 39) {
+	if (A == -1 || B == -1) {
 		ESP_LOGI(TAG, "Cannot create rotary %d %d", A, B);
 		return false;
 	}
@@ -386,6 +348,9 @@ bool create_rotary(void *id, int A, int B, int SW, int long_press, rotary_handle
 	rotary.client = id;
 	rotary.handler = handler;
 	
+	// nasty ESP32 bug: fire-up constantly INT on GPIO 36/39 if ADC1, AMP, Hall used which WiFi does when PS is activated
+	if (A == 36 || A == 39 || B == 36 || B == 39 || SW == 36 || SW == 39) gpio36_39_used = true;
+
     // Initialise the rotary encoder device with the GPIOs for A and B signals
     rotary_encoder_init(&rotary.info, A, B);
 		

components/services/component.mk

@@ -9,4 +9,3 @@
 
 COMPONENT_SRCDIRS := . 
 COMPONENT_ADD_INCLUDEDIRS := .
-CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_DEBUG

components/services/globdefs.h

@@ -17,6 +17,7 @@ extern int i2c_system_port;
 extern int i2c_system_speed;
 extern int spi_system_host;
 extern int spi_system_dc_gpio;
+extern bool gpio36_39_used;
 typedef struct {
 	int timer, base_channel, max;
 } pwm_system_t;

components/services/infrared.c

@@ -39,7 +39,7 @@ static const char* TAG = "IR";
 /****************************************************************************************
  * 
  */
-static bool nec_check_in_range(int duration_ticks, int target_us, int margin_us) {
+inline bool nec_check_in_range(int duration_ticks, int target_us, int margin_us) {
     if(( NEC_ITEM_DURATION(duration_ticks) < (target_us + margin_us))
         && ( NEC_ITEM_DURATION(duration_ticks) > (target_us - margin_us))) {
         return true;
@@ -174,4 +174,4 @@ void infrared_init(RingbufHandle_t *rb, int gpio) {
 	// get RMT RX ringbuffer
     rmt_get_ringbuf_handle(RMT_RX_CHANNEL, rb);
     rmt_rx_start(RMT_RX_CHANNEL, 1);
-}
+}

components/services/led.c

@@ -18,17 +18,17 @@
 #include "esp_log.h"
 #include "driver/gpio.h"
 #include "driver/ledc.h"
-#include "platform_config.h"
 #include "led.h"
 #include "globdefs.h"
 #include "accessors.h"
+#include "config.h"
 
 #define MAX_LED	8
 #define BLOCKTIME	10	// up to portMAX_DELAY
 
 static const char *TAG = "led";
 
-static EXT_RAM_ATTR struct led_s {
+static struct led_s {
 	gpio_num_t gpio;
 	bool on;
 	int onstate;
@@ -40,7 +40,7 @@ static EXT_RAM_ATTR struct led_s {
 	TimerHandle_t timer;
 } leds[MAX_LED];
 
-static EXT_RAM_ATTR struct {
+static struct {
 	int gpio;
 	int active;
 	int pwm;
@@ -85,7 +85,7 @@ static void vCallbackFunction( TimerHandle_t xTimer ) {
 bool led_blink_core(int idx, int ontime, int offtime, bool pushed) {
 	if (!leds[idx].gpio || leds[idx].gpio < 0 ) return false;
 	
-	ESP_LOGD(TAG,"led_blink_core %d on:%d off:%d, pushed:%u", idx, ontime, offtime, pushed);
+	ESP_LOGD(TAG,"led_blink_core");
 	if (leds[idx].timer) {
 		// normal requests waits if a pop is pending
 		if (!pushed && leds[idx].pushed) {
@@ -231,7 +231,8 @@ void led_svc_init(void) {
 #ifndef CONFIG_LED_LOCKED
 	parse_set_GPIO(set_led_gpio);
 #endif
-
+	ESP_LOGI(TAG,"Configuring LEDs green:%d (active:%d %d%%), red:%d (active:%d %d%%)", green.gpio, green.active, green.pwm, green.gpio, green.active, green.pwm );
+	
 	char *nvs_item = config_alloc_get(NVS_TYPE_STR, "led_brightness"), *p; 
 	if (nvs_item) {
 		if ((p = strcasestr(nvs_item, "green")) != NULL) green.pwm = atoi(strchr(p, '=') + 1);
@@ -241,6 +242,4 @@ void led_svc_init(void) {
 
 	led_config(LED_GREEN, green.gpio, green.active, green.pwm);
 	led_config(LED_RED, red.gpio, red.active, red.pwm);
-	
-	ESP_LOGI(TAG,"Configuring LEDs green:%d (active:%d %d%%), red:%d (active:%d %d%%)", green.gpio, green.active, green.pwm, red.gpio, red.active, red.pwm );
 }

components/services/messaging.c

@@ -1,284 +0,0 @@
-	/**
- *
- */
-#include <stdlib.h> // Required for libtelnet.h
-#include <esp_log.h>
-#include "stdbool.h"
-#include <lwip/def.h>
-#include <lwip/sockets.h>
-#include <errno.h>
-#include <string.h>
-#include "esp_app_trace.h"
-#include "esp_attr.h"
-#include "config.h"
-#include "nvs_utilities.h"
-#include "platform_esp32.h"
-#include "messaging.h"
-#include "trace.h"
-/************************************
- * Globals
- */
-
-const static char tag[] = "messaging";
-typedef struct {
-	struct messaging_list_t * next;
-	char * subscriber_name;
-	size_t max_count;
-	RingbufHandle_t buf_handle;
-} messaging_list_t;
-static messaging_list_t top;
-#define MSG_LENGTH_AVG 1024
-
-messaging_list_t * get_struct_ptr(messaging_handle_t handle){
-	return (messaging_list_t *)handle;
-}
-messaging_handle_t  get_handle_ptr(messaging_list_t * handle){
-	return (messaging_handle_t )handle;
-}
-
-RingbufHandle_t messaging_create_ring_buffer(uint8_t max_count){
-	RingbufHandle_t buf_handle = NULL;
-	StaticRingbuffer_t *buffer_struct = malloc(sizeof(StaticRingbuffer_t));
-	if (buffer_struct != NULL) {
-		size_t buf_size = (size_t )(sizeof(single_message_t)+8+MSG_LENGTH_AVG)*(size_t )(max_count>0?max_count:5); // no-split buffer requires an additional 8 bytes
-		buf_size = buf_size - (buf_size % 4);
-		uint8_t *buffer_storage = (uint8_t *)heap_caps_malloc(buf_size, MALLOC_CAP_SPIRAM | MALLOC_CAP_32BIT);
-		if (buffer_storage== NULL) {
-			ESP_LOGE(tag,"buff alloc failed");
-		}
-		else {
-			buf_handle = xRingbufferCreateStatic(buf_size, RINGBUF_TYPE_NOSPLIT, buffer_storage, buffer_struct);
-		}
-	}
-	else {
-		ESP_LOGE(tag,"ringbuf alloc failed");
-	}
-	return buf_handle;
-}
-void messaging_fill_messages(messaging_list_t * target_subscriber){
-	single_message_t * message=NULL;
-    UBaseType_t uxItemsWaiting;
-
-    vRingbufferGetInfo(top.buf_handle, NULL, NULL, NULL, NULL, &uxItemsWaiting);
-    for(size_t i=0;i<uxItemsWaiting;i++){
-    	message= messaging_retrieve_message(top.buf_handle);
-    	if(message){
-			//re-post to original queue so it is available to future subscribers
-			messaging_post_to_queue(get_handle_ptr(&top), message, message->msg_size);
-			// post to new subscriber
-			messaging_post_to_queue(get_handle_ptr(target_subscriber) , message, message->msg_size);
-			FREE_AND_NULL(message);
-    	}
-    }
-}
-messaging_handle_t messaging_register_subscriber(uint8_t max_count, char * name){
-	messaging_list_t * cur=&top;
-	while(cur->next){
-		cur = get_struct_ptr(cur->next);
-	}
-	cur->next=heap_caps_malloc(sizeof(messaging_list_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
-	if(!cur->next){
-		ESP_LOGE(tag,"subscriber alloc failed");
-		return NULL;
-	}
-	memset(cur->next,0x00,sizeof(messaging_list_t));
-	cur = get_struct_ptr(cur->next);
-	cur->max_count=max_count;
-	cur->subscriber_name=strdup(name);
-	cur->buf_handle = messaging_create_ring_buffer(max_count);
-	if(cur->buf_handle){
-		messaging_fill_messages(cur);
-	}
-	return cur->buf_handle;
-}
-void messaging_service_init(){
-	size_t max_count=15;
-	top.buf_handle = messaging_create_ring_buffer(max_count);
-	if(!top.buf_handle){
-		ESP_LOGE(tag, "messaging service init failed.");
-	}
-	else {
-		top.max_count = max_count;
-		top.subscriber_name = strdup("messaging");
-	}
-	return;
-}
-
-const char * messaging_get_type_desc(messaging_types msg_type){
-	switch (msg_type) {
-	CASE_TO_STR(MESSAGING_INFO);
-	CASE_TO_STR(MESSAGING_WARNING);
-	CASE_TO_STR(MESSAGING_ERROR);
-		default:
-			return "Unknown";
-			break;
-	}
-}
-const char * messaging_get_class_desc(messaging_classes msg_class){
-	switch (msg_class) {
-	CASE_TO_STR(MESSAGING_CLASS_OTA);
-	CASE_TO_STR(MESSAGING_CLASS_SYSTEM);
-	CASE_TO_STR(MESSAGING_CLASS_STATS);
-	CASE_TO_STR(MESSAGING_CLASS_CFGCMD);
-	CASE_TO_STR(MESSAGING_CLASS_BT);
-		default:
-			return "Unknown";
-			break;
-	}
-}
-
-cJSON *  messaging_retrieve_messages(RingbufHandle_t buf_handle){
-	single_message_t * message=NULL;
-	cJSON * json_messages=cJSON_CreateArray();
-	cJSON * json_message=NULL;
-	size_t item_size;
-    UBaseType_t uxItemsWaiting;
-    vRingbufferGetInfo(buf_handle, NULL, NULL, NULL, NULL, &uxItemsWaiting);
-	for(int i = 0;i<uxItemsWaiting;i++){
-		message = (single_message_t *)xRingbufferReceive(buf_handle, &item_size, pdMS_TO_TICKS(50));
-		//Check received data
-		if (message== NULL) {
-			ESP_LOGE(tag,"received null ptr");
-		}
-		else {
-			json_message = cJSON_CreateObject();
-			cJSON_AddStringToObject(json_message, "message", message->message);
-			cJSON_AddStringToObject(json_message, "type", messaging_get_type_desc(message->type));
-			cJSON_AddStringToObject(json_message, "class", messaging_get_class_desc(message->msg_class));
-			cJSON_AddNumberToObject(json_message,"sent_time",message->sent_time);
-			cJSON_AddNumberToObject(json_message,"current_time",esp_timer_get_time() / 1000);
-			cJSON_AddItemToArray(json_messages,json_message);
-			vRingbufferReturnItem(buf_handle, (void *)message);
-		}
-	}
-	return json_messages;
-}
-single_message_t *  messaging_retrieve_message(RingbufHandle_t buf_handle){
-	single_message_t * message=NULL;
-	single_message_t * message_copy=NULL;
-	size_t item_size;
-    UBaseType_t uxItemsWaiting;
-    vRingbufferGetInfo(buf_handle, NULL, NULL, NULL, NULL, &uxItemsWaiting);
-	if(uxItemsWaiting>0){
-		message = (single_message_t *)xRingbufferReceive(buf_handle, &item_size, pdMS_TO_TICKS(50));
-		message_copy  = heap_caps_malloc(item_size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
-		if(message_copy){
-			memcpy(message_copy,message,item_size);
-		}
-		vRingbufferReturnItem(buf_handle, (void *)message);
-	}
-	return message_copy;
-}
-
-esp_err_t messaging_post_to_queue(messaging_handle_t subscriber_handle, single_message_t * message, size_t message_size){
-	size_t item_size=0;
-	messaging_list_t * subscriber=get_struct_ptr(subscriber_handle);
-	if(!subscriber->buf_handle){
-		ESP_LOGE(tag,"post failed: null buffer for %s", str_or_unknown(subscriber->subscriber_name));
-		return ESP_FAIL;
-	}
-	void * pItem=NULL;
-	UBaseType_t res=pdFALSE;
-	while(1){
-		ESP_LOGD(tag,"Attempting to reserve %d bytes for %s",message_size, str_or_unknown(subscriber->subscriber_name));
-		res =  xRingbufferSendAcquire(subscriber->buf_handle, &pItem, message_size, pdMS_TO_TICKS(50));
-		if(res == pdTRUE && pItem){
-			ESP_LOGD(tag,"Reserving complete for %s", str_or_unknown(subscriber->subscriber_name));
-			memcpy(pItem,message,message_size);
-			xRingbufferSendComplete(subscriber->buf_handle, pItem);
-			break;
-		}
-		ESP_LOGD(tag,"Dropping for %s",str_or_unknown(subscriber->subscriber_name));
-		single_message_t * dummy = (single_message_t *)xRingbufferReceive(subscriber->buf_handle, &item_size, pdMS_TO_TICKS(50));
-		if (dummy== NULL) {
-			ESP_LOGE(tag,"Dropping message failed");
-			break;
-		}
-		else {
-			ESP_LOGD(tag,"Dropping message of %d bytes for %s",item_size, str_or_unknown(subscriber->subscriber_name));
-			vRingbufferReturnItem(subscriber->buf_handle, (void *)dummy);
-		}
-	}
-	if (res != pdTRUE) {
-		ESP_LOGE(tag,"post to %s failed",str_or_unknown(subscriber->subscriber_name));
-		return ESP_FAIL;
-	}
-	return ESP_OK;
-}
-	esp_err_t messaging_type_to_err_type(messaging_types type){
-		switch (type) {
-		case MESSAGING_INFO:
-			return ESP_LOG_INFO;
-			break;
-		case MESSAGING_ERROR:
-			return ESP_LOG_ERROR;
-			break;
-		case MESSAGING_WARNING:
-			return ESP_LOG_WARN;
-			break;
-		default:
-			return ESP_LOG_DEBUG;
-			break;
-		}
-		return ESP_LOG_DEBUG;
-	}
-void messaging_post_message(messaging_types type,messaging_classes msg_class, const char *fmt, ...){
-	single_message_t * message=NULL;
-	size_t msg_size=0;
-	size_t ln =0;
-	messaging_list_t * cur=&top;
-	va_list va;
-	va_start(va, fmt);
-	ln = vsnprintf(NULL, 0, fmt, va)+1;
-	msg_size = sizeof(single_message_t)+ln;
-	message = (single_message_t *)heap_caps_malloc(msg_size, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
-	vsprintf(message->message, fmt, va);
-	va_end(va);
-	message->msg_size = msg_size;
-	message->type = type;
-	message->msg_class = msg_class;
-	message->sent_time = esp_timer_get_time() / 1000;
-	ESP_LOGD(tag,"Post: %s",message->message);
-	while(cur){
-		messaging_post_to_queue(get_handle_ptr(cur),  message, msg_size);
-		cur = get_struct_ptr(cur->next);
-	}
-	FREE_AND_NULL(message);
-	return;
-
-}
-void log_send_messaging(messaging_types msgtype,const char *fmt, ...) {
-	va_list va;
-	va_start(va, fmt);
-	size_t ln = vsnprintf(NULL, 0, fmt, va)+1;
-	char * message_txt = malloc(ln);
-	if(message_txt){
-		vsprintf(message_txt, fmt, va);
-		va_end(va);
-		ESP_LOG_LEVEL_LOCAL(messaging_type_to_err_type(msgtype),tag, "%s",message_txt);
-		messaging_post_message(msgtype, MESSAGING_CLASS_SYSTEM, message_txt );
-		free(message_txt);
-	}
-	else{
-		ESP_LOGE(tag, "Memory allocation failed while sending message");
-	}
-}
-void cmd_send_messaging(const char * cmdname,messaging_types msgtype, const char *fmt, ...){
-	va_list va;
-	va_start(va, fmt);
-	size_t cmd_len = strlen(cmdname)+1;
-	size_t ln = vsnprintf(NULL, 0, fmt, va)+1;
-	char * message_txt = malloc(ln+cmd_len);
-	if(message_txt){
-		strcpy(message_txt,cmdname);
-		strcat(message_txt,"\n");
-		vsprintf((message_txt+cmd_len), fmt, va);
-		va_end(va);
-		ESP_LOG_LEVEL_LOCAL(messaging_type_to_err_type(msgtype),tag, "%s",message_txt);
-		messaging_post_message(msgtype, MESSAGING_CLASS_CFGCMD, message_txt );
-		free(message_txt);
-	}
-	else{
-		ESP_LOGE(tag, "Memory allocation failed while sending message");
-	}
-}

components/services/messaging.h

@@ -1,50 +0,0 @@
-#include "sdkconfig.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/ringbuf.h"
-#include "cJSON.h"
-#pragma once
-typedef enum {
-	MESSAGING_INFO,
-	MESSAGING_WARNING,
-	MESSAGING_ERROR
-} messaging_types;
-typedef enum {
-	MESSAGING_CLASS_OTA,
-	MESSAGING_CLASS_SYSTEM,
-	MESSAGING_CLASS_STATS,
-	MESSAGING_CLASS_CFGCMD,
-	MESSAGING_CLASS_BT
-} messaging_classes;
-
-typedef struct messaging_list_t *messaging_handle_t;
-
-typedef struct {
-	time_t sent_time;
-	messaging_types type;
-	messaging_classes msg_class;
-	size_t msg_size;
-	char message[];
-} single_message_t;
-
-cJSON *  messaging_retrieve_messages(RingbufHandle_t buf_handle);
-messaging_handle_t messaging_register_subscriber(uint8_t max_count, char * name);
-esp_err_t messaging_post_to_queue(messaging_handle_t subscriber_handle, single_message_t * message, size_t message_size);
-void messaging_post_message(messaging_types type,messaging_classes msg_class, const char * fmt, ...);
-cJSON *  messaging_retrieve_messages(RingbufHandle_t buf_handle);
-single_message_t *  messaging_retrieve_message(RingbufHandle_t buf_handle);
-void log_send_messaging(messaging_types msgtype,const char *fmt, ...);
-void cmd_send_messaging(const char * cmdname,messaging_types msgtype, const char *fmt, ...);
-esp_err_t messaging_type_to_err_type(messaging_types type);
-void messaging_service_init();
-
-#define REALLOC_CAT(e,n) e=realloc(e,strlen(n)); e=strcat(e,n)
-#define LOG_SEND(y, ...) \
-{  \
-ESP_LOG_LEVEL_LOCAL(messaging_type_to_err_type(y),TAG,   ##__VA_ARGS__); \
-messaging_post_message(y, MESSAGING_CLASS_SYSTEM,  ##__VA_ARGS__); }
-
-#define LOG_SEND_ERROR( ...) LOG_SEND(MESSAGING_ERROR,##__VA_ARGS__)
-#define LOG_SEND_INFO( ...) LOG_SEND(MESSAGING_INFO,##__VA_ARGS__)
-#define LOG_SEND_WARN( ...) LOG_SEND(MESSAGING_WARNING,##__VA_ARGS__)
-
-