From 7bd70e735c209a843da97059607e58afb55fca8c Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sun, 9 Feb 2020 22:04:43 +0100
Subject: [PATCH] cleaned up mixing

---
 src/ems.h       | 11 ++++++++---
 src/my_config.h |  4 ++++
 src/version.h   |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/ems.h b/src/ems.h
index 7e7ad1d67..5d15bb346 100644
--- a/src/ems.h
+++ b/src/ems.h
@@ -34,11 +34,14 @@
 
 // thermostat specific
 #define EMS_THERMOSTAT_MAXHC 4     // max number of heating circuits
-#define EMS_THERMOSTAT_MAXWWC 2    // max number of warm water circuits
 #define EMS_THERMOSTAT_DEFAULTHC 1 // default heating circuit is 1
 #define EMS_THERMOSTAT_WRITE_YES true
 #define EMS_THERMOSTAT_WRITE_NO false
 
+// mixing specific
+#define EMS_MIXING_MAXHC 4  // max number of heating circuits
+#define EMS_MIXING_MAXWWC 2 // max number of warm water circuits
+
 // Device Flags
 #define EMS_DEVICE_FLAG_NONE 0   // no flags set
 #define EMS_DEVICE_FLAG_SM10 10  // solar module1
@@ -269,6 +272,8 @@ typedef struct {
     uint8_t      product_id;
     char         version[10];
 
+    uint8_t brand; // 0=unknown, 1=bosch, 2=junkers, 3=buderus, 4=nefit, 5=sieger, 11=worcester
+
     // UBAParameterWW
     uint8_t wWActivated;     // Warm Water activated
     uint8_t wWSelTemp;       // Warm Water selected temperature
@@ -363,8 +368,8 @@ typedef struct {
     const char *          device_desc_p;
     uint8_t               product_id;
     char                  version[10];
-    _EMS_MixingModule_HC  hc[EMS_THERMOSTAT_MAXHC];   // array for the 4 heating circuits
-    _EMS_MixingModule_WWC wwc[EMS_THERMOSTAT_MAXWWC]; // array for the 2 ww circuits
+    _EMS_MixingModule_HC  hc[EMS_MIXING_MAXHC];   // array for the 4 heating circuits
+    _EMS_MixingModule_WWC wwc[EMS_MIXING_MAXWWC]; // array for the 2 ww circuits
 } _EMS_MixingModule;
 
 // Solar Module - SM10/SM100/SM200/ISM1
diff --git a/src/my_config.h b/src/my_config.h
index 8f909c409..4948b4c2b 100644
--- a/src/my_config.h
+++ b/src/my_config.h
@@ -37,6 +37,10 @@
 #define THERMOSTAT_HEATINGTYPE "heatingtype"         // RC35 specific (3=floorheating)
 #define THERMOSTAT_CIRCUITCALCTEMP "circuitcalctemp" // RC35 specific
 
+// mixing module
+#define MIXING_HC "hc"   // which heating circuit number
+#define MIXING_WWC "wwc" // which warm water circuit number
+
 // MQTT for boiler
 #define TOPIC_BOILER_DATA "boiler_data"                // for sending boiler values to MQTT
 #define TOPIC_BOILER_TAPWATER_ACTIVE "tapwater_active" // if hot tap water is running
diff --git a/src/version.h b/src/version.h
index 354d326d6..6ee70b06c 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.5b29"
+#define APP_VERSION "1.9.5b30"