Use Winter/ Summer Logic for Cooling

sHedC · Oct 25, 2023 · 875a141 · 875a141
1 parent 98f3d32
commit 875a141
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/masterthermconnect/__main__.py b/masterthermconnect/__main__.py
@@ -414,6 +414,14 @@ def main(argv=None) -> int:
     except SystemExit as ex:
         return ex.code
 
+    # Check we have any arguments
+    try:
+        if not args.command:
+            return -1
+    except Exception:
+        print("usage: masterthermconnect -h")
+        return 0
+
     # If User/ Pass is not provided then get from the command line.
     login_user = input("User: ") if args.user is None else args.user
     login_pass = getpass.getpass() if args.password is None else args.password

diff --git a/masterthermconnect/datamapread.py b/masterthermconnect/datamapread.py
@@ -296,9 +296,9 @@
                 "'dhw' if {0} else "
                 "'pool' if {1} else "
                 "'aux_heater' if not ({2} or {3}) and ({4} or {5}) else "
-                "'cooling_dpc' if {6} and ({7} or {12} or {13}) else "
-                "'cooling' if {7} or {12} or {13} else "
-                "'heating' if {8} or {9} or {10} or {11} else "
+                "'heating' if {13} and ({8} or {9} or {10} or {11}) else "
+                "'cooling_dpc' if {6} and ({7} or {12} or {8} or {9} or {10} or {11}) else "
+                "'cooling' if {7} or {12} or {8} or {9} or {10} or {11} else "
                 "'idle'"
             ),
             [
@@ -315,7 +315,7 @@
                 [bool, "D_10"],  # 10 - Ciculation
                 [bool, "D_8"],  # 11 - Fan
                 [bool, "D_277"],  # 12 - Cooling Pump On
-                [bool, "D_193"],  # 13 - Requested Mode
+                [bool, "D_24"],  # 13 - Operation Mode 1=Winter, 0=Summer
             ],
         ],
     ],

diff --git a/tests/fixtures/newapi/pumpdata_10021_2_0.json b/tests/fixtures/newapi/pumpdata_10021_2_0.json
@@ -532,7 +532,7 @@
                 "D_21": "0",
                 "D_22": "0",
                 "D_23": "1",
-                "D_24": "1",
+                "D_24": "0",
                 "D_25": "1",
                 "D_26": "0",
                 "D_27": "0",
@@ -1054,7 +1054,7 @@
                 "I_47": "5",
                 "I_48": "1",
                 "I_49": "0",
-                "I_50": "1",
+                "I_50": "2",
                 "I_51": "0",
                 "I_52": "0",
                 "I_53": "60",