Merge remote-tracking branch 'origin/dev' into main

CHANGELOG_LATEST.md

@@ -1,44 +1,9 @@
 # Changelog
 
-### Added
-- function keys in editor: cursor, del, home, end. F1=help, F2=show, and other shortcuts
-- SM100 pump working time and energy units
-- heating curve parameters and commands for RC300
-- `wwonetime` for RC300 thermostat
-- expose test framework via api (#611)
-- SysLog has enable/disable flag in WebUI
-- Add solar configuration telegrams (#616) [thanks @hpanther]
-- `log trace` shows decoded or optional raw telegrams, `watch unknown` for only unknown telegrams
-- WM10 switch telegrams
-- boiler information (#633), pumpmod min/max commands
-- maintenance message and command
-- thermostat program, reducemode, controlmode
-- optional delayed start for sending tx-telegrams to prevent conflicts with KM200
-- RC35 holiday setting with `+` for 'at home'
+## Added
 
-### Fixed
-- mixer IPM pumpstatus
-- mixer devices in HA were incorrectly named
-- Prevent HA MQTT config messages for thermostat that has no 'currtemp' (#582)
-- serviceCodeNumber, 3-char serviceCode, exhausttemp and heating_active for newer ems+ boilers
-- prevent MQTT publish messages from sending twice
-- repeated output on read commands
-- heating_active for ems+
-- fix telegrams matched to masterthermostat 0x18
+## Fixed
 
-### Changed
-- optimized MQTT for HA to reduce heap fragmentation issues
-- change syslog settings without reboot
-- HA-config split in smaller blocks
-- commands `fetch` and `publish [ha]` as call
-- mqtt json package sizes
-- renamed the command system info (which showed settings) to `settings`
-- renamed the command system report (Which dumped debug info) to `info`
-- Changing settings via web restarts only selected services
-- renamed pio targets (esp8266-ci and esp32-ci for GitHub CI)
-- telnet default settings `log info`, timeout 60 min
-- `log debug` not showing telegram names, use `log trace` or `watch on` to show the telegrams
-- optimized how console and web display device data (#632)
+## Changed
 
-### Removed
-- old shell and python build scripts
+## Removed

README.md

@@ -2,7 +2,7 @@
 
 **EMS-ESP** is an open-source firmware for the Espressif ESP8266 and ESP32 microcontroller that communicates with **EMS** (Energy Management System) based equipment from manufacturers like Bosch, Buderus, Nefit, Junkers, Worcester and Sieger.
 
-This is the firmware for the ESP8266.
+This is the firmware for the ESP8266, known as version 2. We've since moved to the ESP32 platform with v3 which opens up many more possibilities for additional features. Make sure you check out https://github.com/emsesp/EMS-ESP32. Version 2 will be restricted to only maintaince releases.
 
 [![version](https://img.shields.io/github/release/emsesp/EMS-ESP.svg?label=Latest%20Release)](https://github.com/emsesp/EMS-ESP/blob/main/CHANGELOG.md)
 [![release-date](https://img.shields.io/github/release-date/emsesp/EMS-ESP.svg?label=Released)](https://github.com/emsesp/EMS-ESP/commits/main)

interface/package.json

@@ -6,7 +6,7 @@
     "@material-ui/core": "^4.11.3",
     "@material-ui/icons": "^4.11.2",
     "@types/lodash": "^4.14.168",
-    "@types/node": "^12.20.6",
+    "@types/node": "^12.20.8",
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.2",
     "@types/react-material-ui-form-validator": "^2.1.0",

lib/uuid-syslog/src/syslog.cpp

@@ -387,15 +387,19 @@ bool SyslogService::can_transmit() {
 }
 
 bool SyslogService::transmit(const QueuedLogMessage & message) {
-    /*
     // modifications by Proddy. From https://github.com/emsesp/EMS-ESP/issues/395#issuecomment-640053528
+    // also see https://github.com/emsesp/EMS-ESP/issues/758
     struct tm tm;
+    int8_t    tz = 0;
 
     tm.tm_year = 0;
     if (message.time_.tv_sec != (time_t)-1) {
-        gmtime_r(&message.time_.tv_sec, &tm);
+        struct tm utc;
+        gmtime_r(&message.time_.tv_sec, &utc);
+        localtime_r(&message.time_.tv_sec, &tm);
+        tz = tm.tm_hour - utc.tm_hour;
+        tz = tz > 12 ? tz - 24 : tz < -12 ? tz + 24 : tz;
     }
-    */
 
     if (udp_.beginPacket(host_, port_) != 1) {
         last_transmit_ = uuid::get_uptime_ms();
@@ -404,29 +408,25 @@ bool SyslogService::transmit(const QueuedLogMessage & message) {
 
     udp_.printf_P(PSTR("<%u>1 "), ((unsigned int)message.content_->facility * 8) + std::min(7U, (unsigned int)message.content_->level));
 
-    /*
     if (tm.tm_year != 0) {
-        udp_.printf_P(PSTR("%04u-%02u-%02uT%02u:%02u:%02u.%06luZ"),
+        udp_.printf_P(PSTR("%04u-%02u-%02uT%02u:%02u:%02u.%06lu%+02d:00"),
                       tm.tm_year + 1900,
                       tm.tm_mon + 1,
                       tm.tm_mday,
                       tm.tm_hour,
                       tm.tm_min,
                       tm.tm_sec,
-                      (unsigned long)message.time_.tv_usec);
+                      (unsigned long)message.time_.tv_usec,
+                      tz);
     } else {
         udp_.print('-');
     }
-    */
 
-    udp_.print('-');
-    udp_.printf_P(PSTR(" %s - - - - \xEF\xBB\xBF"), hostname_.c_str());
+    udp_.printf_P(PSTR(" %s %s - - - \xEF\xBB\xBF"), hostname_.c_str(), uuid::read_flash_string(message.content_->name).c_str());
+
     udp_.print(uuid::log::format_timestamp_ms(message.content_->uptime_ms, 3).c_str());
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat"
-    udp_.printf_P(PSTR(" %c %lu: [%S] "), uuid::log::format_level_char(message.content_->level), message.id_, message.content_->name);
-#pragma GCC diagnostic pop
+    udp_.printf_P(PSTR(" %c %lu: "), uuid::log::format_level_char(message.content_->level), message.id_);
     udp_.print(message.content_->text.c_str());
     bool ok = (udp_.endPacket() == 1);
 

src/device_library.h

@@ -25,17 +25,17 @@
 
 // Boilers - 0x08
 { 64, DeviceType::BOILER, F("BK13/BK15/Smartline/GB1x2"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
-{ 72, DeviceType::BOILER, F("GB125/MC10"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
+{ 72, DeviceType::BOILER, F("GB125/MC10"), DeviceFlags::EMS_DEVICE_FLAG_EMS},
 { 84, DeviceType::BOILER, F("Logamax Plus GB022"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
-{ 95, DeviceType::BOILER, F("Condens 2500/Logamax/Logomatic/Cerapur Top/Greenstar/Generic HT3"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
+{ 95, DeviceType::BOILER, F("Condens 2500/Logamax/Logomatic/Cerapur Top/Greenstar/Generic HT3"), DeviceFlags::EMS_DEVICE_FLAG_HT3},
 {115, DeviceType::BOILER, F("Topline/GB162"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {122, DeviceType::BOILER, F("Proline"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {123, DeviceType::BOILER, F("GBx72/Trendline/Cerapur/Greenstar Si/27i"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {131, DeviceType::BOILER, F("GB212"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {133, DeviceType::BOILER, F("GB125/Logamatic MC110"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {167, DeviceType::BOILER, F("Cerapur Aero"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {170, DeviceType::BOILER, F("Logano GB212"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
-{172, DeviceType::BOILER, F("Enviline/Compress 6000AW/Hybrid 7000iAW"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
+{172, DeviceType::BOILER, F("Enviline/Compress 6000AW/Hybrid 7000iAW"), DeviceFlags::EMS_DEVICE_FLAG_HEATPUMP},
 {195, DeviceType::BOILER, F("Condens 5000i/Greenstar 8000"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {203, DeviceType::BOILER, F("Logamax U122/Cerapur"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {208, DeviceType::BOILER, F("Logamax Plus/GB192/Condens GC9000"), DeviceFlags::EMS_DEVICE_FLAG_NONE},
@@ -80,6 +80,7 @@
 {157, DeviceType::THERMOSTAT, F("RC200/CW100"), DeviceFlags::EMS_DEVICE_FLAG_RC100}, // 0x18
 {158, DeviceType::THERMOSTAT, F("RC300/RC310/Moduline 3000/1010H/CW400/Sense II"), DeviceFlags::EMS_DEVICE_FLAG_RC300}, // 0x10
 {165, DeviceType::THERMOSTAT, F("RC100/Moduline 1000/1010"), DeviceFlags::EMS_DEVICE_FLAG_RC100}, // 0x18, 0x38
+{216, DeviceType::THERMOSTAT, F("CRF200S"), DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
 
 // Thermostat - Sieger - 0x10 / 0x17
 { 66, DeviceType::THERMOSTAT, F("ES72/RC20"), DeviceFlags::EMS_DEVICE_FLAG_RC20_2}, // 0x17 or remote