iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

4mb build version

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-12-13 01:06:08 +03:00
parent 9a7f6c5b05
commit 9fd88ffae1
3 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
include/items/SensorAnalogClass.h
View File

@@ -1,36 +1,36 @@
#pragma once //#pragma once
#include <Arduino.h> //#include <Arduino.h>
//
#include "Class/LineParsing.h" //#include "Class/LineParsing.h"
#include "Global.h" //#include "Global.h"
#include "items/SensorConvertingClass.h" //#include "items/SensorConvertingClass.h"
//
class SensorAnalogClass : public SensorConvertingClass { //class SensorAnalogClass : public SensorConvertingClass {
public: // public:
SensorAnalogClass() : SensorConvertingClass(){}; // SensorAnalogClass() : SensorConvertingClass(){};
//
void SensorAnalogInit() { // void SensorAnalogInit() {
jsonWriteStr(configOptionJson, _key + "_pin", _pin); // jsonWriteStr(configOptionJson, _key + "_pin", _pin);
jsonWriteStr(configOptionJson, _key + "_map", _map); // jsonWriteStr(configOptionJson, _key + "_map", _map);
jsonWriteStr(configOptionJson, _key + "_с", _c); // jsonWriteStr(configOptionJson, _key + "_с", _c);
} // }
//
int SensorAnalogRead(String key, String pin) { // int SensorAnalogRead(String key, String pin) {
int value; // int value;
#ifdef ESP32 //#ifdef ESP32
int pinInt = pin.toInt(); // int pinInt = pin.toInt();
value = analogRead(pinInt); // value = analogRead(pinInt);
#endif //#endif
#ifdef ESP8266 //#ifdef ESP8266
value = analogRead(A0); // value = analogRead(A0);
#endif //#endif
value = this->mapping(key, value); // value = this->mapping(key, value);
float valueFl = this->correction(key, value); // float valueFl = this->correction(key, value);
eventGen2(key, String(valueFl)); // eventGen2(key, String(valueFl));
jsonWriteStr(configLiveJson, key, String(valueFl)); // jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl)); // publishStatus(key, String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl)); // SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
return value; // return value;
} // }
}; //};
extern SensorAnalogClass mySensorAnalog; //extern SensorAnalogClass mySensorAnalog;

2
platformio.ini
View File

@@ -1,6 +1,6 @@
[platformio] [platformio]
default_envs = esp8266_01_1m default_envs = esp8266
;============================================================================================================================================= ;=============================================================================================================================================
[common_env_data] [common_env_data]
lib_deps_external = lib_deps_external =

42
src/items/SensorAnalogClass.cpp
View File

@@ -1,21 +1,21 @@
#include "BufferExecute.h" //#include "BufferExecute.h"
#include "items/SensorAnalogClass.h" //#include "items/SensorAnalogClass.h"
#ifdef ANALOG_ENABLED //#ifdef ANALOG_ENABLED
//==============================================Модуль аналогового сенсора=========================================================================================== ////==============================================Модуль аналогового сенсора===========================================================================================
//=================================================================================================================================================================== ////===================================================================================================================================================================
SensorAnalogClass mySensorAnalog; //SensorAnalogClass mySensorAnalog;
void analogAdc() { //void analogAdc() {
mySensorAnalog.update(); // mySensorAnalog.update();
String key = mySensorAnalog.gkey(); // String key = mySensorAnalog.gkey();
sCmd.addCommand(key.c_str(), analogReading); // sCmd.addCommand(key.c_str(), analogReading);
sensorReadingMap10sec += key + ","; // sensorReadingMap10sec += key + ",";
mySensorAnalog.SensorAnalogInit(); // mySensorAnalog.SensorAnalogInit();
mySensorAnalog.clear(); // mySensorAnalog.clear();
} //}
//
void analogReading() { //void analogReading() {
String key = sCmd.order(); // String key = sCmd.order();
String pin = jsonReadStr(configOptionJson, key + "_pin"); // String pin = jsonReadStr(configOptionJson, key + "_pin");
mySensorAnalog.SensorAnalogRead(key, pin); // mySensorAnalog.SensorAnalogRead(key, pin);
} //}
#endif //#endif