From f3303c92725d10e6da0727b97be9148d22a489d1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 20 Dec 2023 16:24:27 +1100 Subject: [PATCH] HAL_SITL: use uint64_div1000() match ChibiOS --- libraries/AP_HAL_SITL/system.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libraries/AP_HAL_SITL/system.cpp b/libraries/AP_HAL_SITL/system.cpp index 138ee2a7c2..1e4a59be20 100644 --- a/libraries/AP_HAL_SITL/system.cpp +++ b/libraries/AP_HAL_SITL/system.cpp @@ -9,6 +9,7 @@ #include #include "Scheduler.h" +#include extern const AP_HAL::HAL& hal; @@ -179,18 +180,7 @@ uint64_t micros64() uint64_t millis64() { - const HALSITL::Scheduler* scheduler = HALSITL::Scheduler::from(hal.scheduler); - uint64_t stopped_usec = scheduler->stopped_clock_usec(); - if (stopped_usec) { - return stopped_usec / 1000; - } - - struct timeval tp; - gettimeofday(&tp, nullptr); - uint64_t ret = 1.0e3*((tp.tv_sec + (tp.tv_usec*1.0e-6)) - - (state.start_time.tv_sec + - (state.start_time.tv_usec*1.0e-6))); - return ret; + return uint64_div1000(micros64()); } } // namespace AP_HAL