andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-30 18:49:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
MichaelDvP
2024-11-05 07:44:12 +01:00
parent 086aef6ef2
commit 000a73156a
2 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/emsdevice.cpp
View File

@@ -135,11 +135,27 @@ const char * EMSdevice::device_type_2_device_name(const uint8_t device_type) {
case DeviceType::GATEWAY: case DeviceType::GATEWAY:
return F_(gateway); return F_(gateway);
case DeviceType::SWITCH: case DeviceType::SWITCH:
return F_(switch); return F_(switcher);
case DeviceType::CONTROLLER : return F_(controller); case DeviceType::CONNECT : return F_(connect); case DeviceType::ALERT : return F_(alert); case DeviceType::CONTROLLER:
case DeviceType::EXTENSION : return F_(extension); case DeviceType::GENERIC : return F_(generic); return F_(controller);
case DeviceType::HEATSOURCE : return F_(heatsource); case DeviceType::VENTILATION : return F_(ventilation); case DeviceType::CONNECT:
case DeviceType::WATER : return F_(water); case DeviceType::POOL : return F_(pool); default : return Helpers::translated_word(FL_(unknown), true); return F_(connect);
case DeviceType::ALERT:
return F_(alert);
case DeviceType::EXTENSION:
return F_(extension);
case DeviceType::GENERIC:
return F_(generic);
case DeviceType::HEATSOURCE:
return F_(heatsource);
case DeviceType::VENTILATION:
return F_(ventilation);
case DeviceType::WATER:
return F_(water);
case DeviceType::POOL:
return F_(pool);
default:
return Helpers::translated_word(FL_(unknown), true);
} }
} }
@@ -217,23 +233,47 @@ uint8_t EMSdevice::device_name_2_device_type(const char * topic) {
if (!strcmp(lowtopic, F_(mixer))) { if (!strcmp(lowtopic, F_(mixer))) {
return DeviceType::MIXER; return DeviceType::MIXER;
} }
if (!strcmp(lowtopic, F_(switch))) { if (!strcmp(lowtopic, F_(switcher))) {
return DeviceType::SWITCH; return DeviceType::SWITCH;
} }
if (!strcmp(lowtopic, F_(gateway))) { return DeviceType::GATEWAY; } if (!strcmp(lowtopic, F_(alert))) { if (!strcmp(lowtopic, F_(gateway))) {
return DeviceType::GATEWAY;
}
if (!strcmp(lowtopic, F_(alert))) {
return DeviceType::ALERT; return DeviceType::ALERT;
} if (!strcmp(lowtopic, F_(extension))) { return DeviceType::EXTENSION; } if (!strcmp(lowtopic, F_(heatsource))) { }
if (!strcmp(lowtopic, F_(extension))) {
return DeviceType::EXTENSION;
}
if (!strcmp(lowtopic, F_(heatsource))) {
return DeviceType::HEATSOURCE; return DeviceType::HEATSOURCE;
} if (!strcmp(lowtopic, F_(ventilation))) { return DeviceType::VENTILATION; } if (!strcmp(lowtopic, F_(water))) { }
if (!strcmp(lowtopic, F_(ventilation))) {
return DeviceType::VENTILATION;
}
if (!strcmp(lowtopic, F_(water))) {
return DeviceType::WATER; return DeviceType::WATER;
} if (!strcmp(lowtopic, F_(pool))) { return DeviceType::POOL; } }
if (!strcmp(lowtopic, F_(pool))) {
return DeviceType::POOL;
}
// non EMS // non EMS
if (!strcmp(lowtopic, F_(custom))) { return DeviceType::CUSTOM; } if (!strcmp(lowtopic, F_(temperaturesensor))) { if (!strcmp(lowtopic, F_(custom))) {
return DeviceType::CUSTOM;
}
if (!strcmp(lowtopic, F_(temperaturesensor))) {
return DeviceType::TEMPERATURESENSOR; return DeviceType::TEMPERATURESENSOR;
} if (!strcmp(lowtopic, F_(analogsensor))) { return DeviceType::ANALOGSENSOR; } if (!strcmp(lowtopic, F_(scheduler))) { }
if (!strcmp(lowtopic, F_(analogsensor))) {
return DeviceType::ANALOGSENSOR;
}
if (!strcmp(lowtopic, F_(scheduler))) {
return DeviceType::SCHEDULER; return DeviceType::SCHEDULER;
} if (!strcmp(lowtopic, F_(system))) { return DeviceType::SYSTEM; } }
if (!strcmp(lowtopic, F_(system))) {
return DeviceType::SYSTEM;
}
return DeviceType::UNKNOWN; return DeviceType::UNKNOWN;
} }

2
src/locale_common.h
View File

@@ -88,7 +88,7 @@ MAKE_WORD(coldshot)
// device types - lowercase, used in MQTT // device types - lowercase, used in MQTT
MAKE_WORD(boiler) MAKE_WORD(boiler)
MAKE_WORD(thermostat) MAKE_WORD(thermostat)
MAKE_WORD(switch) MAKE_WORD_CUSTOM(switcher, "switch")
MAKE_WORD(solar) MAKE_WORD(solar)
MAKE_WORD(mixer) MAKE_WORD(mixer)
MAKE_WORD(gateway) MAKE_WORD(gateway)