diff --git a/components/display/driver_SSD1306.c b/components/display/driver_SSD1306.c index 07bcc939..1abda98c 100644 --- a/components/display/driver_SSD1306.c +++ b/components/display/driver_SSD1306.c @@ -109,10 +109,12 @@ static bool display_init(char *config, char *welcome) { */ static void print_message(char *msg) { if (!msg) return; + SSD1306_AddressMode Mode = AddressMode; SSD1306_Clear( &I2CDisplay, SSD_COLOR_BLACK ); SSD1306_SetDisplayAddressMode( &I2CDisplay, AddressMode_Horizontal ); SSD1306_FontDrawAnchoredString( &I2CDisplay, TextAnchor_Center, msg, SSD_COLOR_WHITE ); SSD1306_Update( &I2CDisplay ); + SSD1306_SetDisplayAddressMode( &I2CDisplay, Mode ); } /**************************************************************************************** diff --git a/plugin/SqueezeESP32/Graphics.pm b/plugin/SqueezeESP32/Graphics.pm index e5733ed6..dadd335a 100644 --- a/plugin/SqueezeESP32/Graphics.pm +++ b/plugin/SqueezeESP32/Graphics.pm @@ -4,6 +4,47 @@ use strict; use base qw(Slim::Display::Squeezebox2); +my $VISUALIZER_NONE = 0; + +my @modes = ( + # mode 0 + { desc => ['BLANK'], + bar => 0, secs => 0, width => 128, + params => [$VISUALIZER_NONE] }, + # mode 1 + { desc => ['PROGRESS_BAR'], + bar => 1, secs => 0, width => 128, + params => [$VISUALIZER_NONE] }, + # mode 2 + { desc => ['ELAPSED'], + bar => 0, secs => 1, width => 128, + params => [$VISUALIZER_NONE] }, + # mode 3 + { desc => ['ELAPSED', 'AND', 'PROGRESS_BAR'], + bar => 1, secs => 1, width => 128, + params => [$VISUALIZER_NONE] }, + # mode 4 + { desc => ['REMAINING'], + bar => 0, secs => -1, width => 128, + params => [$VISUALIZER_NONE] }, + # mode 5 + { desc => ['CLOCK'], + bar => 0, secs => 0, width => 128, clock => 1, + params => [$VISUALIZER_NONE] }, + # mode 6 + { desc => ['SETUP_SHOWBUFFERFULLNESS'], + bar => 0, secs => 0, width => 128, fullness => 1, + params => [$VISUALIZER_NONE] }, +); + +sub modes { + return \@modes; +} + +sub nmodes { + return $#modes; +} + =comment sub bytesPerColumn { return 4; diff --git a/plugin/SqueezeESP32/SqueezeESP32.zip b/plugin/SqueezeESP32/SqueezeESP32.zip index ab1e5cbb..15126a7d 100644 Binary files a/plugin/SqueezeESP32/SqueezeESP32.zip and b/plugin/SqueezeESP32/SqueezeESP32.zip differ diff --git a/plugin/SqueezeESP32/install.xml b/plugin/SqueezeESP32/install.xml index 5d60aef8..626fd90d 100644 --- a/plugin/SqueezeESP32/install.xml +++ b/plugin/SqueezeESP32/install.xml @@ -10,6 +10,6 @@ PLUGIN_SQUEEZEESP32 PLUGIN_SQUEEZEESP32_DESC Plugins::SqueezeESP32::Plugin - 0.2 + 0.3 Philippe diff --git a/plugin/repo.xml b/plugin/repo.xml index 685fe5f0..ee9b377f 100644 --- a/plugin/repo.xml +++ b/plugin/repo.xml @@ -1,10 +1,10 @@ - + https://github.com/sle118/squeezelite-esp32 Philippe - 066d97b8ca3fa53cbfaa7caf06f47fdc066344fe + 799ae4860f9c009ac25c2ec35eb4070c5f474659 philippe_44@outlook.com SqueezeESP32 additional player id (100) http://github.com/sle118/squeezelite-esp32/raw/master/plugin/SqueezeESP32/SqueezeESP32.zip