retrofit to gcc8

.cproject

@@ -239,7 +239,7 @@
                             							
                             <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"/>
+                            <builder arguments="&quot;c:/msys32/opt/esp-idf-v4.0/tools/idf.py&quot;" buildPath="${workspace_loc:/squeezelite-esp32}" command="python" id="cdt.managedbuild.builder.gnu.cross.1069921467" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" 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">
                                 								
@@ -386,6 +386,102 @@
             <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
             		
         </cconfiguration>
+        		
+        <cconfiguration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654">
+            			
+            <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654" moduleId="org.eclipse.cdt.core.settings" name="recovery_v4_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="" id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654" name="recovery_v4_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.198620654." name="/" resourcePath="">
+                        						
+                        <toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.1364218078" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
+                            							
+                            <option id="cdt.managedbuild.option.gnu.cross.prefix.1316973088" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
+                            							
+                            <option id="cdt.managedbuild.option.gnu.cross.path.1533370660" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path"/>
+                            							
+                            <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1113719760" 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.471226915" 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.1853083833" 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.1483360479" 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.1568613100" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+                                							
+                            </tool>
+                            							
+                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1352130306" 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.1685232195" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols"/>
+                                								
+                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2092028428" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+                                							
+                            </tool>
+                            							
+                            <tool id="cdt.managedbuild.tool.gnu.cross.c.linker.884207941" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
+                            							
+                            <tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.380922275" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
+                                								
+                                <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.687965807" 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.509939232" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
+                            							
+                            <tool id="cdt.managedbuild.tool.gnu.cross.assembler.633829614" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
+                                								
+                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.1702921489" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+                                							
+                            </tool>
+                            						
+                        </toolChain>
+                        					
+                    </folderInfo>
+                    				
+                </configuration>
+                			
+            </storageModule>
+            			
+            <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+            		
+        </cconfiguration>
         	
     </storageModule>
     	
@@ -407,6 +503,8 @@
             		
         </configuration>
         		
+        <configuration configurationName="recovery_v4_windows"/>
+        		
         <configuration configurationName="recovery_windows">
             			
             <resource resourceType="PROJECT" workspacePath="/squeezelite-esp32"/>

.settings/language.settings.xml

@@ -59,7 +59,7 @@
             			
             <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">
+            <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="41138253894086201" 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"/>
                 				
@@ -96,5 +96,29 @@
         </extension>
         	
     </configuration>
+    	
+    <configuration id="cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654" name="recovery_v4_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>
     
 </project>

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

@@ -24,6 +24,23 @@ environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786/PATH/op
 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.198620654/BATCH_BUILD/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/BATCH_BUILD/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/BATCH_BUILD/value=1
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/IDF_PATH/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/IDF_PATH/operation=replace
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/IDF_PATH/value=C\:/msys32/opt/esp-idf
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/PATH/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/PATH/operation=replace
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/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.198620654/PROJECT_NAME/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/PROJECT_NAME/operation=replace
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/PROJECT_NAME/value=recovery
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/PROJECT_VER/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/PROJECT_VER/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/PROJECT_VER/value=custom
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/append=true
+environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.1603996291.198620654/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
@@ -46,10 +63,10 @@ environment/project/cdt.managedbuild.toolchain.gnu.cross.base.293933348.16039962
 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/IDF_PATH/value=C\:/msys32/opt/esp-idf-v4.0
 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/PATH/value=C\:\\Program Files\\CMake\\bin;C\:\\msys32\\opt\\openocd-esp32\\bin;C\:\\msys32\\opt\\xtensa-esp32-elf-gcc8_2_0\\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

CMakeLists.txt

@@ -1,3 +1,13 @@
 cmake_minimum_required(VERSION 3.5)
+set(COMPONENT_ADD_INCLUDEDIRS main components/tools)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(squeezelite-esp32)
+
+
+
+if(NOT $ENV{PROJECT_NAME} or $ENV{PROJECT_NAME} = "recovery")
+	add_definitions(-DRECOVERY_APPLICATION=1)
+	project(recovery)
+else()
+	add_definitions(-DRECOVERY_APPLICATION=0)
+	project(squeezelite)
+endif()

build-scripts/ESP32-A1S-sdkconfig.defaults

@@ -773,13 +773,13 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_ESP32_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
 
 
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
+CONFIG_PTHREAD_DEFAULT_CORE_1=y
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y

build-scripts/I2S-4MFlash-sdkconfig.defaults

@@ -773,13 +773,13 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_ESP32_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
 
 
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
+CONFIG_PTHREAD_DEFAULT_CORE_1=y
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y

build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults

@@ -774,13 +774,13 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_ESP32_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
 
 
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
+CONFIG_PTHREAD_DEFAULT_CORE_1=y
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y

build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults

@@ -773,13 +773,13 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_ESP32_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
 
 
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
+CONFIG_PTHREAD_DEFAULT_CORE_1=y
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y

build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults

@@ -773,13 +773,13 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_ESP32_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
 
 
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
+CONFIG_PTHREAD_DEFAULT_CORE_1=y
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y

build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults

@@ -767,13 +767,13 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_ESP32_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
 
 
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
+CONFIG_PTHREAD_DEFAULT_CORE_1=y
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y

components/cmd_i2c/CMakeLists.txt

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

components/cmd_i2c/component.mk

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

components/cmd_nvs/CMakeLists.txt

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

components/cmd_nvs/component.mk

@@ -1,13 +0,0 @@
-#
-# Component Makefile
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default,
-# this will take the sources in the src/ directory, compile them and link them into
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
-#
-
-COMPONENT_ADD_INCLUDEDIRS := .
-CFLAGS += 	-I$(COMPONENT_PATH)/../squeezelite-ota
-COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/components/tools/
-COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/main

components/cmd_system/CMakeLists.txt

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

components/cmd_system/component.mk

@@ -1,12 +0,0 @@
-#
-# Component Makefile
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default,
-# this will take the sources in the src/ directory, compile them and link them into
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
-#
-
-COMPONENT_ADD_INCLUDEDIRS := .
-COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/main/
-COMPONENT_EXTRA_INCLUDES += $(PROJECT_PATH)/components/tools/

components/display/CMakeLists.txt

@@ -1,5 +1,5 @@
-idf_component_register(SRCS "led.c" "audio_controls.c" "buttons.c" "services.c" "monitor.c"INCLUDE_DIRS 
-						INCLUDE_DIRS . ../tools/
+idf_component_register(SRCS  "display.c" "SH1106.c" "SSD1306.c" "SSD132x.c"  "core/ifaces/default_if_i2c.c" "core/ifaces/default_if_spi.c" "core/gds_draw.c" "core/gds_font.c" "core/gds_image.c" "core/gds_text.c" "core/gds.c" "fonts/font_droid_sans_fallback_11x13.c"  "fonts/font_droid_sans_fallback_15x17.c" "fonts/font_droid_sans_fallback_24x28.c" "fonts/font_droid_sans_mono_13x24.c" "fonts/font_droid_sans_mono_16x31.c" "fonts/font_droid_sans_mono_7x13.c"
+						INCLUDE_DIRS . fonts core
                    
 )
 

components/display/display.c

@@ -23,7 +23,7 @@
 #include <arpa/inet.h>
 #include "esp_log.h"
 #include "globdefs.h"
-#include "config.h"
+#include "platform_config.h"
 #include "tools.h"
 #include "display.h"
 #include "gds.h"
@@ -371,4 +371,4 @@ void displayer_control(enum displayer_cmd_e cmd, ...) {
 	
 	xSemaphoreGive(displayer.mutex);
 	va_end(args);
-}
+}

components/driver_bt/CMakeLists.txt

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

components/driver_bt/bt_app_sink.c

@@ -22,7 +22,7 @@
 #include "esp_a2dp_api.h"
 #include "esp_avrc_api.h"
 #include "nvs.h"
-#include "config.h"
+#include "platform_config.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "trace.h"

components/driver_bt/bt_app_source.c

@@ -15,7 +15,7 @@
 #include "esp_wifi.h"
 #include "freertos/timers.h"
 #include "argtable3/argtable3.h"
-#include "config.h"
+#include "platform_config.h"
 #include "bt_app_core.h"
 #include "trace.h"
 

components/config/nvs_utilities.c → components/platform_config/nvs_utilities.c

@@ -10,11 +10,11 @@
 #include "driver/uart.h"
 #include "linenoise/linenoise.h"
 #include "argtable3/argtable3.h"
-#include "esp_vfs_fat.h"
+
 #include "nvs.h"
 #include "nvs_flash.h"
 #include "nvs_utilities.h"
-#include "config.h"
+#include "platform_config.h"
 
 const char current_namespace[] = "config";
 const char settings_partition[] = "settings";

components/config/config.c → components/platform_config/platform_config.c

@@ -19,7 +19,7 @@
  *
  */
 //#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
-#include "config.h"
+#include "platform_config.h"
 #include "nvs_utilities.h"
 
 #include <stdio.h>
@@ -31,7 +31,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"

components/cmd_i2c/cmd_i2ctools.c → components/platform_console/cmd_i2ctools.c

@@ -15,7 +15,7 @@
 #include "esp_log.h"
 #include "string.h"
 #include "stdio.h"
-#include "config.h"
+#include "platform_config.h"
 #include "accessors.h"
 
 #define I2C_MASTER_TX_BUF_DISABLE 0 /*!< I2C master doesn't need buffer */

components/cmd_system/cmd_system.c → components/platform_console/cmd_system.c

@@ -26,7 +26,7 @@
 #include "esp_partition.h"
 #include "esp_ota_ops.h"
 #include "platform_esp32.h"
-#include "config.h"
+#include "platform_config.h"
 #include "esp_sleep.h"
 #include "driver/uart.h"            // for the uart driver access
 

main/console.c → components/platform_console/platform_console.c

@@ -7,6 +7,8 @@
  CONDITIONS OF ANY KIND, either express or implied.
  */
 
+#include "platform_console.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -23,11 +25,10 @@
 #include "platform_esp32.h"
 #include "esp_pthread.h"
 #include "cmd_decl.h"
-#include "console.h"
 #include "wifi_manager.h"
 
 #include "cmd_squeezelite.h"
-#include "config.h"
+#include "platform_config.h"
 pthread_t thread_console;
 static void * console_thread();
 void console_start();

components/raop/raop_sink.c

@@ -11,7 +11,7 @@
 #include "esp_pthread.h"
 #include "esp_system.h"
 #include "freertos/timers.h"
-#include "config.h"
+#include "platform_config.h"
 #include "raop.h"
 #include "audio_controls.h"
 #include "display.h"

components/services/CMakeLists.txt

@@ -1,6 +1,7 @@
-idf_component_register(SRCS "led.c" "audio_controls.c" "buttons.c" "services.c" "monitor.c"INCLUDE_DIRS 
+idf_component_register(SRCS "accessors.c" "led.c" "audio_controls.c" "battery.c" "buttons.c" "services.c" "monitor.c" "rotary_encoder.c" 
 						INCLUDE_DIRS . ../tools/
-                   
+						REQUIRES json platform_config
+
 )
 
 

components/services/accessors.c

@@ -11,7 +11,7 @@
 #include "driver/gpio.h"
 #include "driver/i2c.h"
 #include "driver/spi_master.h"
-#include "config.h"
+#include "platform_config.h"
 #include "accessors.h"
 #include "globdefs.h"
 
@@ -104,4 +104,4 @@ void parse_set_GPIO(void (*cb)(int gpio, char *value)) {
 	} while (p++);
 	
 	free(nvs_item);
-}	
+}	

components/services/audio_controls.c

@@ -26,7 +26,7 @@
 #include "esp_log.h"
 #include "cJSON.h"
 #include "buttons.h"
-#include "config.h"
+#include "platform_config.h"
 #include "audio_controls.h"
 
 typedef esp_err_t (actrls_config_map_handler) (const cJSON * member, actrls_config_t *cur_config,uint32_t offset);

components/services/battery.c

@@ -16,7 +16,7 @@
 #include "esp_log.h"
 #include "driver/adc.h"
 #include "battery.h"
-#include "config.h"
+#include "platform_config.h"
 
 /* 
  There is a bug in esp32 which causes a spurious interrupt on gpio 36/39 when

components/services/monitor.c

@@ -19,7 +19,7 @@
 #include "buttons.h"
 #include "led.h"
 #include "globdefs.h"
-#include "config.h"
+#include "platform_config.h"
 #include "accessors.h"
 
 #define MONITOR_TIMER	(10*1000)

components/services/services.c

@@ -10,7 +10,7 @@
 #include "esp_log.h"
 #include "driver/gpio.h"
 #include <driver/i2c.h>
-#include "config.h"
+#include "platform_config.h"
 #include "battery.h"
 #include "led.h"
 #include "monitor.h"
@@ -95,4 +95,4 @@ void services_init(void) {
 	led_svc_init();
 	battery_svc_init();
 	monitor_svc_init();
-}
+}

components/squeezelite-ota/squeezelite-ota.c

@@ -23,7 +23,7 @@
 #include "esp_err.h"
 #include "tcpip_adapter.h"
 #include "squeezelite-ota.h"
-#include "config.h"
+#include "platform_config.h"
 #include <time.h>
 #include <sys/time.h>
 #include <stdarg.h>

components/squeezelite/decode_external.c

@@ -19,7 +19,7 @@
  *
  */
 
-#include "config.h" 
+#include "platform_config.h"
 #include "squeezelite.h"
 #include "bt_app_sink.h"
 #include "raop_sink.h"

components/squeezelite/external/dac_external.c

@@ -23,7 +23,7 @@
 #include <freertos/task.h>
 #include <driver/i2s.h>
 #include "esp_log.h"
-#include "config.h"
+#include "platform_config.h"
 #include "adac.h"
 
 static bool init(int i2c_port_num, int i2s_num, i2s_config_t *config);

components/squeezelite/output_bt.c

@@ -22,7 +22,7 @@
 #include "driver/gpio.h"
 #include "squeezelite.h"
 #include "perf_trace.h"
-#include "config.h"
+#include "platform_config.h"
 
 extern struct outputstate output;
 extern struct buffer *outputbuf;
@@ -195,4 +195,4 @@ void output_bt_tick(void) {
 		LOG_INFO("              ==========+==========+===========+===========+");
 		RESET_ALL_MIN_MAX;
 	}	
-}	
+}	

components/squeezelite/output_i2s.c

@@ -51,7 +51,7 @@ sure that using rate_delay would fix that
 #include "time.h"
 #include "led.h"
 #include "monitor.h"
-#include "config.h"
+#include "platform_config.h"
 #include "accessors.h"
 #include "globdefs.h"
 

components/telnet/telnet.c

@@ -18,9 +18,9 @@
  * https://github.com/PocketSprite/8bkc-sdk/blob/master/8bkc-components/8bkc-hal/vfs-stdout.c
  *
  */
-#include <stdlib.h> // Required for libtelnet.h
+#include <stdlib.h> // Required for CONFIG_PTHREAD_TASK_PRIO_DEFAULT.h
 #include <esp_log.h>
-#include "libtelnet.h"
+#include "CONFIG_PTHREAD_TASK_PRIO_DEFAULT.h"
 #include "stdbool.h"
 #include <lwip/def.h>
 #include <lwip/sockets.h>
@@ -35,7 +35,7 @@
 #include "esp_attr.h"
 #include "soc/uart_struct.h"
 #include "driver/uart.h"
-#include "config.h"
+#include "platform_config.h"
 #include "nvs_utilities.h"
 #include "platform_esp32.h"
 

components/wifi-manager/CMakeLists.txt

@@ -1,7 +1,7 @@
 idf_component_register(SRCS "dns_server.c" "http_server.c" "wifi_manager.c"
                        INCLUDE_DIRS .
-                       REQUIRES esp_common 
-                       PRIV_REQUIRES newlib freertos  spi_flash nvs_flash mdns pthread wpa_supplicant cmd_system 
+                       REQUIRES esp_common newlib freertos  spi_flash nvs_flash mdns pthread wpa_supplicant platform_console  squeezelite-ota 
+
                        EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz
 
 

components/wifi-manager/http_server.c

@@ -42,7 +42,7 @@ function to process requests, decode URLs, serve files, etc. etc.
 #include "esp_system.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "config.h"
+#include "platform_config.h"
 
 #define HTTP_STACK_SIZE	(5*1024)
 

components/wifi-manager/wifi_manager.c

@@ -58,7 +58,7 @@ Contains the freeRTOS task and all necessary support
 #include "esp_ota_ops.h"
 #include "esp_app_format.h"
 #include "cJSON.h"
-#include "config.h"
+#include "platform_config.h"
 #include "trace.h"
 #include "cmd_system.h"
 #include "monitor.h"

main/CMakeLists.txt

@@ -1,8 +1,4 @@
-set(COMPONENT_ADD_INCLUDEDIRS . )
-
-set(COMPONENT_SRCS "esp_app_main.c" "platform_esp32.c" "cmd_wifi.c" "console.c" "nvs_utilities.c" "cmd_squeezelite.c" "config.c")
-set(REQUIRES esp_common)
-set(REQUIRES_COMPONENTS freertos squeezelite nvs_flash esp32 spi_flash newlib log console ota tools )
-
-
-register_component()
+idf_component_register(SRCS "esp_app_main.c"  
+						REQUIRES esp_common  pthread squeezelite-ota platform_console
+                    	INCLUDE_DIRS .
+                    	)

main/esp_app_main.c

@@ -45,7 +45,7 @@
 #include "wifi_manager.h"
 #include "squeezelite-ota.h"
 #include <math.h>
-#include "config.h"
+#include "platform_config.h"
 #include "audio_controls.h"
 #include "telnet.h"
 

sdkconfig.defaults

@@ -741,13 +741,13 @@ CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
-CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
-CONFIG_ESP32_PTHREAD_STACK_MIN=768
+CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
+CONFIG_PTHREAD_STACK_MIN=768
 
 
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1=y
-CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=1
-CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
+CONFIG_PTHREAD_DEFAULT_CORE_1=y
+CONFIG_PTHREAD_TASK_CORE_DEFAULT=1
+CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 
 
 CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y