mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-06 15:59:52 +03:00
Merge remote-tracking branch 'origin/dev' into main
This commit is contained in:
3
.github/workflows/pre_release.yml
vendored
3
.github/workflows/pre_release.yml
vendored
@@ -56,5 +56,6 @@ jobs:
|
|||||||
automatic_release_tag: "latest"
|
automatic_release_tag: "latest"
|
||||||
prerelease: true
|
prerelease: true
|
||||||
files: |
|
files: |
|
||||||
CHANGELOG_DEV.md
|
CHANGELOG_LATEST.md
|
||||||
./build/firmware/*.*
|
./build/firmware/*.*
|
||||||
|
|
||||||
|
|||||||
64
CHANGELOG.md
64
CHANGELOG.md
@@ -44,7 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- renamed pio targets (esp8266-ci and esp32-ci for GitHub CI)
|
- renamed pio targets (esp8266-ci and esp32-ci for GitHub CI)
|
||||||
- telnet default settings `log info`, timeout 60 min
|
- telnet default settings `log info`, timeout 60 min
|
||||||
- `log debug` not showing telegram names, use `log trace` or `watch on` to show the telegrams
|
- `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](https://github.com/proddy/EMS-ESP/issues/632))
|
- optimized how console and web display device data ([#632](https://github.com/emsesp/EMS-ESP/issues/632))
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
- old shell and python build scripts
|
- old shell and python build scripts
|
||||||
@@ -154,7 +154,7 @@ See README.me for more details.
|
|||||||
- Support writing to Junkers FR100 thermostats
|
- Support writing to Junkers FR100 thermostats
|
||||||
- Support writing to RC100, Moduline 1000/1010 thermostats
|
- Support writing to RC100, Moduline 1000/1010 thermostats
|
||||||
- MM10 Mixing module support (thanks @MichaelDvP)
|
- MM10 Mixing module support (thanks @MichaelDvP)
|
||||||
- MM200 warm water circuits (https://github.com/proddy/EMS-ESP/pull/315)
|
- MM200 warm water circuits (https://github.com/emsesp/EMS-ESP/pull/315)
|
||||||
- Support for Moduline 200 and Sieger ES72 thermostats
|
- Support for Moduline 200 and Sieger ES72 thermostats
|
||||||
- First implementation of writing to generic Junker Thermostats (thanks @Neonox31)
|
- First implementation of writing to generic Junker Thermostats (thanks @Neonox31)
|
||||||
- Added model type (Buderus, Sieger, Junkers, Nefit, Bosch, Worcester) to device names
|
- Added model type (Buderus, Sieger, Junkers, Nefit, Bosch, Worcester) to device names
|
||||||
@@ -166,7 +166,7 @@ See README.me for more details.
|
|||||||
- Added features to WW messages (0x33, 0x34) to improve WW monitoring. (PR#338 by @ypaindaveine)
|
- Added features to WW messages (0x33, 0x34) to improve WW monitoring. (PR#338 by @ypaindaveine)
|
||||||
- Added mixing log and stub for EMS type 0xAC (PR#338 by @ypaindaveine)
|
- Added mixing log and stub for EMS type 0xAC (PR#338 by @ypaindaveine)
|
||||||
- Added Thermostat retrieving settings (0xA5) (validated on RC30N) with MQTT support (thanks Yves @ypaindaveine. See #352)
|
- Added Thermostat retrieving settings (0xA5) (validated on RC30N) with MQTT support (thanks Yves @ypaindaveine. See #352)
|
||||||
- Merged with PR https://github.com/proddy/EMS-ESP/pull/366 from @MichaelDvP fixing RC20 and MM50
|
- Merged with PR https://github.com/emsesp/EMS-ESP/pull/366 from @MichaelDvP fixing RC20 and MM50
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- set boiler warm water temp on Junkers/Bosch HT3
|
- set boiler warm water temp on Junkers/Bosch HT3
|
||||||
@@ -193,7 +193,7 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Added `publish_always` forcing MQTT topics to be always sent regardless if the data hasn't changed
|
- Added `publish_always` forcing MQTT topics to be always sent regardless if the data hasn't changed
|
||||||
- Support for DHW once (OneTime water) heating command via MQTT [issue 195](https://github.com/proddy/EMS-ESP/issues/195)
|
- Support for DHW once (OneTime water) heating command via MQTT [issue 195](https://github.com/emsesp/EMS-ESP/issues/195)
|
||||||
- Added scripts to automatically build firmware images on every Commit/Pull and nightly builds using TravisCI
|
- Added scripts to automatically build firmware images on every Commit/Pull and nightly builds using TravisCI
|
||||||
- Added option to WebUI to also download the latest development build
|
- Added option to WebUI to also download the latest development build
|
||||||
- Added build scripts for automated CI with TravisCI
|
- Added build scripts for automated CI with TravisCI
|
||||||
@@ -267,7 +267,7 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
- External dallas sensor values sent in MQTT payload as float values and not strings
|
- External dallas sensor values sent in MQTT payload as float values and not strings
|
||||||
- All MQTT topics for the Thermostat have the Heating Circuit appended (e.g. `thermostat_data1`). This includes the commands.
|
- All MQTT topics for the Thermostat have the Heating Circuit appended (e.g. `thermostat_data1`). This includes the commands.
|
||||||
- Shower timer and shower alert and not MQTT published at boot up
|
- Shower timer and shower alert and not MQTT published at boot up
|
||||||
- Heating Active logic change to use Selected Flow Temp of min 30 instead of 70 (https://github.com/proddy/EMS-ESP/issues/193)
|
- Heating Active logic change to use Selected Flow Temp of min 30 instead of 70 (https://github.com/emsesp/EMS-ESP/issues/193)
|
||||||
- Cleaned up Telnet messages during bootup to only show key information.
|
- Cleaned up Telnet messages during bootup to only show key information.
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
@@ -278,7 +278,7 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Support for multiple Heating Circuits - https://github.com/proddy/EMS-ESP/issues/162
|
- Support for multiple Heating Circuits - https://github.com/emsesp/EMS-ESP/issues/162
|
||||||
- new `mqttlog` command also shows which MQTT topics it is subscribed too
|
- new `mqttlog` command also shows which MQTT topics it is subscribed too
|
||||||
- Optimized event log loading in web and added integrity checks on all config and log files during boot
|
- Optimized event log loading in web and added integrity checks on all config and log files during boot
|
||||||
- `autodetect quick` for detecting known devices from our database list
|
- `autodetect quick` for detecting known devices from our database list
|
||||||
@@ -286,7 +286,7 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- fixed zero values (0.0) for setpoint temperature with the RC35 thermostat when in Auto mode - https://github.com/proddy/EMS-ESP/issues/180
|
- fixed zero values (0.0) for setpoint temperature with the RC35 thermostat when in Auto mode - https://github.com/emsesp/EMS-ESP/issues/180
|
||||||
- added check for corrupted event log, which could happen due to SPIFFS writing while UART is active
|
- added check for corrupted event log, which could happen due to SPIFFS writing while UART is active
|
||||||
- made Junkers work again (broke in 1.9.0)
|
- made Junkers work again (broke in 1.9.0)
|
||||||
|
|
||||||
@@ -370,13 +370,13 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
- EMS+ core support (thanks too @gl3nni3 for doing the first research)
|
- EMS+ core support (thanks too @gl3nni3 for doing the first research)
|
||||||
- MQTT 'restart' topic to reboot ESP (thanks @balk77)
|
- MQTT 'restart' topic to reboot ESP (thanks @balk77)
|
||||||
- Support for multiple thermostat heating circuits like the HC1/HC2 on a RC35, also via MQTT (thanks @lobocobra)
|
- Support for multiple thermostat heating circuits like the HC1/HC2 on a RC35, also via MQTT (thanks @lobocobra)
|
||||||
- `boiler flowtemp` command to set the flow temperature [(issue 59)](https://github.com/proddy/EMS-ESP/issues/59)
|
- `boiler flowtemp` command to set the flow temperature [(issue 59)](https://github.com/emsesp/EMS-ESP/issues/59)
|
||||||
- added a test harness to try out response to various telegrams (test command)
|
- added a test harness to try out response to various telegrams (test command)
|
||||||
- `tx_delay` setting for circuits where we needed to slow down Tx transmission
|
- `tx_delay` setting for circuits where we needed to slow down Tx transmission
|
||||||
- new boiler: Nefit proline hrc 24 cw4 thermostat and Nefit Enviline heatpump
|
- new boiler: Nefit proline hrc 24 cw4 thermostat and Nefit Enviline heatpump
|
||||||
- new boiler: Buderus Logamax plus
|
- new boiler: Buderus Logamax plus
|
||||||
- new thermostat: Buderus RC300 and RC310 thermostats, read-only [(issue 37)](https://github.com/proddy/EMS-ESP/issues/37)
|
- new thermostat: Buderus RC300 and RC310 thermostats, read-only [(issue 37)](https://github.com/emsesp/EMS-ESP/issues/37)
|
||||||
- new thermostat: Junkers FR10, read-only [(issue 98)](https://github.com/proddy/EMS-ESP/issues/98)
|
- new thermostat: Junkers FR10, read-only [(issue 98)](https://github.com/emsesp/EMS-ESP/issues/98)
|
||||||
- new devices: Buderus Web Gateway KM200, Buderus Solar Module SM100
|
- new devices: Buderus Web Gateway KM200, Buderus Solar Module SM100
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
@@ -393,9 +393,9 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
- `crash` command to see stack of last system crash, with .py files to track stack dump (compile with `-DCRASH`)
|
- `crash` command to see stack of last system crash, with .py files to track stack dump (compile with `-DCRASH`)
|
||||||
- publish dallas external temp sensors to MQTT (thanks @JewelZB)
|
- publish dallas external temp sensors to MQTT (thanks @JewelZB)
|
||||||
- shower timer and shower alert options available via set commands
|
- shower timer and shower alert options available via set commands
|
||||||
- added support for warm water modes Hot, Comfort and Intelligent [(issue 67)](https://github.com/proddy/EMS-ESP/issues/67)
|
- added support for warm water modes Hot, Comfort and Intelligent [(issue 67)](https://github.com/emsesp/EMS-ESP/issues/67)
|
||||||
- added `set publish_time` to set how often to force a publish of MQTT
|
- added `set publish_time` to set how often to force a publish of MQTT
|
||||||
- support for SM10 Solar Module including MQTT [(issue 77)](https://github.com/proddy/EMS-ESP/issues/77)
|
- support for SM10 Solar Module including MQTT [(issue 77)](https://github.com/emsesp/EMS-ESP/issues/77)
|
||||||
- `refresh` command to force a fetch of all known data from the connected EMS devices
|
- `refresh` command to force a fetch of all known data from the connected EMS devices
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
@@ -412,7 +412,7 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
- `test_mode` renamed to `silent_mode`
|
- `test_mode` renamed to `silent_mode`
|
||||||
- `set wifi` replaced with `set wifi_ssid` and `set wifi_password` to allow values with spaces
|
- `set wifi` replaced with `set wifi_ssid` and `set wifi_password` to allow values with spaces
|
||||||
- EMS values are stored in the raw format and only converted to strings when displayed or published, removing the need for parsing floats
|
- EMS values are stored in the raw format and only converted to strings when displayed or published, removing the need for parsing floats
|
||||||
- All floating point temperatures are to one decimal place [(issue 79)](https://github.com/proddy/EMS-ESP/issues/79)
|
- All floating point temperatures are to one decimal place [(issue 79)](https://github.com/emsesp/EMS-ESP/issues/79)
|
||||||
|
|
||||||
## [1.5.6] 2019-03-09
|
## [1.5.6] 2019-03-09
|
||||||
|
|
||||||
@@ -462,7 +462,7 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Improved MQTT LWT (Last Will Testament). Uses payload called 'online' and 'offline'. See https://github.com/proddy/EMS-ESP/issues/57
|
- Improved MQTT LWT (Last Will Testament). Uses payload called 'online' and 'offline'. See https://github.com/emsesp/EMS-ESP/issues/57
|
||||||
- Added ESP32 support to MyESP library
|
- Added ESP32 support to MyESP library
|
||||||
- Added Bosch Easy thermostat, Buderus Logamax U122
|
- Added Bosch Easy thermostat, Buderus Logamax U122
|
||||||
- Support for changing boiler wwtemp via MQTT (merge #58 from egrekov). thanks!
|
- Support for changing boiler wwtemp via MQTT (merge #58 from egrekov). thanks!
|
||||||
@@ -479,7 +479,7 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Added incoming MQTT "TOPIC_BOILER_WWACTIVATED" to set the warm water on/off. Payload is 1 or 0. See [issue](https://github.com/proddy/EMS-ESP/issues/46#issuecomment-460375689).
|
- Added incoming MQTT "TOPIC_BOILER_WWACTIVATED" to set the warm water on/off. Payload is 1 or 0. See [issue](https://github.com/emsesp/EMS-ESP/issues/46#issuecomment-460375689).
|
||||||
- Added the list of all MQTT topics to the README file
|
- Added the list of all MQTT topics to the README file
|
||||||
|
|
||||||
## [1.5.1] 2019-02-03
|
## [1.5.1] 2019-02-03
|
||||||
@@ -541,7 +541,7 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Handle thermostats that don't have builtin temperature sensors when showing current temperature (https://github.com/proddy/EMS-ESP/issues/18#issuecomment-451012963)
|
- Handle thermostats that don't have builtin temperature sensors when showing current temperature (https://github.com/emsesp/EMS-ESP/issues/18#issuecomment-451012963)
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
@@ -572,14 +572,14 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
### Added
|
### Added
|
||||||
|
|
||||||
- MQTT keep alive, last will testament and other settings all configurable in my_config.h
|
- MQTT keep alive, last will testament and other settings all configurable in my_config.h
|
||||||
- RC35: MQTT day/night/auto mode; sets setpoint temperature in type 0x3D depends on current night/day Mode (@SpaceTeddy) [#33](https://github.com/proddy/EMS-ESP/pull/33)
|
- RC35: MQTT day/night/auto mode; sets setpoint temperature in type 0x3D depends on current night/day Mode (@SpaceTeddy) [#33](https://github.com/emsesp/EMS-ESP/pull/33)
|
||||||
|
|
||||||
## [1.3.0] 2019-01-09
|
## [1.3.0] 2019-01-09
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- Renamed project from EMS-ESP-Boiler to EMS-ESP since it's kinda EMS generic now
|
- Renamed project from EMS-ESP-Boiler to EMS-ESP since it's kinda EMS generic now
|
||||||
- Support for RC20RF and RFM20 (https://github.com/proddy/EMS-ESP/issues/18)
|
- Support for RC20RF and RFM20 (https://github.com/emsesp/EMS-ESP/issues/18)
|
||||||
- Moved all EMS device information into a separate file `ems_devices.h` so no longer need to touch `ems.h`
|
- Moved all EMS device information into a separate file `ems_devices.h` so no longer need to touch `ems.h`
|
||||||
- Telnet commands can be strings now and output is suspended when typing
|
- Telnet commands can be strings now and output is suspended when typing
|
||||||
|
|
||||||
@@ -598,9 +598,9 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
- Scanning known EMS Devices now ignores duplicates (https://github.com/proddy/EMS-ESP/pull/30)
|
- Scanning known EMS Devices now ignores duplicates (https://github.com/emsesp/EMS-ESP/pull/30)
|
||||||
- ServiceCode stored as a two byte char
|
- ServiceCode stored as a two byte char
|
||||||
- Support for RC20RF and RFM20 (https://github.com/proddy/EMS-ESP/issues/18)
|
- Support for RC20RF and RFM20 (https://github.com/emsesp/EMS-ESP/issues/18)
|
||||||
|
|
||||||
## [1.2.3] 2019-01-03
|
## [1.2.3] 2019-01-03
|
||||||
|
|
||||||
@@ -608,23 +608,23 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
|
|
||||||
- Can now hardcode Boiler and Thermostat types in my_config.h to bypass auto-detection
|
- Can now hardcode Boiler and Thermostat types in my_config.h to bypass auto-detection
|
||||||
- Fixed MQTT subscribing to Heating and Hot Water active topics
|
- Fixed MQTT subscribing to Heating and Hot Water active topics
|
||||||
- Fixed for listening to incoming MQTT topics (https://github.com/proddy/EMS-ESP/issues/27)
|
- Fixed for listening to incoming MQTT topics (https://github.com/emsesp/EMS-ESP/issues/27)
|
||||||
- Fixed handling of current temperature on an RC35-type thermostat that doesn't have a sensor (https://github.com/proddy/EMS-ESP/issues/18)
|
- Fixed handling of current temperature on an RC35-type thermostat that doesn't have a sensor (https://github.com/emsesp/EMS-ESP/issues/18)
|
||||||
|
|
||||||
## [1.2.2] 2019-01-02
|
## [1.2.2] 2019-01-02
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Issues in 1.2.1 (see https://github.com/proddy/EMS-ESP/issues/25)
|
- Issues in 1.2.1 (see https://github.com/emsesp/EMS-ESP/issues/25)
|
||||||
- Logic for determining if there is activity on the EMS bus and using the onboard LEDs properly
|
- Logic for determining if there is activity on the EMS bus and using the onboard LEDs properly
|
||||||
|
|
||||||
## [1.2.1] 2019-01-02
|
## [1.2.1] 2019-01-02
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- Only process broadcast messages if the offset (byte 4) is 0. (https://github.com/proddy/EMS-ESP/issues/23)
|
- Only process broadcast messages if the offset (byte 4) is 0. (https://github.com/emsesp/EMS-ESP/issues/23)
|
||||||
- Improved checking for duplicate sent Tx telegrams by comparing CRCs
|
- Improved checking for duplicate sent Tx telegrams by comparing CRCs
|
||||||
- Removed distinguishing between noise on the line and corrupt telegrams (https://github.com/proddy/EMS-ESP/issues/24)
|
- Removed distinguishing between noise on the line and corrupt telegrams (https://github.com/emsesp/EMS-ESP/issues/24)
|
||||||
|
|
||||||
## [1.2.0] 2019-01-01
|
## [1.2.0] 2019-01-01
|
||||||
|
|
||||||
@@ -644,7 +644,7 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
- Fetch UBATotalUptimeMessage from Boiler to get total working minutes
|
- Fetch UBATotalUptimeMessage from Boiler to get total working minutes
|
||||||
- Added check to see if bus is connected. Shown in stats page
|
- Added check to see if bus is connected. Shown in stats page
|
||||||
- If no Wifi connection can be made, start up as a WiFi Access Point (AP)
|
- If no Wifi connection can be made, start up as a WiFi Access Point (AP)
|
||||||
- Report out service codes and water-flow [pull-request](https://github.com/proddy/EMS-ESP/pull/20/files). Thanks @Bonusbartus
|
- Report out service codes and water-flow [pull-request](https://github.com/emsesp/EMS-ESP/pull/20/files). Thanks @Bonusbartus
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
@@ -673,16 +673,16 @@ There are breaking changes in this release. See `publish_time` below and make su
|
|||||||
|
|
||||||
- Fixed handling of negative floating point values (like outdoor temp)
|
- Fixed handling of negative floating point values (like outdoor temp)
|
||||||
- Fixed handling of auto & manual mode on an RC30
|
- Fixed handling of auto & manual mode on an RC30
|
||||||
- [Fixed condition where all telegram types were processed, instead of only broadcasts or our own reads](https://github.com/proddy/EMS-ESP/issues/15)
|
- [Fixed condition where all telegram types were processed, instead of only broadcasts or our own reads](https://github.com/emsesp/EMS-ESP/issues/15)
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Created this CHANGELOG.md file!
|
- Created this CHANGELOG.md file!
|
||||||
- [Added support for the Nefit Easy thermostat, reading of temperature values only](https://github.com/proddy/EMS-ESP/issues/9) - note *read only* (big thanks @**kroon040** for lending me an Easy device)
|
- [Added support for the Nefit Easy thermostat, reading of temperature values only](https://github.com/emsesp/EMS-ESP/issues/9) - note *read only* (big thanks @**kroon040** for lending me an Easy device)
|
||||||
- [Added support for RC35/Moduline 400](https://github.com/proddy/EMS-ESP/issues/14) - *read only*
|
- [Added support for RC35/Moduline 400](https://github.com/emsesp/EMS-ESP/issues/14) - *read only*
|
||||||
- [New raw logging mode for logging](https://github.com/proddy/EMS-ESP/issues/11)
|
- [New raw logging mode for logging](https://github.com/emsesp/EMS-ESP/issues/11)
|
||||||
- [New 'r'command to send raw data to EMS](https://github.com/proddy/EMS-ESP/issues/11)
|
- [New 'r'command to send raw data to EMS](https://github.com/emsesp/EMS-ESP/issues/11)
|
||||||
- [Added MQTT messages for hot water on and heating on](https://github.com/proddy/EMS-ESP/issues/10)
|
- [Added MQTT messages for hot water on and heating on](https://github.com/emsesp/EMS-ESP/issues/10)
|
||||||
- Implemented FIFO circular buffer queue for up to 20 Tx messages (Q command to show queue)
|
- Implemented FIFO circular buffer queue for up to 20 Tx messages (Q command to show queue)
|
||||||
- Toggle Tx transmission via telnet (use 'X' command)
|
- Toggle Tx transmission via telnet (use 'X' command)
|
||||||
- Show thermostat type in help stats (use 's' command)
|
- Show thermostat type in help stats (use 's' command)
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
- Updated to the latest ArduinoJson library
|
- Updated to the latest ArduinoJson library
|
||||||
- some names of mqtt-tags like in v2.2.1
|
- some names of mqtt-tags like in v2.2.1
|
||||||
- new ESP32 partition side to allow for smoother OTA and fallback
|
- new ESP32 partition side to allow for smoother OTA and fallback
|
||||||
- Network Gateway IP is optional ([#682](https://github.com/proddy/EMS-ESP/issues/682))
|
- Network Gateway IP is optional (#682)emsesp/EMS-ESP
|
||||||
|
- moved to a new GitHub repo https://github.com/emsesp/EMS-ESP32
|
||||||
### Removed
|
### Removed
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -388,7 +388,7 @@ bool SyslogService::can_transmit() {
|
|||||||
|
|
||||||
bool SyslogService::transmit(const QueuedLogMessage & message) {
|
bool SyslogService::transmit(const QueuedLogMessage & message) {
|
||||||
/*
|
/*
|
||||||
// modifications by Proddy. From https://github.com/proddy/EMS-ESP/issues/395#issuecomment-640053528
|
// modifications by Proddy. From https://github.com/emsesp/EMS-ESP/issues/395#issuecomment-640053528
|
||||||
struct tm tm;
|
struct tm tm;
|
||||||
|
|
||||||
tm.tm_year = 0;
|
tm.tm_year = 0;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -65,7 +65,7 @@ void EMSESPShell::display_banner() {
|
|||||||
println();
|
println();
|
||||||
printfln(F("┌──────────────────────────────────────┐"));
|
printfln(F("┌──────────────────────────────────────┐"));
|
||||||
printfln(F("│ %sEMS-ESP version %-10s%s │"), COLOR_BOLD_ON, EMSESP_APP_VERSION, COLOR_BOLD_OFF);
|
printfln(F("│ %sEMS-ESP version %-10s%s │"), COLOR_BOLD_ON, EMSESP_APP_VERSION, COLOR_BOLD_OFF);
|
||||||
printfln(F("│ %s%shttps://github.com/proddy/EMS-ESP%s │"), COLOR_BRIGHT_GREEN, COLOR_UNDERLINE, COLOR_RESET);
|
printfln(F("│ %s%shttps://github.com/emsesp/EMS-ESP%s │"), COLOR_BRIGHT_GREEN, COLOR_UNDERLINE, COLOR_RESET);
|
||||||
printfln(F("│ │"));
|
printfln(F("│ │"));
|
||||||
printfln(F("│ type %shelp%s to show available commands │"), COLOR_UNDERLINE, COLOR_RESET);
|
printfln(F("│ type %shelp%s to show available commands │"), COLOR_UNDERLINE, COLOR_RESET);
|
||||||
printfln(F("└──────────────────────────────────────┘"));
|
printfln(F("└──────────────────────────────────────┘"));
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -311,7 +311,7 @@ void Boiler::process_UBAMonitorFast(std::shared_ptr<const Telegram> telegram) {
|
|||||||
has_update(telegram->read_bitvalue(wWCirc_, 7, 7));
|
has_update(telegram->read_bitvalue(wWCirc_, 7, 7));
|
||||||
|
|
||||||
// warm water storage sensors (if present)
|
// warm water storage sensors (if present)
|
||||||
// wWStorageTemp2 is also used by some brands as the boiler temperature - see https://github.com/proddy/EMS-ESP/issues/206
|
// wWStorageTemp2 is also used by some brands as the boiler temperature - see https://github.com/emsesp/EMS-ESP/issues/206
|
||||||
has_update(telegram->read_value(wWStorageTemp1_, 9)); // 0x8300 if not available
|
has_update(telegram->read_value(wWStorageTemp1_, 9)); // 0x8300 if not available
|
||||||
has_update(telegram->read_value(wWStorageTemp2_, 11)); // 0x8000 if not available - this is boiler temp
|
has_update(telegram->read_value(wWStorageTemp2_, 11)); // 0x8000 if not available - this is boiler temp
|
||||||
|
|
||||||
@@ -580,7 +580,7 @@ void Boiler::process_UBAEnergySupplied(std::shared_ptr<const Telegram> telegram)
|
|||||||
|
|
||||||
// 0x2A - MC10Status
|
// 0x2A - MC10Status
|
||||||
// e.g. 88 00 2A 00 00 00 00 00 00 00 00 00 D2 00 00 80 00 00 01 08 80 00 02 47 00
|
// e.g. 88 00 2A 00 00 00 00 00 00 00 00 00 D2 00 00 80 00 00 01 08 80 00 02 47 00
|
||||||
// see https://github.com/proddy/EMS-ESP/issues/397
|
// see https://github.com/emsesp/EMS-ESP/issues/397
|
||||||
void Boiler::process_MC10Status(std::shared_ptr<const Telegram> telegram) {
|
void Boiler::process_MC10Status(std::shared_ptr<const Telegram> telegram) {
|
||||||
has_update(telegram->read_value(mixerTemp_, 14));
|
has_update(telegram->read_value(mixerTemp_, 14));
|
||||||
has_update(telegram->read_value(tankMiddleTemp_, 18));
|
has_update(telegram->read_value(tankMiddleTemp_, 18));
|
||||||
@@ -967,7 +967,7 @@ bool Boiler::set_warmwater_activated(const char * value, const int8_t id) {
|
|||||||
|
|
||||||
LOG_INFO(F("Setting boiler warm water active %s"), v ? "on" : "off");
|
LOG_INFO(F("Setting boiler warm water active %s"), v ? "on" : "off");
|
||||||
|
|
||||||
// https://github.com/proddy/EMS-ESP/issues/268
|
// https://github.com/emsesp/EMS-ESP/issues/268
|
||||||
uint8_t n;
|
uint8_t n;
|
||||||
if (EMSbus::is_ht3()) {
|
if (EMSbus::is_ht3()) {
|
||||||
n = (v ? 0x08 : 0x00); // 0x08 is on, 0x00 is off
|
n = (v ? 0x08 : 0x00); // 0x08 is on, 0x00 is off
|
||||||
@@ -1020,7 +1020,7 @@ bool Boiler::set_tapwarmwater_activated(const char * value, const int8_t id) {
|
|||||||
|
|
||||||
// Activate / De-activate One Time warm water 0x35
|
// Activate / De-activate One Time warm water 0x35
|
||||||
// true = on, false = off
|
// true = on, false = off
|
||||||
// See also https://github.com/proddy/EMS-ESP/issues/341#issuecomment-596245458 for Junkers
|
// See also https://github.com/emsesp/EMS-ESP/issues/341#issuecomment-596245458 for Junkers
|
||||||
bool Boiler::set_warmwater_onetime(const char * value, const int8_t id) {
|
bool Boiler::set_warmwater_onetime(const char * value, const int8_t id) {
|
||||||
bool v = false;
|
bool v = false;
|
||||||
if (!Helpers::value2bool(value, v)) {
|
if (!Helpers::value2bool(value, v)) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -158,11 +158,11 @@ void Mixer::process_IPMStatusMessage(std::shared_ptr<const Telegram> telegram) {
|
|||||||
|
|
||||||
// Mixer on a MM10 - 0xAB
|
// Mixer on a MM10 - 0xAB
|
||||||
// e.g. Mixer Module -> All, type 0xAB, telegram: 21 00 AB 00 2D 01 BE 64 04 01 00 (CRC=15) #data=7
|
// e.g. Mixer Module -> All, type 0xAB, telegram: 21 00 AB 00 2D 01 BE 64 04 01 00 (CRC=15) #data=7
|
||||||
// see also https://github.com/proddy/EMS-ESP/issues/386
|
// see also https://github.com/emsesp/EMS-ESP/issues/386
|
||||||
void Mixer::process_MMStatusMessage(std::shared_ptr<const Telegram> telegram) {
|
void Mixer::process_MMStatusMessage(std::shared_ptr<const Telegram> telegram) {
|
||||||
// the heating circuit is determine by which device_id it is, 0x20 - 0x23
|
// the heating circuit is determine by which device_id it is, 0x20 - 0x23
|
||||||
// 0x21 is position 2. 0x20 is typically reserved for the WM10 switch module
|
// 0x21 is position 2. 0x20 is typically reserved for the WM10 switch module
|
||||||
// see https://github.com/proddy/EMS-ESP/issues/270 and https://github.com/proddy/EMS-ESP/issues/386#issuecomment-629610918
|
// see https://github.com/emsesp/EMS-ESP/issues/270 and https://github.com/emsesp/EMS-ESP/issues/386#issuecomment-629610918
|
||||||
|
|
||||||
has_update(telegram->read_value(flowTempHc_, 1)); // is * 10
|
has_update(telegram->read_value(flowTempHc_, 1)); // is * 10
|
||||||
has_update(telegram->read_bitvalue(pumpStatus_, 3, 2)); // is 0 or 0x64 (100%), check only bit 2
|
has_update(telegram->read_bitvalue(pumpStatus_, 3, 2)); // is 0 or 0x64 (100%), check only bit 2
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -36,7 +36,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
|
|||||||
|
|
||||||
// if we're on auto mode, register this thermostat if it has a device id of 0x10, 0x17 or 0x18
|
// if we're on auto mode, register this thermostat if it has a device id of 0x10, 0x17 or 0x18
|
||||||
// or if its the master thermostat we defined
|
// or if its the master thermostat we defined
|
||||||
// see https://github.com/proddy/EMS-ESP/issues/362#issuecomment-629628161
|
// see https://github.com/emsesp/EMS-ESP/issues/362#issuecomment-629628161
|
||||||
if ((master_thermostat == device_id)
|
if ((master_thermostat == device_id)
|
||||||
|| ((master_thermostat == EMSESP_DEFAULT_MASTER_THERMOSTAT) && (device_id < 0x19) && ((actual_master_thermostat == EMSESP_DEFAULT_MASTER_THERMOSTAT) || (device_id < actual_master_thermostat)))) {
|
|| ((master_thermostat == EMSESP_DEFAULT_MASTER_THERMOSTAT) && (device_id < 0x19) && ((actual_master_thermostat == EMSESP_DEFAULT_MASTER_THERMOSTAT) || (device_id < actual_master_thermostat)))) {
|
||||||
EMSESP::actual_master_thermostat(device_id);
|
EMSESP::actual_master_thermostat(device_id);
|
||||||
@@ -177,7 +177,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
|
|||||||
|
|
||||||
// HA will report an error in the climate component if it doesn't have the setpoint temp, current temperatures and the mode (e.g. auto)
|
// HA will report an error in the climate component if it doesn't have the setpoint temp, current temperatures and the mode (e.g. auto)
|
||||||
// The mode always comes later (1 minute) so we force a read request to suppress HA errors.
|
// The mode always comes later (1 minute) so we force a read request to suppress HA errors.
|
||||||
// https://github.com/proddy/EMS-ESP/commit/9d5bd11d268a61bbba8dcabacdb96db48b8829ac#commitcomment-48028642
|
// https://github.com/emsesp/EMS-ESP/commit/9d5bd11d268a61bbba8dcabacdb96db48b8829ac#commitcomment-48028642
|
||||||
for (uint8_t i = 0; i < set_typeids.size(); i++) {
|
for (uint8_t i = 0; i < set_typeids.size(); i++) {
|
||||||
EMSESP::send_read_request(set_typeids[i], device_id);
|
EMSESP::send_read_request(set_typeids[i], device_id);
|
||||||
}
|
}
|
||||||
@@ -618,7 +618,7 @@ void Thermostat::process_RC20Monitor_2(std::shared_ptr<const Telegram> telegram)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 0xAD - for reading the mode from the RC20/ES72 thermostat (0x17)
|
// 0xAD - for reading the mode from the RC20/ES72 thermostat (0x17)
|
||||||
// see https://github.com/proddy/EMS-ESP/issues/334#issuecomment-611698259
|
// see https://github.com/emsesp/EMS-ESP/issues/334#issuecomment-611698259
|
||||||
// offset: 01-nighttemp, 02-daytemp, 03-mode, 0B-program(1-9), 0D-setpoint_roomtemp(temporary)
|
// offset: 01-nighttemp, 02-daytemp, 03-mode, 0B-program(1-9), 0D-setpoint_roomtemp(temporary)
|
||||||
void Thermostat::process_RC20Set_2(std::shared_ptr<const Telegram> telegram) {
|
void Thermostat::process_RC20Set_2(std::shared_ptr<const Telegram> telegram) {
|
||||||
std::shared_ptr<Thermostat::HeatingCircuit> hc = heating_circuit(telegram);
|
std::shared_ptr<Thermostat::HeatingCircuit> hc = heating_circuit(telegram);
|
||||||
@@ -765,7 +765,7 @@ void Thermostat::process_RC300Monitor(std::shared_ptr<const Telegram> telegram)
|
|||||||
// if manual, take the current setpoint temp at pos 6
|
// if manual, take the current setpoint temp at pos 6
|
||||||
// if auto, take the next setpoint temp at pos 7
|
// if auto, take the next setpoint temp at pos 7
|
||||||
// pos 3 is the current target temp and sometimes can be 0
|
// pos 3 is the current target temp and sometimes can be 0
|
||||||
// see https://github.com/proddy/EMS-ESP/issues/256#issuecomment-585171426
|
// see https://github.com/emsesp/EMS-ESP/issues/256#issuecomment-585171426
|
||||||
// pos 3 actual setpoint (optimized), i.e. changes with temporary change, summer/holiday-modes
|
// pos 3 actual setpoint (optimized), i.e. changes with temporary change, summer/holiday-modes
|
||||||
// pos 6 actual setpoint according to programmed changes eco/comfort
|
// pos 6 actual setpoint according to programmed changes eco/comfort
|
||||||
// pos 7 next setpoint in the future, time to next setpoint in pos 8/9
|
// pos 7 next setpoint in the future, time to next setpoint in pos 8/9
|
||||||
@@ -909,7 +909,7 @@ void Thermostat::process_RC30Set(std::shared_ptr<const Telegram> telegram) {
|
|||||||
void Thermostat::process_RC35Monitor(std::shared_ptr<const Telegram> telegram) {
|
void Thermostat::process_RC35Monitor(std::shared_ptr<const Telegram> telegram) {
|
||||||
// exit if the 15th byte (second from last) is 0x00, which I think is calculated flow setpoint temperature
|
// exit if the 15th byte (second from last) is 0x00, which I think is calculated flow setpoint temperature
|
||||||
// with weather controlled RC35s this value is >=5, otherwise can be zero and our setpoint temps will be incorrect
|
// with weather controlled RC35s this value is >=5, otherwise can be zero and our setpoint temps will be incorrect
|
||||||
// see https://github.com/proddy/EMS-ESP/issues/373#issuecomment-627907301
|
// see https://github.com/emsesp/EMS-ESP/issues/373#issuecomment-627907301
|
||||||
if (telegram->offset > 0 || telegram->message_length < 15) {
|
if (telegram->offset > 0 || telegram->message_length < 15) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1816,7 +1816,7 @@ bool Thermostat::set_temperature(const float temperature, const uint8_t mode, co
|
|||||||
} else if (mode_ == HeatingCircuit::Mode::DAY) {
|
} else if (mode_ == HeatingCircuit::Mode::DAY) {
|
||||||
offset = EMS_OFFSET_RC35Set_temp_day;
|
offset = EMS_OFFSET_RC35Set_temp_day;
|
||||||
} else {
|
} else {
|
||||||
offset = EMS_OFFSET_RC35Set_seltemp; // https://github.com/proddy/EMS-ESP/issues/310
|
offset = EMS_OFFSET_RC35Set_seltemp; // https://github.com/emsesp/EMS-ESP/issues/310
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
uint8_t modetype = hc->get_mode_type();
|
uint8_t modetype = hc->get_mode_type();
|
||||||
@@ -1827,7 +1827,7 @@ bool Thermostat::set_temperature(const float temperature, const uint8_t mode, co
|
|||||||
|
|
||||||
} else if (model == EMS_DEVICE_FLAG_JUNKERS) {
|
} else if (model == EMS_DEVICE_FLAG_JUNKERS) {
|
||||||
// figure out if we have older or new thermostats, Heating Circuits on 0x65 or 0x79
|
// figure out if we have older or new thermostats, Heating Circuits on 0x65 or 0x79
|
||||||
// see https://github.com/proddy/EMS-ESP/issues/335#issuecomment-593324716)
|
// see https://github.com/emsesp/EMS-ESP/issues/335#issuecomment-593324716)
|
||||||
bool old_junkers = (has_flags(EMS_DEVICE_FLAG_JUNKERS_OLD));
|
bool old_junkers = (has_flags(EMS_DEVICE_FLAG_JUNKERS_OLD));
|
||||||
if (!old_junkers) {
|
if (!old_junkers) {
|
||||||
switch (mode) {
|
switch (mode) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -180,7 +180,7 @@ class Thermostat : public EMSdevice {
|
|||||||
static constexpr uint8_t EMS_OFFSET_RC20Set_mode = 23; // position of thermostat mode
|
static constexpr uint8_t EMS_OFFSET_RC20Set_mode = 23; // position of thermostat mode
|
||||||
static constexpr uint8_t EMS_OFFSET_RC20Set_temp = 28; // position of thermostat setpoint temperature
|
static constexpr uint8_t EMS_OFFSET_RC20Set_temp = 28; // position of thermostat setpoint temperature
|
||||||
|
|
||||||
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_mode = 3; // ES72 - see https://github.com/proddy/EMS-ESP/issues/334
|
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_mode = 3; // ES72 - see https://github.com/emsesp/EMS-ESP/issues/334
|
||||||
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_temp_night = 1; // ES72
|
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_temp_night = 1; // ES72
|
||||||
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_temp_day = 2; // ES72
|
static constexpr uint8_t EMS_OFFSET_RC20_2_Set_temp_day = 2; // ES72
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -652,7 +652,7 @@ void EMSESP::process_UBADevices(std::shared_ptr<const Telegram> telegram) {
|
|||||||
// if we haven't already detected this device, request it's version details, unless its us (EMS-ESP)
|
// if we haven't already detected this device, request it's version details, unless its us (EMS-ESP)
|
||||||
// when the version info is received, it will automagically add the device
|
// when the version info is received, it will automagically add the device
|
||||||
// always skip modem device 0x0D, it does not reply to version request
|
// always skip modem device 0x0D, it does not reply to version request
|
||||||
// see https://github.com/proddy/EMS-ESP/issues/460#issuecomment-709553012
|
// see https://github.com/emsesp/EMS-ESP/issues/460#issuecomment-709553012
|
||||||
if ((device_id != EMSbus::ems_bus_id()) && !(EMSESP::device_exists(device_id)) && (device_id != 0x0D) && (device_id != 0x0C)) {
|
if ((device_id != EMSbus::ems_bus_id()) && !(EMSESP::device_exists(device_id)) && (device_id != 0x0D) && (device_id != 0x0C)) {
|
||||||
LOG_DEBUG(F("New EMS device detected with ID 0x%02X. Requesting version information."), device_id);
|
LOG_DEBUG(F("New EMS device detected with ID 0x%02X. Requesting version information."), device_id);
|
||||||
send_read_request(EMSdevice::EMS_TYPE_VERSION, device_id);
|
send_read_request(EMSdevice::EMS_TYPE_VERSION, device_id);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -99,7 +99,7 @@ void Shower::send_mqtt_stat(bool state, bool force) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
char s[7];
|
char s[7];
|
||||||
Mqtt::publish(F("shower_active"), Helpers::render_boolean(s, state)); // https://github.com/proddy/EMS-ESP/issues/369
|
Mqtt::publish(F("shower_active"), Helpers::render_boolean(s, state)); // https://github.com/emsesp/EMS-ESP/issues/369
|
||||||
|
|
||||||
// if we're in HA mode make sure we've first sent out the HA MQTT Discovery config topic
|
// if we're in HA mode make sure we've first sent out the HA MQTT Discovery config topic
|
||||||
if ((Mqtt::ha_enabled()) && (!ha_configdone_ || force)) {
|
if ((Mqtt::ha_enabled()) && (!ha_configdone_ || force)) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -131,7 +131,7 @@ void System::syslog_init(bool refresh) {
|
|||||||
syslog_enabled_ = false;
|
syslog_enabled_ = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// in case service is still running, this flushes the queue - https://github.com/proddy/EMS-ESP/issues/496
|
// in case service is still running, this flushes the queue - https://github.com/emsesp/EMS-ESP/issues/496
|
||||||
if (!syslog_enabled_) {
|
if (!syslog_enabled_) {
|
||||||
syslog_.log_level((uuid::log::Level)-1);
|
syslog_.log_level((uuid::log::Level)-1);
|
||||||
syslog_.mark_interval(0);
|
syslog_.mark_interval(0);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -180,10 +180,10 @@ void RxService::add(uint8_t * data, uint8_t length) {
|
|||||||
// work out depending on the type, where the data message block starts and the message length
|
// work out depending on the type, where the data message block starts and the message length
|
||||||
// EMS 1 has type_id always in data[2], if it gets a ems+ inquiry it will reply with FF but short length
|
// EMS 1 has type_id always in data[2], if it gets a ems+ inquiry it will reply with FF but short length
|
||||||
// i.e. sending 0B A1 FF 00 01 D8 20 CRC to a MM10 Mixer (ems1.0), the reply is 21 0B FF 00 CRC
|
// i.e. sending 0B A1 FF 00 01 D8 20 CRC to a MM10 Mixer (ems1.0), the reply is 21 0B FF 00 CRC
|
||||||
// see: https://github.com/proddy/EMS-ESP/issues/380#issuecomment-633663007
|
// see: https://github.com/emsesp/EMS-ESP/issues/380#issuecomment-633663007
|
||||||
if (data[2] != 0xFF || length < 6) {
|
if (data[2] != 0xFF || length < 6) {
|
||||||
// EMS 1.0
|
// EMS 1.0
|
||||||
// also handle F7, F9 as EMS 1.0, see https://github.com/proddy/EMS-ESP/issues/109#issuecomment-492781044
|
// also handle F7, F9 as EMS 1.0, see https://github.com/emsesp/EMS-ESP/issues/109#issuecomment-492781044
|
||||||
type_id = data[2];
|
type_id = data[2];
|
||||||
message_data = data + 4;
|
message_data = data + 4;
|
||||||
message_length = length - 5;
|
message_length = length - 5;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -442,7 +442,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
|
|||||||
shell.printfln(F("Testing adding a TC100 thermostat to the EMS bus..."));
|
shell.printfln(F("Testing adding a TC100 thermostat to the EMS bus..."));
|
||||||
|
|
||||||
// add a thermostat
|
// add a thermostat
|
||||||
add_device(0x18, 202); // Bosch TC100 - https://github.com/proddy/EMS-ESP/issues/474
|
add_device(0x18, 202); // Bosch TC100 - https://github.com/emsesp/EMS-ESP/issues/474
|
||||||
|
|
||||||
// 0x0A
|
// 0x0A
|
||||||
uart_telegram({0x98, 0x0B, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00});
|
uart_telegram({0x98, 0x0B, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00});
|
||||||
@@ -497,7 +497,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
|
|||||||
add_device(0x10, 158); // RC300
|
add_device(0x10, 158); // RC300
|
||||||
add_device(0x48, 189); // KM200
|
add_device(0x48, 189); // KM200
|
||||||
|
|
||||||
// see https://github.com/proddy/EMS-ESP/issues/390
|
// see https://github.com/emsesp/EMS-ESP/issues/390
|
||||||
|
|
||||||
uart_telegram_withCRC("90 48 FF 04 01 A6 5C");
|
uart_telegram_withCRC("90 48 FF 04 01 A6 5C");
|
||||||
uart_telegram_withCRC("90 48 FF 00 01 A6 4C");
|
uart_telegram_withCRC("90 48 FF 00 01 A6 4C");
|
||||||
@@ -552,7 +552,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
|
|||||||
if (command == "cr100") {
|
if (command == "cr100") {
|
||||||
shell.printfln(F("Testing CR100"));
|
shell.printfln(F("Testing CR100"));
|
||||||
|
|
||||||
add_device(0x18, 157); // Bosch CR100 - https://github.com/proddy/EMS-ESP/issues/355
|
add_device(0x18, 157); // Bosch CR100 - https://github.com/emsesp/EMS-ESP/issues/355
|
||||||
|
|
||||||
// RCPLUSStatusMessage_HC1(0x01A5)
|
// RCPLUSStatusMessage_HC1(0x01A5)
|
||||||
// 98 00 FF 00 01 A5 00 CF 21 2E 00 00 2E 24 03 25 03 03 01 03 25 00 C8 00 00 11 01 03 (no CRC)
|
// 98 00 FF 00 01 A5 00 CF 21 2E 00 00 2E 24 03 25 03 03 01 03 25 00 C8 00 00 11 01 03 (no CRC)
|
||||||
@@ -756,7 +756,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
|
|||||||
add_device(0x08, 123); // Nefit Trendline
|
add_device(0x08, 123); // Nefit Trendline
|
||||||
|
|
||||||
// add a thermostat
|
// add a thermostat
|
||||||
add_device(0x18, 157); // Bosch CR100 - https://github.com/proddy/EMS-ESP/issues/355
|
add_device(0x18, 157); // Bosch CR100 - https://github.com/emsesp/EMS-ESP/issues/355
|
||||||
|
|
||||||
// RCPLUSStatusMessage_HC1(0x01A5) - HC1
|
// RCPLUSStatusMessage_HC1(0x01A5) - HC1
|
||||||
uart_telegram({0x98, 0x00, 0xFF, 0x00, 0x01, 0xA5, 0x00, 0xCF, 0x21, 0x2E, 0x00, 0x00, 0x2E, 0x24, 0x03, 0x25, 0x03, 0x03, 0x01, 0x03, 0x25, 0x00, 0xC8, 0x00, 0x00, 0x11, 0x01, 0x03});
|
uart_telegram({0x98, 0x00, 0xFF, 0x00, 0x01, 0xA5, 0x00, 0xCF, 0x21, 0x2E, 0x00, 0x00, 0x2E, 0x24, 0x03, 0x25, 0x03, 0x03, 0x01, 0x03, 0x25, 0x00, 0xC8, 0x00, 0x00, 0x11, 0x01, 0x03});
|
||||||
@@ -829,7 +829,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
|
|||||||
uart_telegram({0x1B, 0x5B, 0xFD, 0x2D, 0x9E, 0x3A, 0xB6, 0xE5, 0x02, 0x20, 0x33, 0x30, 0x32, 0x3A, 0x20, 0x5B, 0x73, 0xFF, 0xFF, 0xCB, 0xDF, 0xB7, 0xA7, 0xB5, 0x67, 0x77, 0x77, 0xE4, 0xFF, 0xFD, 0x77, 0xFF});
|
uart_telegram({0x1B, 0x5B, 0xFD, 0x2D, 0x9E, 0x3A, 0xB6, 0xE5, 0x02, 0x20, 0x33, 0x30, 0x32, 0x3A, 0x20, 0x5B, 0x73, 0xFF, 0xFF, 0xCB, 0xDF, 0xB7, 0xA7, 0xB5, 0x67, 0x77, 0x77, 0xE4, 0xFF, 0xFD, 0x77, 0xFF});
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://github.com/proddy/EMS-ESP/issues/380#issuecomment-633663007
|
// https://github.com/emsesp/EMS-ESP/issues/380#issuecomment-633663007
|
||||||
if (command == "rx3") {
|
if (command == "rx3") {
|
||||||
shell.printfln(F("Testing rx3..."));
|
shell.printfln(F("Testing rx3..."));
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/proddy/EMS-ESP/issues/380
|
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/emsesp/EMS-ESP/issues/380
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(ESP32)
|
#if defined(ESP32)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* EMS-ESP - https://github.com/proddy/EMS-ESP
|
* EMS-ESP - https://github.com/emsesp/EMS-ESP
|
||||||
* Copyright 2020 Paul Derbyshire
|
* Copyright 2020 Paul Derbyshire
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/proddy/EMS-ESP/issues/380
|
* ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/emsesp/EMS-ESP/issues/380
|
||||||
*/
|
*/
|
||||||
#if defined(ESP32)
|
#if defined(ESP32)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user