not working version

This commit is contained in:
Dmitry Borisenko
2020-09-03 01:12:43 +03:00
parent 8a07b7cbd7
commit 93c6b05238
25 changed files with 148 additions and 124 deletions

View File

@@ -1,17 +1,15 @@
#pragma once
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "Global.h"
class Switch : public LineParsing {
class ButtonInClass : public LineParsing {
protected:
int numberEntering = 0;
int state = _state.toInt();
public:
Switch() : LineParsing(){};
ButtonInClass() : LineParsing(){};
void init() {
if (_pin != "") {
@@ -53,4 +51,4 @@ class Switch : public LineParsing {
}
};
extern Switch* mySwitch;
extern ButtonInClass* myButtonIn;

View File

@@ -1,12 +1,11 @@
#pragma once
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "Global.h"
class Button1 : public LineParsing {
class ButtonOutClass : public LineParsing {
public:
Button1() : LineParsing(){};
ButtonOutClass() : LineParsing(){};
void pinModeSet() {
if (_pin != "") {
@@ -40,4 +39,4 @@ class Button1 : public LineParsing {
}
};
extern Button1* myButton;
extern ButtonOutClass* myButtonOut;

View File

@@ -1,13 +1,11 @@
#pragma once
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "Global.h"
class Input : public LineParsing {
class InputClass : public LineParsing {
public:
Input() : LineParsing(){};
InputClass() : LineParsing(){};
void inputSetDefaultFloat() {
inputSetFloat(_key, _state);
@@ -30,4 +28,4 @@ class Input : public LineParsing {
}
};
extern Input* myInput;
extern InputClass* myInput;

View File

@@ -1,12 +1,11 @@
#pragma once
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "Global.h"
class OutputModule : public LineParsing {
class OutputTextClass : public LineParsing {
public:
OutputModule() : LineParsing(){};
OutputTextClass() : LineParsing(){};
void OutputModuleStateSetDefault() {
if (_state != "") {
@@ -21,4 +20,4 @@ class OutputModule : public LineParsing {
MqttClient::publishStatus(key, state);
}
};
extern OutputModule* myText;
extern OutputTextClass* myOutputText;

View File

@@ -1,13 +1,11 @@
#pragma once
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "Global.h"
class Pwm : public LineParsing {
class PwmOutClass : public LineParsing {
public:
Pwm() : LineParsing(){};
PwmOutClass() : LineParsing(){};
void pwmModeSet() {
if (_pin != "") {
@@ -30,4 +28,4 @@ class Pwm : public LineParsing {
}
};
extern Pwm* myPwm;
extern PwmOutClass* myPwmOut;

View File

@@ -1,35 +1,32 @@
#pragma once
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "Class/SensorConverting.h"
#include "items/SensorConvertingClass.h"
#include "Global.h"
class SensorAnalog : public SensorConverting {
class SensorAnalogClass : public SensorConvertingClass {
public:
SensorAnalog() : SensorConverting(){};
void SensorAnalogInit(String key) {
}
SensorAnalogClass() : SensorConvertingClass(){};
int SensorAnalogRead(String key, String pin) {
int pinInt = pin.toInt();
int value;
#ifdef ESP32
value = analogRead(pinInt);
#endif
#ifdef ESP8266
pinInt = pinInt;
value = analogRead(A0);
#endif
value = this->mapping(key, value);
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
Serial.println("[I] sensor '" + key + "' data: " + String(valueFl));
return value;
}
};
extern SensorAnalog* mySensorAnalog;
extern SensorAnalogClass* mySensorAnalog;

View File

@@ -5,9 +5,9 @@
#include "Class/LineParsing.h"
#include "Global.h"
class SensorConverting : public LineParsing {
class SensorConvertingClass : public LineParsing {
public:
SensorConverting() : LineParsing(){};
SensorConvertingClass() : LineParsing(){};
int mapping(String key, int input) {
String map_ = jsonReadStr(configOptionJson, key + "_map");

View File

@@ -0,0 +1,34 @@
#pragma once
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "items/SensorConvertingClass.h"
#include "Global.h"
class SensorUltrasonic : public SensorConvertingClass {
public:
SensorUltrasonic() : SensorConvertingClass(){};
int SensorUltrasonicRead(String key, String pin) {
int trig = selectFromMarkerToMarker(pin, ",", 0).toInt();
int echo = selectFromMarkerToMarker(pin, ",", 1).toInt();
int value;
digitalWrite(trig, LOW);
delayMicroseconds(2);
digitalWrite(trig, HIGH);
delayMicroseconds(10);
digitalWrite(trig, LOW);
long duration_ = pulseIn(echo, HIGH, 30000); // 3000 µs = 50cm // 30000 µs = 5 m
value = duration_ / 29 / 2;
value = this->mapping(key, value);
float valueFl = this->correction(key, value);
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
MqttClient::publishStatus(key, String(valueFl));
Serial.println("[I] sensor '" + key + "' data: " + String(valueFl));
return value;
}
};
extern SensorUltrasonic* mySensorUltrasonic;