jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-21 17:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Second attempt at #3541

Browse Source
This commit is contained in:
Blaz Kristan 2023-11-27 14:24:07 +01:00
parent 9e135cc81d
commit b88344a6c0
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wled00/led.cpp
View File

@ -134,10 +134,8 @@ void stateUpdated(byte callMode) {
usermods.onStateChange(callMode); usermods.onStateChange(callMode);
if (fadeTransition) { if (fadeTransition) {
// restore (global) transition time if not called from UDP notifier or single/temporary transition from JSON (also playlist)
if (!(callMode == CALL_MODE_NOTIFICATION || jsonTransitionOnce)) strip.setTransition(transitionDelay);
jsonTransitionOnce = false;
if (strip.getTransition() == 0) { if (strip.getTransition() == 0) {
jsonTransitionOnce = false;
transitionActive = false; transitionActive = false;
applyFinalBri(); applyFinalBri();
strip.trigger(); strip.trigger();
@ -190,7 +188,10 @@ void handleTransitions()
float tper = (millis() - transitionStartTime)/(float)strip.getTransition(); float tper = (millis() - transitionStartTime)/(float)strip.getTransition();
if (tper >= 1.0f) { if (tper >= 1.0f) {
strip.setTransitionMode(false); // stop all transitions strip.setTransitionMode(false); // stop all transitions
// restore (global) transition time if not called from UDP notifier or single/temporary transition from JSON (also playlist)
if (jsonTransitionOnce) strip.setTransition(transitionDelay);
transitionActive = false; transitionActive = false;
jsonTransitionOnce = false;
tperLast = 0; tperLast = 0;
applyFinalBri(); applyFinalBri();
return; return;

5
wled00/udp.cpp
View File

@ -213,7 +213,10 @@ void parseNotifyPacket(uint8_t *udpIn) {
// set transition time before making any segment changes // set transition time before making any segment changes
if (version > 3) { if (version > 3) {
if (fadeTransition) strip.setTransition(((udpIn[17] << 0) & 0xFF) + ((udpIn[18] << 8) & 0xFF00)); if (fadeTransition) {
jsonTransitionOnce = true;
strip.setTransition(((udpIn[17] << 0) & 0xFF) + ((udpIn[18] << 8) & 0xFF00));
}
} }
//apply colors from notification to main segment, only if not syncing full segments //apply colors from notification to main segment, only if not syncing full segments

2
wled00/wled.h
View File

@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2311150 #define VERSION 2311270
//uncomment this if you have a "my_config.h" file you'd like to use //uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG //#define WLED_USE_MY_CONFIG