Merge pull request #46 from stevenewald/echavemann/deprecate-timer

Deprecate Old Timer
stevenewald · Dec 8, 2024 · 26acd41 · 26acd41
2 parents f11fc00 + a9e466e
commit 26acd41
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 108 deletions.
diff --git a/include/drivers/timer.hpp b/include/drivers/timer.hpp
diff --git a/include/drivers/virtual_timer_controller.hpp b/include/drivers/virtual_timer_controller.hpp
@@ -40,6 +40,8 @@ class VirtualTimerController {
     );
     void virtual_timer_cancel(uint32_t timer_id);
 
+    uint32_t read_timer() const;
+
     static VirtualTimerController& get();
 
     VirtualTimerController(VirtualTimerController&) = delete;
@@ -56,8 +58,6 @@ class VirtualTimerController {
 
     void enqueue_next_timer() const;
 
-    uint32_t read_timer() const;
-
     uint32_t timer_start(
         uint32_t microseconds, ProcessCallbackPtr callback, ProcessId timer_creator
     );

diff --git a/src/drivers/driver_commands.cpp b/src/drivers/driver_commands.cpp
@@ -3,7 +3,6 @@
 #include "drivers/button_driver.hpp"
 #include "drivers/driver_enums.hpp"
 #include "drivers/led_display.hpp"
-#include "drivers/timer.hpp"
 #include "drivers/virtual_timer_controller.hpp"
 
 #include <stdio.h>
@@ -23,7 +22,7 @@ etl::optional<int> handle_command(DriverCommand type, int arg1, int arg2, int ar
             led_display.set_led(arg1, arg2, arg3);
             break;
         case DriverCommand::GET_TIME:
-            return timer4_controller.get_time_us();
+            return VirtualTimerController::get().read_timer();
         case DriverCommand::TERMINAL_OUTPUT:
             printf((char*)arg1);
             break;

diff --git a/src/drivers/timer.cpp b/src/drivers/timer.cpp