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

mixing renamed to mixer

Browse Source
This commit is contained in:
proddy
2020-10-26 14:31:44 +01:00
parent 15b752fcdf
commit 04f36130c8
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/boiler.cpp
View File

@@ -898,7 +898,7 @@ void Boiler::process_UBAMonitorSlow(std::shared_ptr<const Telegram> telegram) {
changed_ |= telegram->read_value(outdoorTemp_, 0);
changed_ |= telegram->read_value(boilTemp_, 2);
changed_ |= telegram->read_value(exhaustTemp_, 4);
changed_ |= telegram->read_value(switchTemp_, 25); // only if there is a mixing module present
changed_ |= telegram->read_value(switchTemp_, 25); // only if there is a mixer module present
changed_ |= telegram->read_value(pumpMod_, 9);
changed_ |= telegram->read_value(burnStarts_, 10, 3); // force to 3 bytes
changed_ |= telegram->read_value(burnWorkMin_, 13, 3); // force to 3 bytes

4
src/devices/mixer.cpp
View File

@@ -124,7 +124,7 @@ void Mixer::show_values(uuid::console::Shell & shell) {
}
// publish values via MQTT
// topic is mixing_data<id>
// topic is mixer_data<id>
void Mixer::publish_values(JsonObject & json, bool force) {
// handle HA first
if (Mqtt::mqtt_format() == Mqtt::Format::HA) {
@@ -223,7 +223,7 @@ bool Mixer::export_values(JsonObject & json) {
// creates JSON doc from values
// returns false if empty
bool Mixer::export_values_format(uint8_t mqtt_format, JsonObject & json) {
// check if there is data for the mixing unit
// check if there is data for the mixer unit
if (!Helpers::hasValue(status_)) {
return 0;
}