From 00661de7fc86379ad4b28a2da906157856526624 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Apr 2023 15:26:35 +0200
Subject: [PATCH] accept up to 250 fps target in LED preferences
warning included.
---
platformio.ini | 4 +-
wled00/FX.h | 3 +-
wled00/FX_fcn.cpp | 3 +-
wled00/data/settings_leds.htm | 8 +-
wled00/html_settings.h | 960 +++++++++++++++++-----------------
wled00/wled.cpp | 2 +
wled00/wled.h | 2 +-
7 files changed, 499 insertions(+), 483 deletions(-)
diff --git a/platformio.ini b/platformio.ini
index 71fb8d5e..13c92232 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -51,7 +51,7 @@ default_envs =
esp8266_4MB_M
wemos_shield_esp32_4MB_M
wemos_shield_esp32_4MB_ICS4343x_M
- wemos_shield_esp32_4MB_SPM1423_M
+ wemos_shield_esp32_4MB_SPM1423_M
wemos_shield_esp32_4MB_LineIn_M
wemos_shield_esp32_16MB_M
wemos_shield_esp32_16MB_ICS4343x_M
@@ -70,7 +70,7 @@ default_envs =
esp32_16MB_V4_M_debug ;; experimental
esp8266pro_16MB_S
esp8266pro_16MB_M
- esp01_1MB_S
+ esp01_1MB_S
esp32_16MB_M_eth
athom_music_esp32_4MB_M
diff --git a/wled00/FX.h b/wled00/FX.h
index b7bd3e06..1bfe8b0d 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -83,7 +83,8 @@
assuming each segment uses the same amount of data. 256 for ESP8266, 640 for ESP32. */
#define FAIR_DATA_PER_SEG (MAX_SEGMENT_DATA / strip.getMaxSegments())
-#define MIN_SHOW_DELAY (_frametime < 16 ? 8 : 15)
+//#define MIN_SHOW_DELAY (_frametime < 16 ? 8 : 15)
+#define MIN_SHOW_DELAY (_frametime < 16 ? (_frametime <8? (_frametime <7? (_frametime <6 ? 2 :3) :4) : 8) : 15) // WLEDMM support higher framerates (up to 250fps)
#define NUM_COLORS 3 /* number of colors per segment */
#define SEGMENT strip._segments[strip.getCurrSegmentId()]
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 14afd344..85f95eef 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1650,8 +1650,9 @@ uint16_t WS2812FX::getFps() {
}
void WS2812FX::setTargetFps(uint8_t fps) {
- if (fps > 0 && fps <= 120) _targetFps = fps;
+ if (fps > 0 && fps <= 251) _targetFps = fps; // WLEDMM allow higher framerates
_frametime = 1000 / _targetFps;
+ if (_frametime < 1) _frametime = 1; // WLEDMM better safe than sorry
}
void WS2812FX::setMode(uint8_t segid, uint8_t m) {
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index b2aab7d4..9da32d90 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -147,6 +147,7 @@
let isRGBW = false, gRGBW = false, memu = 0;
gId('ampwarning').style.display = (d.Sf.MA.value > 7200) ? 'inline':'none';
+ gId('fpswarning').style.display = (d.Sf.FR.value > 69) ? 'block':'none'; // WLEDMM
if (d.Sf.LA.value == 255) laprev = 12;
else if (d.Sf.LA.value > 0) laprev = d.Sf.LA.value;
@@ -690,7 +691,12 @@ Length: None (not recommended)
+ ⚠ WLED may become unstable above 70 fps.
Config template: Apply