working version with optimization

This commit is contained in:
Dmitry Borisenko
2020-09-03 02:07:12 +03:00
parent 89fed305c8
commit ab65cda820
17 changed files with 79 additions and 81 deletions

View File

@@ -3,20 +3,19 @@
//==========================================Модуль кнопок===================================================
//button-out light toggle Кнопки Свет 1 pin[12] inv[1] st[1]
//==========================================================================================================
ButtonOutClass* myButtonOut;
ButtonOutClass myButtonOut;
void buttonOut() {
myButtonOut = new ButtonOutClass();
myButtonOut->update();
String key = myButtonOut->gkey();
String pin = myButtonOut->gpin();
String inv = myButtonOut->ginv();
myButtonOut.update();
String key = myButtonOut.gkey();
String pin = myButtonOut.gpin();
String inv = myButtonOut.ginv();
sCmd.addCommand(key.c_str(), buttonOutSet);
jsonWriteStr(configOptionJson, key + "_pin", pin);
jsonWriteStr(configOptionJson, key + "_inv", inv);
myButtonOut->pinModeSet();
myButtonOut->pinStateSetDefault();
myButtonOut->pinStateSetInvDefault();
myButtonOut->clear();
myButtonOut.pinModeSet();
myButtonOut.pinStateSetDefault();
myButtonOut.pinStateSetInvDefault();
myButtonOut.clear();
}
void buttonOutSet() {
@@ -25,8 +24,8 @@ void buttonOutSet() {
String pin = jsonReadStr(configOptionJson, key + "_pin");
String inv = jsonReadStr(configOptionJson, key + "_inv");
if (inv == "") {
myButtonOut->pinChange(key, pin, state, true);
myButtonOut.pinChange(key, pin, state, true);
} else {
myButtonOut->pinChange(key, pin, state, false);
myButtonOut.pinChange(key, pin, state, false);
}
}