andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

MM10 merge from MichaelDvP

Browse Source
This commit is contained in:
Paul
2019-12-30 15:53:13 +01:00
parent cb35277b07
commit 7a1b1603cd
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
- Solar Module SM200 support - Solar Module SM200 support
- `set master_thermostat <product id>` to choose with thermostat is master when there are multiple on the bus - `set master_thermostat <product id>` to choose with thermostat is master when there are multiple on the bus
- MM10 Mixer support (thanks @MichaelDvP)
### Fixed ### Fixed
- set boiler warm water temp on Junkers/Bosch HT3 - set boiler warm water temp on Junkers/Bosch HT3

1
src/ems-esp.cpp
View File

@@ -483,7 +483,6 @@ void showInfo() {
_renderIntValue(" Current pump modulation", "%", EMS_Mixing.hc[hc_num - 1].pumpMod); _renderIntValue(" Current pump modulation", "%", EMS_Mixing.hc[hc_num - 1].pumpMod);
if (EMS_Mixing.hc[hc_num - 1].valveStatus != EMS_VALUE_INT_NOTSET) if (EMS_Mixing.hc[hc_num - 1].valveStatus != EMS_VALUE_INT_NOTSET)
_renderIntValue(" Current valve status", "", EMS_Mixing.hc[hc_num - 1].valveStatus); _renderIntValue(" Current valve status", "", EMS_Mixing.hc[hc_num - 1].valveStatus);
} }
} }
} }

2
src/ems.cpp
View File

@@ -1240,7 +1240,7 @@ void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
void _process_MMStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) { void _process_MMStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
uint8_t hc = (EMS_RxTelegram->type - EMS_TYPE_MMStatusMessage); uint8_t hc = (EMS_RxTelegram->type - EMS_TYPE_MMStatusMessage);
if (hc!=0) { if (hc != 0) {
return; // invalid type return; // invalid type
} }
EMS_Mixing.hc[hc].active = true; EMS_Mixing.hc[hc].active = true;

2
src/version.h
View File

@@ -1 +1 @@
#define APP_VERSION "1.9.5b6" #define APP_VERSION "1.9.5b7"