mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-27 06:32:19 +03:00
упростил код сенсора
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"type": "Reading",
|
||||
"subtype": "AnalogAdc",
|
||||
"id": "t",
|
||||
"id": "t1",
|
||||
"widget": "anydata",
|
||||
"page": "Сенсоры",
|
||||
"descr": "Температура",
|
||||
@@ -12,7 +12,7 @@
|
||||
{
|
||||
"type": "Reading",
|
||||
"subtype": "AnalogAdc",
|
||||
"id": "t",
|
||||
"id": "t2",
|
||||
"widget": "anydata",
|
||||
"page": "Сенсоры",
|
||||
"descr": "Температура",
|
||||
|
||||
@@ -2,15 +2,4 @@
|
||||
#include "Global.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);
|
||||
@@ -1,20 +1,26 @@
|
||||
#include "modules/AnalogAdc.h"
|
||||
|
||||
// setup()
|
||||
AnalogAdc::AnalogAdc(String parameters) {
|
||||
init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int"));
|
||||
class AnalogAdc : public IoTSensor {
|
||||
public:
|
||||
// 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()
|
||||
void AnalogAdc::doByInterval() {
|
||||
float value = analogRead(_pin);
|
||||
regEvent((String)value, "analog");
|
||||
}
|
||||
|
||||
regEvent((String)value, "analog");
|
||||
}
|
||||
~AnalogAdc();
|
||||
|
||||
private:
|
||||
unsigned int _pin;
|
||||
};
|
||||
|
||||
void* getAPI_AnalogAdc(String parameters) {
|
||||
String subtype;
|
||||
|
||||
Reference in New Issue
Block a user