From a2b3cc7e8616d9603f410dc0ebf406daa6af6149 Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Sat, 22 Oct 2022 13:04:10 +0300 Subject: [PATCH] timer: correct systicks data type --- Timer/inc/Timer.h | 5 ++--- Timer/src/Timer.cpp | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Timer/inc/Timer.h b/Timer/inc/Timer.h index 227f4a5..840d386 100644 --- a/Timer/inc/Timer.h +++ b/Timer/inc/Timer.h @@ -13,7 +13,7 @@ #include static volatile std::atomic_int timer; -static volatile unsigned int systicks = 0; +static volatile std::atomic_int systicks; extern "C" { @@ -24,8 +24,7 @@ extern "C" void SysTick_Handler (void); } -uint32_t millis(); - +uint32_t millis (); class Timer { diff --git a/Timer/src/Timer.cpp b/Timer/src/Timer.cpp index 0b93fe3..c66d9ea 100644 --- a/Timer/src/Timer.cpp +++ b/Timer/src/Timer.cpp @@ -25,6 +25,7 @@ Timer::Timer (uint32_t freq) : freq (freq) SysTick_Config (sysTickRate / freq); counter = 0; timer = 0; + systicks = 0; } Timer::~Timer ()