init

JacekZubielik · Oct 12, 2023 · d8e1879 · d8e1879
1 parent bdae1c5
commit d8e1879
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 14 deletions.
diff --git a/.github/workflows/web_deploy.yml b/.github/workflows/web_deploy.yml
@@ -3,7 +3,7 @@ on:
   workflow_call:
     secrets:
       WEB_INSTALLER:
-        required: true       
+        required: true
   workflow_dispatch:
 jobs:
   update_web_installer:
@@ -17,10 +17,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          submodules: true    
+          submodules: true
       - name: Update Web Installer Project
         run: |
           . /opt/esp/python_env/idf4.3_py3.8_env/bin/activate
-          git config --global --add safe.directory /__w/squeezelite-esp32/squeezelite-esp32   
+          git config --global --add safe.directory /__w/squeezelite-esp32/squeezelite-esp32
           build_tools.py manifest --flash_file "/build/flash_project_args" --outdir "./bin_files" --manif_name "manifest" --max_count 3
-          build_tools.py pushinstaller --source "./bin_files" --manif_name "manifest" --target "web-installer" --url "https://github.com/sle118/squeezelite-esp32-installer.git" --artifacts "docs/artifacts" --web_installer_branch "main" --token "${{env.WEB_INSTALLER}}"
+          build_tools.py pushinstaller --source "./bin_files" --manif_name "manifest" --target "web-installer" --url "https://github.com/jacekzubielik/squeezelite-esp32-installer.git" --artifacts "docs/artifacts" --web_installer_branch "main" --token "${{env.WEB_INSTALLER}}"
diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
@@ -49,6 +49,9 @@ menu "Squeezelite-ESP32"
 	menu "Target"
 		choice OUTPUT_TYPE
 			prompt "Main system"
+    			default BASIC_I2C_BT
+				help
+					Type of hardware platform
     			default BASIC_I2C_BT
 				help
 					Type of hardware platform
@@ -66,6 +69,7 @@ menu "Squeezelite-ESP32"
 				select BAT_LOCKED
 				select I2C_LOCKED
 				select AMP_LOCKED
+				select AMP_LOCKED
 				select TARGET_LOCKED
 			config BASIC_I2C_BT
 				bool "Generic I2S & Bluetooth"
@@ -81,24 +85,16 @@ menu "Squeezelite-ESP32"
 				select LED_LOCKED
 				select TARGET_LOCKED
 		endchoice
-		config WITH_CONFIG_UI
-			bool "Enable config UI"
-			default n
-			help
-				Enable configuring system options with the UI
-		config WITH_METRICS
-			bool "Enable Metrics"
-			default n
-			help
-				Enable capturing and reporting anonymous metrics
 		config RELEASE_API
 			string "Software update URL"
 			default "https://api.github.com/repos/JacekZubielik/squeezelite-esp32/releases"
+			default "https://api.github.com/repos/JacekZubielik/squeezelite-esp32/releases"
 			help
 				Set the URL of the API that the front-end UI will use to fetch software updates
 		config SQUEEZELITE_ESP32_RELEASE_URL
 			string "Release URL"
 			default "https://github.com/JacekZubielik/squeezelite-esp32/releases"
+			default "https://github.com/JacekZubielik/squeezelite-esp32/releases"
 			help
 				Set the URL where users can see a list of releases
 		# you can't change default values once they are set so changing "Target" will not reset
@@ -109,13 +105,15 @@ menu "Squeezelite-ESP32"
 			default "Squeezelite-TWATCH" if TWATCH2020
 			default "Muse" if MUSE
 			default "Zeppelin" if ZEPPELIN
+			default "Zeppelin" if ZEPPELIN
 			default "Squeezelite-ESP32"
 		config FW_PLATFORM_NAME
 			string
 			default "SqueezeAmp" if SQUEEZEAMP
 			default "TWATCH" if TWATCH2020
 			default "Muse" if MUSE
 			default "Zeppelin" if ZEPPELIN
+			default "Zeppelin" if ZEPPELIN
 			default "ESP32"
 		# AGGREGATES - begin
 		# these parameters are "aggregates"	that take precedence. They must have a default value
@@ -125,36 +123,46 @@ menu "Squeezelite-ESP32"
 			default "model=I2S,bck=26,ws=25,do=33,i2c=53,sda=21,scl=22" if TWATCH2020
 			default "model=I2S,bck=5,ws=25,do=26,di=35,i2c=16,sda=18,scl=23,mck" if MUSE
 			default "model=I2S,bck=13,ws=15,do=14" if ZEPPELIN
+			default "model=I2S,bck=13,ws=15,do=14" if ZEPPELIN
 			default ""
 		config SPDIF_CONFIG
 			string
 			default "bck=33,ws=25,do=15" if SQUEEZEAMP
 			default	"" if ZEPPELIN
+			default	"" if ZEPPELIN
 			default	""
+		config GPIO_EXP_CONFIG
 		config GPIO_EXP_CONFIG
 			string
 			default	""
 		config SPI_CONFIG
 			string
 			default "dc=27,data=19,clk=18" if TWATCH2020
+			default "dc=27,data=19,clk=18" if TWATCH2020
 			default "mosi=15,miso=2,clk=14"	if MUSE
 			default	"data=23,clk=18,dc=33,host=1" if ZEPPELIN
 			default	""
+			default	"data=23,clk=18,dc=33,host=1" if ZEPPELIN
+			default	""
 		config DISPLAY_CONFIG
 			string
 			default "SPI,driver=ST7789,width=240,height=240,cs=5,back=12,speed=16000000,HFlip,VFlip" if TWATCH2020
 			default "SPI,width=256,height=64,cs=5,reset=32,speed=8000000,driver=SSD1322,HFlip,VFlip,rotate" if ZEPPELIN
+			default "SPI,width=256,height=64,cs=5,reset=32,speed=8000000,driver=SSD1322,HFlip,VFlip,rotate" if ZEPPELIN
 			default ""
 		config ETH_CONFIG
 			string
 			default	"model=lan8720,mdc=4,mdio=2,rst=1" if ZEPPELIN
+			default	"model=lan8720,mdc=4,mdio=2,rst=1" if ZEPPELIN
 			default ""
 		# AGGREGATES - end
+		# AGGREGATES - end
 		config DAC_CONTROLSET
 			string
 			default "{ \"init\": [ {\"reg\":41, \"val\":128}, {\"reg\":18, \"val\":255} ], \"poweron\": [ {\"reg\":18, \"val\":64, \"mode\":\"or\"} ], \"poweroff\": [ {\"reg\":18, \"val\":191, \"mode\":\"and\"} ] }" if TWATCH2020
 			default "{\"init\":[ {\"reg\":0,\"val\":128}, {\"reg\":0,\"val\":0}, {\"reg\":25,\"val\":4}, {\"reg\":1,\"val\":80}, {\"reg\":2,\"val\":0},	{\"reg\":8,\"val\":0}, {\"reg\":4,\"val\":192},	{\"reg\":0,\"val\":18}, {\"reg\":1,\"val\":0}, {\"reg\":23,\"val\":24}, {\"reg\":24,\"val\":2}, {\"reg\":38,\"val\":9}, {\"reg\":39,\"val\":144}, {\"reg\":42,\"val\":144}, {\"reg\":43,\"val\":128}, {\"reg\":45,\"val\":128}, {\"reg\":27,\"val\":0}, {\"reg\":26,\"val\":0}, {\"reg\":2,\"val\":240}, {\"reg\":2,\"val\":0},	{\"reg\":29,\"val\":28}, {\"reg\":4,\"val\":48}, {\"reg\":25,\"val\":0}, {\"reg\":46,\"val\":33}, {\"reg\":47,\"val\":33} ]}" if MUSE
 			default ""
+			default ""
 		config AUDIO_CONTROLS
 			string
 			default "[{\"gpio\":32, \"pull\":true, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_VOLDOWN\"}, \"longpress\":{\"pressed\":\"ACTRLS_PREV\"}}, {\"gpio\":19, \"pull\":true, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_VOLUP\"}, \"longpress\":{\"pressed\":\"ACTRLS_NEXT\"}}, {\"gpio\":12, \"pull\":true, \"long_press\":1000, \"normal\":{\"pressed\":\"ACTRLS_TOGGLE\"},\"longpress\":{\"pressed\":\"ACTRLS_POWER\"}}]" if MUSE
@@ -164,31 +172,41 @@ menu "Squeezelite-ESP32"
 			default "channel=7,scale=20.24,atten=0" if SQUEEZEAMP
 			default "channel=5,scale=7.00,atten=3,cells=1" if MUSE
 			default ""
+			default ""
 		config TARGET
 			string
 			default "muse" if MUSE
 			default "zeppelin" if ZEPPELIN
 			default ""
+		config AMP_GPIO
+			default "zeppelin" if ZEPPELIN
+			default ""
 		config AMP_GPIO
 			int
 			default 21 if MUSE
 			default -1
+		config POWER_GPIO
 		config POWER_GPIO
 			int
 			default -1
+			default -1
 		config JACK_GPIO
 			int
 			default 34 if SQUEEZEAMP || MUSE
 			default -1
+			default -1
 		config SPKFAULT_GPIO
 			int
 			default 2 if SQUEEZEAMP
 			default -1
+			default -1
 		config BAT_CHANNEL
+			int
 			int
 			default 7 if SQUEEZEAMP
 			default -1
 		config LED_GREEN_GPIO
+			int
 			int
 			default 12 if SQUEEZEAMP
 			default -1
@@ -201,6 +219,7 @@ menu "Squeezelite-ESP32"
 			default "0=ir" if SQUEEZEAMP
 			default "" if TWATCH2020
 			default	"36=ir" if ZEPPELIN
+			default	"36=ir" if ZEPPELIN
 	endmenu
 
 	menu "Audio settings"
@@ -295,6 +314,7 @@ menu "Squeezelite-ESP32"
 		        string "Name of Squeezelite device to use when connecting to A2DP device"
 		        default "Squeezelite"
 			default "Zeppelin" if ZEPPELIN
+			default "Zeppelin" if ZEPPELIN
 		        help
 		            This is the name of the device that the Bluetooth speaker will see when it is connected to.
 		    config A2DP_CONTROL_DELAY_MS
@@ -321,6 +341,7 @@ menu "Squeezelite-ESP32"
 			string "Name of Bluetooth A2DP device"
 		        default "ESP32-BT"
 			default "Zeppelin" if ZEPPELIN
+			default "Zeppelin" if ZEPPELIN
 		    help
 				This is the name of the bluetooth speaker that will be broadcasted
 		config BT_SINK_PIN
@@ -335,6 +356,7 @@ menu "Squeezelite-ESP32"
 			string "Name of AirPlay device"
 				default "ESP32-AirPlay"
 				default "Zeppelin-AirPlay" if ZEPPELIN
+				default "Zeppelin-AirPlay" if ZEPPELIN
 		    help
 				This is the name of the AirPlay speaker that will be broadcasted
 		config AIRPLAY_PORT
@@ -348,8 +370,10 @@ menu "Squeezelite-ESP32"
 			default y
 			help
 				Enable Spotify connect using CSpot
+				Enable Spotify connect using CSpot
 	endmenu
 
+
 	menu "Controls"
 		depends on !MUSE
 		config AUDIO_CONTROLS