From 13f86edd8a5cb7d58b1ac4e45d6ffbb63fb23533 Mon Sep 17 00:00:00 2001 From: Christian Weithe Date: Mon, 28 Oct 2019 18:42:14 +0100 Subject: [PATCH] rename RC20F to RC20RF --- CHANGELOG.md | 4 ++-- src/ems.cpp | 10 +++++----- src/ems_devices.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbc38ac26..381396edc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -371,7 +371,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Renamed project from EMS-ESP-Boiler to EMS-ESP since it's kinda EMS generic now -- Support for RC20F and RFM20 (https://github.com/proddy/EMS-ESP/issues/18) +- Support for RC20RF and RFM20 (https://github.com/proddy/EMS-ESP/issues/18) - Moved all EMS device information into a separate file `ems_devices.h` so no longer need to touch `ems.h` - Telnet commands can be strings now and output is suspended when typing @@ -392,7 +392,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Scanning known EMS Devices now ignores duplicates (https://github.com/proddy/EMS-ESP/pull/30) - ServiceCode stored as a two byte char -- Support for RC20F and RFM20 (https://github.com/proddy/EMS-ESP/issues/18) +- Support for RC20RF and RFM20 (https://github.com/proddy/EMS-ESP/issues/18) ## [1.2.3] 2019-01-03 diff --git a/src/ems.cpp b/src/ems.cpp index cd3cebf24..02c4945ee 100644 --- a/src/ems.cpp +++ b/src/ems.cpp @@ -137,16 +137,16 @@ const _EMS_Type EMS_Types[] = { {EMS_MODEL_RC10, EMS_TYPE_RC10Set, "RC10Set", _process_RC10Set}, {EMS_MODEL_RC10, EMS_TYPE_RC10StatusMessage, "RC10StatusMessage", _process_RC10StatusMessage}, - // RC20 and RC20F + // RC20 and RC20RF {EMS_MODEL_RC20, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage}, {EMS_MODEL_RC20, EMS_TYPE_RCTime, "RCTime", _process_RCTime}, {EMS_MODEL_RC20, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set}, {EMS_MODEL_RC20, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage}, - {EMS_MODEL_RC20F, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage}, - {EMS_MODEL_RC20F, EMS_TYPE_RCTime, "RCTime", _process_RCTime}, - {EMS_MODEL_RC20F, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set}, - {EMS_MODEL_RC20F, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage}, + {EMS_MODEL_RC20RF, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage}, + {EMS_MODEL_RC20RF, EMS_TYPE_RCTime, "RCTime", _process_RCTime}, + {EMS_MODEL_RC20RF, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set}, + {EMS_MODEL_RC20RF, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage}, // RC30 {EMS_MODEL_RC30, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage}, diff --git a/src/ems_devices.h b/src/ems_devices.h index 9221ae2f2..49a075d26 100644 --- a/src/ems_devices.h +++ b/src/ems_devices.h @@ -171,7 +171,7 @@ typedef enum { EMS_MODEL_ES73, EMS_MODEL_RC10, EMS_MODEL_RC20, - EMS_MODEL_RC20F, + EMS_MODEL_RC20RF, EMS_MODEL_RC30, EMS_MODEL_RC35, EMS_MODEL_EASY, @@ -283,7 +283,7 @@ const _Thermostat_Device Thermostat_Devices[] = { // Buderus/Nefit {EMS_MODEL_RC10, 79, 0x17, "RC10/Moduline 100", EMS_THERMOSTAT_WRITE_YES}, {EMS_MODEL_RC20, 77, 0x17, "RC20/Moduline 300", EMS_THERMOSTAT_WRITE_YES}, - {EMS_MODEL_RC20F, 93, 0x18, "RC20F", EMS_THERMOSTAT_WRITE_YES}, + {EMS_MODEL_RC20RF, 93, 0x18, "RC20RF", EMS_THERMOSTAT_WRITE_YES}, {EMS_MODEL_RC30, 67, 0x10, "RC30", EMS_THERMOSTAT_WRITE_YES}, {EMS_MODEL_RC30, 78, 0x10, "RC30/Moduline 400", EMS_THERMOSTAT_WRITE_YES}, {EMS_MODEL_RC35, 86, 0x10, "RC35", EMS_THERMOSTAT_WRITE_YES},