mirror of https://github.com/sfeakes/AqualinkD.git
Update for 2.6.0 dev
parent
d203927d12
commit
c3a15de5ab
Binary file not shown.
Binary file not shown.
|
@ -1194,7 +1194,7 @@ if (strlen(cleanwhitespace(value)) <= 0) {
|
||||||
} else {
|
} else {
|
||||||
LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons+1);
|
LOG(AQUA_LOG,LOG_WARNING, "Error with '%s', total buttons=%d, config has %d already, ignoring!\n",param, TOTAL_BUTTONS, aqdata->total_buttons+1);
|
||||||
}
|
}
|
||||||
} else if (strncasecmp(param + 17, "_altlabel", 9) == 0) {
|
} else if (strncasecmp(param + 17, "_altLabel", 9) == 0) {
|
||||||
char *label = cleanalloc(value);
|
char *label = cleanalloc(value);
|
||||||
aqkey *button = getVirtualButton(aqdata, num);
|
aqkey *button = getVirtualButton(aqdata, num);
|
||||||
if (button != NULL) {
|
if (button != NULL) {
|
||||||
|
@ -2033,7 +2033,7 @@ bool writeCfg (struct aqualinkdata *aqdata)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isVBUTTON_ALTLABEL(aqdata->aqbuttons[i].special_mask)) {
|
if (isVBUTTON_ALTLABEL(aqdata->aqbuttons[i].special_mask)) {
|
||||||
fprintf(fp,"%s_altlabel=%s\n", prefix, ((vbutton_detail *)aqdata->aqbuttons[i].special_mask_ptr)->altlabel);
|
fprintf(fp,"%s_altLabel=%s\n", prefix, ((vbutton_detail *)aqdata->aqbuttons[i].special_mask_ptr)->altlabel);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -689,7 +689,7 @@
|
||||||
//}
|
//}
|
||||||
|
|
||||||
const buttonTypelist = ["pumpIndex", "pumpID", "pumpType", "pumpName", "lightMode"];
|
const buttonTypelist = ["pumpIndex", "pumpID", "pumpType", "pumpName", "lightMode"];
|
||||||
const virtButtonTypelist = ["pumpIndex", "pumpID", "pumpType", "pumpName", "onetouchID"];
|
const virtButtonTypelist = ["pumpIndex", "pumpID", "pumpType", "pumpName", "onetouchID", "altLabel"];
|
||||||
|
|
||||||
const configtable = document.getElementById("config_table");
|
const configtable = document.getElementById("config_table");
|
||||||
const newRow = configtable.insertRow();
|
const newRow = configtable.insertRow();
|
||||||
|
@ -788,7 +788,7 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const virtButtonTypelist = ["pumpIndex", "pumpID", "pumpType", "pumpName", "onetouchID"];
|
const virtButtonTypelist = ["pumpIndex", "pumpID", "pumpType", "pumpName", "onetouchID", "altLabel"];
|
||||||
|
|
||||||
const configtable = document.getElementById("config_table");
|
const configtable = document.getElementById("config_table");
|
||||||
|
|
||||||
|
@ -993,6 +993,7 @@
|
||||||
js['valid values'] = validvalues;
|
js['valid values'] = validvalues;
|
||||||
break;
|
break;
|
||||||
case "pumpName":
|
case "pumpName":
|
||||||
|
case "altLabel":
|
||||||
js.type = "string";
|
js.type = "string";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue