Merge remote-tracking branch 'upstream/dev' into MM10

.gitignore

@@ -18,3 +18,6 @@ node_modules
 # project specfic
 scripts/stackdmp.txt
 firmware
+
+# firmware
+*.bin

.travis.yml

@@ -1,7 +1,7 @@
 os: linux
 language: python
 python:
-  - "2.7"
+  - "3.8"
 
 cache:
   directories:
@@ -55,6 +55,7 @@ before_deploy:
 deploy:
   provider: releases
   edge:
+    source: wenkokke/dpl
     branch: master
   token: ${GITHUB_TOKEN}
   file_glob: true

platformio.ini

@@ -110,5 +110,5 @@ board = d1_mini
 build_type = release
 build_flags = ${common.build_flags} ${common.custom_flags}
 extra_scripts = 
-  ;pre:scripts/pre_script.py
+  pre:scripts/pre_script.py
   scripts/main_script.py

src/ems-esp.cpp

@@ -270,6 +270,9 @@ void showInfo() {
     }
 
     myDebug_P(PSTR(""));
+
+    // show boiler stats if connected
+    if (ems_getBoilerEnabled()) {
         myDebug_P(PSTR("%sBoiler stats:%s"), COLOR_BOLD_ON, COLOR_BOLD_OFF);
 
         // version details
@@ -362,6 +365,7 @@ void showInfo() {
                       (EMS_Boiler.UBAuptime % 1440) / 60,
                       EMS_Boiler.UBAuptime % 60);
         }
+    }
 
     // For SM10/SM100/SM200 Solar Module
     if (ems_getSolarModuleEnabled()) {

src/ems.cpp

@@ -49,7 +49,7 @@ const uint8_t ems_crc_table[] = {0x00, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E,
                                  0xF9, 0xFB, 0xFD, 0xFF, 0xF1, 0xF3, 0xF5, 0xF7, 0xE9, 0xEB, 0xED, 0xEF, 0xE1, 0xE3, 0xE5, 0xE7};
 
 const uint8_t  TX_WRITE_TIMEOUT_COUNT = 2;       // 3 retries before timeout
-const uint32_t EMS_BUS_TIMEOUT        = 15000;   // timeout in ms before recognizing the ems bus is offline (15 seconds)
+const uint32_t EMS_BUS_TIMEOUT        = 45000;   // timeout in ms before recognizing the ems bus is offline (45 seconds)
 const uint32_t EMS_POLL_TIMEOUT       = 5000000; // timeout in microseconds before recognizing the ems bus is offline (5 seconds)
 
 /*
@@ -1195,8 +1195,9 @@ void _process_RC30StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
 void _process_RC35StatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     // exit if...
     // - the 15th byte (second from last) is 0x00, which I think is flow temp, means HC is not is use
-    // - its not a broadcast, so destination is 0x00
+    // - its not a broadcast, so destination is 0x00 (not in use since 6/1/2020 - issue #238)
-    if ((EMS_RxTelegram->data[14] == 0x00) || (EMS_RxTelegram->dest != EMS_ID_NONE)) {
+    // if ((EMS_RxTelegram->data[14] == 0x00) || (EMS_RxTelegram->dest != EMS_ID_NONE)) {
+    if (EMS_RxTelegram->data[14] == 0x00) {
         return;
     }
 
@@ -1369,6 +1370,11 @@ int8_t _getHeatingCircuit(_EMS_RxTelegram * EMS_RxTelegram) {
         return -1;
     }
 
+    // ignore telegrams that have no data, or only a single byte
+    if (EMS_RxTelegram->data_length <= 1) {
+        return -1;
+    }
+
     int8_t hc;
 
     switch (EMS_RxTelegram->type) {

src/ems_devices.h

@@ -253,6 +253,7 @@ static const _EMS_Device EMS_Devices[] = {
     {171, EMS_DEVICE_TYPE_CONNECT, "EMS-OT OpenTherm converter", EMS_DEVICE_FLAG_NONE},                         // 0x02
     {189, EMS_DEVICE_TYPE_GATEWAY, "Web Gateway KM200", EMS_DEVICE_FLAG_NONE},                                  // 0x48
     {94, EMS_DEVICE_TYPE_GATEWAY, "RC Remote Device", EMS_DEVICE_FLAG_NONE},                                    // 0x18
+    {207, EMS_DEVICE_TYPE_CONTROLLER, "Worcester Sense II/Bosch CS200 Solar Controller", EMS_DEVICE_FLAG_NONE}, // 0x10
 
     //
     // Thermostats, typically device id of 0x10, 0x17, 0x18, 0x38 (RC100), 0x39 (Easy)
@@ -263,7 +264,7 @@ static const _EMS_Device EMS_Devices[] = {
     {203, EMS_DEVICE_TYPE_THERMOSTAT, "Bosch EasyControl CT200", EMS_DEVICE_FLAG_EASY | EMS_DEVICE_FLAG_NO_WRITE},             // 0x18, cannot write
     {157, EMS_DEVICE_TYPE_THERMOSTAT, "Buderus RC200/Bosch CW100/Junkers CW100", EMS_DEVICE_FLAG_NO_WRITE},                    // 0x18, cannot write
 
-    // Buderus/Nefit
+    // Buderus/Nefit specific
     {79, EMS_DEVICE_TYPE_THERMOSTAT, "RC10/Moduline 100", EMS_DEVICE_FLAG_RC10},                                    // 0x17
     {77, EMS_DEVICE_TYPE_THERMOSTAT, "RC20/Moduline 300", EMS_DEVICE_FLAG_RC20},                                    // 0x17
     {67, EMS_DEVICE_TYPE_THERMOSTAT, "RC30", EMS_DEVICE_FLAG_RC30},                                                 // 0x10

src/version.h

@@ -1 +1 @@
-#define APP_VERSION "1.9.5b14"
+#define APP_VERSION "1.9.5b16"