Var changes

This commit is contained in:
Dmitry Borisenko
2020-09-03 23:29:34 +03:00
parent 26b211dc07
commit eea82a7edb
26 changed files with 217 additions and 374 deletions

View File

@@ -1,5 +1,6 @@
#include "items/itemsGlobal.h"
#include "items/ButtonOutClass.h"
#include "items/ItemsGlobal.h"
//==========================================Модуль кнопок===================================================
//button-out light toggle Кнопки Свет 1 pin[12] inv[1] st[1]
//==========================================================================================================
@@ -10,22 +11,13 @@ void buttonOut() {
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.init();
myButtonOut.pinStateSetDefault();
myButtonOut.pinStateSetInvDefault();
myButtonOut.clear();
}
void buttonOutSet() {
String key = sCmd.order();
String state = sCmd.next();
String pin = jsonReadStr(configOptionJson, key + "_pin");
String inv = jsonReadStr(configOptionJson, key + "_inv");
if (inv == "") {
myButtonOut.pinChange(key, pin, state, true);
} else {
myButtonOut.pinChange(key, pin, state, false);
}
myButtonOut.pinChange(key, state);
}