Skip to content

Commit 84dd26c

Browse files
committed
Some more optimisations.
1 parent 86be5df commit 84dd26c

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

wled00/xml.cpp

Lines changed: 5 additions & 10 deletions
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);"),
@@ -653,8 +651,7 @@ void getSettingsJS(byte subPage, Print& settingsScript)
653651
{
654652
printSetFormValue(settingsScript,PSTR("SOMP"),strip.isMatrix);
655653
#ifndef WLED_DISABLE_2D
656-
settingsScript.printf_P(PSTR("maxPanels=%d;"),WLED_MAX_PANELS);
657-
settingsScript.print(F("resetPanels();"));
654+
settingsScript.printf_P(PSTR("maxPanels=%d;resetPanels();"),WLED_MAX_PANELS);
658655
if (strip.isMatrix) {
659656
if(strip.panels>0){
660657
printSetFormValue(settingsScript,PSTR("PW"),strip.panel[0].width); //Set generator Width and Height to first panel size for convenience
@@ -664,11 +661,9 @@ void getSettingsJS(byte subPage, Print& settingsScript)
664661
// panels
665662
for (unsigned i=0; i<strip.panels; i++) {
666663
char n[5];
667-
settingsScript.print(F("addPanel("));
668-
settingsScript.print(itoa(i,n,10));
669-
settingsScript.print(F(");"));
664+
settingsScript.printf_P(PSTR("addPanel(%d);"), itoa(i,n,10));
670665
char pO[8] = { '\0' };
671-
snprintf_P(pO, 7, PSTR("P%d"), i); // MAX_PANELS is 64 so pO will always only be 4 characters or less
666+
snprintf_P(pO, 7, PSTR("P%d"), i); // WLED_MAX_PANELS is 18 so pO will always only be 4 characters or less
672667
pO[7] = '\0';
673668
unsigned l = strlen(pO);
674669
// create P0B, P1B, ..., P63B, etc for other PxxX

0 commit comments

Comments
 (0)