fix: tests part 7, should work now

Author: victor-Lopez25

Inc/MockedDrivers/mocked_ll_tim.hpp

@@ -119,10 +119,13 @@ class TIM_TypeDef{
         }
         return true;
     }
+
+    void inc_cnt_and_check(uint32_t val);
 };
 static_assert(sizeof(TimerRegister<Reg_CNT>) == sizeof(uint32_t));
 void simulate_ticks(TIM_TypeDef* tim);
 
+/*
 template<>
 struct RegisterTraits<TimReg,TimReg::Reg_CNT> {
     static void write(uint32_t& target, uint32_t val) {
@@ -133,7 +136,7 @@ struct RegisterTraits<TimReg,TimReg::Reg_CNT> {
         }
     }
 };
-
+*/
 
 #define DECLARE_TIMER(TIM_IDX) \
     extern TIM_TypeDef*  TIM_IDX##_BASE; \

Src/MockedDrivers/mocked_ll_tim.cpp

@@ -10,7 +10,7 @@ void TIM_TypeDef::generate_update() {
         active_RCR = RCR;
         internal_rcr_cnt = active_RCR;
         internal_psc_cnt = 0;
-        CNT = 0; // Usually UEV also resets CNT unless configured otherwise
+        *((uint32_t*)&CNT) = 0; // Usually UEV also resets CNT unless configured otherwise
         SR &= ~(1U << 0); // Clear UIF if needed, or set it depending on CR1
 }
 void simulate_ticks(TIM_TypeDef* tim){
@@ -58,4 +58,11 @@ void simulate_ticks(TIM_TypeDef* tim){
             tim->internal_rcr_cnt--;
         }
     }
+}
+
+void TIM_TypeDef::inc_cnt_and_check(uint32_t val) {
+    if(val != 0 && this->check_CNT_increase_preconditions()){
+        this->CNT += val;
+        simulate_ticks(this);
+    }
 }

Tests/Time/scheduler_test.cpp

@@ -44,12 +44,11 @@ TEST_F(SchedulerTests, TaskRegistration) {
 TEST_F(SchedulerTests, TaskExecutionShort) {
     Scheduler::register_task(10,&fake_workload);
     Scheduler::start();
-    // TIM2_BASE->ARR = 500; 
-    // TIM2_BASE->generate_update();
+    TIM2_BASE->PSC = 2; // quicker test
 
     constexpr int NUM_TICKS = 1'000;
     for(int i = 0; i < NUM_TICKS; i++){
-        TIM2_BASE->CNT++;
+        for(int j = 0; j <= TIM2_BASE->PSC; j++) TIM2_BASE->inc_cnt_and_check(1);
         Scheduler::update();
     }
     // 1000 ticks / 10 ticks/task = 100 executions.
@@ -61,10 +60,11 @@ TEST_F(SchedulerTests, TaskExecutionLong) {
     Scheduler::start();
     // TIM2_BASE->ARR = 500;
     TIM2_BASE->generate_update();
+    TIM2_BASE->PSC = 2; // quicker test
 
     constexpr int NUM_TICKS = 1'000'000;
     for(int i = 0; i < NUM_TICKS; i++){
-        TIM2_BASE->CNT++;
+        for(int j = 0; j <= TIM2_BASE->PSC; j++) TIM2_BASE->inc_cnt_and_check(1);
         Scheduler::update();
     }
     EXPECT_EQ(count, 100'000);
@@ -73,10 +73,11 @@ TEST_F(SchedulerTests, TaskExecutionLong) {
 TEST_F(SchedulerTests, SetTimeout) {
     Scheduler::set_timeout(10, &fake_workload);
     Scheduler::start();
-    
+    TIM2_BASE->PSC = 2; // quicker test
+
     constexpr int NUM_TICKS = 100;
     for(int i = 0; i < NUM_TICKS; i++){
-        TIM2_BASE->CNT++;
+        for(int j = 0; j <= TIM2_BASE->PSC; j++) TIM2_BASE->inc_cnt_and_check(1);
         Scheduler::update();
     }
     EXPECT_EQ(count, 1);
@@ -86,10 +87,12 @@ TEST_F(SchedulerTests, GlobalTickOverflow) {
     Scheduler::global_tick_us_ = 0xFFFFFFF0ULL; // Near 32-bit max
     Scheduler::register_task(20, &fake_workload);
     Scheduler::start();
-    
+    TIM2_BASE->PSC = 2; // quicker test
+
     constexpr int NUM_TICKS = 100;
     for(int i = 0; i < NUM_TICKS; i++){
-        TIM2_BASE->CNT++;
+        for(int j = 0; j <= TIM2_BASE->PSC; j++) TIM2_BASE->inc_cnt_and_check(1);
+
         Scheduler::update();
     }
     // 100 ticks /20 ticks/task = 5 executions.
@@ -99,10 +102,11 @@ TEST_F(SchedulerTests, GlobalTickOverflow) {
 TEST_F(SchedulerTests, TimeoutClearAddTask) {
     uint8_t timeout_id = Scheduler::set_timeout(10, &fake_workload);
     Scheduler::start();
+    TIM2_BASE->PSC = 2; // quicker test
 
     constexpr int NUM_TICKS = 100;
     for(int i = 0; i < NUM_TICKS; i++) {
-        TIM2_BASE->CNT++;
+        for(int j = 0; j <= TIM2_BASE->PSC; j++) TIM2_BASE->inc_cnt_and_check(1);
         Scheduler::update();
     }
 
@@ -135,10 +139,11 @@ TEST_F(SchedulerTests, TaskDe_ReRegistration) {
     uint8_t operational_task = 0;
     uint8_t fault_task = 0;
     Scheduler::start();
+    TIM2_BASE->PSC = 2; // quicker test
 
     constexpr int NUM_TICKS = 100;
     for(int i = 0; i < NUM_TICKS; i++) {
-        TIM2_BASE->CNT++;
+        for(int j = 0; j <= TIM2_BASE->PSC; j++) TIM2_BASE->inc_cnt_and_check(1);
         if(i == 21){
             Scheduler::unregister_task(connecting_task);
             operational_task = Scheduler::register_task(10,operational_cyclic);