Merge pull request emsesp#2241 from proddy/dev

update dump telegrams CSV for Mixer
MichaelDvP · Nov 22, 2024 · b1b8a12 · b1b8a12
2 parents dbd6d38 + b9a0744
commit b1b8a12
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/docs/Modbus-Entity-Registers.md b/docs/Modbus-Entity-Registers.md
@@ -9,7 +9,7 @@
 
 !!! note
 
-    This file has been auto-generated. Do not edit.
+    This file has been auto-generated. Do not modify.
 
 ## Devices of type *alert*
 ### EM10

diff --git a/docs/dump_telegrams.csv b/docs/dump_telegrams.csv
@@ -105,15 +105,14 @@ telegram_type_id,name,is_fetched
 0x02A0,RC300Curves, 
 0x02A1,RC300Curves, 
 0x02A2,RC300Curves, 
-0x02A5,RC300Monitor, 
+0x02A5,CRFMonitor, 
 0x02A6,RC300Monitor, 
-0x02A7,CRFMonitor, 
-0x02A8,RC300Monitor, 
+0x02A7,RC300Monitor, 
+0x02A8,CRFMonitor, 
 0x02A9,RC300Monitor, 
 0x02AA,RC300Monitor, 
 0x02AB,RC300Monitor, 
 0x02AC,RC300Monitor, 
-0x02AD,MMPLUSConfigMessage,fetched
 0x02AF,RC300Summer, 
 0x02B0,RC300Summer, 
 0x02B1,RC300Summer, 
@@ -122,7 +121,6 @@ telegram_type_id,name,is_fetched
 0x02B4,RC300Summer, 
 0x02B5,RC300Summer, 
 0x02B6,RC300Summer, 
-0x02B7,MMPLUSStatusMessage, 
 0x02B9,RC300Set, 
 0x02BA,RC300Set, 
 0x02BB,RC300Set, 
@@ -131,11 +129,13 @@ telegram_type_id,name,is_fetched
 0x02BE,RC300Set, 
 0x02BF,RC300Set, 
 0x02C0,RC300Set, 
-0x02CC,RC300Set2, 
+0x02CC,HPPressure,fetched
+0x02CD,MMPLUSConfigMessage,fetched
 0x02CE,RC300Set2, 
 0x02D0,RC300Set2, 
 0x02D2,RC300Set2, 
 0x02D6,HPPump2,fetched
+0x02D7,MMPLUSStatusMessage, 
 0x02F5,RC300WWmode,fetched
 0x02F6,RC300WW2mode,fetched
 0x0313,MMPLUSConfigMessage_WWC,fetched

diff --git a/src/emsesp.cpp b/src/emsesp.cpp
@@ -353,7 +353,7 @@ void EMSESP::dump_all_entities(uuid::console::Shell & shell) {
                         device_id = 0x40; // dhw 1
                     }
                 }
-                
+
                 // For a Mixer, fix device_id to 0x20 to give us all the settings
                 if (device.device_type == DeviceType::MIXER) {
                     device_id = 0x20; // hc
@@ -398,6 +398,11 @@ void EMSESP::dump_all_telegrams(uuid::console::Shell & shell) {
                     }
                 }
 
+                // For a Mixer, fix device_id to 0x20 to give us all the settings
+                if (device.device_type == DeviceType::MIXER) {
+                    device_id = 0x20; // hc
+                }
+
                 // add the device and print out all the entities
                 emsdevices.push_back(
                     EMSFactory::add(device.device_type, device_id, device.product_id, "1.0", device.default_name, device.flags, EMSdevice::Brand::NO_BRAND));