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 pull request #743 from MichaelDvP/dev

Browse Source 
Typos, selflowtemp check
This commit is contained in:
Proddy
2022-11-13 19:56:32 +01:00
committed by GitHub
parent 9dd0bf01e2 9865c84df5
commit d3a84e02e4
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/i18n/de/index.ts
View File

@@ -37,7 +37,7 @@ const de: Translation = {
PRODUCT: 'Produkt', PRODUCT: 'Produkt',
VERSION: 'Version', VERSION: 'Version',
ENTITY_NAME: 'Entitätsname', ENTITY_NAME: 'Entitätsname',
VALUE: '{{Wert||wert}}', VALUE: 'Wert',
SHOW_FAV: 'nur Favoriten anzeigen', SHOW_FAV: 'nur Favoriten anzeigen',
DEVICE_SENSOR_DATA: 'Geräte- und Sensordaten', DEVICE_SENSOR_DATA: 'Geräte- und Sensordaten',
DEVICES_SENSORS: 'Geräte & Sensoren', DEVICES_SENSORS: 'Geräte & Sensoren',

2
interface/src/project/types.ts
View File

@@ -197,7 +197,7 @@ export const DeviceValueUOM_s = [
'kW', 'kW',
'W', 'W',
'KB', 'KB',
'second', 'seconds',
'dBm', 'dBm',
'°F', '°F',
'mV', 'mV',

5
src/devices/boiler.cpp
View File

@@ -1772,6 +1772,11 @@ bool Boiler::set_flow_temp(const char * value, const int8_t id) {
return false; return false;
} }
// no write/verify if there is no change, see https://github.com/emsesp/EMS-ESP32/issues/654
if (v == selFlowTemp_) {
return true;
}
if (has_telegram_id(0xE4)) { if (has_telegram_id(0xE4)) {
write_command(EMS_TYPE_UBASetPoints, 0, v, 0xE4); write_command(EMS_TYPE_UBASetPoints, 0, v, 0xE4);
} else { } else {

2
src/mqtt.cpp
View File

@@ -1091,7 +1091,7 @@ void Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdevice
// keep it compatible to v3.4, use english fullname, no prefix (basename prefix commented out) // keep it compatible to v3.4, use english fullname, no prefix (basename prefix commented out)
char object_id[130]; char object_id[130];
if (have_tag) { if (have_tag) {
snprintf(object_id, sizeof(object_id), "%s_%s_%s", device_name, EMSdevice::tag_to_string(tag).c_str(), en_name); snprintf(object_id, sizeof(object_id), "%s_%s_%s", device_name, EMSdevice::tag_to_mqtt(tag).c_str(), en_name);
} else { } else {
snprintf(object_id, sizeof(object_id), "%s_%s", device_name, en_name); snprintf(object_id, sizeof(object_id), "%s_%s", device_name, en_name);
} }