mixing renamed to mixer

CHANGELOG.md

@@ -25,8 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - summer, winter modes for the CW400 thermostat
 - new command under system called `report`. http://ems-esp/api?device=system&cmd=report to generate a report log for troubleshooting
 - thermostat error codes
-- Console command `pulbish ha` to also force the creation of the Home Assistant MQTT Discovery topics
+- Console command `publish ha` to also force the creation of the Home Assistant MQTT Discovery topics
-- Heatpump values (dew temperature and relative air humidity)
+- Heat pump values (dew temperature and relative air humidity)
 
 ### Fixed
 - fix wwontime readback
@@ -94,7 +94,7 @@ First version of v2 with
 - Support for Home Assistant MQTT Discovery (https://www.home-assistant.io/docs/mqtt/discovery/)
 - Can be run standalone as an independent Access Point or join an existing WiFi network
 - Easier first-time configuration via a web Captive Portal
-- Supporting over 70 EMS devices (boilers, thermostats, solar modules, mixing modules, heat pumps, gateways)
+- Supporting over 70 EMS devices (boilers, thermostats, solar modules, mixer modules, heat pumps, gateways)
 
 See README.me for more details.
 

README.md

@@ -30,14 +30,14 @@ Note, EMS-ESP requires a small hardware circuit that can convert the EMS bus dat
 - Compatible with both ESP8266 and ESP32
 - A multi-user secure web interface to change settings and monitor the data
 - A console, accessible via Serial and Telnet for more monitoring
-- Native support for Home Assistan via [MQTT Discovery](https://www.home-assistant.io/docs/mqtt/discovery/)
+- Native support for Home Assistant via [MQTT Discovery](https://www.home-assistant.io/docs/mqtt/discovery/)
 - Can run standalone as an independent WiFi Access Point or join an existing WiFi network
 - Easy first-time configuration via a web Captive Portal
-- Support for more than [72 EMS devices](https://emsesp.github.io/docs/#/Supported-EMS-Devices) (boilers, thermostats, solar modules, mixing modules, heat pumps, gateways)
+- Support for more than [70 EMS devices](https://emsesp.github.io/docs/#/Supported-EMS-Devices) (boilers, thermostats, solar modules, mixer modules, heat pumps, gateways)
   
 ## **Screenshots**
 
-### Web interface:
+### Web Interface:
 
 | | |
 | --- | --- |
@@ -68,12 +68,12 @@ If you're looking for support on **EMS-ESP** there are some options available:
 * [Official EMS-ESP Documentation](https://emsesp.github.io/docs): For information on how to build and upload the firmware
 * [FAQ and Troubleshooting](https://emsesp.github.io/docs/#/Troubleshooting): For information on common problems and solutions. See also [BBQKees's wiki](https://bbqkees-electronics.nl/wiki/gateway/troubleshooting.html)
 
-### Support's Community
+### Support Community
 
 * [EMS-ESP Support Chat](https://gitter.im/EMS-ESP/community#): For support, troubleshooting and general questions. You have better chances to get fast answers from members of the community
 * [Search in Issues](https://github.com/proddy/EMS-ESP/issues): You might find an answer to your question by searching current or closed issues
 
-### Developers' Community
+### Developer's Community
 
 * [Bug Report](https://github.com/proddy/EMS-ESP/issues/new?template=bug_report.md): For reporting Bugs
 * [Feature Request](https://github.com/proddy/EMS-ESP/issues/new?template=feature_request.md): For requesting features/functions
@@ -89,10 +89,10 @@ You can contribute to EMS-ESP by
 ## **Credits**
 
 A shout out to the people helping EMS-ESP get to where it is today...
-- **@MichaelDvP** for all his amazing contributions and patience. Specifically the improved uart library, thermostat and mixing logic.
+- **@MichaelDvP** for all his amazing contributions and patience. Specifically the improved uart library, thermostat and mixer logic.
 - **@BBQKees** for his endless testing and building the awesome circuit boards
 - **@susisstrolch** for writing a first working version of the EMS bridge circuit which I used to design EMS-ESP version 0.1 back in August 2017
-- Plus everyone else providing suggestions, PRs and the odd donation that keep us motivated. Thanks!
+- plus everyone else providing suggestions, PRs and the odd donation that keep us motivated. Thanks!
 
 ## **License**
 

src/devices/boiler.cpp

@@ -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

src/devices/mixer.cpp

@@ -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;
     }