diff --git a/include/classes/IoTSensor.h b/include/classes/IoTSensor.h index 9fa541b0..40807f75 100644 --- a/include/classes/IoTSensor.h +++ b/include/classes/IoTSensor.h @@ -4,12 +4,11 @@ class IoTSensor { public: - IoTSensor(); + IoTSensor(String parameters); ~IoTSensor(); void loop(); virtual void doByInterval(); - void init(String subtype, String id, unsigned long interval); void regEvent(String value, String consoleInfo); String getSubtype(); @@ -24,7 +23,3 @@ class IoTSensor { String _id; unsigned long _interval; }; - -// extern IoTSensor* myIoTSensor; -//модулям не нужно знать эту переменную -//- ок понял \ No newline at end of file diff --git a/src/classes/IoTSensor.cpp b/src/classes/IoTSensor.cpp index 0e2b10f9..fa253b5c 100644 --- a/src/classes/IoTSensor.cpp +++ b/src/classes/IoTSensor.cpp @@ -3,13 +3,12 @@ #include "Classes/ScenarioClass3.h" #include "Classes/IoTSensor.h" -void IoTSensor::init(String subtype, String id, unsigned long interval) { - _interval = interval * 1000; - _subtype = subtype; - _id = id; -} -IoTSensor::IoTSensor() {} +IoTSensor::IoTSensor(String parameters) { + _interval = jsonReadInt(parameters, "int") * 1000; + _subtype = jsonReadStr(parameters, "subtype"); + _id = jsonReadStr(parameters, "id"); +} IoTSensor::~IoTSensor() {} String IoTSensor::getSubtype() {