From eb5c7c3ceaf792673bd697134b1ca57aff9aef2a Mon Sep 17 00:00:00 2001 From: philippe44 Date: Mon, 13 Jan 2020 22:13:40 -0800 Subject: [PATCH] display update --- components/display/driver_SSD1306.c | 2 ++ plugin/SqueezeESP32/Graphics.pm | 41 +++++++++++++++++++++++++++ plugin/SqueezeESP32/SqueezeESP32.zip | Bin 2266 -> 2628 bytes plugin/SqueezeESP32/install.xml | 2 +- plugin/repo.xml | 4 +-- 5 files changed, 46 insertions(+), 3 deletions(-) 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 ab1e5cbb89b1b329aaeb601fb90cfdb01dfd8441..15126a7d3096c617ed88fcf61e70cce8b3c07c67 100644 GIT binary patch delta 1205 zcmca5ctoT=z?+#xgn@y9gCTgMZopT~aQ397H>ZPk;;UiB_UZsX1*)CJi4P-rFx32cb0MvowZ}F>pzj(j8+eJpZ5&NT-B)Y z#C6i<`ftVOPd*P7h-2qwikqXKamrWt{*#tJsvOm_hfV6;bs}^#PweiRRLm4(Al3Ce zLF~l!v$4X*O$^T(p9(MBa4*N;^t)bVPql1|Kc>foPs{yx`*)>Kmc=$B+<3XCn4sR{ zWtS`(lp3~Os$j5`aC*<8cXeN`<^8MLzL^aoDMu5cnf;vp{oyV*5jw4Op*LSjE&_Q2bbAMXX!3 zX8qKhyIOAc>i0zE?-u`ivY_M7!z0^dBj4EieX{9)Jf+~@zml%9$3J=MS1qdwkm~7} zv-HFAtj+5_g`8c!`@qA4+!wevt0=D2IC(Ql;GLk^iAOe`+rwnM!xrsaQP#8SnZ0_+ zMv>@<;}c?dcWT(~6R7cgzNj=Psyv@F*+l8=<(Gmsc4DbFboS46ckTOlEvPgw)=&53 z-Ey9-DPP~&BVzpQ2HpCAwc-2E2mzz~H4uZMJTtGjBrzvPuOc@mcj9TU!ww>C-<#e~ zh+WX_vz66wj-M#6Qb$PJt^(m>Pa@c#3#F^6{`%sV*W0T1|9{PMzSnLiGy1P_E)M_b zYSgd%e5c+{6RGfz{JScA&!1e){Bu37u*y>%M@lvneKicbog z@6@&GP|eOghFhl}t5IzYbl6qkUzJz>B7e14SJUqcD>pkkaQ?l;@3DSTwgS7Y;2z1j zkw)A{7N|Q-nc}%n;?@T32@1RCJt+yk5Tkh4CRbi=e(|?WXE$xvNuGUFb%L2u+yT+B zklag}Ci~Cdke$#t%S$`>nvsdf^sjyy)0e&3?e^!Wp1Nb@iGZGO11k;m`1anYA8;Lw{K$1bs1ktvV49+Gn+=j#UO>6r9a0E2G}5QBoTxTGjE zFTGf=q@tv?cO%y!0|~b0Pc-)hZeQiE@YTKLR#=kej+P8N1A*wRQy2N`vo6;=SAP8J zq@_pW-fZ0PETD6ai_gxeEY+Q>B=z6+zKEW2y!+3G<0UggZ^znc{B)s05|f$Pmh+)z@5wvZwArQ_ zs)Q{(HTfl*oINlpprr&ApeH~;0f^rN(*{zy-~tOWFfcMmFhm_UJFwu?WH)vjCN1X4 yE$op@;;fVJvzxl&3L0c{H?W}u6tcOlYYgA^othlUVZ#*2K6yHaEgJ_1$Tia!as2z?+#xgn@y9gW(9XZa_-ThUKS#JS9d325unjUX)mnk(peqSCAWe-ZuY` zfdJcso&QAdH8e6VcYeAebm=xN>4`=LO6qo#gv*597~lU>ex^Mj!f)5*&-*Twu8LX7 zRgvb@+B@ASp1pzj&(lbyC4b6St={-WGx;F%_a_^c9Ip>rVR7wtV%`O>pWXY6v;OO7 z+?p%l`ZIFdH7DmY?M>pX^YQw(Uu|wT6t779u~*{b^~yy+bW&-z{B zM)>(deTaI%P45$@UjjWl0qW_@yyB9?oE*K1+??DAzTV7+0&VY`{wL;h+vY^+c6iTv zb?~>-fz?OOMl?_6pX?d=_iLK{Ev<^0`;{})CHKkegt>Q|tk}NV{OqoELYm7(tJrt{ z;ttv?emz`9<^TTC`Cp z>8EzOs-NGt`6V$gO5FrxpEVb*%zc{9_M=Vx=G}W+-o}WZb(t%2{OFE6vpKyF_pI$- zaKinfZukSvoXlf~H`!1B%eYyKxr;f13m6Uz43U%719I}#N*e>&APhrKzb^sbIOu zf$WF*P*d1sB@S&Dxon4(uTNfORCzedA4LEDHx*0=cr!BDGe8pN2aGsU0lEhS6oB|M z!{mt^l57lKif22IPTs&_!^Fxo`5i|j(Z*1lNq^e+2*lPLUGIN_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