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

Qconso computation corrected

Browse Source
This commit is contained in:
Etienne Chassaing 2025-08-06 11:53:47 +02:00
parent 9ad18a17c8
commit 34f0dda210
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.py
View File

@ -110,9 +110,7 @@ def format_DS_data(data):
"TankLevel": np.round(data.get("TankLevel", 0.0), 2), "TankLevel": np.round(data.get("TankLevel", 0.0), 2),
"Qinlet": np.round(data.get("Inlet_flow", 0.0), 1), "Qinlet": np.round(data.get("Inlet_flow", 0.0), 1),
"Qoutlet": np.round(data.get("Outlet_flow", 0.0), 1), "Qoutlet": np.round(data.get("Outlet_flow", 0.0), 1),
"Q_conso_filt": np.round(data.get("Qdrain_sp", 0.0), 1), "Q_conso": np.round(data.get("Inlet_flow", 0.0), 1) - np.round(data.get("Outlet_flow", 0.0), 1),
"Q_conso_filt": np.round(data.get("Qdrain_sp", 0.0), 1),
"Q_conso_filt": np.round(data.get("Qdrain_sp", 0.0), 1),
} }

19
templates/control.html
View File

@ -339,20 +339,20 @@
<div class="monitor-block"> <div class="monitor-block">
<h2><i class="fas fa-thermometer-half"></i> Pro</h2> <h2><i class="fas fa-thermometer-half"></i> Pro</h2>
<div class="monitor-values" id="Pro"> <div class="monitor-values" id="Pro">
<div class="monitor-value">#1<br>0.0 units</div> <div class="monitor-value">#1<br>0.0 bar</div>
<div class="monitor-value">#2<br>0.0 units</div> <div class="monitor-value">#2<br>0.0 bar</div>
<div class="monitor-value">#3<br>0.0 units</div> <div class="monitor-value">#3<br>0.0 bar</div>
</div> </div>
</div> </div>
<div class="monitor-block"> <div class="monitor-block">
<div style="display: flex; justify-content: space-between;"> <div style="display: flex; justify-content: space-between;">
<div style="flex: 1; margin-right: 10px;"> <div style="flex: 1; margin-right: 10px;">
<h2><i class="fas fa-tachometer-alt"></i> Tank Level</h2> <h2><i class="fas fa-tachometer-alt"></i> Tank Level</h2>
<div class="monitor-value">DS<br>0.0</div> <div class="monitor-value"><br>0.0 %</div>
</div> </div>
<div style="flex: 1; margin-left: 10px;"> <div style="flex: 1; margin-left: 10px;">
<h2><i class="fas fa-exchange-alt"></i> Qconso</h2> <h2><i class="fas fa-exchange-alt"></i> Qconso</h2>
<div class="monitor-value">DS<br>0.0 L/h</div> <div class="monitor-value"><br>0.0 L/h</div>
</div> </div>
</div> </div>
</div> </div>
@ -508,15 +508,6 @@
} }
} }
function updateMonitorValues(id, values, unit) {
const container = document.getElementById(id);
const valueElements = container.querySelectorAll('.monitor-value');
valueElements.forEach((element, index) => {
if (index < values.length) {
element.innerHTML = `#${index + 1}<br>${values[index]} ${unit}`;
}
});
}
setInterval(updateMonitorData, 1000); setInterval(updateMonitorData, 1000);