From 93807ade1d04f3e5dcdbc4f7b4e29dd2d7b5a023 Mon Sep 17 00:00:00 2001
From: Hugo Jean Ponsin <hugo.ponsin@psi.ch>
Date: Tue, 28 Jul 2026 14:33:47 +0200
Subject: [PATCH] refactoring maths

---
 src/device/handlers/PressureCalculator.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/device/handlers/PressureCalculator.cpp b/src/device/handlers/PressureCalculator.cpp
index 458ee0e..d06e8e9 100644
--- a/src/device/handlers/PressureCalculator.cpp
+++ b/src/device/handlers/PressureCalculator.cpp
@@ -9,21 +9,13 @@
 
 void PressureCalculator::update() {
     float averagePower = average.getAverage();
-    float c2contrib = averagePower * cachedConstant2;
+    float c2contrib = -cachedConstant1 * averagePower * cachedConstant2;
     float c1contrib =
-        cachedConstant1 * (cachedTemperature - cachedSP - c2contrib);
+        (cachedConstant1 * (cachedTemperature - cachedSP)) - c2contrib;
     float uncappedPressure = cachedMinimalPressure + c1contrib;
 
-    float cappedPressure = uncappedPressure;
-
-    if (c2contrib != 0) {
-        c2contrib = -c2contrib * cachedConstant1;
-    } else {
-        c2contrib = 0.0f;
-    }
-
-    cappedPressure = std::clamp(uncappedPressure, cachedMinimalPressure,
-                                cachedMaximalPressure);
+    float cappedPressure = std::clamp(uncappedPressure, cachedMinimalPressure,
+                                      cachedMaximalPressure);
 
     Event event = {};