andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-11 02:09:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
Proddy
2020-10-25 18:38:30 +01:00
committed by GitHub
parent 5e7e80e390 9ee95985b7
commit 243a467234
16 changed files with 62 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/locale_EN.h
View File

@@ -94,7 +94,7 @@ MAKE_PSTR_WORD(connect)
MAKE_PSTR_WORD(heatpump)
MAKE_PSTR_WORD(generic)
MAKE_PSTR_WORD(dallassensor)
MAKE_PSTR_WORD(sensor)
MAKE_PSTR_WORD(unknown)
MAKE_PSTR(1space, " ")
MAKE_PSTR(2spaces, " ")
@@ -269,7 +269,7 @@ MAKE_PSTR(modetype, "Mode type")
MAKE_PSTR(airHumidity, "Relative air humidity")
MAKE_PSTR(dewTemperature, "Dew point temperature")
// HA icons
// Home Assistant icons
MAKE_PSTR(icontemperature, "mdi:coolant-temperature")
MAKE_PSTR(iconpercent, "mdi:sine-wave")
MAKE_PSTR(iconfire, "mdi:fire")
@@ -285,5 +285,4 @@ MAKE_PSTR(iconthermostat, "mdi:home-thermometer-outline")
MAKE_PSTR(iconheatpump, "mdi:water-pump")
// MQTT topic suffix
// MAKE_PSTR(mqtt_suffix_main, "_main")
MAKE_PSTR(mqtt_suffix_ww, "_ww")