From 1f1cd789cef4efa1c3a2cfeb5b2a469b58b6242d Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 10 Oct 2019 14:23:47 +0200 Subject: [PATCH] https://github.com/proddy/EMS-ESP/issues/205 - product ID 95 is not unqiue to Junkers! --- src/ems.cpp | 6 ------ src/ems.h | 3 +-- src/ems_devices.h | 2 +- src/version.h | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/ems.cpp b/src/ems.cpp index 910c03990..b0a1bc61a 100644 --- a/src/ems.cpp +++ b/src/ems.cpp @@ -2076,12 +2076,6 @@ void _process_Version(_EMS_RxTelegram * EMS_RxTelegram) { EMS_Boiler.product_id = Boiler_Devices[i].product_id; strlcpy(EMS_Boiler.version, version, sizeof(EMS_Boiler.version)); - // check to see if its a Junkers Heatronic 3, which has a different poll'ing logic - if (EMS_Boiler.product_id == EMS_PRODUCTID_HEATRONIC) { - EMS_Sys_Status.emsIDMask = 0x80; - EMS_Sys_Status.emsPollAck[0] = EMS_ID_ME ^ EMS_Sys_Status.emsIDMask; - } - ems_getBoilerValues(); // get Boiler values that we would usually have to wait for } return; diff --git a/src/ems.h b/src/ems.h index 0d2d64f05..bb4659851 100644 --- a/src/ems.h +++ b/src/ems.h @@ -87,7 +87,6 @@ #define EMS_ID_GATEWAY 0x48 // KM200 Web Gateway // Product IDs -#define EMS_PRODUCTID_HEATRONIC 95 // Junkers Heatronic 3 device #define EMS_PRODUCTID_SM10 73 // SM10 solar module #define EMS_PRODUCTID_SM50 162 // SM50 solar module #define EMS_PRODUCTID_SM100 163 // SM100 solar module @@ -247,7 +246,7 @@ const _EMS_TxTelegram EMS_TX_TELEGRAM_NEW = { // where defintions are stored typedef struct { uint8_t product_id; - char model_string[50]; + char model_string[70]; } _Boiler_Device; typedef struct { diff --git a/src/ems_devices.h b/src/ems_devices.h index db74ac75a..221ff668e 100644 --- a/src/ems_devices.h +++ b/src/ems_devices.h @@ -202,7 +202,7 @@ const _Boiler_Device Boiler_Devices[] = { {203, "Buderus Logamax U122/Junkers Cerapur"}, {208, "Buderus Logamax plus/GB192"}, {64, "Sieger BK15/Nefit Smartline/Buderus GB152"}, - {EMS_PRODUCTID_HEATRONIC, "Bosch Condens 2500/Junkers Heatronic 3"}, + {95, "Bosch Condens 2500/Buderus Logamax GB062/Junkers Heatronic 3"}, {122, "Nefit Proline"}, {170, "Buderus Logano GB212"}, {172, "Nefit Enviline"} diff --git a/src/version.h b/src/version.h index 131a503ba..dc06860db 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define APP_VERSION "1.9.2b3" +#define APP_VERSION "1.9.2b4"