From 4517e9040a780cede95931e005e1510e0ddadd9a Mon Sep 17 00:00:00 2001 From: Philippe G Date: Wed, 27 May 2020 16:58:07 -0700 Subject: [PATCH] log scale 0..5 for brightness - release --- components/squeezelite/display.c | 7 ++++--- plugin/SqueezeESP32.zip | Bin 10338 -> 10327 bytes plugin/SqueezeESP32/Graphics.pm | 2 +- plugin/SqueezeESP32/install.xml | 2 +- plugin/repo.xml | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/squeezelite/display.c b/components/squeezelite/display.c index 75459d6f..76342ba0 100644 --- a/components/squeezelite/display.c +++ b/components/squeezelite/display.c @@ -646,12 +646,13 @@ static void grfb_handler(u8_t *data, int len) { pkt->brightness = htons(pkt->brightness); xSemaphoreTake(displayer.mutex, portMAX_DELAY); - - if (pkt->brightness < 0) { + + // LMS driver sends 0..5 value, we assume driver is highly log + if (pkt->brightness <= 0) { GDS_DisplayOff(display); } else { GDS_DisplayOn(display); - GDS_SetContrast(display, pkt->brightness); + GDS_SetContrast(display, 255 * powf(pkt->brightness / 5.0f, 3)); } xSemaphoreGive(displayer.mutex); diff --git a/plugin/SqueezeESP32.zip b/plugin/SqueezeESP32.zip index f5f08c891556bce75842c14bd981fd146db87a2c..1d8b8c75c2a623b291aa0cb813f54b63fb7e3c63 100644 GIT binary patch delta 2563 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 diff --git a/plugin/SqueezeESP32/Graphics.pm b/plugin/SqueezeESP32/Graphics.pm index 2597a557..b23cf95b 100644 --- a/plugin/SqueezeESP32/Graphics.pm +++ b/plugin/SqueezeESP32/Graphics.pm @@ -88,7 +88,7 @@ sub displayWidth { } sub brightnessMap { - return (65535, 10, 50, 100, 200); + return (0 .. 5); } =comment diff --git a/plugin/SqueezeESP32/install.xml b/plugin/SqueezeESP32/install.xml index a835ce52..7d20081e 100644 --- a/plugin/SqueezeESP32/install.xml +++ b/plugin/SqueezeESP32/install.xml @@ -10,6 +10,6 @@ PLUGIN_SQUEEZEESP32 PLUGIN_SQUEEZEESP32_DESC Plugins::SqueezeESP32::Plugin - 0.93 + 0.94 Philippe diff --git a/plugin/repo.xml b/plugin/repo.xml index 52afc5ca..f13e8830 100644 --- a/plugin/repo.xml +++ b/plugin/repo.xml @@ -1,10 +1,10 @@ - + https://github.com/sle118/squeezelite-esp32 Philippe - 42e9a5713355c5c7b8b318f4254a183e9bb86b8f + a9bf10b47d13508ba051e4067cdabc2c283f4824 philippe_44@outlook.com SqueezeESP32 additional player id (100) http://github.com/sle118/squeezelite-esp32/raw/master/plugin/SqueezeESP32.zip