From 9fd88ffae1c27bac2db3eb59373b6da8c086287b Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sun, 13 Dec 2020 01:06:08 +0300 Subject: [PATCH] 4mb build version --- include/items/SensorAnalogClass.h | 72 +++++++++++++++---------------- platformio.ini | 2 +- src/items/SensorAnalogClass.cpp | 42 +++++++++--------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/include/items/SensorAnalogClass.h b/include/items/SensorAnalogClass.h index ccaba263..a4007eb4 100644 --- a/include/items/SensorAnalogClass.h +++ b/include/items/SensorAnalogClass.h @@ -1,36 +1,36 @@ -#pragma once -#include - -#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; \ No newline at end of file +//#pragma once +//#include +// +//#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; \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 5040336a..b2e3463e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,6 +1,6 @@ [platformio] -default_envs = esp8266_01_1m +default_envs = esp8266 ;============================================================================================================================================= [common_env_data] lib_deps_external = diff --git a/src/items/SensorAnalogClass.cpp b/src/items/SensorAnalogClass.cpp index 470d31c6..e8dcc9dd 100644 --- a/src/items/SensorAnalogClass.cpp +++ b/src/items/SensorAnalogClass.cpp @@ -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 \ No newline at end of file +//#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 \ No newline at end of file