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

fix merge chaos

Browse Source
This commit is contained in:
proddy
2022-11-20 21:11:24 +01:00
parent dccdf18226
commit d2503431c6
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/emsdevicevalue.cpp
View File

@@ -105,27 +105,9 @@ DeviceValue::DeviceValue(uint8_t device_type,
// must be an int of 4 bytes, 32bit aligned // must be an int of 4 bytes, 32bit aligned
const char * DeviceValue::DeviceValueUOM_s[] = { const char * DeviceValue::DeviceValueUOM_s[] = {
F_(uom_blank), // F_(uom_blank), F_(uom_degrees), F_(uom_degrees), F_(uom_percent), F_(uom_lmin), F_(uom_kwh), F_(uom_wh),
F_(uom_degrees), // FL_(hours)[0], FL_(minutes)[0], F_(uom_ua), F_(uom_bar), F_(uom_kw), F_(uom_w), F_(uom_kb),
F_(uom_degrees), // FL_(seconds)[0], F_(uom_dbm), F_(uom_fahrenheit), F_(uom_mv), F_(uom_sqm), F_(uom_m3),
F_(uom_percent), //
F_(uom_lmin), //
F_(uom_kwh), //
F_(uom_wh), //
F_(uom_hours), //
F_(uom_minutes), //
F_(uom_ua), //
F_(uom_bar), //
F_(uom_kw), //
F_(uom_w), //
F_(uom_kb), //
F_(uom_seconds), //
F_(uom_dbm), //
F_(uom_fahrenheit), //
F_(uom_mv), //
F_(uom_sqm), //
F_(uom_m3),
F_(uom_l),
F_(uom_blank) // connectivity F_(uom_blank) // connectivity
}; };