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

3.2.2b8

Browse Source
This commit is contained in:
proddy
2021-09-25 18:41:16 +02:00
parent 9e856b28a9
commit 84cc964a7a
5 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/boiler.cpp
View File

@@ -832,9 +832,9 @@ void Boiler::process_UBAErrorMessage2(std::shared_ptr<const Telegram> telegram)
if (telegram->offset > 0 || telegram->message_length < 14) { if (telegram->offset > 0 || telegram->message_length < 14) {
return; return;
} }
char code[4]; char code[4];
uint16_t codeNo; uint16_t codeNo;
uint32_t timecode; uint32_t timecode;
code[0] = telegram->message_data[5]; code[0] = telegram->message_data[5];
code[1] = telegram->message_data[6]; code[1] = telegram->message_data[6];
code[2] = telegram->message_data[7]; code[2] = telegram->message_data[7];

9
src/devices/solar.cpp
View File

@@ -130,13 +130,8 @@ Solar::Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const s
register_device_value(TAG_NONE, &energyToday_, DeviceValueType::ULONG, nullptr, FL_(energyToday), DeviceValueUOM::WH); register_device_value(TAG_NONE, &energyToday_, DeviceValueType::ULONG, nullptr, FL_(energyToday), DeviceValueUOM::WH);
register_device_value(TAG_NONE, &energyTotal_, DeviceValueType::ULONG, FL_(div10), FL_(energyTotal), DeviceValueUOM::KWH); register_device_value(TAG_NONE, &energyTotal_, DeviceValueType::ULONG, FL_(div10), FL_(energyTotal), DeviceValueUOM::KWH);
register_device_value(TAG_NONE, register_device_value(
&heatTransferSystem_, TAG_NONE, &heatTransferSystem_, DeviceValueType::BOOL, nullptr, FL_(heatTransferSystem), DeviceValueUOM::NONE, MAKE_CF_CB(set_heatTransferSystem));
DeviceValueType::BOOL,
nullptr,
FL_(heatTransferSystem),
DeviceValueUOM::NONE,
MAKE_CF_CB(set_heatTransferSystem));
register_device_value(TAG_NONE, &externalTank_, DeviceValueType::BOOL, nullptr, FL_(externalTank), DeviceValueUOM::NONE, MAKE_CF_CB(set_externalTank)); register_device_value(TAG_NONE, &externalTank_, DeviceValueType::BOOL, nullptr, FL_(externalTank), DeviceValueUOM::NONE, MAKE_CF_CB(set_externalTank));
register_device_value( register_device_value(
TAG_NONE, &thermalDisinfect_, DeviceValueType::BOOL, nullptr, FL_(thermalDisinfect), DeviceValueUOM::NONE, MAKE_CF_CB(set_thermalDisinfect)); TAG_NONE, &thermalDisinfect_, DeviceValueType::BOOL, nullptr, FL_(thermalDisinfect), DeviceValueUOM::NONE, MAKE_CF_CB(set_thermalDisinfect));

3
src/devices/thermostat.cpp
View File

@@ -2504,8 +2504,7 @@ void Thermostat::register_device_values() {
TAG_DEVICE_DATA_WW, &wwProgMode_, DeviceValueType::ENUM, FL_(enum_wwProgMode), FL_(wwProgMode), DeviceValueUOM::NONE, MAKE_CF_CB(set_wwProgMode)); TAG_DEVICE_DATA_WW, &wwProgMode_, DeviceValueType::ENUM, FL_(enum_wwProgMode), FL_(wwProgMode), DeviceValueUOM::NONE, MAKE_CF_CB(set_wwProgMode));
register_device_value( register_device_value(
TAG_DEVICE_DATA_WW, &wwCircProg_, DeviceValueType::ENUM, FL_(enum_wwProgMode), FL_(wwCircProg), DeviceValueUOM::NONE, MAKE_CF_CB(set_wwCircProg)); TAG_DEVICE_DATA_WW, &wwCircProg_, DeviceValueType::ENUM, FL_(enum_wwProgMode), FL_(wwCircProg), DeviceValueUOM::NONE, MAKE_CF_CB(set_wwCircProg));
register_device_value( register_device_value(TAG_DEVICE_DATA_WW, &wwDisinfect_, DeviceValueType::BOOL, nullptr, FL_(wwDisinfect), DeviceValueUOM::NONE, MAKE_CF_CB(set_wwDisinfect));
TAG_DEVICE_DATA_WW, &wwDisinfect_, DeviceValueType::BOOL, nullptr, FL_(wwDisinfect), DeviceValueUOM::NONE, MAKE_CF_CB(set_wwDisinfect));
register_device_value(TAG_DEVICE_DATA_WW, register_device_value(TAG_DEVICE_DATA_WW,
&wwDisinfectDay_, &wwDisinfectDay_,
DeviceValueType::ENUM, DeviceValueType::ENUM,

9
src/mqtt.cpp
View File

@@ -1003,7 +1003,7 @@ void Mqtt::publish_ha_sensor(uint8_t type, // EMSdevice::Dev
snprintf(topic, sizeof(topic), "sensor/%s/%s/config", mqtt_base_.c_str(), uniq.c_str()); // topic snprintf(topic, sizeof(topic), "sensor/%s/%s/config", mqtt_base_.c_str(), uniq.c_str()); // topic
uint8_t set_state_class = 0; uint8_t set_state_class = 0;
enum uint8_t {MEASURE = 1, TOTAL}; enum uint8_t { MEASURE = 1, TOTAL };
// unit of measure and map the HA icon // unit of measure and map the HA icon
if (uom != DeviceValueUOM::NONE) { if (uom != DeviceValueUOM::NONE) {
@@ -1053,11 +1053,8 @@ void Mqtt::publish_ha_sensor(uint8_t type, // EMSdevice::Dev
doc["ic"] = F_(icondbm); doc["ic"] = F_(icondbm);
break; break;
case DeviceValueUOM::NONE: case DeviceValueUOM::NONE:
if (type == DeviceValueType::INT || if (type == DeviceValueType::INT || type == DeviceValueType::UINT || type == DeviceValueType::SHORT || type == DeviceValueType::USHORT
type == DeviceValueType::UINT || || type == DeviceValueType::ULONG) {
type == DeviceValueType::SHORT ||
type == DeviceValueType::USHORT ||
type == DeviceValueType::ULONG) {
doc["ic"] = F_(iconnum); doc["ic"] = F_(iconnum);
set_state_class = TOTAL; set_state_class = TOTAL;
} }

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "v3.2.2b7" #define EMSESP_APP_VERSION "3.2.2b8"