⚠ Restoring presets/configuration will OVERWRITE your current presets/configuration.
Incorrect upload or configuration may require a factory reset or re-flashing of your ESP.
From 0404ec988137acca997e620384cf446b19dce350 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 7 Nov 2024 23:15:39 +0100
Subject: [PATCH 7/9] changes in response to feedback from @willmmiles
* MIN_SHOW_DELAY -> MIN_FRAME_DELAY
* allow up to 250 for target FPS
* minor cleanup
* added specific MIN_FRAME_DELAY for -S2
---
wled00/FX.h | 10 ++++++----
wled00/FX_fcn.cpp | 11 +++++------
wled00/data/settings_leds.htm | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/wled00/FX.h b/wled00/FX.h
index d749d7796..56a0c9bd0 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -46,10 +46,12 @@
#define WLED_FPS 42
#define FRAMETIME_FIXED (1000/WLED_FPS)
#define FRAMETIME strip.getFrameTime()
-#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) // all ESP32 except -C3(very slow, untested)
- #define MIN_SHOW_DELAY 3 // supports higher framerates and better animation control
+#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
+ #define MIN_FRAME_DELAY 2 // minimum wait between repaints, to keep other functions like WiFi alive
+#elif defined(CONFIG_IDF_TARGET_ESP32S2)
+ #define MIN_FRAME_DELAY 4 // S2 is slower than normal esp32, and only has one core
#else
- #define MIN_SHOW_DELAY (_frametime < 16 ? 8 : 15) // legacy MIN_SHOW_DELAY - creates more idle loops, but reduces framerates
+ #define MIN_FRAME_DELAY 8 // 8266 legacy MIN_SHOW_DELAY
#endif
#define FPS_UNLIMITED 0
@@ -842,7 +844,7 @@ class WS2812FX { // 96 bytes
getMappedPixelIndex(uint16_t index) const;
inline uint16_t getFrameTime() const { return _frametime; } // returns amount of time a frame should take (in ms)
- inline uint16_t getMinShowDelay() const { return MIN_SHOW_DELAY; } // returns minimum amount of time strip.service() can be delayed (constant)
+ inline uint16_t getMinShowDelay() const { return MIN_FRAME_DELAY; } // returns minimum amount of time strip.service() can be delayed (constant)
inline uint16_t getLength() const { return _length; } // returns actual amount of LEDs on a strip (2D matrix may have less LEDs than W*H)
inline uint16_t getTransition() const { return _transitionDur; } // returns currently set transition time (in ms)
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 6bc61d10d..f4b46dade 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1312,7 +1312,7 @@ void WS2812FX::service() {
if (_suspend) return;
unsigned long elapsed = nowUp - _lastServiceShow;
- if (elapsed < 2) return; // keep wifi alive - no matter if triggered or unlimited
+ if (elapsed <= MIN_FRAME_DELAY) return; // keep wifi alive - no matter if triggered or unlimited
if ( !_triggered && (_targetFps != FPS_UNLIMITED)) { // unlimited mode = no frametime
if (elapsed < _frametime) return; // too early for service
}
@@ -1369,7 +1369,6 @@ void WS2812FX::service() {
Segment::modeBlend(false); // unset semaphore
}
#endif
- frameDelay = max(frameDelay, unsigned(MIN_SHOW_DELAY)); // limit effects that want to go faster than target FPS
seg.call++;
if (seg.isInTransition() && frameDelay > FRAMETIME) frameDelay = FRAMETIME; // force faster updates during transition
BusManager::setSegmentCCT(oldCCT); // restore old CCT for ABL adjustments
@@ -1390,7 +1389,7 @@ void WS2812FX::service() {
yield();
Segment::handleRandomPalette(); // slowly transition random palette; move it into for loop when each segment has individual random palette
show();
- _lastServiceShow = nowUp; // correct timestamp, for better FPS control
+ _lastServiceShow = nowUp; // update timestamp, for precise FPS control
}
#ifdef WLED_DEBUG
if ((_targetFps != FPS_UNLIMITED) && (millis() - nowUp > _frametime)) DEBUG_PRINTF_P(PSTR("Slow strip %u/%d.\n"), (unsigned)(millis()-nowUp), (int)_frametime);
@@ -1445,9 +1444,9 @@ uint16_t WS2812FX::getFps() const {
}
void WS2812FX::setTargetFps(uint8_t fps) {
- if (fps <= 120) _targetFps = fps;
+ if (fps <= 250) _targetFps = fps;
if (_targetFps > 0) _frametime = 1000 / _targetFps;
- else _frametime = 3; // unlimited mode
+ else _frametime = MIN_FRAME_DELAY; // unlimited mode
}
void WS2812FX::setMode(uint8_t segid, uint8_t m) {
@@ -1495,7 +1494,7 @@ void WS2812FX::setBrightness(uint8_t b, bool direct) {
BusManager::setBrightness(b);
if (!direct) {
unsigned long t = millis();
- if (_segments[0].next_time > t + 22 && t - _lastShow > MIN_SHOW_DELAY) trigger(); //apply brightness change immediately if no refresh soon
+ if (_segments[0].next_time > t + 22 && t - _lastShow > MIN_FRAME_DELAY) trigger(); //apply brightness change immediately if no refresh soon
}
}
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 55f8122e8..b467d5b9b 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -875,7 +875,7 @@ Swap:
- Target refresh rate: FPS
+ Target refresh rate: FPS
⚠ Unlimited FPS Mode is experimental ⚠
⚠ High FPS Mode is experimental.
Please backup WLED configuration and presets first!
From 001e2ad2875742b51861ba826baa9a9727698ea0 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:35:42 +0100
Subject: [PATCH 8/9] adjust audioreactive for the new FRAME_DELAY logic
minor
---
usermods/audioreactive/audio_reactive.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index ad449fc83..9c463e0a1 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -75,7 +75,7 @@ static uint8_t soundAgc = 0; // Automagic gain control: 0 - n
//static float volumeSmth = 0.0f; // either sampleAvg or sampleAgc depending on soundAgc; smoothed sample
static float FFT_MajorPeak = 1.0f; // FFT: strongest (peak) frequency
static float FFT_Magnitude = 0.0f; // FFT: volume (magnitude) of peak frequency
-static bool samplePeak = false; // Boolean flag for peak - used in effects. Responding routine may reset this flag. Auto-reset after strip.getMinShowDelay()
+static bool samplePeak = false; // Boolean flag for peak - used in effects. Responding routine may reset this flag. Auto-reset after strip.getFrameTime()
static bool udpSamplePeak = false; // Boolean flag for peak. Set at the same time as samplePeak, but reset by transmitAudioData
static unsigned long timeOfPeak = 0; // time of last sample peak detection.
static uint8_t fftResult[NUM_GEQ_CHANNELS]= {0};// Our calculated freq. channel result table to be used by effects
@@ -536,8 +536,8 @@ static void detectSamplePeak(void) {
#endif
static void autoResetPeak(void) {
- uint16_t MinShowDelay = MAX(50, strip.getMinShowDelay()); // Fixes private class variable compiler error. Unsure if this is the correct way of fixing the root problem. -THATDONFC
- if (millis() - timeOfPeak > MinShowDelay) { // Auto-reset of samplePeak after a complete frame has passed.
+ uint16_t peakDelay = max(uint16_t(50), strip.getFrameTime());
+ if (millis() - timeOfPeak > peakDelay) { // Auto-reset of samplePeak after at least one complete frame has passed.
samplePeak = false;
if (audioSyncEnabled == 0) udpSamplePeak = false; // this is normally reset by transmitAudioData
}
From 6790f8af084a4f4fe04672d82c6f55744d6d095d Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 21 Nov 2024 22:16:03 +0100
Subject: [PATCH 9/9] Same MIN_FRAME_DELAY=3 for -C3 and -S2
---
wled00/FX.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wled00/FX.h b/wled00/FX.h
index 56a0c9bd0..c15500aa3 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -48,8 +48,8 @@
#define FRAMETIME strip.getFrameTime()
#if defined(ARDUINO_ARCH_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
#define MIN_FRAME_DELAY 2 // minimum wait between repaints, to keep other functions like WiFi alive
-#elif defined(CONFIG_IDF_TARGET_ESP32S2)
- #define MIN_FRAME_DELAY 4 // S2 is slower than normal esp32, and only has one core
+#elif defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C3)
+ #define MIN_FRAME_DELAY 3 // S2/C3 are slower than normal esp32, and only have one core
#else
#define MIN_FRAME_DELAY 8 // 8266 legacy MIN_SHOW_DELAY
#endif