From 71dcd0626b6c20af551dbe8de47287f1a2781840 Mon Sep 17 00:00:00 2001 From: biver Date: Tue, 1 Feb 2022 12:30:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D0=BC=20=D1=81=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20key=20?= =?UTF-8?q?=D0=BD=D0=B0=20subtype=20=D0=B4=D0=BB=D1=8F=20IoTSensor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/classes/IoTSensor.h | 6 +++--- src/classes/IoTSensor.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/classes/IoTSensor.h b/include/classes/IoTSensor.h index caf08d9c..9fa541b0 100644 --- a/include/classes/IoTSensor.h +++ b/include/classes/IoTSensor.h @@ -9,10 +9,10 @@ class IoTSensor { void loop(); virtual void doByInterval(); - void init(String key, String id, unsigned long interval); + void init(String subtype, String id, unsigned long interval); void regEvent(String value, String consoleInfo); - String getKey(); + String getSubtype(); String getID(); unsigned long currentMillis; @@ -20,7 +20,7 @@ class IoTSensor { unsigned long difference; protected: - String _key; + String _subtype; String _id; unsigned long _interval; }; diff --git a/src/classes/IoTSensor.cpp b/src/classes/IoTSensor.cpp index eb461b86..0e2b10f9 100644 --- a/src/classes/IoTSensor.cpp +++ b/src/classes/IoTSensor.cpp @@ -3,17 +3,17 @@ #include "Classes/ScenarioClass3.h" #include "Classes/IoTSensor.h" -void IoTSensor::init(String key, String id, unsigned long interval) { +void IoTSensor::init(String subtype, String id, unsigned long interval) { _interval = interval * 1000; - _key = key; + _subtype = subtype; _id = id; } IoTSensor::IoTSensor() {} IoTSensor::~IoTSensor() {} -String IoTSensor::getKey() { - return _key; +String IoTSensor::getSubtype() { + return _subtype; } String IoTSensor::getID() {