andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 08:19:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

changes to backend, some refactoring

Browse Source
This commit is contained in:
Proddy
2022-04-15 13:04:52 +02:00
parent 9e293136b9
commit 4b3b9524ef
13 changed files with 340 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/analogsensor.h
View File

@@ -36,7 +36,7 @@ class AnalogSensor {
public:
class Sensor {
public:
Sensor(const uint8_t id, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type);
Sensor(const uint8_t gpio, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type);
~Sensor() = default;
void set_offset(const float offset) {
@@ -48,8 +48,8 @@ class AnalogSensor {
name_ = name;
}
uint8_t id() const {
return id_;
uint8_t gpio() const {
return gpio_;
}
float value() const {
@@ -99,7 +99,7 @@ class AnalogSensor {
uint32_t last_polltime_ = 0; // for timer
private:
uint8_t id_;
uint8_t gpio_;
std::string name_;
float offset_;
float factor_;
@@ -157,7 +157,7 @@ class AnalogSensor {
return sensors_.size();
}
bool update(uint8_t id, const std::string & name, float offset, float factor, uint8_t uom, int8_t type);
bool update(uint8_t gpio, const std::string & name, float offset, float factor, uint8_t uom, int8_t type);
bool get_value_info(JsonObject & output, const char * cmd, const int8_t id) const;
#ifdef EMSESP_DEBUG
@@ -171,7 +171,7 @@ class AnalogSensor {
static uuid::log::Logger logger_;
void remove_ha_topic(const uint8_t id) const;
bool command_setvalue(const char * value, const int8_t id);
bool command_setvalue(const char * value, const int8_t gpio);
void measure();
bool command_info(const char * value, const int8_t id, JsonObject & output) const;
bool command_commands(const char * value, const int8_t id, JsonObject & output);