ButtonOut changed (not working version)

This commit is contained in:
Dmitry Borisenko
2020-11-13 17:13:50 +03:00
parent 96f160fc88
commit 50ad50efb2
19 changed files with 216 additions and 168 deletions

32
include/items/ButtonOut.h Normal file
View File

@@ -0,0 +1,32 @@
#pragma once
#include <Arduino.h>
#include "Global.h"
class ButtonOut;
typedef std::vector<ButtonOut> MyButtonOutVector;
class ButtonOut {
public:
ButtonOut(unsigned int pin, boolean inv, String key);
~ButtonOut();
void init();
void execute(String state);
private:
unsigned int _pin;
boolean _inv;
String _key;
void addNewDelOldData(const String filename, size_t maxPoints, String payload);
};
extern MyButtonOutVector* myButtonOut;
extern void buttonOut();
extern void buttonOutExecute();

View File

@@ -1,41 +1,41 @@
#pragma once
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "Global.h"
class ButtonOutClass : public LineParsing {
public:
ButtonOutClass() : LineParsing() {};
void init() {
if (_pin != "") {
pinMode(_pin.toInt(), OUTPUT);
}
jsonWriteStr(configOptionJson, _key + "_pin", _pin);
jsonWriteStr(configOptionJson, _key + "_inv", _inv);
}
void pinStateSetDefault() {
pinChange(_key, _state);
}
void pinChange(String key, String state) {
String pin = jsonReadStr(configOptionJson, key + "_pin");
String inv = jsonReadStr(configOptionJson, key + "_inv");
int pinInt = pin.toInt();
if (inv == "") {
digitalWrite(pinInt, state.toInt());
}
else {
digitalWrite(pinInt, !state.toInt());
}
eventGen2(key, state);
jsonWriteInt(configLiveJson, key, state.toInt());
publishStatus(key, state);
}
};
extern ButtonOutClass myButtonOut;
//#pragma once
//#include <Arduino.h>
//
//#include "Class/LineParsing.h"
//#include "Global.h"
//
//class ButtonOutClass : public LineParsing {
//public:
// ButtonOutClass() : LineParsing() {};
//
// void init() {
// if (_pin != "") {
// pinMode(_pin.toInt(), OUTPUT);
// }
// jsonWriteStr(configOptionJson, _key + "_pin", _pin);
// jsonWriteStr(configOptionJson, _key + "_inv", _inv);
// }
//
// void pinStateSetDefault() {
// pinChange(_key, _state);
// }
//
//
// void pinChange(String key, String state) {
// String pin = jsonReadStr(configOptionJson, key + "_pin");
// String inv = jsonReadStr(configOptionJson, key + "_inv");
// int pinInt = pin.toInt();
//
// if (inv == "") {
// digitalWrite(pinInt, state.toInt());
// }
// else {
// digitalWrite(pinInt, !state.toInt());
// }
// eventGen2(key, state);
// jsonWriteInt(configLiveJson, key, state.toInt());
// publishStatus(key, state);
// }
//};
//
//extern ButtonOutClass myButtonOut;