Skip to content

Commit f51bc9d

Browse files
committed
Merge branch 'xml-bugfix' into stable
2 parents 3532fc8 + 84dd26c commit f51bc9d

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

package.json

+3
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@
2727
"html-minifier-terser": "^7.2.0",
2828
"inliner": "^1.13.1",
2929
"nodemon": "^3.1.7"
30+
},
31+
"engines": {
32+
"node": ">=20.0.0"
3033
}
3134
}

wled00/xml.cpp

+5-10
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ void appendGPIOinfo(Print& settingsScript) {
147147
settingsScript.print(F("];"));
148148

149149
// add info about max. # of pins
150-
settingsScript.print(F("d.max_gpio="));
151-
settingsScript.print(WLED_NUM_PINS);
152-
settingsScript.print(';');
150+
settingsScript.printf_P(PSTR("d.max_gpio=%d;"),WLED_NUM_PINS);
153151
}
154152

155153
//get values for settings form in javascript
@@ -269,7 +267,7 @@ void getSettingsJS(byte subPage, Print& settingsScript)
269267
{
270268
appendGPIOinfo(settingsScript);
271269

272-
settingsScript.print(F("d.ledTypes=")); settingsScript.print(BusManager::getLEDTypesJSONString().c_str()); settingsScript.print(";");
270+
settingsScript.printf_P(PSTR("d.ledTypes=%s;"), BusManager::getLEDTypesJSONString().c_str());
273271

274272
// set limits
275273
settingsScript.printf_P(PSTR("bLimits(%d,%d,%d,%d,%d,%d,%d,%d);"),
@@ -650,8 +648,7 @@ void getSettingsJS(byte subPage, Print& settingsScript)
650648
{
651649
printSetFormValue(settingsScript,PSTR("SOMP"),strip.isMatrix);
652650
#ifndef WLED_DISABLE_2D
653-
settingsScript.printf_P(PSTR("maxPanels=%d;"),WLED_MAX_PANELS);
654-
settingsScript.print(F("resetPanels();"));
651+
settingsScript.printf_P(PSTR("maxPanels=%d;resetPanels();"),WLED_MAX_PANELS);
655652
if (strip.isMatrix) {
656653
if(strip.panels>0){
657654
printSetFormValue(settingsScript,PSTR("PW"),strip.panel[0].width); //Set generator Width and Height to first panel size for convenience
@@ -661,11 +658,9 @@ void getSettingsJS(byte subPage, Print& settingsScript)
661658
// panels
662659
for (unsigned i=0; i<strip.panels; i++) {
663660
char n[5];
664-
settingsScript.print(F("addPanel("));
665-
settingsScript.print(itoa(i,n,10));
666-
settingsScript.print(F(");"));
661+
settingsScript.printf_P(PSTR("addPanel(%d);"), itoa(i,n,10));
667662
char pO[8] = { '\0' };
668-
snprintf_P(pO, 7, PSTR("P%d"), i); // MAX_PANELS is 64 so pO will always only be 4 characters or less
663+
snprintf_P(pO, 7, PSTR("P%d"), i); // WLED_MAX_PANELS is 18 so pO will always only be 4 characters or less
669664
pO[7] = '\0';
670665
unsigned l = strlen(pO);
671666
// create P0B, P1B, ..., P63B, etc for other PxxX

0 commit comments

Comments
 (0)