iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

bug with virtual button fixed

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-12-10 02:11:47 +03:00
parent 253a9a5ae5
commit 81866043bc
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/items/vButtonOut.h
View File

@@ -10,7 +10,7 @@ typedef std::vector<ButtonOut> MyButtonOutVector;
class ButtonOut { class ButtonOut {
public: public:
ButtonOut(unsigned int pin, boolean inv, String key); ButtonOut(String pin, boolean inv, String key);
~ButtonOut(); ~ButtonOut();
@@ -18,7 +18,7 @@ class ButtonOut {
private: private:
unsigned int _pin; String _pin;
boolean _inv; boolean _inv;
String _key; String _key;

26
src/items/vButtonOut.cpp
View File

@@ -5,27 +5,31 @@
#include <Arduino.h> #include <Arduino.h>
//this class save data to flash //this class save data to flash
ButtonOut::ButtonOut(unsigned int pin, boolean inv, String key) { ButtonOut::ButtonOut(String pin, boolean inv, String key) {
_pin = pin; _pin = pin;
_inv = inv; _inv = inv;
_key = key; _key = key;
pinMode(_pin, OUTPUT); if (_pin != "") {
pinMode(_pin.toInt(), OUTPUT);
}
int state = jsonReadInt(configStoreJson, key); int state = jsonReadInt(configStoreJson, key);
this->execute(String(state)); this->execute(String(state));
} }
ButtonOut::~ButtonOut() {} ButtonOut::~ButtonOut() {}
void ButtonOut::execute(String state) { void ButtonOut::execute(String state) {
if (state == "change") { if (state != "" && _pin != "") {
state = String(!digitalRead(_pin)); if (state == "change") {
digitalWrite(_pin, state.toInt()); state = String(!digitalRead(_pin.toInt()));
} digitalWrite(_pin.toInt(), state.toInt());
else {
if (_inv) {
digitalWrite(_pin, !state.toInt());
} }
else { else {
digitalWrite(_pin, state.toInt()); if (_inv) {
digitalWrite(_pin.toInt(), !state.toInt());
}
else {
digitalWrite(_pin.toInt(), state.toInt());
}
} }
} }
eventGen2(_key, state); eventGen2(_key, state);
@@ -53,7 +57,7 @@ void buttonOut() {
static bool firstTime = true; static bool firstTime = true;
if (firstTime) myButtonOut = new MyButtonOutVector(); if (firstTime) myButtonOut = new MyButtonOutVector();
firstTime = false; firstTime = false;
myButtonOut->push_back(ButtonOut(pin.toInt(), invb, key)); myButtonOut->push_back(ButtonOut(pin, invb, key));
sCmd.addCommand(key.c_str(), buttonOutExecute); sCmd.addCommand(key.c_str(), buttonOutExecute);
} }

7
src/items/vInOutput.cpp
View File

@@ -53,10 +53,13 @@ void inOutputExecute() {
String key = sCmd.order(); String key = sCmd.order();
String value = sCmd.next(); String value = sCmd.next();
if (!isDigitStr(value)) { //если значение - текст if (!isDigitStr(value)) { //если значение - текст
if (value.indexOf(":") == -1) { //если этот текст не время if (value.indexOf(":") == -1) { //если этот текст не время
value = getValue(value); String tmp = getValue(value);
if(tmp != "no value") {
value = tmp;
value.replace("#"," ");
}
} }
} }