NV14

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

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;
+}

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;

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]

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);