iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +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
#include <Arduino.h>
#include "Class/LineParsing.h"
#include "Global.h"
#include "items/SensorConvertingClass.h"
class SensorAnalogClass : public SensorConvertingClass {
public:
SensorAnalogClass() : SensorConvertingClass(){};
void SensorAnalogInit() {
jsonWriteStr(configOptionJson, _key + "_pin", _pin);
jsonWriteStr(configOptionJson, _key + "_map", _map);
jsonWriteStr(configOptionJson, _key + "_с", _c);
}
int SensorAnalogRead(String key, String pin) {
int value;
#ifdef ESP32
int pinInt = pin.toInt();
value = analogRead(pinInt);
#endif
#ifdef ESP8266
value = analogRead(A0);
#endif
value = this->mapping(key, value);
float valueFl = this->correction(key, value);
eventGen2(key, String(valueFl));
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
return value;
}
};
extern SensorAnalogClass mySensorAnalog;
//#pragma once
//#include <Arduino.h>
//
//#include "Class/LineParsing.h"
//#include "Global.h"
//#include "items/SensorConvertingClass.h"
//
//class SensorAnalogClass : public SensorConvertingClass {
// public:
// SensorAnalogClass() : SensorConvertingClass(){};
//
// void SensorAnalogInit() {
// jsonWriteStr(configOptionJson, _key + "_pin", _pin);
// jsonWriteStr(configOptionJson, _key + "_map", _map);
// jsonWriteStr(configOptionJson, _key + "_с", _c);
// }
//
// int SensorAnalogRead(String key, String pin) {
// int value;
//#ifdef ESP32
// int pinInt = pin.toInt();
// value = analogRead(pinInt);
//#endif
//#ifdef ESP8266
// value = analogRead(A0);
//#endif
// value = this->mapping(key, value);
// float valueFl = this->correction(key, value);
// eventGen2(key, String(valueFl));
// jsonWriteStr(configLiveJson, key, String(valueFl));
// publishStatus(key, String(valueFl));
// SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
// return value;
// }
//};
//extern SensorAnalogClass mySensorAnalog;

2
platformio.ini
View File

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

42
src/items/SensorAnalogClass.cpp
View File

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