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

Simplification of ledmap width and height segment settings

Browse Source 
(no recreation of panels anymore so back to default shows original)
This commit is contained in:
Ewoud
2023-03-17 13:44:52 +01:00
parent 72a77bea9c
commit e3e5825618
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wled00/FX_fcn.cpp
View File

@@ -2082,21 +2082,11 @@ bool WS2812FX::deserializeMap(uint8_t n) {
JsonArray map = doc[F("map")]; JsonArray map = doc[F("map")];
if (!map.isNull() && map.size()) { // not an empty map if (!map.isNull() && map.size()) { // not an empty map
//WLEDMM: support ledmap file properties width and height //WLEDMM: support ledmap file properties width and height
if (doc[F("width")]>0 && doc[F("height")]>0) { if (doc[F("width")]>0 && doc[F("height")]>0) {
panels = 1; Segment::maxWidth = doc[F("width")];;
panel.clear(); Segment::maxHeight = doc[F("height")];;
panel.reserve(1U); // pre-allocate memory for panels
Panel p;
p.bottomStart = p.rightStart = p.vertical = p.serpentine = false;
p.xOffset = p.yOffset = 0;
p.width = doc[F("width")];
p.height = doc[F("height")];
strip.panel.push_back(p);
Segment::maxWidth = p.width;
Segment::maxHeight = p.height;
resetSegments(true); //WLEDMM not makeAutoSegments() as we only want to change bounds resetSegments(true); //WLEDMM not makeAutoSegments() as we only want to change bounds
} }

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 2303162 #define VERSION 2303170
//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