упростил код сенсора

This commit is contained in:
Dmitry Borisenko
2022-01-15 16:41:25 +01:00
parent ea68905f4e
commit a4a8c75206
3 changed files with 19 additions and 24 deletions

View File

@@ -2,7 +2,7 @@
{ {
"type": "Reading", "type": "Reading",
"subtype": "AnalogAdc", "subtype": "AnalogAdc",
"id": "t", "id": "t1",
"widget": "anydata", "widget": "anydata",
"page": "Сенсоры", "page": "Сенсоры",
"descr": "Температура", "descr": "Температура",
@@ -12,7 +12,7 @@
{ {
"type": "Reading", "type": "Reading",
"subtype": "AnalogAdc", "subtype": "AnalogAdc",
"id": "t", "id": "t2",
"widget": "anydata", "widget": "anydata",
"page": "Сенсоры", "page": "Сенсоры",
"descr": "Температура", "descr": "Температура",

View File

@@ -2,15 +2,4 @@
#include "Global.h" #include "Global.h"
#include "Classes/IoTSensor.h" #include "Classes/IoTSensor.h"
class AnalogAdc : public IoTSensor {
public:
AnalogAdc(String parameters);
~AnalogAdc();
void doByInterval();
private:
unsigned int _pin;
};
extern void* getAPI_AnalogAdc(String params); extern void* getAPI_AnalogAdc(String params);

View File

@@ -1,20 +1,26 @@
#include "modules/AnalogAdc.h" #include "modules/AnalogAdc.h"
// setup() class AnalogAdc : public IoTSensor {
AnalogAdc::AnalogAdc(String parameters) { public:
init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int")); // setup()
AnalogAdc(String parameters) {
init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int"));
_pin = jsonReadInt(parameters, "pin"); _pin = jsonReadInt(parameters, "pin");
} }
AnalogAdc::~AnalogAdc() {} // loop()
void doByInterval() {
float value = analogRead(_pin);
// loop() regEvent((String)value, "analog");
void AnalogAdc::doByInterval() { }
float value = analogRead(_pin);
regEvent((String)value, "analog"); ~AnalogAdc();
}
private:
unsigned int _pin;
};
void* getAPI_AnalogAdc(String parameters) { void* getAPI_AnalogAdc(String parameters) {
String subtype; String subtype;