From 061478635c6fbbc7652f98cf1d897edba42872e8 Mon Sep 17 00:00:00 2001 From: Jonathan <148167.jw@gmail.com> Date: Wed, 20 Dec 2023 16:53:31 +0100 Subject: [PATCH 1/3] REM to development branch --- Core/Inc/roboteam_embedded_messages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Inc/roboteam_embedded_messages b/Core/Inc/roboteam_embedded_messages index d80493a..27e6961 160000 --- a/Core/Inc/roboteam_embedded_messages +++ b/Core/Inc/roboteam_embedded_messages @@ -1 +1 @@ -Subproject commit d80493a4fee333a86f50532c4c902eedf3b088c9 +Subproject commit 27e696188df37742fb24f938496d09348fa77423 From 442f76a0925eef7ca3cd640b7f5754e2e5e2ca7f Mon Sep 17 00:00:00 2001 From: Jonathan <148167.jw@gmail.com> Date: Wed, 20 Dec 2023 16:53:57 +0100 Subject: [PATCH 2/3] Moved timestamp increase to be actually in control loop --- Core/Src/robot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Src/robot.c b/Core/Src/robot.c index bf65ff9..879d452 100644 --- a/Core/Src/robot.c +++ b/Core/Src/robot.c @@ -941,6 +941,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) { } flag_sdcard_write_feedback = true; + unix_timestamp += 1; } else if (htim->Instance == TIM_BUZZER->Instance) { @@ -953,5 +954,4 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) { shoot_Callback(); } - unix_timestamp += 1 ; } From a94b8b313c6d7ac4c7c3f9d71f4038573661370f Mon Sep 17 00:00:00 2001 From: Jonathan <148167.jw@gmail.com> Date: Thu, 21 Dec 2023 15:27:11 +0100 Subject: [PATCH 3/3] De-initalize timestamp if robot halts --- Core/Src/robot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Core/Src/robot.c b/Core/Src/robot.c index 879d452..6984b92 100644 --- a/Core/Src/robot.c +++ b/Core/Src/robot.c @@ -869,7 +869,8 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) { return; } - if( halt && !test_isTestRunning(square)){ + if(halt && !test_isTestRunning(square)) { + unix_initalized = false; wheels_Stop(); return; }