From 65878512676f36ce1173c6d5c7247a73be4def55 Mon Sep 17 00:00:00 2001
From: Etienne Chassaing <60154720+cetiennec@users.noreply.github.com>
Date: Mon, 4 Aug 2025 15:47:58 +0200
Subject: [PATCH] Adds conductivity reading on the main panel

---
 main.py                | 4 +++-
 templates/control.html | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index 626ad4a..dc3160d 100644
--- a/main.py
+++ b/main.py
@@ -79,7 +79,9 @@ def format_data(data):
         "Pro": np.round(data.get("PS2", 0.0), 2),
         "Pdilute": np.round(data.get("PS3", 0.0), 2),
         "Pretentate": np.round(data.get("PS1", 0.0), 2),
-        "Conductivity": np.round(data.get("Cond", 0.0), 1),
+        "Cfeed": np.round(data.get("Conductivity_Feed", 0.0), 1),
+        "Cperm": np.round(data.get("Conductivity_Permeate", 0.0), 1),
+        "Cdilute": np.round(data.get("Conductivity_Product", 0.0), 1),
         "MV02": np.round(data.get("MV02", 0.0), 1),
         "MV02_sp": np.round(data.get("MV02_sp", 0.0), 1),
         "MV03": np.round(data.get("MV03", 0.0), 1),
diff --git a/templates/control.html b/templates/control.html
index 5b5ea39..3d527ff 100644
--- a/templates/control.html
+++ b/templates/control.html
@@ -320,8 +320,8 @@
             </div>
         </div>
         <div class="monitor-block">
-            <h2><i class="fas fa-bolt"></i> Conductivity</h2>
-            <div class="monitor-values" id="Conductivity">
+            <h2><i class="fas fa-bolt"></i> Cdilute</h2>
+            <div class="monitor-values" id="Cdilute">
                 <div class="monitor-value">#1<br>0.0 µS/cm</div>
                 <div class="monitor-value">#2<br>0.0 µS/cm</div>
                 <div class="monitor-value">#3<br>0.0 µS/cm</div>
@@ -479,7 +479,7 @@
         <div class="monitor-value">P_ro<br>${puData.Pro.toFixed(1)} bar</div>
         <div class="monitor-value">P_dilute<br>${puData.Pdilute.toFixed(1)} bar</div>
         <div class="monitor-value">P_retentate<br>${puData.Pretentate.toFixed(1)} bar</div>
-        <div class="monitor-value">Conductivity<br>${puData.Conductivity.toFixed(1)} µS/cm</div>
+        <div class="monitor-value">Cdilute<br>${puData.Cdilute.toFixed(1)} µS/cm</div>
         `;
         }
     }
@@ -500,7 +500,7 @@ async function fetchMonitorData() {
         const fields = {
             "Qperm": "L/h",
             "Pdilute": "bar",
-            "Conductivity": "µS/cm",
+            "Cdilute": "µS/cm",
             "Pro": "bar"
         };