浏览代码

Merge branch 'led_visu-v4.3' of https://github.com/wizmo2/squeezelite-esp32 into led_visu-v4.3

Wizmo2 1 年之前
父节点
当前提交
fcd23552ff
共有 5 个文件被更改,包括 17 次插入13 次删除
  1. 2 2
      components/squeezelite/displayer.c
  2. 二进制
      plugin/SqueezeESP32.zip
  3. 3 0
      plugin/SqueezeESP32/Player.pm
  4. 2 1
      plugin/SqueezeESP32/RgbLed.pm
  5. 10 10
      sdkconfig

+ 2 - 2
components/squeezelite/displayer.c

@@ -1278,8 +1278,8 @@ static void ledv_handler( u8_t *data, int len) {
 	led_visu.style = pkt->style;
 	led_visu.max = pkt->bright;
 
-		led_vu_clear();
-		if (led_visu.mode) {
+	led_vu_clear();
+	if (led_visu.mode) {
 		if (led_visu.mode == VISU_SPECTRUM) {
 			led_visu.n = (led_visu.config < MAX_BARS) ? led_visu.config : MAX_BARS;
 			spectrum_limits(led_visu.bars, 0, led_visu.n, 0, 0.25);

二进制
plugin/SqueezeESP32.zip


+ 3 - 0
plugin/SqueezeESP32/Player.pm

@@ -150,6 +150,9 @@ sub power {
 		$client->update_artwork(1);
 	} else {
 		$client->clear_artwork(1);
+		if ($client->hasLED) {
+			Plugins::SqueezeESP32::RgbLed::updateLED($client, 0);
+		}
 	}
 
 	return $res;

+ 2 - 1
plugin/SqueezeESP32/RgbLed.pm

@@ -70,12 +70,13 @@ sub ledVisualizerNModes {
 
 sub updateLED {
 	my $client = shift;
+	my $on = shift || 1;
 	my $cprefs = $prefs->client($client);
 	
 	my $visu = $cprefs->get('led_visualizer') || 0;
 	my $bright = $cprefs->get('led_brightness') || 20;
 	
-	$visu = 0 if ($visu < 0 || $visu > ledVisualizerNModes || !(Slim::Player::Source::playmode($client) eq 'play'));
+	$visu = 0 if ($visu < 0 || $visu > ledVisualizerNModes || !(Slim::Player::Source::playmode($client) eq 'play') || !$on);
 	my $modes  = ledVisualizerModes;
 	my $params = $modes->[$visu]{'params'};
 	my $data = pack('CCC', $params->[0], $params->[1], $bright);

+ 10 - 10
sdkconfig

@@ -203,12 +203,11 @@ CONFIG_AUDIO_CONTROLS=""
 CONFIG_BAT_CONFIG="channel=7,scale=20.24,atten=0"
 CONFIG_TARGET=""
 CONFIG_AMP_GPIO=-1
-CONFIG_JACK_GPIO=34
-CONFIG_SPKFAULT_GPIO=2
-CONFIG_BAT_CHANNEL=7
-CONFIG_LED_GREEN_GPIO=12
-CONFIG_LED_RED_GPIO=13
-CONFIG_SET_GPIO="0=ir"
+CONFIG_JACK_GPIO=-1
+CONFIG_SPKFAULT_GPIO=-1
+CONFIG_BAT_CHANNEL=-1
+CONFIG_LED_GREEN_GPIO=-1
+CONFIG_LED_RED_GPIO=-1
 # end of Target
 
 #
@@ -274,6 +273,7 @@ CONFIG_CSPOT_SINK=y
 # Various I/O
 #
 CONFIG_I2C_CONFIG=""
+CONFIG_SET_GPIO=""
 CONFIG_ROTARY_ENCODER=""
 # end of Various I/O
 
@@ -908,11 +908,11 @@ 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 is not set
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
 # CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
-CONFIG_FREERTOS_ASSERT_DISABLE=y
+# CONFIG_FREERTOS_ASSERT_DISABLE is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1536
-CONFIG_FREERTOS_ISR_STACKSIZE=2096
+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
@@ -1085,7 +1085,7 @@ CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
-CONFIG_LWIP_ESP_LWIP_ASSERT=y
+# CONFIG_LWIP_ESP_LWIP_ASSERT is not set
 
 #
 # Hooks