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

https://github.com/proddy/EMS-ESP/issues/205 - product ID 95 is not unqiue to Junkers!

Browse Source
This commit is contained in:
proddy
2019-10-10 14:23:47 +02:00
parent c0ac34fc15
commit 1f1cd789ce
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ems.cpp
View File

@@ -2076,12 +2076,6 @@ void _process_Version(_EMS_RxTelegram * EMS_RxTelegram) {
EMS_Boiler.product_id = Boiler_Devices[i].product_id; EMS_Boiler.product_id = Boiler_Devices[i].product_id;
strlcpy(EMS_Boiler.version, version, sizeof(EMS_Boiler.version)); 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 ems_getBoilerValues(); // get Boiler values that we would usually have to wait for
} }
return; return;

3
src/ems.h
View File

@@ -87,7 +87,6 @@
#define EMS_ID_GATEWAY 0x48 // KM200 Web Gateway #define EMS_ID_GATEWAY 0x48 // KM200 Web Gateway
// Product IDs // Product IDs
#define EMS_PRODUCTID_HEATRONIC 95 // Junkers Heatronic 3 device
#define EMS_PRODUCTID_SM10 73 // SM10 solar module #define EMS_PRODUCTID_SM10 73 // SM10 solar module
#define EMS_PRODUCTID_SM50 162 // SM50 solar module #define EMS_PRODUCTID_SM50 162 // SM50 solar module
#define EMS_PRODUCTID_SM100 163 // SM100 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 // where defintions are stored
typedef struct { typedef struct {
uint8_t product_id; uint8_t product_id;
char model_string[50]; char model_string[70];
} _Boiler_Device; } _Boiler_Device;
typedef struct { typedef struct {

2
src/ems_devices.h
View File

@@ -202,7 +202,7 @@ const _Boiler_Device Boiler_Devices[] = {
{203, "Buderus Logamax U122/Junkers Cerapur"}, {203, "Buderus Logamax U122/Junkers Cerapur"},
{208, "Buderus Logamax plus/GB192"}, {208, "Buderus Logamax plus/GB192"},
{64, "Sieger BK15/Nefit Smartline/Buderus GB152"}, {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"}, {122, "Nefit Proline"},
{170, "Buderus Logano GB212"}, {170, "Buderus Logano GB212"},
{172, "Nefit Enviline"} {172, "Nefit Enviline"}

2
src/version.h
View File

@@ -1 +1 @@
#define APP_VERSION "1.9.2b3" #define APP_VERSION "1.9.2b4"