diff --git a/src/Apps.h b/src/Apps.h index a7acaba3..03e32fbc 100644 --- a/src/Apps.h +++ b/src/Apps.h @@ -26,7 +26,7 @@ String WEATHER_HUM; struct CustomApp { - uint32_t currentFrame; + uint32_t currentFrame = 0; String iconName; String iconFile; String drawInstructions; @@ -507,6 +507,7 @@ void ShowCustomApp(String name, FastLED_NeoMatrix *matrix, MatrixDisplayUiState { ca->isGif = isGifFlags[i]; ca->icon = LittleFS.open(filePath); + ca->currentFrame=0; break; // Exit loop if icon was found } } diff --git a/src/DisplayManager.cpp b/src/DisplayManager.cpp index d4e44590..28b795ef 100644 --- a/src/DisplayManager.cpp +++ b/src/DisplayManager.cpp @@ -610,12 +610,14 @@ bool DisplayManager_::generateCustomPage(const String &name, JsonObject doc, boo { customApp.iconName = newIconName; customApp.icon.close(); + customApp.currentFrame = 0; customApp.iconSearched = false; } } else { customApp.icon.close(); + customApp.currentFrame = 0; customApp.iconSearched = false; customApp.iconName = ""; } diff --git a/src/Functions.h b/src/Functions.h index dac5a694..49263fd4 100644 --- a/src/Functions.h +++ b/src/Functions.h @@ -62,7 +62,6 @@ uint32_t hsvToRgb(uint8_t h, uint8_t s, uint8_t v) uint32_t hexToUint32(const char *hexString) { uint32_t rgbValue = (uint32_t)strtol(hexString, NULL, 16); - Serial.println(rgbValue); return rgbValue; // Nur RGB, kein Alpha-Kanal } diff --git a/src/GifPlayer.h b/src/GifPlayer.h index d9117468..aa9be7bc 100644 --- a/src/GifPlayer.h +++ b/src/GifPlayer.h @@ -238,7 +238,7 @@ class GifPlayer if ((prevDisposalMethod != DISPOSAL_NONE) && (prevDisposalMethod != DISPOSAL_LEAVE)) { - mtx->clear(); + //mtx->fillRect(offsetX, offsetY, lsdWidth, lsdHeight, 0); } if (prevDisposalMethod == DISPOSAL_BACKGROUND) diff --git a/src/Globals.cpp b/src/Globals.cpp index 4a356ce1..0ac30f40 100644 --- a/src/Globals.cpp +++ b/src/Globals.cpp @@ -204,7 +204,7 @@ void loadSettings() CALENDAR_HEADER_COLOR = Settings.getUInt("CHCOL", 0xFF0000); CALENDAR_TEXT_COLOR = Settings.getUInt("CTCOL", 0x000000); CALENDAR_BODY_COLOR = Settings.getUInt("CBCOL", 0xFFFFFF); - TRANS_EFFECT = Settings.getUInt("TEFF", 10); + TRANS_EFFECT = Settings.getUInt("TEFF", 1); TIME_MODE = Settings.getUInt("TMODE", 1); TIME_COLOR = Settings.getUInt("TIME_COL", 0); DATE_COLOR = Settings.getUInt("DATE_COL", 0); @@ -297,7 +297,7 @@ IPAddress gateway; IPAddress subnet; IPAddress primaryDNS; IPAddress secondaryDNS; -const char *VERSION = "0.85"; +const char *VERSION = "0.86"; String MQTT_HOST = ""; uint16_t MQTT_PORT = 1883;