From 04a33387ec212985d413919a9aa1d47c1b8e2e02 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Sun, 3 May 2020 14:42:16 +0200 Subject: Refine thresholds --- sw/main.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'sw') 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 -- cgit v1.2.3