|
@@ -200,22 +200,28 @@ boolean setConfig(char* param, char* value) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else if ( strcmp(param, "offMsg") == 0 ) {
|
|
else if ( strcmp(param, "offMsg") == 0 ) {
|
|
- strlcpy(offMessage, value, 14);
|
|
+ strlcpy(offMessage, value, 15);
|
|
}
|
|
}
|
|
else if ( strcmp(param, "modename0") == 0 ) {
|
|
else if ( strcmp(param, "modename0") == 0 ) {
|
|
- strlcpy(modename0, value, 14);
|
|
+ strlcpy(modename0, value, 15);
|
|
}
|
|
}
|
|
else if ( strcmp(param, "modename1") == 0 ) {
|
|
else if ( strcmp(param, "modename1") == 0 ) {
|
|
- strlcpy(modename1, value, 14);
|
|
+ strlcpy(modename1, value, 15);
|
|
}
|
|
}
|
|
else if ( strcmp(param, "psetname0") == 0 ) {
|
|
else if ( strcmp(param, "psetname0") == 0 ) {
|
|
- strlcpy(psetname0, value, 14);
|
|
+ strlcpy(psetname0, value, 15);
|
|
}
|
|
}
|
|
else if ( strcmp(param, "psetname1") == 0 ) {
|
|
else if ( strcmp(param, "psetname1") == 0 ) {
|
|
- strlcpy(psetname1, value, 14);
|
|
+ strlcpy(psetname1, value, 15);
|
|
}
|
|
}
|
|
else if ( strcmp(param, "psetname2") == 0 ) {
|
|
else if ( strcmp(param, "psetname2") == 0 ) {
|
|
- strlcpy(psetname2, value, 14);
|
|
+ strlcpy(psetname2, value, 15);
|
|
|
|
+ }
|
|
|
|
+ else if ( strcmp(param, "itemplab") == 0 ) {
|
|
|
|
+ strlcpy(itemplab, value, 2);
|
|
|
|
+ }
|
|
|
|
+ else if ( strcmp(param, "otemplab") == 0 ) {
|
|
|
|
+ strlcpy(otemplab, value, 2);
|
|
}
|
|
}
|
|
else if ( strcmp(param, "PIRenDisp") == 0 ) {
|
|
else if ( strcmp(param, "PIRenDisp") == 0 ) {
|
|
int valueInt = atoi(value);
|
|
int valueInt = atoi(value);
|
|
@@ -465,6 +471,14 @@ void getConfig(char* param) {
|
|
sprintf(buf, "psetname2: '%s'", psetname2);
|
|
sprintf(buf, "psetname2: '%s'", psetname2);
|
|
sendStatus(buf);
|
|
sendStatus(buf);
|
|
}
|
|
}
|
|
|
|
+ else if ( strcmp(param, "itemplab") == 0 ) {
|
|
|
|
+ sprintf(buf, "itemplab: '%s'", itemplab);
|
|
|
|
+ sendStatus(buf);
|
|
|
|
+ }
|
|
|
|
+ else if ( strcmp(param, "otemplab") == 0 ) {
|
|
|
|
+ sprintf(buf, "otemplab: '%s'", otemplab);
|
|
|
|
+ sendStatus(buf);
|
|
|
|
+ }
|
|
else if ( strcmp(param, "PIRenDisp") == 0 ) {
|
|
else if ( strcmp(param, "PIRenDisp") == 0 ) {
|
|
char buf2[11];
|
|
char buf2[11];
|
|
if (PIR_enablesDisplay) strcpy(buf2, "1");
|
|
if (PIR_enablesDisplay) strcpy(buf2, "1");
|
|
@@ -578,6 +592,10 @@ void printConfig2() {
|
|
Serial.println(psetname1);
|
|
Serial.println(psetname1);
|
|
Serial.print("psetname2: ");
|
|
Serial.print("psetname2: ");
|
|
Serial.println(psetname2);
|
|
Serial.println(psetname2);
|
|
|
|
+ Serial.print("itemplab: ");
|
|
|
|
+ Serial.println(itemplab);
|
|
|
|
+ Serial.print("otemplab: ");
|
|
|
|
+ Serial.println(otemplab);
|
|
Serial.print("offMsg: ");
|
|
Serial.print("offMsg: ");
|
|
Serial.println(offMessage);
|
|
Serial.println(offMessage);
|
|
Serial.print("PIRenDisp: ");
|
|
Serial.print("PIRenDisp: ");
|
|
@@ -734,12 +752,14 @@ boolean loadConfig2() {
|
|
displayInterval = atoi(json["dispInt"] | "");
|
|
displayInterval = atoi(json["dispInt"] | "");
|
|
displayInterval_saved = displayInterval;
|
|
displayInterval_saved = displayInterval;
|
|
displayTimeout = atoi(json["dispTout"] | "");
|
|
displayTimeout = atoi(json["dispTout"] | "");
|
|
- strlcpy(modename0, json["modename0"] | "", 14);
|
|
+ strlcpy(modename0, json["modename0"] | "", 15);
|
|
- strlcpy(modename1, json["modename1"] | "", 14);
|
|
+ strlcpy(modename1, json["modename1"] | "", 15);
|
|
- strlcpy(psetname0, json["psetname0"] | "", 14);
|
|
+ strlcpy(psetname0, json["psetname0"] | "", 15);
|
|
- strlcpy(psetname1, json["psetname1"] | "", 14);
|
|
+ strlcpy(psetname1, json["psetname1"] | "", 15);
|
|
- strlcpy(psetname2, json["psetname2"] | "", 14);
|
|
+ strlcpy(psetname2, json["psetname2"] | "", 15);
|
|
- strlcpy(offMessage, json["offMsg"] | "", 14);
|
|
+ strlcpy(itemplab, json["itemplab"] | "", 2);
|
|
|
|
+ strlcpy(otemplab, json["otemplab"] | "", 2);
|
|
|
|
+ strlcpy(offMessage, json["offMsg"] | "", 15);
|
|
|
|
|
|
if (atoi(json["PIRenDisp"] | "") == 1) PIR_enablesDisplay = true;
|
|
if (atoi(json["PIRenDisp"] | "") == 1) PIR_enablesDisplay = true;
|
|
else PIR_enablesDisplay = false;
|
|
else PIR_enablesDisplay = false;
|
|
@@ -887,6 +907,8 @@ boolean saveConfig2() { // safeConfig2
|
|
json["psetname0"] = psetname0;
|
|
json["psetname0"] = psetname0;
|
|
json["psetname1"] = psetname1;
|
|
json["psetname1"] = psetname1;
|
|
json["psetname2"] = psetname2;
|
|
json["psetname2"] = psetname2;
|
|
|
|
+ json["itemplab"] = itemplab;
|
|
|
|
+ json["otemplab"] = otemplab;
|
|
json["offMsg"] = offMessage;
|
|
json["offMsg"] = offMessage;
|
|
|
|
|
|
if (PIR_enablesDisplay) json["PIRenDisp"] = 1;
|
|
if (PIR_enablesDisplay) json["PIRenDisp"] = 1;
|