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

Optimization

Browse Source
This commit is contained in:
Dmitry Borisenko
2020-10-20 22:55:45 +03:00
parent 6064b9eac9
commit a5171f1178
25 changed files with 69 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Consts.h
View File

@@ -85,7 +85,8 @@ struct Time_t {
enum TimerTask_t { WIFI_SCAN,
WIFI_MQTT_CONNECTION_CHECK,
SENSORS,
SENSORS10SEC,
SENSORS60SEC,
STEPPER1,
STEPPER2,
LOG1,

52
include/Errors.h
View File

@@ -1,52 +0,0 @@
#pragma once
#include <Arduino.h>
#include "Utils/StringUtils.h"
class Error : public Printable {
public:
static Error OK() {
return Error();
}
static Error InfoMessage(const char *message) {
return Error(EL_INFO, message);
}
static Error ErrorMessage(const char *message) {
return Error(EL_ERROR, message);
}
public:
Error() : _type{ET_NONE}, _level{EL_NONE} {};
Error(const ErrorLevel_t level, const char *message) : Error(ET_FUNCTION, level, message){};
Error(const ErrorType_t type, const ErrorLevel_t level, const char *message) : _type{type}, _level{level} {
strncpy(_message, message, sizeof(_message));
};
const ErrorLevel_t level() const { return _level; }
const ErrorType_t type() const { return _type; }
const char *message() const { return _message; }
operator bool() const { return _level != EL_NONE; }
const String toString() const {
char buf[128];
sprintf(buf, "[%c] %s", getErrorLevelStr(_level), _message);
return String(buf);
}
virtual size_t printTo(Print &p) const {
return p.println(toString().c_str());
}
private:
char _message[128];
ErrorType_t _type;
ErrorLevel_t _level;
};

4
include/Global.h
View File

@@ -7,7 +7,6 @@
#include "ESP8266.h"
#include "Consts.h"
#include "Errors.h"
#include "GyverFilters.h"
#include "Upgrade.h"
#include "Clock.h"
@@ -74,7 +73,8 @@ extern String itemsFile;
extern String itemsLine;
// Sensors
extern String sensorReadingMap;
extern String sensorReadingMap10sec;
extern String sensorReadingMap60sec;
extern int8_t dallasEnterCounter;
extern String logging_value_names_list;

1
include/Utils/PrintMessage.h
View File

@@ -3,7 +3,6 @@
#include "Arduino.h"
#include "Utils/StringUtils.h"
#include "Utils/TimeUtils.h"
#include "Errors.h"
#include "Global.h"
#define pm PrintMessage(MODULE)

2
include/items/InputClass.h
View File

@@ -24,7 +24,7 @@ class InputClass : public LineParsing {
void inputSetStr(String key, String state) {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, state);
publishStatus(key, state);
publishStatus(key, state);
}
};

2
include/items/SensorAnalogClass.h
View File

@@ -29,7 +29,7 @@ class SensorAnalogClass : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
return value;
}
};

8
include/items/SensorBme280Class.h
View File

@@ -18,7 +18,7 @@ class SensorBme280Class : public SensorConvertingClass {
bme.begin(hexStringToUint8(_addr));
jsonWriteStr(configOptionJson, _key + "_map", _map);
jsonWriteStr(configOptionJson, _key + "_с", _c);
sensorReadingMap += _key + ",";
sensorReadingMap10sec += _key + ",";
}
void SensorBme280ReadTmp(String key) {
@@ -28,7 +28,7 @@ class SensorBme280Class : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
}
void SensorBme280ReadHum(String key) {
@@ -38,7 +38,7 @@ class SensorBme280Class : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
}
void SensorBme280ReadPress(String key) {
@@ -49,7 +49,7 @@ class SensorBme280Class : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
}
};
extern SensorBme280Class mySensorBme280;

6
include/items/SensorBmp280Class.h
View File

@@ -17,7 +17,7 @@ class SensorBmp280Class : public SensorConvertingClass {
bmp.begin(hexStringToUint8(_addr));
jsonWriteStr(configOptionJson, _key + "_map", _map);
jsonWriteStr(configOptionJson, _key + "_с", _c);
sensorReadingMap += _key + ",";
sensorReadingMap10sec += _key + ",";
}
void SensorBmp280ReadTmp(String key) {
@@ -29,7 +29,7 @@ class SensorBmp280Class : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
}
void SensorBmp280ReadPress(String key) {
@@ -42,7 +42,7 @@ class SensorBmp280Class : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
}
};
extern SensorBmp280Class mySensorBmp280;

4
include/items/SensorDallasClass.h
View File

@@ -14,7 +14,7 @@ class SensorDallasClass : public SensorConvertingClass {
sensors.begin();
sensors.setResolution(48);
sensorReadingMap += _key + ",";
sensorReadingMap10sec += _key + ",";
dallasEnterCounter++;
jsonWriteInt(configOptionJson, _key + "_num", dallasEnterCounter);
@@ -37,7 +37,7 @@ class SensorDallasClass : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
}
}
}

6
include/items/SensorDhtClass.h
View File

@@ -17,7 +17,7 @@ class SensorDhtClass : public SensorConvertingClass {
if (_type == "dht22") {
dht.setup(_pin.toInt(), DHTesp::DHT22);
}
sensorReadingMap += _key + ",";
sensorReadingMap10sec += _key + ",";
//to do если надо будет читать несколько dht
//dhtEnterCounter++;
@@ -44,7 +44,7 @@ class SensorDhtClass : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
} else {
Serial.println("[E] sensor '" + key);
}
@@ -68,7 +68,7 @@ class SensorDhtClass : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
} else {
Serial.println("[E] sensor '" + key);
}

6
include/items/SensorModbusClass.h
View File

@@ -18,8 +18,8 @@
// uart.begin(9600);
// jsonWriteStr(configOptionJson, _key + "_map", _map);
// jsonWriteStr(configOptionJson, _key + "_с", _c);
// sensorReadingMap += _key + " " + _addr + " " + _reg + ",";
// Serial.println(sensorReadingMap);
// sensorReadingMap10sec += _key + " " + _addr + " " + _reg + ",";
// Serial.println(sensorReadingMap10sec);
// }
//
// void SensorModbusRead(String key, uint8_t slaveAddress, uint16_t regAddress) {
@@ -38,7 +38,7 @@
// eventGen(key, "");
// jsonWriteStr(configLiveJson, key, String(valueFl));
// publishStatus(key, String(valueFl));
// Serial.println("I sensor '" + key + "' data: " + String(valueFl) + ", Slave dev addr: " + String(slaveAddress) + ", Register: " + String(regAddress));
// SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl) + ", Slave dev addr: " + String(slaveAddress) + ", Register: " + String(regAddress));
// }
//
// bool getResultMsg(ModbusMaster* modbus1, uint16_t result) {

4
include/items/SensorUltrasonicClass.h
View File

@@ -12,7 +12,7 @@ class SensorUltrasonic : public SensorConvertingClass {
public:
SensorUltrasonic() : SensorConvertingClass(){};
void init() {
sensorReadingMap += _key + ",";
sensorReadingMap10sec += _key + ",";
String trig = selectFromMarkerToMarker(_pin, ",", 0);
String echo = selectFromMarkerToMarker(_pin, ",", 1);
pinMode(trig.toInt(), OUTPUT);
@@ -43,7 +43,7 @@ class SensorUltrasonic : public SensorConvertingClass {
eventGen(key, "");
jsonWriteStr(configLiveJson, key, String(valueFl));
publishStatus(key, String(valueFl));
Serial.println("I sensor '" + key + "' data: " + String(valueFl));
SerialPrint("I", "Sensor", "'" + key + "' data: " + String(valueFl));
}
};
extern SensorUltrasonic mySensorUltrasonic;