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

add times as a new HA UOM - #156

Browse Source
This commit is contained in:
Proddy
2021-10-12 12:59:00 +02:00
parent 50befd8991
commit 3ecf92fa41
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG_LATEST.md
View File

@@ -12,6 +12,7 @@
- Support for Junkers program and remote (fb10/fb110) temperature - Support for Junkers program and remote (fb10/fb110) temperature
- Home Assistant `state_class` attribute for Wh, kWh, W and KW [#129](https://github.com/emsesp/EMS-ESP32/issues/129) - Home Assistant `state_class` attribute for Wh, kWh, W and KW [#129](https://github.com/emsesp/EMS-ESP32/issues/129)
- Add current room influence for RC300[#136] - Add current room influence for RC300[#136]
- Added Home Assistant device_class to sensor entities
## Fixed ## Fixed
@@ -28,10 +29,13 @@
- "unit" renamed to "uom" in API call to recall a Device Value - "unit" renamed to "uom" in API call to recall a Device Value
- initial backend React changes to replace the class components (HOCs) with React Hooks - initial backend React changes to replace the class components (HOCs) with React Hooks
- Use program-names instead of numbers - Use program-names instead of numbers
- Boiler's maintenancemessage always published in MQTT (to prevent HA missing entity)
- Unit of Measure 'times' added to MQTT Fails, Rx fails, Rx received, Tx fails, Tx reads & Tx writes
## **BREAKING CHANGES** ## **BREAKING CHANGES**
- API: "unit" renamed to "uom" in API call to recall a Device Value - API: "unit" renamed to "uom" in API call to recall a Device Value
- HA: `sensor.boiler_boiler_temperature` renamed to `sensor.actual_boiler_temperature` - HA: `sensor.boiler_boiler_temperature` renamed to `sensor.actual_boiler_temperature`
- HA: `binary_sensor.boiler_ww_disinfecting` renamed to `binary_sensor.boiler_ww_disinfection` - HA: `binary_sensor.boiler_ww_disinfecting` renamed to `binary_sensor.boiler_ww_disinfection`
- HA: # removed from counts in MQTT Fails, Rx fails, Rx received, Tx fails, Tx reads & Tx writes
- `txread` renamed to `txreads` and `txwrite` renamed to `txwrites` in MQTT heartbeat payload

1
src/emsdevice.cpp
View File

@@ -40,6 +40,7 @@ static const __FlashStringHelper * DeviceValueUOM_s[] __attribute__((__aligned__
F_(seconds), F_(seconds),
F_(dbm), F_(dbm),
F_(mv), F_(mv),
F_(times),
F_(oclock) F_(oclock)
}; };

8
src/emsdevice.h
View File

@@ -44,9 +44,8 @@ enum DeviceValueType : uint8_t {
}; };
// Unit Of Measurement mapping - maps to DeviceValueUOM_s in emsdevice.cpp // Unit Of Measurement mapping - maps to DeviceValueUOM_s in emsdevice.cpp. Sequence is important!!
// uom - also used with HA // also used with HA as uom
// sequence is important!
enum DeviceValueUOM : uint8_t { enum DeviceValueUOM : uint8_t {
NONE = 0, // 0 NONE = 0, // 0
@@ -65,7 +64,8 @@ enum DeviceValueUOM : uint8_t {
SECONDS, // 13 SECONDS, // 13
DBM, // 14 DBM, // 14
MV, // 15 MV, // 15
OCLOCK // 16 TIMES, // 16
OCLOCK // 17
}; };

1
src/locale_EN.h
View File

@@ -184,6 +184,7 @@ MAKE_PSTR(kb, "KB")
MAKE_PSTR(seconds, "seconds") MAKE_PSTR(seconds, "seconds")
MAKE_PSTR(dbm, "dBm") MAKE_PSTR(dbm, "dBm")
MAKE_PSTR(mv, "mV") MAKE_PSTR(mv, "mV")
MAKE_PSTR(times, "times")
MAKE_PSTR(oclock, "o'clock") MAKE_PSTR(oclock, "o'clock")
// TAG mapping - maps to DeviceValueTAG_s in emsdevice.cpp // TAG mapping - maps to DeviceValueTAG_s in emsdevice.cpp