aboutsummaryrefslogtreecommitdiffstats
path: root/sw
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2020-05-03 14:42:16 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2020-05-03 14:42:16 +0200
commit04a33387ec212985d413919a9aa1d47c1b8e2e02 (patch)
tree467d98bcd5d1640f10a1357466967fedda943d7b /sw
parent65c7cb80d510c702876f3d937accafbb185ab900 (diff)
downloadglutte-batteries-04a33387ec212985d413919a9aa1d47c1b8e2e02.tar.gz
glutte-batteries-04a33387ec212985d413919a9aa1d47c1b8e2e02.tar.bz2
glutte-batteries-04a33387ec212985d413919a9aa1d47c1b8e2e02.zip
Refine thresholds
Diffstat (limited to 'sw')
-rw-r--r--sw/main.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/main.cpp b/sw/main.cpp
index de1c693..7b18683 100644
--- a/sw/main.cpp
+++ b/sw/main.cpp
@@ -55,18 +55,18 @@ constexpr double R_SHUNT = 1e-3; // Ohm
* For every relay, define a threshold below which the
* relay should be active.
*/
-constexpr double THRESHOLD_K1 = 1200.0 * 3600;
-constexpr double THRESHOLD_K2 = 1000.0 * 3600;
-constexpr double THRESHOLD_K3 = 600.0 * 3600;
-constexpr double THRESHOLD_HYSTERESIS = 10.0 * 3600;
-
-constexpr double THRESHOLD_K1_UP = 1200.0 * 3600 + THRESHOLD_HYSTERESIS;
-constexpr double THRESHOLD_K2_UP = 1000.0 * 3600 + THRESHOLD_HYSTERESIS;
-constexpr double THRESHOLD_K3_UP = 600.0 * 3600 + THRESHOLD_HYSTERESIS;
-
-constexpr double THRESHOLD_K1_DOWN = 1200.0 * 3600 - THRESHOLD_HYSTERESIS;
-constexpr double THRESHOLD_K2_DOWN = 1000.0 * 3600 - THRESHOLD_HYSTERESIS;
-constexpr double THRESHOLD_K3_DOWN = 600.0 * 3600 - THRESHOLD_HYSTERESIS;
+constexpr double THRESHOLD_K1 = 1550.0 * 3600;
+constexpr double THRESHOLD_K2 = 1300.0 * 3600;
+constexpr double THRESHOLD_K3 = 800.0 * 3600;
+constexpr double THRESHOLD_HYSTERESIS = 50.0 * 3600;
+
+constexpr double THRESHOLD_K1_UP = THRESHOLD_K1 + THRESHOLD_HYSTERESIS;
+constexpr double THRESHOLD_K2_UP = THRESHOLD_K2 + THRESHOLD_HYSTERESIS;
+constexpr double THRESHOLD_K3_UP = THRESHOLD_K3 + THRESHOLD_HYSTERESIS;
+
+constexpr double THRESHOLD_K1_DOWN = THRESHOLD_K1;
+constexpr double THRESHOLD_K2_DOWN = THRESHOLD_K2;
+constexpr double THRESHOLD_K3_DOWN = THRESHOLD_K3;
constexpr uint32_t MAX_CAPACITY = 1650uL * 3600uL; // As