Version 1.20

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: ''
+labels: bug
 assignees: ''
 
 ---

README.md

@@ -4,7 +4,12 @@ EMS-ESP-Boiler is a project to build a controller circuit running with an ESP826
 
 There are 3 parts to this project, first the design of the circuit, second the code for the ESP8266 microcontroller firmware and lastly an example configuration for Home Assistant to monitor the data and issue direct commands via MQTT.
 
+<<<<<<< HEAD
 [![version](https://img.shields.io/badge/version-1.1.2-brightgreen.svg)](CHANGELOG.md)
+=======
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b8880625bdf841d4adb2829732030887)](https://app.codacy.com/app/proddy/EMS-ESP-Boiler?utm_source=github.com&utm_medium=referral&utm_content=proddy/EMS-ESP-Boiler&utm_campaign=Badge_Grade_Settings)
+[![version](https://img.shields.io/badge/version-1.1.0-brightgreen.svg)](CHANGELOG.md)
+>>>>>>> 53b7531bddff62a32f4dbd8cf4fa655e65215554
 
 - [EMS-ESP-Boiler](#ems-esp-boiler)
   - [Introduction](#introduction)

src/ems.cpp

@@ -1584,6 +1584,21 @@ void ems_setWarmWaterActivated(bool activated) {
     EMS_TxQueue.push(EMS_TxTelegram);
 }
 
+void ems_setWarmWaterModeComfort(bool comfort) {
+    myDebug("Setting boiler warm water to comfort mode %s\n", comfort ? "Comfort" : "Eco");
+
+    _EMS_TxTelegram EMS_TxTelegram = EMS_TX_TELEGRAM_NEW; // create new Tx
+
+    EMS_TxTelegram.action        = EMS_TX_TELEGRAM_WRITE;
+    EMS_TxTelegram.dest          = EMS_ID_BOILER;
+    EMS_TxTelegram.type          = EMS_TYPE_UBAParameterWW;
+    EMS_TxTelegram.offset        = EMS_OFFSET_UBAParameterWW_wwComfort;
+    EMS_TxTelegram.length        = EMS_MIN_TELEGRAM_LENGTH;
+    EMS_TxTelegram.type_validate = EMS_ID_NONE; // don't validate
+    EMS_TxTelegram.dataValue =
+        (comfort ? EMS_VALUE_UBAParameterWW_wwComfort_Comfort : EMS_VALUE_UBAParameterWW_wwComfort_Eco); // 0x00 is on, 0xD8 is off
+    EMS_TxQueue.push(EMS_TxTelegram);
+}
 /**
  * Activate / De-activate the Warm Tap Water
  * true = on, false = off

src/ems.h

@@ -49,6 +49,10 @@
 #define EMS_VALUE_UBAParameterWW_wwComfort_Comfort 0x00 // the value for comfort
 #define EMS_VALUE_UBAParameterWW_wwComfort_Eco 0xD8     // the value for eco
 
+#define EMS_OFFSET_UBAParameterWW_wwComfort 9           // WW is in comfort or eco mode
+#define EMS_VALUE_UBAParameterWW_wwComfort_Comfort 0x00 // the value for comfort
+#define EMS_VALUE_UBAParameterWW_wwComfort_Eco 0xD8     // the value for eco
+
 /* 
  * Thermostat...
  */
@@ -317,6 +321,7 @@ void ems_setThermostatTemp(float temp);
 void ems_setThermostatMode(uint8_t mode);
 void ems_setWarmWaterTemp(uint8_t temperature);
 void ems_setWarmWaterActivated(bool activated);
+void ems_setWarmWaterModeComfort(bool comfort);
 void ems_setWarmTapWaterActivated(bool activated);
 void ems_setExperimental(uint8_t value);
 void ems_setPoll(bool b);