From 068ba79f26f480da4c64b06b33a3541e6fb91a0f Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sun, 3 Apr 2022 16:19:14 +0200
Subject: [PATCH] NV14

---
 radio/src/keys.cpp                                 |  2 +-
 radio/src/targets/common/arm/stm32/timers_driver.h | 11 ++++++++++-
 radio/src/telemetry/multi.h                        |  2 +-
 radio/src/telemetry/telemetry_holders.h            |  2 +-
 radio/src/timers.h                                 |  6 ------
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/radio/src/keys.cpp b/radio/src/keys.cpp
index 7f7d8c447..2a24dfcb7 100644
--- a/radio/src/keys.cpp
+++ b/radio/src/keys.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "keys.h"
-#include "timers.h"
+#include "timers_driver.h"
 #include "opentx_helpers.h"
 
 #define KEY_LONG_DELAY              32  // long key press minimum duration (x10ms), must be less than KEY_REPEAT_DELAY
diff --git a/radio/src/targets/common/arm/stm32/timers_driver.h b/radio/src/targets/common/arm/stm32/timers_driver.h
index 08aa37ce2..5e9291e9b 100644
--- a/radio/src/targets/common/arm/stm32/timers_driver.h
+++ b/radio/src/targets/common/arm/stm32/timers_driver.h
@@ -25,7 +25,7 @@
 
 uint16_t getTmr2MHz();
 
-#elif defined(STM32)
+#else
 
 #include "board.h"
 
@@ -38,3 +38,12 @@ static inline uint16_t getTmr2MHz() { return TIMER_2MHz_TIMER->CNT; }
 void watchdogSuspend(uint32_t timeout);
 
 #endif
+
+#include "opentx_types.h"
+
+extern volatile tmr10ms_t g_tmr10ms;
+
+static inline tmr10ms_t get_tmr10ms()
+{
+  return g_tmr10ms;
+}
diff --git a/radio/src/telemetry/multi.h b/radio/src/telemetry/multi.h
index ff454d9e9..f5ec3cc8c 100644
--- a/radio/src/telemetry/multi.h
+++ b/radio/src/telemetry/multi.h
@@ -22,7 +22,7 @@
 #ifndef OPENTX_MULTI_H
 #define OPENTX_MULTI_H
 
-#include "../timers.h"
+#include "timers_driver.h"
 
 #define MULTI_BUFFER_SIZE 177
 extern uint8_t * Multi_Buffer;
diff --git a/radio/src/telemetry/telemetry_holders.h b/radio/src/telemetry/telemetry_holders.h
index f48ec97b7..d345434c8 100644
--- a/radio/src/telemetry/telemetry_holders.h
+++ b/radio/src/telemetry/telemetry_holders.h
@@ -24,7 +24,7 @@
 
 #include <inttypes.h>
 #include <string.h>
-#include "../timers.h"
+#include "timers_driver.h"
 
 #define TELEMETRY_AVERAGE_COUNT   3     // we actually average one more reading!
 #define RAW_FRSKY_MINMAX(v)       v.values[TELEMETRY_AVERAGE_COUNT-1]
diff --git a/radio/src/timers.h b/radio/src/timers.h
index e3240f47b..2afc9ecaa 100644
--- a/radio/src/timers.h
+++ b/radio/src/timers.h
@@ -57,12 +57,6 @@ void restoreTimers();
 
 void evalTimers(int16_t throttle, uint8_t tick10ms);
 
-extern volatile tmr10ms_t g_tmr10ms;
-static inline tmr10ms_t get_tmr10ms()
-{
-  return g_tmr10ms;
-}
-
 int16_t throttleSource2Source(int16_t thrSrc);
 int16_t source2ThrottleSource(int16_t src);