From 4be1355c4082eb4f02b23389ab77b4dea7e78bb8 Mon Sep 17 00:00:00 2001
From: Kilian Bracher <k.bracher@fasttube.de>
Date: Fri, 16 May 2025 23:10:07 +0200
Subject: [PATCH] add minimum duration of 1 sec for precharge

---
 AMS_Master_Code/Core/Inc/ts_state_machine.h | 2 ++
 AMS_Master_Code/Core/Src/ts_state_machine.c | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/AMS_Master_Code/Core/Inc/ts_state_machine.h b/AMS_Master_Code/Core/Inc/ts_state_machine.h
index ace534c..e3a7f5c 100644
--- a/AMS_Master_Code/Core/Inc/ts_state_machine.h
+++ b/AMS_Master_Code/Core/Inc/ts_state_machine.h
@@ -11,6 +11,8 @@
 // Time to wait after reaching 95% of battery voltage before exiting precharge
 // Set this to 1000 in scruti to demonstrate the voltage on the multimeter
 #define PRECHARGE_95_DURATION 0 // ms
+// Minimum precharge time
+#define PRECHARGE_MIN_DURATION 1000 // ms
 // Time to wait for discharge
 #define DISCHARGE_DURATION 5000 // ms
 // Time to wait after there is no more error condition before exiting TS_ERROR
diff --git a/AMS_Master_Code/Core/Src/ts_state_machine.c b/AMS_Master_Code/Core/Src/ts_state_machine.c
index 34a9c67..8768983 100644
--- a/AMS_Master_Code/Core/Src/ts_state_machine.c
+++ b/AMS_Master_Code/Core/Src/ts_state_machine.c
@@ -12,6 +12,7 @@
 TSStateHandle ts_state;
 
 static uint32_t precharge_95_reached_timestamp = 0;
+static uint32_t precharge_start_timestamp = 0;
 static uint32_t charging_check_timestamp = 0;
 static uint32_t discharge_begin_timestamp = 0;
 static uint32_t precharge_opened_timestamp = 0;
@@ -104,15 +105,20 @@ TSState ts_sm_update_precharge() {
     discharge_begin_timestamp = HAL_GetTick();
     return TS_DISCHARGE;
   }
+  if (precharge_start_timestamp == 0) {
+    precharge_start_timestamp = HAL_GetTick();
+  }
   if (shunt_data.voltage_veh > MIN_VEHICLE_SIDE_VOLTAGE &&
       shunt_data.voltage_veh > 0.95 * shunt_data.voltage_bat) {
     const uint32_t now = HAL_GetTick();
     if (precharge_95_reached_timestamp == 0) {
       precharge_95_reached_timestamp = now;
     } else if ((now - precharge_95_reached_timestamp) >=
-               PRECHARGE_95_DURATION) {
+               PRECHARGE_95_DURATION &&
+               (now - precharge_start_timestamp) >= PRECHARGE_MIN_DURATION) {
       precharge_95_reached_timestamp = 0;
       precharge_opened_timestamp = 0;
+      precharge_start_timestamp = 0;
       //precharge_opened = 0;
       return TS_ACTIVE;
     }