From 563a93fb56406abc3270ba9d2a8df5592f24db0e Mon Sep 17 00:00:00 2001
From: aniketSaha <aniket.saha@nehemis.com>
Date: Wed, 16 Jul 2025 09:23:26 +0200
Subject: [PATCH] Added changes for valve setpoints and feedback

---
 classCAN.py | 32 +++++++++++++++++++++++++++++++-
 main.py     |  7 +++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/classCAN.py b/classCAN.py
index bec8cd8..5d77937 100644
--- a/classCAN.py
+++ b/classCAN.py
@@ -77,6 +77,22 @@ class CANBackend:
                             ps3 = node.sdo[0x2005][3].raw
                             ps4 = node.sdo[0x2005][4].raw
 
+                            mv02Cmd = node.sdo[0x2014][1].raw
+                            mv03Cmd = node.sdo[0x2012][1].raw
+                            mv04Cmd = node.sdo[0x2019][1].raw
+                            mv05Cmd = node.sdo[0x2020][1].raw
+                            mv06Cmd = node.sdo[0x2021][1].raw
+                            mv07Cmd = node.sdo[0x2015][1].raw
+                            mv08Cmd = node.sdo[0x2022][1].raw
+
+                            mv02fb = node.sdo[0x3000][1].raw
+                            mv03fb = node.sdo[0x3000][2].raw
+                            mv04fb = node.sdo[0x3000][3].raw
+                            mv05fb = node.sdo[0x3000][4].raw
+                            mv06fb = node.sdo[0x3000][5].raw
+                            mv07fb = node.sdo[0x3000][6].raw
+                            mv08fb = node.sdo[0x3000][7].raw
+
                             self.latest_data[pu_number] = {
                                 "FM1": (fm1 / 100.0) * 60.0,
                                 "FM2": (fm2 / 100.0) * 60.0,
@@ -85,7 +101,21 @@ class CANBackend:
                                 "PS1": ps1 / 1000.0,
                                 "PS2": ps2 / 1000.0,
                                 "PS3": ps3 / 1000.0,
-                                "PS4": ps4 / 1000.0
+                                "PS4": ps4 / 1000.0,
+                                "MV02_sp" : mv02Cmd,
+                                "MV03_sp" : mv03Cmd,
+                                "MV04_sp" : mv04Cmd,
+                                "MV05_sp" : mv05Cmd,
+                                "MV06_sp" : mv06Cmd,
+                                "MV07_sp" : mv07Cmd,
+                                "MV08_sp" : mv08Cmd,
+                                "MV02" : mv02fb,
+                                "MV03" : mv03fb,
+                                "MV04" : mv04fb,
+                                "MV05" : mv05fb,
+                                "MV06" : mv06fb,
+                                "MV07" : mv07fb,
+                                "MV08" : mv08fb,
                             }
 
                             print(f"[PU{pu_number}] FM1: {fm1}, PS1: {ps1}")
diff --git a/main.py b/main.py
index 865d460..84f88a9 100644
--- a/main.py
+++ b/main.py
@@ -47,20 +47,27 @@ def format_data(data):
         "Qdilute": data.get("FM1", 0.0),
         "Qdrain": data.get("FM4", 0.0),
         "Qrecirc": data.get("FM3", 0.0),
+
         "Pro": data.get("PS1", 0.0),
         "Pdilute": data.get("PS3", 0.0),
         "Prentate": data.get("PS2", 0.0),
+
         "Conductivity": data.get("Cond", 0.0),
+
         "MV02": data.get("MV02", 0.0),
         "MV02_sp": data.get("MV02_sp", 0.0),
+
         "MV03": data.get("MV03", 0.0),
         "MV03_sp": data.get("MV03_sp", 0.0),
+
         "MV05": data.get("MV05", 0.0),
         "MV05_sp": data.get("MV05_sp", 0.0),
         "MV06": data.get("MV06", 0.0),
         "MV06_sp": data.get("MV06_sp", 0.0),
+
         "MV07": data.get("MV07", 0.0),
         "MV07_sp": data.get("MV07_sp", 0.0),
+        
         "MV08": data.get("MV08", 0.0),
         "MV08_sp": data.get("MV08_sp", 0.0),
     }