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

auto formatting

Browse Source
This commit is contained in:
proddy
2021-04-25 09:53:45 +02:00
parent e854161da9
commit 1bd834924a
5 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG_LATEST.md
View File

@@ -5,9 +5,10 @@
- Mock API to simulate an ESP, for testing web - Mock API to simulate an ESP, for testing web
- Able to write values from the Web UI - Able to write values from the Web UI
- check values with `"cmd":<valuename>` and data empty or `?` - check values with `"cmd":<valuename>` and data empty or `?`
- set hc for values and commands by id or prefix `hc<x>`+separarator, separator can be any char - set hc for values and commands by id or prefix `hc<x>`+separator, separator can be any char
## Fixed ## Fixed
- Don't create Home Assistant MQTT discovery entries for device values that don't exists (#756 on EMS-ESP repo) - Don't create Home Assistant MQTT discovery entries for device values that don't exists (#756 on EMS-ESP repo)
- Update shower MQTT when a shower start is detected - Update shower MQTT when a shower start is detected
- S32 board profile - S32 board profile

1
src/devices/solar.cpp
View File

@@ -95,7 +95,6 @@ Solar::Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const s
register_device_value(TAG_NONE, &energyLastHour_, DeviceValueType::ULONG, FL_(div10), FL_(energyLastHour), DeviceValueUOM::WH); register_device_value(TAG_NONE, &energyLastHour_, DeviceValueType::ULONG, FL_(div10), FL_(energyLastHour), 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, &energyToday_, DeviceValueType::ULONG, nullptr, FL_(energyToday), DeviceValueUOM::WH); register_device_value(TAG_NONE, &energyToday_, DeviceValueType::ULONG, nullptr, FL_(energyToday), DeviceValueUOM::WH);
} }
// publish HA config // publish HA config

2
src/devices/solar.h
View File

@@ -75,12 +75,14 @@ class Solar : public EMSdevice {
uint8_t climateZone_; // climate zone identifier uint8_t climateZone_; // climate zone identifier
uint16_t collector1Area_; // Area of collector field 1 uint16_t collector1Area_; // Area of collector field 1
uint8_t collector1Type_; // Type of collector field 1, 01=flat, 02=vacuum uint8_t collector1Type_; // Type of collector field 1, 01=flat, 02=vacuum
// SM100wwTemperature - 0x07D6 // SM100wwTemperature - 0x07D6
uint8_t wwTemp_1_; uint8_t wwTemp_1_;
uint8_t wwTemp_3_; uint8_t wwTemp_3_;
uint8_t wwTemp_4_; uint8_t wwTemp_4_;
uint8_t wwTemp_5_; uint8_t wwTemp_5_;
uint8_t wwTemp_7_; uint8_t wwTemp_7_;
// SM100wwStatus - 0x07AA // SM100wwStatus - 0x07AA
uint8_t wwPump_; uint8_t wwPump_;