Fix unit tests after latest rebase.

adbancroft · Dec 7, 2024 · e0ad554 · e0ad554
1 parent 7642346
commit e0ad554
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/test/test_schedules/test_state_machine.cpp b/test/test_schedules/test_state_machine.cpp
@@ -19,7 +19,7 @@ static void test_defaultPendingToRunning(void) {
     schedule.Status = PENDING;
     startCount = 0;
     endCount = 0;
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+    ATOMIC() {
         IGN1_TIMER_DISABLE();
         schedule.Duration = uS_TO_TIMER_COMPARE(2048); 
 #if defined(CORE_AVR)        
@@ -70,7 +70,7 @@ static void test_defaultRunningToPending(void) {
     startCount = 0;
     endCount = 0;
 
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+    ATOMIC() {
         IGN1_TIMER_DISABLE();
         schedule.nextStartCompare = schedule._counter + uS_TO_TIMER_COMPARE(2048); 
 

diff --git a/test/test_sensors/test_map_sampling.cpp b/test/test_sensors/test_map_sampling.cpp
@@ -1,5 +1,6 @@
 #include <unity.h>
 #include "../test_utils.h"
+#include "globals.h"
 #include "sensors_map_structs.h"
 
 static void test_instantaneous(void) {