chores: remove simuTimerMicros()

Author: raphaelcoeffic

radio/src/gui/colorlcd/libui/mainwindow.cpp

@@ -22,10 +22,9 @@
 #include "keyboard_base.h"
 #include "layout.h"
 #include "etx_lv_theme.h"
-#include "sdcard.h"
 
-// timers_driver.h
-uint32_t timersGetMsTick();
+#include "os/time.h"
+#include "sdcard.h"
 
 MainWindow* MainWindow::_instance = nullptr;
 
@@ -55,7 +54,7 @@ void MainWindow::emptyTrash()
 
 void MainWindow::run(bool trash)
 {
-  auto start = timersGetMsTick();
+  auto start = time_get_ms();
 
   auto opaque = Layer::getFirstOpaque();
   if (opaque) {
@@ -71,7 +70,7 @@ void MainWindow::run(bool trash)
 
   if (trash) emptyTrash();
 
-  auto delta = timersGetMsTick() - start;
+  auto delta = time_get_ms() - start;
   if (delta > 10) {
     TRACE_WINDOWS("MainWindow::run took %dms", delta);
   }

radio/src/os/time_native.cpp

@@ -23,11 +23,12 @@
 
 #include <chrono>
 
-extern uint64_t simuTimerMicros(void);
-
 uint32_t time_get_ms()
 {
-  return simuTimerMicros() / 1000;
+  static auto _start = std::chrono::steady_clock::now();;
+  auto now = std::chrono::steady_clock::now();
+  auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(now - _start);
+  return duration.count();
 }
 
 time_point_t time_point_now()

radio/src/targets/simu/opentxsimulator.cpp

@@ -40,7 +40,7 @@
 
 #define GET_SWITCH_BOOL(sw__)    getSwitch((sw__), 0);
 
-#define ETXS_DBG    qDebug() << "(" << simuTimerMicros() << "us)"
+#define ETXS_DBG    qDebug() << "(" << time_get_ms() << "us)"
 
 int16_t g_anas[MAX_ANALOG_INPUTS];
 QVector<QIODevice *> OpenTxSimulator::tracebackDevices;
@@ -765,7 +765,7 @@ void OpenTxSimulator::run()
   }
 
   if (!(loops % (SIMULATOR_INTERFACE_HEARTBEAT_PERIOD / 10))) {
-    emit heartbeat(loops, simuTimerMicros() / 1000);
+    emit heartbeat(loops, time_get_ms());
   }
 }
 

radio/src/targets/simu/simulib.cpp

@@ -32,7 +32,6 @@
 #include "edgetx.h"
 
 #include <assert.h>
-#include <chrono>
 
 int g_snapshot_idx = 0;
 
@@ -56,27 +55,6 @@ extern const etx_hal_adc_driver_t simu_adc_driver;
 
 void lcdCopy(void * dest, void * src);
 
-uint64_t simuTimerMicros(void)
-{
-  auto now = std::chrono::steady_clock::now();
-  return (uint64_t) std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch()).count();
-}
-
-uint16_t getTmr16KHz()
-{
-  return simuTimerMicros() * 2 / 125;
-}
-
-uint16_t getTmr2MHz()
-{
-  return simuTimerMicros() * 2;
-}
-
-uint32_t timersGetMsTick(void)
-{
-  return simuTimerMicros() / 1000;
-}
-
 void simuInit()
 {
 #if defined(ROTARY_ENCODER_NAVIGATION)

radio/src/targets/simu/simulib.h

@@ -53,8 +53,6 @@ void WASM_IMPORT(simuQueueAudio)(const uint8_t* buf, uint32_t len);
 
 void simuMain();
 
-uint64_t simuTimerMicros();
-
 void simuFatfsSetPaths(const char * sdPath, const char * settingsPath);
 std::string simuFatfsGetCurrentPath();
 std::string simuFatfsGetRealPath(const std::string& p);