examples use std::chrono::duration in Timer**::setPeriod(...)

modm-io · Jun 12, 2022 · c949daf · c949daf
1 parent 5ddcab3
commit c949daf
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/examples/blue_pill_f103/encoder_input_bitbang/main.cpp b/examples/blue_pill_f103/encoder_input_bitbang/main.cpp
@@ -38,18 +38,19 @@ MODM_ISR(TIM2)
 	encoder.update();
 }
 
+template<class Timer, class Rep, class Period>
 void
-init_Timer2(const uint16_t period)
+initPeriodicInterrupt(std::chrono::duration<Rep, Period> period)
 {
-	Timer2::enable();
-	Timer2::setMode(Timer2::Mode::UpCounter);
+	Timer::enable();
+	Timer::setMode(Timer::Mode::UpCounter);
 
-	Timer2::template setPeriod<Board::SystemClock>(period);
-	Timer2::enableInterruptVector(true, 10);
-	Timer2::enableInterrupt(Timer2::Interrupt::Update);
+	Timer::template setPeriod<Board::SystemClock>(period);
+	Timer::enableInterruptVector(true, 10);
+	Timer::enableInterrupt(Timer::Interrupt::Update);
 
-	Timer2::applyAndReset();
-	Timer2::start();
+	Timer::applyAndReset();
+	Timer::start();
 }
 
 int
@@ -61,7 +62,7 @@ main()
 	Usart2::initialize<Board::SystemClock, 115200_Bd>();
 
 	encoder.initialize();
-	init_Timer2(1000); // 1ms period
+	initPeriodicInterrupt<Timer2>(1ms);
 
 	int value(0);
 

diff --git a/examples/nucleo_f042k6/vector_table_ram/main.cpp b/examples/nucleo_f042k6/vector_table_ram/main.cpp
@@ -38,7 +38,7 @@ main()
 
 	Timer14::enable();
 	Timer14::setMode(Timer14::Mode::UpCounter);
-	Timer14::setPeriod<Board::SystemClock>(500'000 /* us */);
+	Timer14::setPeriod<Board::SystemClock>(500ms);
 	Timer14::applyAndReset();
 	Timer14::start();
 	Timer14::enableInterrupt(Timer14::Interrupt::Update);

diff --git a/examples/nucleo_l031k6/vector_table_ram/main.cpp b/examples/nucleo_l031k6/vector_table_ram/main.cpp
@@ -37,7 +37,7 @@ main()
 
 	Timer2::enable();
 	Timer2::setMode(Timer2::Mode::UpCounter);
-	Timer2::setPeriod<Board::SystemClock>(500'000 /* us */);
+	Timer2::setPeriod<Board::SystemClock>(500ms);
 	Timer2::applyAndReset();
 	Timer2::start();
 	Timer2::enableInterrupt(Timer2::Interrupt::Update);

diff --git a/examples/stm32f3_discovery/timer/basic/main.cpp b/examples/stm32f3_discovery/timer/basic/main.cpp
@@ -24,7 +24,7 @@ main()
 	//Timer1::setMode(Timer1::Mode::CenterAligned3);
 	Timer1::setMode(Timer1::Mode::UpCounter);
 	Timer1::setOverflow(0xff);
-	//Timer1::setPeriod(4);
+	//Timer1::setPeriod(4us);
 	Timer1::applyAndReset();
 	Timer1::start();
 

diff --git a/examples/stm32f4_discovery/timer_test/main.cpp b/examples/stm32f4_discovery/timer_test/main.cpp
@@ -39,7 +39,7 @@ testTimerAdvancedStart()
 	TIMER::enable();
 	TIMER::setMode(TIMER::Mode::UpCounter);
 
-	TIMER::template setPeriod<Board::SystemClock>(250000);
+	TIMER::template setPeriod<Board::SystemClock>(250ms);
 	TIMER::enableInterruptVector(TIMER::Interrupt::Update, true, 10);
 	TIMER::enableInterrupt(TIMER::Interrupt::Update);
 
@@ -54,7 +54,7 @@ testTimerStart()
 	TIMER::enable();
 	TIMER::setMode(TIMER::Mode::UpCounter);
 
-	TIMER::template setPeriod<Board::SystemClock>(250000);
+	TIMER::template setPeriod<Board::SystemClock>(250ms);
 	TIMER::enableInterruptVector(true, 10);
 	TIMER::enableInterrupt(TIMER::Interrupt::Update);