aniketSaha/NorthStar-HMI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds conductivity reading on the main panel

Browse Source
This commit is contained in:
Etienne Chassaing 2025-08-04 15:47:58 +02:00
parent 09f9e8feb2
commit 6587851267
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.py
View File

@ -79,7 +79,9 @@ def format_data(data):
"Pro": np.round(data.get("PS2", 0.0), 2), "Pro": np.round(data.get("PS2", 0.0), 2),
"Pdilute": np.round(data.get("PS3", 0.0), 2), "Pdilute": np.round(data.get("PS3", 0.0), 2),
"Pretentate": np.round(data.get("PS1", 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": np.round(data.get("MV02", 0.0), 1),
"MV02_sp": np.round(data.get("MV02_sp", 0.0), 1), "MV02_sp": np.round(data.get("MV02_sp", 0.0), 1),
"MV03": np.round(data.get("MV03", 0.0), 1), "MV03": np.round(data.get("MV03", 0.0), 1),

8
templates/control.html
View File

@ -320,8 +320,8 @@
</div> </div>
</div> </div>
<div class="monitor-block"> <div class="monitor-block">
<h2><i class="fas fa-bolt"></i> Conductivity</h2> <h2><i class="fas fa-bolt"></i> Cdilute</h2>
<div class="monitor-values" id="Conductivity"> <div class="monitor-values" id="Cdilute">
<div class="monitor-value">#1<br>0.0 µS/cm</div> <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">#2<br>0.0 µS/cm</div>
<div class="monitor-value">#3<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_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_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">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 = { const fields = {
"Qperm": "L/h", "Qperm": "L/h",
"Pdilute": "bar", "Pdilute": "bar",
"Conductivity": "µS/cm", "Cdilute": "µS/cm",
"Pro": "bar" "Pro": "bar"
}; };