andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 16:59:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

added strings for all device names

Browse Source
This commit is contained in:
proddy
2020-10-25 18:31:33 +01:00
parent 4c36f21582
commit 6540d29085
1 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/emsdevice.cpp
View File

@@ -73,6 +73,10 @@ std::string EMSdevice::device_type_2_device_name(const uint8_t device_type) {
return read_flash_string(F_(solar)); return read_flash_string(F_(solar));
break; break;
case DeviceType::CONNECT:
return read_flash_string(F_(connect));
break;
case DeviceType::MIXER: case DeviceType::MIXER:
return read_flash_string(F_(mixer)); return read_flash_string(F_(mixer));
break; break;
@@ -89,8 +93,12 @@ std::string EMSdevice::device_type_2_device_name(const uint8_t device_type) {
return read_flash_string(F_(switch)); return read_flash_string(F_(switch));
break; break;
case DeviceType::GATEWAY:
return read_flash_string(F_(gateway));
break;
default: default:
return std::string{}; return read_flash_string(F_(unknown));
break; break;
} }
} }
@@ -121,55 +129,18 @@ uint8_t EMSdevice::device_name_2_device_type(const char * topic) {
return DeviceType::MIXER; return DeviceType::MIXER;
} }
if (!strcmp_P(topic, reinterpret_cast<PGM_P>(F_(sensor)))) { if (!strcmp_P(topic, reinterpret_cast<PGM_P>(F_(dallassensor)))) {
return DeviceType::DALLASSENSOR; return DeviceType::DALLASSENSOR;
} }
return DeviceType::UNKNOWN; return DeviceType::UNKNOWN;
} }
// return name of the device type, capitalized
std::string EMSdevice::device_type_name() const { std::string EMSdevice::device_type_name() const {
switch (device_type_) { std::string s = device_type_2_device_name(device_type_);
case DeviceType::BOILER: s[0] = toupper(s[0]);
return read_flash_string(F("Boiler")); return s;
break;
case DeviceType::THERMOSTAT:
return read_flash_string(F("Thermostat"));
break;
case DeviceType::HEATPUMP:
return read_flash_string(F("Heat Pump"));
break;
case DeviceType::SOLAR:
return read_flash_string(F("Solar"));
break;
case DeviceType::CONNECT:
return read_flash_string(F("Connect"));
break;
case DeviceType::CONTROLLER:
return read_flash_string(F("Controller"));
break;
case DeviceType::MIXER:
return read_flash_string(F("Mixer"));
break;
case DeviceType::SWITCH:
return read_flash_string(F("Switch"));
break;
case DeviceType::GATEWAY:
return read_flash_string(F("Gateway"));
break;
default:
return read_flash_string(F("Unknown"));
break;
}
} }
// 0=unknown, 1=bosch, 2=junkers, 3=buderus, 4=nefit, 5=sieger, 11=worcester // 0=unknown, 1=bosch, 2=junkers, 3=buderus, 4=nefit, 5=sieger, 11=worcester