Merge pull request #7231 from mikeller/optimise_timer_tests

Made timer tests respect 'USE_TIMER_MGMT'.

src/main/drivers/serial.h

@@ -21,6 +21,9 @@
 #pragma once
 
 #include "drivers/io.h"
+#include "drivers/io_types.h"
+#include "drivers/resource.h"
+
 #include "pg/pg.h"
 
 typedef enum {

src/test/Makefile

@@ -283,9 +283,8 @@ telemetry_ibus_unittest_SRC := \
 
 timer_definition_unittest_EXPAND := yes
 
-# NERO and STM32F7X2 are universal targets with dynamic timer management.
 # SITL is a simulator with empty timerHardware and many hearders in target.c.
-timer_definition_unittest_BLACKLIST := NERO SITL STM32F7X2
+timer_definition_unittest_BLACKLIST := SITL
 
 timer_definition_unittest_SRC = \
 		$(TARGET_DIR)/$(call get_base_target,$1)/target.c

src/test/unit/timer_definition_unittest.cc

@@ -39,6 +39,7 @@ TEST(TimerDefinitionTest, Test_counterMismatch) {
             << " array element appears to be " << &t - timerHardware - 1 << '.';
 }
 
+#if !defined(USE_TIMER_MGMT)
 TEST(TimerDefinitionTest, Test_duplicatePin) {
     std::set<TestPinEnum> usedPins;
     for (const timerHardware_t &t : timerHardware)
@@ -87,6 +88,7 @@ TEST(TimerDefinitionTest, Test_usedTimers)
         << "USED_TIMERS definition based on timerHardware:" << std::endl
         << writeUsedTimers(expected) << std::endl;
 }
+#endif
 
 // STUBS