Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into mdev

Browse Source
This commit is contained in:
Ewoud
2023-01-07 12:01:03 +01:00
parent da590bac7e de4f1d09af
commit 66b15d32d9
41 changed files with 330 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h
View File

@@ -136,7 +136,7 @@ private:
} }
} else { } else {
if (m_offPreset) { if (m_offPreset) {
if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyPreset(m_offPreset, NotifyUpdateMode); applyPreset(m_offPreset, NotifyUpdateMode);
return; return;
} else if (prevPlaylist) { } else if (prevPlaylist) {
if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyPreset(prevPlaylist, NotifyUpdateMode); if (currentPreset==m_onPreset || currentPlaylist==m_onPreset) applyPreset(prevPlaylist, NotifyUpdateMode);

2
wled00/const.h
View File

@@ -342,7 +342,7 @@
#ifdef ESP8266 #ifdef ESP8266
#define SETTINGS_STACK_BUF_SIZE 2048 #define SETTINGS_STACK_BUF_SIZE 2048
#else #else
#define SETTINGS_STACK_BUF_SIZE 3096 //WLEDMM settings per usermod, AudioReactive by far biggest UM #define SETTINGS_STACK_BUF_SIZE 3096
#endif #endif
#ifdef WLED_USE_ETHERNET #ifdef WLED_USE_ETHERNET

2
wled00/ir_codes.h
View File

@@ -143,7 +143,7 @@
#define IR40_AUTO 0xFF50AF // AUTO #define IR40_AUTO 0xFF50AF // AUTO
#define IR40_SLOW 0xFFD02F // SLOW #define IR40_SLOW 0xFFD02F // SLOW
// 44-key defs, to be done later // 44-key defs
#define IR44_BPLUS 0xFF3AC5 // #define IR44_BPLUS 0xFF3AC5 //
#define IR44_BMINUS 0xFFBA45 // #define IR44_BMINUS 0xFFBA45 //
#define IR44_OFF 0xFF827D // #define IR44_OFF 0xFF827D //

10
wled00/json.cpp
View File

@@ -530,15 +530,17 @@ void serializeSegment(JsonObject& root, Segment& seg, byte id, bool forPreset, b
root["sel"] = seg.isSelected(); root["sel"] = seg.isSelected();
root["rev"] = seg.reverse; root["rev"] = seg.reverse;
root["mi"] = seg.mirror; root["mi"] = seg.mirror;
#ifndef WLED_DISABLE_2D
if (strip.isMatrix) { if (strip.isMatrix) {
root["rY"] = seg.reverse_y; root["rY"] = seg.reverse_y;
root["mY"] = seg.mirror_y; root["mY"] = seg.mirror_y;
root[F("tp")] = seg.transpose; root[F("tp")] = seg.transpose;
} }
root["o1"] = seg.check1; #endif
root["o2"] = seg.check2; root["o1"] = seg.check1;
root["o3"] = seg.check3; root["o2"] = seg.check2;
root["si"] = seg.soundSim; root["o3"] = seg.check3;
root["si"] = seg.soundSim;
root["m12"] = seg.map1D2D; root["m12"] = seg.map1D2D;
} }