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

rename topics

Browse Source
This commit is contained in:
MichaelDvP
2020-10-24 17:47:10 +02:00
parent b42b7664ee
commit 9ecb4f4a73
19 changed files with 161 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/emsdevice.cpp
View File

@@ -73,8 +73,8 @@ std::string EMSdevice::device_type_2_device_name(const uint8_t device_type) {
return read_flash_string(F_(solar));
break;
case DeviceType::MIXING:
return read_flash_string(F_(mixing));
case DeviceType::MIXER:
return read_flash_string(F_(mixer));
break;
case DeviceType::DALLASSENSOR:
@@ -117,11 +117,11 @@ uint8_t EMSdevice::device_name_2_device_type(const char * topic) {
return DeviceType::SOLAR;
}
if (!strcmp_P(topic, reinterpret_cast<PGM_P>(F_(mixing)))) {
return DeviceType::MIXING;
if (!strcmp_P(topic, reinterpret_cast<PGM_P>(F_(mixer)))) {
return DeviceType::MIXER;
}
if (!strcmp_P(topic, reinterpret_cast<PGM_P>(F_(dallassensor)))) {
if (!strcmp_P(topic, reinterpret_cast<PGM_P>(F_(sensor)))) {
return DeviceType::DALLASSENSOR;
}
@@ -143,27 +143,27 @@ std::string EMSdevice::device_type_name() const {
break;
case DeviceType::SOLAR:
return read_flash_string(F("Solar Module"));
return read_flash_string(F("Solar"));
break;
case DeviceType::CONNECT:
return read_flash_string(F("Connect Module"));
return read_flash_string(F("Connect"));
break;
case DeviceType::CONTROLLER:
return read_flash_string(F("Controller"));
break;
case DeviceType::MIXING:
return read_flash_string(F("Mixing Module"));
case DeviceType::MIXER:
return read_flash_string(F("Mixer"));
break;
case DeviceType::SWITCH:
return read_flash_string(F("Switching Module"));
return read_flash_string(F("Switch"));
break;
case DeviceType::GATEWAY:
return read_flash_string(F("Gateway Module"));
return read_flash_string(F("Gateway"));
break;
default: