Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
IHOLL
/
squeezelite-esp32
-ын хуулбар https://github.com/sle118/squeezelite-esp32
2
0
Салаа 0
Файлууд Асуудлууд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Merge remote-tracking branch 'origin/Over_The_Air_Update' into
Over_The_Air_Update

Conflicts:
components/wifi-manager/http_server.c
components/wifi-manager/wifi_manager.c

Sebastien 5 жил өмнө
parent
3cb3050257 de76b8372e
commit
d7dc25f5b6
6 өөрчлөгдсөн 63 нэмэгдсэн , 385 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 24 366
      .cproject
  2. 9 3
      .settings/language.settings.xml
  3. 11 1
      components/cmd_nvs/cmd_nvs.c
  4. 1 0
      components/wifi-manager/.gitignore
  5. 2 2
      components/wifi-manager/http_server.c
  6. 16 13
      components/wifi-manager/wifi_manager.c

+ 24 - 366
.cproject
Файл харах 

@@ -3,9 +3,9 @@
 
     	
     <storageModule moduleId="org.eclipse.cdt.core.settings">
 
         		
-        <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786">
 
+        <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348">
 
             			
-            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786" moduleId="org.eclipse.cdt.core.settings" name="Default">
 
+            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348" moduleId="org.eclipse.cdt.core.settings" name="Default">
 
                 				
                 <externalSettings/>
 
                 				
@@ -29,38 +29,37 @@
 
             			
             <storageModule moduleId="cdtBuildSystem" version="4.0.0">
 
                 				
-                <configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786" name="Default" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
 
+                <configuration artifactName="${ProjName}" buildProperties="" 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.1476804786.1800826258" name="/" resourcePath="">
 
+                    <folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.949515869" name="/" resourcePath="">
 
                         						
-                        <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.811827721" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
 
+                        <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.1666584715" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
 
+                            <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.144124148" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
 
+                            <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.1562292378" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
 
+                            <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"/>
 
                             							
-<<<<<<< HEAD
 
-                            <builder arguments="${IDF_PATH}/tools/windows/eclipse_make.py" command="python" id="cdt.managedbuild.builder.gnu.cross.1011968237" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.builder.gnu.cross"/>
 
+                            <builder id="cdt.managedbuild.builder.gnu.cross.1247197310" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="cdt.managedbuild.builder.gnu.cross"/>
 
                             							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1502936757" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
 
+                            <tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.924305212" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
 
                                 								
-                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1614739014" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 
+                                <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.254690821" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
 
+                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1689301712" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
 
                                 								
-                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1365876654" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 
+                                <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.407309631" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
 
+                            <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.765822218" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.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.655344480" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 
+                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1241928244" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 
                                     									
                                     <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 
                                     									
@@ -70,11 +69,11 @@
 
                                 							
                             </tool>
 
                             							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.archiver.1494383819" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
 
+                            <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.280698320" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
 
+                            <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.1422333326" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 
+                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.736707865" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 
                                 							
                             </tool>
 
                             						
@@ -92,372 +91,31 @@
 
         	
     </storageModule>
 
     	
-    <storageModule moduleId="cdtBuildSystem" version="4.0.0">
 
-        		
-        <project id="squeezelite-esp32.null.1272501664" name="squeezelite-esp32"/>
 
-        	
-    </storageModule>
 
-    	
-    <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 
-    	
-    <storageModule moduleId="scannerConfiguration">
 
-        		
-        <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 
-        		
-        <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.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>
 
-        	
-    </storageModule>
 
-    	
-    <storageModule moduleId="refreshScope" versionNumber="2">
 
-        		
-        <configuration configurationName="Default">
 
-            			
-            <resource resourceType="PROJECT" workspacePath="/squeezelite-esp32"/>
 
-            		
-        </configuration>
 
-        	
-    </storageModule>
 
-    	
-    <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
 
-        		
-        <buildTargets>
 
-            			
-            <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
-                				
-                <buildCommand>make</buildCommand>
 
-                				
-                <buildArguments>-j6</buildArguments>
 
-                				
-                <buildTarget>all</buildTarget>
 
-                				
-                <stopOnError>true</stopOnError>
 
-                				
-                <useDefaultCommand>true</useDefaultCommand>
 
-                				
-                <runAllBuilders>true</runAllBuilders>
 
-                			
-            </target>
 
-            			
-            <target name="size-components" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
-                				
-                <buildCommand>make</buildCommand>
 
-                				
-                <buildArguments>-j6</buildArguments>
 
-                				
-                <buildTarget>size-components</buildTarget>
 
-                				
-                <stopOnError>true</stopOnError>
 
-                				
-                <useDefaultCommand>true</useDefaultCommand>
 
-                				
-                <runAllBuilders>true</runAllBuilders>
 
-                			
-            </target>
 
-            			
-            <target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
-                				
-                <buildCommand>make</buildCommand>
 
-                				
-                <buildArguments>-j6</buildArguments>
 
-                				
-                <buildTarget>make -j8 EXTRA_CFLAGS="-D RECOVERY_APPLICATION=1"</buildTarget>
 
-                				
-                <stopOnError>true</stopOnError>
 
-                				
-                <useDefaultCommand>true</useDefaultCommand>
 
-                				
-                <runAllBuilders>true</runAllBuilders>
 
-                			
-            </target>
 
-            			
-            <target name="recovery" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
-                				
-                <buildCommand>python</buildCommand>
 
-                				
-                <buildArguments>${IDF_PATH}/tools/windows/eclipse_make.py -j8 app PROJECT_NAME="recovery.custom"  EXTRA_CFLAGS=" -DRECOVERY_APPLICATION=1"</buildArguments>
 
-                				
-                <buildTarget>recovery</buildTarget>
 
-=======
 
-                            <builder arguments="" command="make" id="cdt.managedbuild.builder.gnu.cross.1011968237" 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.1502936757" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
 
-                                								
-                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1614739014" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 
-                                							
-                            </tool>
 
-                            							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.254690821" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
 
-                                								
-                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1365876654" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 
-                                							
-                            </tool>
 
-                            							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.407309631" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
 
-                            							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.765822218" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
 
-                                								
-                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.655344480" 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.1494383819" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
 
-                            							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.assembler.280698320" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
 
-                                								
-                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1422333326" 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.1476804786.212420495">
 
-            			
-            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495" moduleId="org.eclipse.cdt.core.settings" name="recovery">
 
-                				
-                <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.1476804786.212420495" name="recovery" 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.1476804786.212420495." name="/" resourcePath="">
 
-                        						
-                        <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1615055647" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
 
-                            							
-                            <option id="cdt.managedbuild.option.gnu.cross.prefix.1669084138" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
 
-                            							
-                            <option id="cdt.managedbuild.option.gnu.cross.path.1601842088" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
 
-                            							
-                            <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.2065316488" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
 
-                            							
-                            <builder arguments="" command="make" id="cdt.managedbuild.builder.gnu.cross.442472928" 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.802362645" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
 
-                                								
-                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.123064752" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 
-                                							
-                            </tool>
 
-                            							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.425997512" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
 
-                                								
-                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1366677700" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 
-                                							
-                            </tool>
 
-                            							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1792747550" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
 
-                            							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.199471499" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
 
-                                								
-                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1088734719" 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.878488427" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
 
-                            							
-                            <tool id="cdt.managedbuild.tool.gnu.cross.assembler.939007176" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
 
-                                								
-                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1973534280" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 
-                                							
-                            </tool>
 
-                            						
-                        </toolChain>
 
-                        					
-                    </folderInfo>
 
-                    				
-                </configuration>
 
-                			
-            </storageModule>
 
-            			
-            <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 
-            		
-        </cconfiguration>
 
-        	
-    </storageModule>
 
+    <storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 
     	
     <storageModule moduleId="cdtBuildSystem" version="4.0.0">
 
         		
-        <project id="squeezelite-esp32.null.1272501664" name="squeezelite-esp32"/>
 
+        <project id="squeezelite-esp32.null.1846832406" name="squeezelite-esp32"/>
 
         	
     </storageModule>
 
     	
-    <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 
-    	
     <storageModule moduleId="scannerConfiguration">
 
         		
         <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 
-        		
-        <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.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>
 
         	
     </storageModule>
 
     	
-    <storageModule moduleId="refreshScope" versionNumber="2">
 
-        		
-        <configuration configurationName="Default">
 
-            			
-            <resource resourceType="PROJECT" workspacePath="/squeezelite-esp32"/>
 
-            		
-        </configuration>
 
-        	
-    </storageModule>
 
+    <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 
     	
     <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
 
         		
         <buildTargets>
 
             			
-            <target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
-                				
-                <buildCommand>make</buildCommand>
 
-                				
-                <buildArguments>-j8</buildArguments>
 
-                				
-                <buildTarget>all</buildTarget>
 
-                				
-                <stopOnError>true</stopOnError>
 
-                				
-                <useDefaultCommand>false</useDefaultCommand>
 
-                				
-                <runAllBuilders>true</runAllBuilders>
 
-                			
-            </target>
 
-            			
-            <target name="size-components" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
-                				
-                <buildCommand>make</buildCommand>
 
-                				
-                <buildArguments>-j2</buildArguments>
 
-                				
-                <buildTarget>size-components</buildTarget>
 
-                				
-                <stopOnError>true</stopOnError>
 
-                				
-                <useDefaultCommand>true</useDefaultCommand>
 
-                				
-                <runAllBuilders>true</runAllBuilders>
 
-                			
-            </target>
 
-            			
-            <target name="flash" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
-                				
-                <buildCommand>make</buildCommand>
 
-                				
-                <buildArguments>-j2</buildArguments>
 
-                				
-                <buildTarget>flash</buildTarget>
 
-                				
-                <stopOnError>true</stopOnError>
 
-                				
-                <useDefaultCommand>true</useDefaultCommand>
 
-                				
-                <runAllBuilders>true</runAllBuilders>
 
-                			
-            </target>
 
-            			
-            <target name="recovery" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
-                				
-                <buildCommand>make</buildCommand>
 
-                				
-                <buildArguments>-j8 PROJECT_NAME="recovery.custom"    EXTRA_CFLAGS=" -DRECOVERY_APPLICATION=1"</buildArguments>
 
-                				
-                <buildTarget>app</buildTarget>
 
->>>>>>> refs/remotes/origin/Over_The_Air_Update
 
-                				
-                <stopOnError>true</stopOnError>
 
-                				
-                <useDefaultCommand>false</useDefaultCommand>
 
-                				
-                <runAllBuilders>true</runAllBuilders>
 
-                			
-            </target>
 
-            			
             <target name="app" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 
                 				
-                <buildCommand>python</buildCommand>
 
+                <buildCommand>make</buildCommand>
 
                 				
-                <buildArguments>${IDF_PATH}/tools/windows/eclipse_make.py -j8</buildArguments>
 
+                <buildArguments/>
 
                 				
                 <buildTarget>app</buildTarget>

+ 9 - 3
.settings/language.settings.xml
Файл харах 

@@ -1,7 +1,7 @@
 
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 
 <project>
 
     	
-    <configuration id="cdt.managedbuild.toolchain.gnu.cross.base.1476804786" name="Default">
 
+    <configuration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348" name="Default">
 
         		
         <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 
             			
@@ -9,9 +9,15 @@
 
             			
             <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 
             			
-            <provider-reference id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" ref="shared-provider"/>
 
+            <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
 
             			
-            <provider-reference id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" ref="shared-provider"/>
 
+            <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1275066247887546551" 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"/>

+ 11 - 1
components/cmd_nvs/cmd_nvs.c
Файл харах 

@@ -47,7 +47,7 @@ static const type_str_pair_t type_str_pair[] = {
 
 
 static const size_t TYPE_STR_PAIR_SIZE = sizeof(type_str_pair) / sizeof(type_str_pair[0]);
 
 static const char *ARG_TYPE_STR = "type can be: i8, u8, i16, u16 i32, u32 i64, u64, str, blob";
 
-char current_namespace[16] = "squeezelite-esp32";
 
+char current_namespace[] = "squeezelite-esp32";
 
 static const char * TAG = "platform_esp32";
 
 
 static struct {
 
@@ -97,7 +97,17 @@ static nvs_type_t str_to_type(const char *type)
 
 
     return NVS_TYPE_ANY;
 
 }
 
+static const char *type_to_str(nvs_type_t type)
 
+{
 
+    for (int i = 0; i < TYPE_STR_PAIR_SIZE; i++) {
 
+        const type_str_pair_t *p = &type_str_pair[i];
 
+        if (p->type == type) {
 
+            return  p->str;
 
+        }
 
+    }
 
 
+    return "Unknown";
 
+}
 
 static esp_err_t store_blob(nvs_handle nvs, const char *key, const char *str_values)
 
 {
 
     uint8_t value;

+ 1 - 0
components/wifi-manager/.gitignore
Файл харах 

@@ -0,0 +1 @@
 
+/.code.js.swp

+ 2 - 2
components/wifi-manager/http_server.c
Файл харах 

@@ -44,6 +44,7 @@ static const char array_separator[]=",";
 
 
 /* @brief task handle for the http server */
 
 static TaskHandle_t task_http_server = NULL;
 
+extern char current_namespace[];
 
 
 /**
 
  * @brief embedded binary data.
 
@@ -318,7 +319,7 @@ void http_server_netconn_serve(struct netconn *conn) {
 
 						int lenA=0;
 
 						char * last_parm=save_ptr;
 
 						char * next_parm=save_ptr;
 
-						char * last_parm_name[41]={0};
 
+						char  last_parm_name[41]={0};
 
 						uint8_t autoexec_flag=0;
 
 						bool bErrorFound=false;
 
 
@@ -355,7 +356,6 @@ void http_server_netconn_serve(struct netconn *conn) {
 
 							netconn_write(conn, http_ok_json_no_cache_hdr, sizeof(http_ok_json_no_cache_hdr) - 1, NETCONN_NOCOPY); //200ok
 
 						}
 
 
-
 
 					}
 
 					else{
 
 						netconn_write(conn, http_503_hdr, sizeof(http_503_hdr) - 1, NETCONN_NOCOPY);

+ 16 - 13
components/wifi-manager/wifi_manager.c
Файл харах 

@@ -54,7 +54,9 @@ Contains the freeRTOS task and all necessary support
 
 #include "lwip/err.h"
 
 #include "lwip/netdb.h"
 
 #include "lwip/ip4_addr.h"
 
-#include "app_update/include/esp_ota_ops.h"
 
+#include "esp_ota_ops.h"
 
+#include "esp_app_format.h"
 
+
 
 
 #ifndef SQUEEZELITE_ESP32_RELEASE_URL
 
 #define SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
 
@@ -98,7 +100,7 @@ struct wifi_settings_t wifi_settings = {
 
 };
 
 
 const char wifi_manager_nvs_namespace[] = "espwifimgr";
 
-char current_namespace[16] = "squeezelite-esp32";
 
+extern char current_namespace[];
 
 
 EventGroupHandle_t wifi_manager_event_group;
 
 
@@ -259,7 +261,7 @@ esp_err_t wifi_manager_save_autoexec_config(char * value, char * name, int len){
 
 
     esp_err = nvs_set_str(handle, name, value);
 
 	if (esp_err != ESP_OK){
 
-		ESP_LOGE(TAG,"Unable to save value %s=%s",name,val);
 
+		ESP_LOGE(TAG,"Unable to save value %s=%s",name,value);
 
 		nvs_close(handle);
 
 		return esp_err;
 
 	}
 
@@ -272,7 +274,7 @@ esp_err_t wifi_manager_save_autoexec_config(char * value, char * name, int len){
 
 
 	nvs_close(handle);
 
 
-	ESP_LOGD(TAG, "wifi_manager_wrote %s=%s with length %i", name, val, len);
 
+	ESP_LOGD(TAG, "wifi_manager_wrote %s=%s with length %i", name, value, len);
 
 
 	return ESP_OK;
 
 
@@ -405,15 +407,13 @@ void wifi_manager_clear_ip_info_json(){
 
 void wifi_manager_generate_ip_info_json(update_reason_code_t update_reason_code){
 
 	wifi_config_t *config = wifi_manager_get_wifi_sta_config();
 
 	if(config){
 
-		const char ip_info_json_format[] = ",\"ip\":\"%s\",\"netmask\":\"%s\",\"gw\":\"%s\",\"urc\":%d,\"project_name\":\"%s\",\"version\":\"%s\"";
 
 #if RECOVERY_APPLICATION
 
-		"\"ota_dsc\":\"%s\", \"ota_pct\":%d";
 
+				const char ip_info_json_format[] = ",\"ip\":\"%s\",\"netmask\":\"%s\",\"gw\":\"%s\",\"urc\":%d,\"project_name\":\"%s\",\"version\":\"%s\", \"ota_dsc\":\"%s\", \"ota_pct\":%d}\n";
 
+#else
 
+				const char ip_info_json_format[] = ",\"ip\":\"%s\",\"netmask\":\"%s\",\"gw\":\"%s\",\"urc\":%d,\"project_name\":\"%s\",\"version\":\"%s\"}\n";
 
 #endif
 
-	"}\n";
 
 		memset(ip_info_json, 0x00, JSON_IP_INFO_SIZE);
 
-
 
-		app_desc_t* app_desc=esp_ota_get_app_description(void);
 
-
 
+		const esp_app_desc_t* desc = esp_ota_get_app_description();
 
 		/* to avoid declaring a new buffer we copy the data directly into the buffer at its correct address */
 
 		strcpy(ip_info_json, "{\"ssid\":");
 
 		json_print_string(config->sta.ssid,  (unsigned char*)(ip_info_json+strlen(ip_info_json)) );
 
@@ -434,8 +434,8 @@ void wifi_manager_generate_ip_info_json(update_reason_code_t update_reason_code)
 
 					netmask,
 
 					gw,
 
 					(int)update_reason_code,
 
-					app_desc->project_name,
 
-					app_desc->version
 
+					desc->project_name,
 
+					desc->version
 
 
 
 #if RECOVERY_APPLICATION
 
@@ -450,7 +450,10 @@ void wifi_manager_generate_ip_info_json(update_reason_code_t update_reason_code)
 
 								"0",
 
 								"0",
 
 								"0",
 
-								(int)update_reason_code
 
+								(int)update_reason_code,
 
+								desc->project_name,
 
+								desc->version
 
+
 
 #if RECOVERY_APPLICATION
 
 					,"",
 
 					0