[clock] Allow overriding the clock implementation functions

Author: salkinium

src/modm/platform/clock/avr/clock.cpp.in

@@ -72,8 +72,17 @@ MODM_ISR(TIMER0_COMPA)
 	interrupt = true;
 }
 
+// ----------------------------------------------------------------------------
+// Allow the ability to override the clock now functions
+#ifndef MODM_CHRONO_MILLI_CLOCK_NOW
+#	define MODM_CHRONO_MILLI_CLOCK_NOW modm::chrono::milli_clock::now
+#endif
+#ifndef MODM_CHRONO_MICRO_CLOCK_NOW
+#	define MODM_CHRONO_MICRO_CLOCK_NOW modm::chrono::micro_clock::now
+#endif
+
 modm::chrono::milli_clock::time_point modm_weak
-modm::chrono::milli_clock::now() noexcept
+MODM_CHRONO_MILLI_CLOCK_NOW() noexcept
 {
 	uint32_t time;
 	do
@@ -82,11 +91,11 @@ modm::chrono::milli_clock::now() noexcept
 		time = milli_time;
 	}
 	while(interrupt);
-	return time_point{duration{time}};
+	return modm::chrono::milli_clock::time_point{modm::chrono::milli_clock::duration{time}};
 }
 
 modm::chrono::micro_clock::time_point modm_weak
-modm::chrono::micro_clock::now() noexcept
+MODM_CHRONO_MICRO_CLOCK_NOW() noexcept
 {
 	uint32_t time;
 	uint8_t val;
@@ -101,5 +110,5 @@ modm::chrono::micro_clock::now() noexcept
 
 	time += uint16_t(val * uint16_t({{scaler}})) >> {{shift}};
 
-	return time_point{duration{time}};
+	return modm::chrono::micro_clock::time_point{modm::chrono::micro_clock::duration{time}};
 }

src/modm/platform/clock/systick/systick_timer.cpp.in

@@ -79,11 +79,19 @@ modm::platform::SysTickTimer::disable()
 }
 
 // ----------------------------------------------------------------------------
+// Allow the ability to override the clock now functions
+#ifndef MODM_CHRONO_MILLI_CLOCK_NOW
+#	define MODM_CHRONO_MILLI_CLOCK_NOW modm::chrono::milli_clock::now
+#endif
+#ifndef MODM_CHRONO_MICRO_CLOCK_NOW
+#	define MODM_CHRONO_MICRO_CLOCK_NOW modm::chrono::micro_clock::now
+#endif
+
 modm::chrono::milli_clock::time_point modm_weak
-modm::chrono::milli_clock::now() noexcept
+MODM_CHRONO_MILLI_CLOCK_NOW() noexcept
 {
 %% if systick_frequency == 1000
-	return time_point{duration{milli_time}};
+	return modm::chrono::milli_clock::time_point{modm::chrono::milli_clock::duration{milli_time}};
 %% else
 	uint32_t val, ms;
 %% if multicore
@@ -98,16 +106,16 @@ modm::chrono::milli_clock::now() noexcept
 	}
 	while(interrupt);
 	const auto diff = SysTick->LOAD - val;
-	const auto ms_per_Ncycles = platform::SysTickTimer::ms_per_Ncycles;
-	constexpr auto Ncycles = platform::SysTickTimer::Ncycles;
+	const auto ms_per_Ncycles = modm::platform::SysTickTimer::ms_per_Ncycles;
+	constexpr auto Ncycles = modm::platform::SysTickTimer::Ncycles;
 
 	ms += (uint64_t(diff) * uint64_t(ms_per_Ncycles)) >> Ncycles;
-	return time_point{duration{ms}};
+	return modm::chrono::milli_clock::time_point{modm::chrono::milli_clock::duration{ms}};
 %% endif
 }
 
 modm::chrono::micro_clock::time_point modm_weak
-modm::chrono::micro_clock::now() noexcept
+MODM_CHRONO_MICRO_CLOCK_NOW() noexcept
 {
 	uint32_t val, us;
 %% if multicore
@@ -122,8 +130,8 @@ modm::chrono::micro_clock::now() noexcept
 	}
 	while(interrupt);
 	const auto diff = SysTick->LOAD - val;
-	const auto us_per_Ncycles = platform::SysTickTimer::us_per_Ncycles;
-	constexpr auto Ncycles = platform::SysTickTimer::Ncycles;
+	const auto us_per_Ncycles = modm::platform::SysTickTimer::us_per_Ncycles;
+	constexpr auto Ncycles = modm::platform::SysTickTimer::Ncycles;
 
 %% if systick_frequency == 1000
 	// use a 32x32=32bit multiplication
@@ -132,5 +140,6 @@ modm::chrono::micro_clock::now() noexcept
 	// use a 32x32=64bit multiplication
 	us += (uint64_t(diff) * uint64_t(us_per_Ncycles)) >> Ncycles;
 %% endif
-	return time_point{duration{us}};
+
+	return modm::chrono::micro_clock::time_point{modm::chrono::micro_clock::duration{us}};
 }

src/modm/platform/clock/systick/systick_timer.hpp.in

@@ -82,6 +82,8 @@ private:
 	static void
 	enable(uint32_t reload, bool use_processor_clock);
 
+public:
+	/// @cond
 %% if systick_frequency != 1000
 	// FCPU < 8MHz
 	// 536e6/4 < 27-bit, 8e6/4 < 21-bit
@@ -101,8 +103,7 @@ private:
 	static constexpr uint8_t Ncycles{20};
 %% endif
 	static inline uint32_t us_per_Ncycles{0};
-	friend class modm::chrono::milli_clock;
-	friend class modm::chrono::micro_clock;
+	/// @endcond
 };
 
 }

src/modm/platform/core/hosted/clock.cpp

@@ -11,16 +11,27 @@
 
 #include <modm/architecture/interface/clock.hpp>
 
+// Allow the ability to override the clock now functions
+#ifndef MODM_CHRONO_MILLI_CLOCK_NOW
+#	define MODM_CHRONO_MILLI_CLOCK_NOW modm::chrono::milli_clock::now
+#else
+#endif
+#ifndef MODM_CHRONO_MICRO_CLOCK_NOW
+#	define MODM_CHRONO_MICRO_CLOCK_NOW modm::chrono::micro_clock::now
+#endif
+
 modm::chrono::milli_clock::time_point modm_weak
-modm::chrono::milli_clock::now() noexcept
+MODM_CHRONO_MILLI_CLOCK_NOW() noexcept
 {
 	const auto time = std::chrono::steady_clock::now().time_since_epoch();
-	return time_point{std::chrono::duration_cast<duration>(time)};
+	return modm::chrono::milli_clock::time_point{
+		std::chrono::duration_cast<modm::chrono::milli_clock::duration>(time)};
 }
 
 modm::chrono::micro_clock::time_point modm_weak
-modm::chrono::micro_clock::now() noexcept
+MODM_CHRONO_MICRO_CLOCK_NOW() noexcept
 {
 	const auto time = std::chrono::high_resolution_clock::now().time_since_epoch();
-	return time_point{std::chrono::duration_cast<duration>(time)};
+	return modm::chrono::micro_clock::time_point{
+		std::chrono::duration_cast<modm::chrono::micro_clock::duration>(time)};
 }