[delay] Refactor all deprecated usage of delay

modm-io · Apr 4, 2020 · aa3b111 · aa3b111
1 parent 4b047e0
commit aa3b111
Show file tree

Hide file tree

Showing 135 changed files with 350 additions and 325 deletions.
diff --git a/examples/arduino_uno/basic/blink/main.cpp b/examples/arduino_uno/basic/blink/main.cpp
@@ -24,8 +24,8 @@ main()
 	while (true)
 	{
 		LedD13::set();
-		modm::delayMilliseconds(1000);
+		modm::delay(1s);
 		LedD13::reset();
-		modm::delayMilliseconds(1000);
+		modm::delay(1s);
 	}
 }
diff --git a/examples/avr/1-wire/ds18b20/main.cpp b/examples/avr/1-wire/ds18b20/main.cpp
@@ -17,6 +17,7 @@
 
 using namespace modm::platform;
 using namespace modm::literals;
+using namespace std::chrono_literals;
 
 using OneWirePin = GpioC2;
 using OneWireMaster = BitBangOneWireMaster<OneWirePin>;
@@ -35,14 +36,14 @@ main()
 	modm::IOStream output(device);
 
 	output << "Welcome" << modm::endl;
-	modm::delayMilliseconds(100);
+	modm::delay(100ms);
 
 	OneWireMaster::connect<OneWirePin::BitBang>();
 	OneWireMaster::initialize<SystemClock>();
 
 	if (!OneWireMaster::touchReset()) {
 		output << "No devices found!" << modm::endl;
-		modm::delayMilliseconds(100);
+		modm::delay(100ms);
 		while (true) {
 			// wait forever
 		}
@@ -58,7 +59,7 @@ main()
 			output << rom[i];
 		}
 		output << modm::ascii << modm::endl;
-		modm::delayMilliseconds(100);
+		modm::delay(100ms);
 	}
 	output << "finished!" << modm::endl;
 
@@ -74,7 +75,7 @@ main()
 			int16_t temperature = ds18b20.readTemperature();
 
 			output << "Temperature: " << temperature << modm::endl;
-			modm::delayMilliseconds(100);
+			modm::delay(100ms);
 
 			ds18b20.startConversion();
 		}

diff --git a/examples/avr/adc/basic/main.cpp b/examples/avr/adc/basic/main.cpp
@@ -16,6 +16,7 @@
 
 using namespace modm::platform;
 using namespace modm::literals;
+using namespace std::chrono_literals;
 
 int
 main()
@@ -62,7 +63,7 @@ main()
 			// receiving the UART output on a PC. If you want to do further
 			// calculations with the results instead of sending it
 			// you do not need this.
-			modm::delayMilliseconds(300);
+			modm::delay(300ms);
 
 			// restart the conversion
 			Adc::setChannel(0);

diff --git a/examples/avr/app_can2usb/main.cpp b/examples/avr/app_can2usb/main.cpp
@@ -29,6 +29,7 @@
 #include <modm/debug/logger.hpp>
 
 using namespace modm::platform;
+using namespace std::chrono_literals;
 
 // LED1 Status
 typedef GpioOutputD7 LedStatus;
@@ -110,7 +111,7 @@ main()
 
 	while (true)
 	{
-		modm::delayMilliseconds(100);
+		modm::delay(100ms);
 		LedStatus::toggle();
 		LedRxHigh::toggle();
 		LedRxLow::toggle();

diff --git a/examples/avr/assert/main.cpp b/examples/avr/assert/main.cpp
@@ -32,9 +32,9 @@ modm_abandon(const modm::AssertionInfo &info)
 	Leds::setOutput();
 	while (true) {
 		Leds::write(1);
-		modm::delayMilliseconds(20);
+		modm::delay(20ms);
 		Leds::write(0);
-		modm::delayMilliseconds(180);
+		modm::delay(180ms);
 	}
 }
 
@@ -87,6 +87,6 @@ int main()
 	while (true)
 	{
 		LedD13::toggle();
-		modm::delayMilliseconds(500);
+		modm::delay(500ms);
 	}
 }
diff --git a/examples/avr/display/dogm128/caged_ball/main.cpp b/examples/avr/display/dogm128/caged_ball/main.cpp
@@ -17,6 +17,7 @@
 
 using namespace modm::platform;
 using namespace modm::literals;
+using namespace std::chrono_literals;
 
 
 namespace led
@@ -82,6 +83,6 @@ main()
 		display.drawCircle(Point(x, y), radius);
 		display.update();
 
-		modm::delayMilliseconds(50);
+		modm::delay(50ms);
 	}
 }
diff --git a/examples/avr/display/dogm128/image/main.cpp b/examples/avr/display/dogm128/image/main.cpp
@@ -28,6 +28,7 @@
 
 using namespace modm::platform;
 using namespace modm::literals;
+using namespace std::chrono_literals;
 
 
 namespace led
@@ -218,7 +219,7 @@ main()
 	display.drawImage(modm::glcd::Point(0, 0), modm::accessor::asFlash(bootscreen));
 	display.update();
 
-	modm::delayMilliseconds(1500);
+	modm::delay(1.5s);
 
 	uint8_t units = 0;
 	uint8_t tens = 0;
@@ -237,6 +238,6 @@ main()
 		drawNumber(modm::glcd::Point(64, 0), units);
 		display.update();
 
-		modm::delayMilliseconds(200);
+		modm::delay(200ms);
 	}
 }
diff --git a/examples/avr/display/dogm128/text/main.cpp b/examples/avr/display/dogm128/text/main.cpp
@@ -18,6 +18,7 @@
 
 using namespace modm::platform;
 using namespace modm::literals;
+using namespace std::chrono_literals;
 
 
 // LCD Backlight
@@ -76,7 +77,7 @@ main()
 	display << 0 << 12 << 345 << 6789 << "!\"§$%&/()=?`´,;:-<>";
 	display.update();
 
-	modm::delayMilliseconds(2000);
+	modm::delay(2s);
 
 	display.clear();
 	display.setFont(modm::font::Assertion);
@@ -87,7 +88,7 @@ main()
 	display << "0123456789!\"§$%&/()=?`´,;:-<>";
 	display.update();
 
-	modm::delayMilliseconds(2000);
+	modm::delay(2s);
 
 	display.clear();
 	display.setFont(modm::font::ArcadeClassic);

diff --git a/examples/avr/display/dogm128/touch/main.cpp b/examples/avr/display/dogm128/touch/main.cpp
@@ -18,6 +18,7 @@
 
 using namespace modm::platform;
 using namespace modm::literals;
+using namespace std::chrono_literals;
 
 namespace touch
 {
@@ -115,7 +116,7 @@ main()
 		touch::Left::setOutput();
 		touch::Right::set();
 		touch::Right::setOutput();
-		modm::delayMilliseconds(2);
+		modm::delay(2ms);
 
 		int16_t xAdc = Adc::readChannel(0);
 
@@ -128,7 +129,7 @@ main()
 		touch::Bottom::setOutput();
 		touch::Top::set();
 		touch::Top::setOutput();
-		modm::delayMilliseconds(2);
+		modm::delay(2ms);
 
 		int16_t yAdc = Adc::readChannel(1);
 

diff --git a/examples/avr/display/hd44780/main.cpp b/examples/avr/display/hd44780/main.cpp
@@ -15,6 +15,7 @@
 #include <modm/driver/display/hd44780.hpp>
 
 using namespace modm::platform;
+using namespace std::chrono_literals;
 
 // define the pins used by the LCD
 namespace lcd
@@ -46,7 +47,7 @@ main()
 
 	// The LCD needs at least 50ms after power-up until it can be
 	// initialized. To make sure this is met we wait here
-	modm::delayMilliseconds(50);
+	modm::delay(50ms);
 
 	display.initialize();
 	display.setCursor(0, 0);
@@ -64,6 +65,6 @@ main()
 
 		counter++;
 
-		modm::delayMilliseconds(200);
+		modm::delay(200ms);
 	}
 }
diff --git a/examples/avr/gpio/blinking/main.cpp b/examples/avr/gpio/blinking/main.cpp
@@ -13,6 +13,7 @@
 #include <modm/platform.hpp>
 
 using namespace modm::platform;
+using namespace std::chrono_literals;
 
 typedef GpioOutputB0 Led;
 
@@ -25,7 +26,7 @@ main()
 	{
 		Led::toggle();
 
-		modm::delayMilliseconds(1000);
+		modm::delay(1s);
 	}
 }
 
diff --git a/examples/avr/ports/main.cpp b/examples/avr/ports/main.cpp
@@ -77,10 +77,10 @@ int main()
 	PinGroup4::setInput(); serialStream << modm::bin << PinGroup4::read() << modm::endl;
 	serialStream << modm::endl;
 
-	PinGroup::setOutput(modm::Gpio::High); modm::delayMilliseconds(1000);
+	PinGroup::setOutput(modm::Gpio::High); modm::delay(1s);
 
 	const auto fn_report = []() {
-		serialStream << modm::bin << PinGroup::read() << modm::endl; modm::delayMilliseconds(200);
+		serialStream << modm::bin << PinGroup::read() << modm::endl; modm::delay(200ms);
 	};
 
 	while (true)

diff --git a/examples/avr/xpcc/receiver/main.cpp b/examples/avr/xpcc/receiver/main.cpp
@@ -20,6 +20,7 @@
 
 using namespace modm::platform;
 using namespace modm::literals;
+using namespace std::chrono_literals;
 
 // set new log level
 #undef MODM_LOG_LEVEL
@@ -111,6 +112,6 @@ main()
 
 		component::receiver.update();
 
-		modm::delayMicroseconds(100);
+		modm::delay(100us);
 	}
 }
diff --git a/examples/avr/xpcc/sender/main.cpp b/examples/avr/xpcc/sender/main.cpp
@@ -20,6 +20,7 @@
 
 using namespace modm::platform;
 using namespace modm::literals;
+using namespace std::chrono_literals;
 
 // set new log level
 #undef MODM_LOG_LEVEL
@@ -111,6 +112,6 @@ main()
 
 		component::sender.update();
 
-		modm::delayMicroseconds(100);
+		modm::delay(100us);
 	}
 }
diff --git a/examples/generic/blinky/main.cpp b/examples/generic/blinky/main.cpp
@@ -18,7 +18,7 @@ int main()
 	while (true)
 	{
 		Board::Leds::toggle();
-		modm::delayMilliseconds(Board::Button::read() ? 250 : 500);
+		modm::delay(Board::Button::read() ? 250ms : 500ms);
 #ifdef MODM_BOARD_HAS_LOGGER
 		static uint32_t counter(0);
 		MODM_LOG_INFO << "Loop counter: " << (counter++) << modm::endl;

diff --git a/examples/linux/xpcc/basic/main.cpp b/examples/linux/xpcc/basic/main.cpp
@@ -12,6 +12,7 @@
 // ----------------------------------------------------------------------------
 
 #include <modm/platform.hpp>
+using namespace std::chrono_literals;
 
 #include <modm/communication/xpcc.hpp>
 // #include <modm/communication/xpcc/backend/tipc.hpp>
@@ -65,6 +66,6 @@ main()
 		component::receiver.update();
 		component::sender.update();
 
-		modm::delayMicroseconds(100);
+		modm::delay(100us);
 	}
 }
diff --git a/examples/nucleo_f042k6/adc/main.cpp b/examples/nucleo_f042k6/adc/main.cpp
@@ -44,7 +44,7 @@ main()
 	while (true)
 	{
 		LedD13::toggle();
-		modm::delayMilliseconds(100);
+		modm::delay(100ms);
 
 		MODM_LOG_INFO << "mV=" << (Vref * Adc::getValue() / 4095ul) << modm::endl;
 

diff --git a/examples/nucleo_f042k6/blink/main.cpp b/examples/nucleo_f042k6/blink/main.cpp
@@ -31,7 +31,7 @@ main()
 	while (true)
 	{
 		LedD13::toggle();
-		modm::delayMilliseconds(Button::read() ? 100 : 500);
+		modm::delay(Button::read() ? 100ms : 500ms);
 
 		MODM_LOG_INFO << "loop: " << counter++ << modm::endl;
 	}

diff --git a/examples/nucleo_f103rb/hard_fault/main.cpp b/examples/nucleo_f103rb/hard_fault/main.cpp
@@ -37,7 +37,7 @@ void modm_hardfault_entry()
 	// Put hardware in safe mode here
 	Board::Leds::set();
 	// But do not wait forever
-	modm::delayMilliseconds(100);
+	modm::delay(100ms);
 	// Do not depend on interrupts in this function (buffered UART etc!)
 }
 
@@ -79,7 +79,7 @@ main()
 
 		function2(23, 43);
 
-		modm::delayMilliseconds(250);
+		modm::delay(250ms);
 	}
 
 	return 0;

diff --git a/examples/nucleo_f103rb/undefined_irq/main.cpp b/examples/nucleo_f103rb/undefined_irq/main.cpp
@@ -72,7 +72,7 @@ int main()
 			NVIC_SetPendingIRQ(IRQn_Type(int(EXTI0_IRQn) + ii));
 			ii = (ii + 1) % 5;
 			// wait one second for debounce
-			modm::delayMilliseconds(500);
+			modm::delay(500ms);
 		}
 	}
 

diff --git a/examples/nucleo_f303k8/blink/main.cpp b/examples/nucleo_f303k8/blink/main.cpp
@@ -31,7 +31,7 @@ main()
 	while (true)
 	{
 		LedD13::toggle();
-		modm::delayMilliseconds(Button::read() ? 100 : 500);
+		modm::delay(Button::read() ? 100ms : 500ms);
 
 		MODM_LOG_INFO << "loop: " << counter++ << modm::endl;
 	}

diff --git a/examples/nucleo_f401re/blink/main.cpp b/examples/nucleo_f401re/blink/main.cpp
@@ -31,7 +31,7 @@ main()
 	while (true)
 	{
 		LedD13::toggle();
-		modm::delayMilliseconds(Button::read() ? 100 : 500);
+		modm::delay(Button::read() ? 100ms : 500ms);
 
 		MODM_LOG_INFO << "loop: " << counter++ << modm::endl;
 	}

diff --git a/examples/nucleo_f411re/blink/main.cpp b/examples/nucleo_f411re/blink/main.cpp
@@ -31,7 +31,7 @@ main()
 	while (true)
 	{
 		LedD13::toggle();
-		modm::delayMilliseconds(Button::read() ? 100 : 500);
+		modm::delay(Button::read() ? 100ms : 500ms);
 
 		MODM_LOG_INFO << "loop: " << counter++ << modm::endl;
 	}

diff --git a/examples/nucleo_f411re/radio/nrf24-phy-test/main.cpp b/examples/nucleo_f411re/radio/nrf24-phy-test/main.cpp
@@ -53,7 +53,7 @@ int main()
 		MODM_LOG_INFO << "Testing PHY2" << modm::endl;
 		test<Nrf2Phy>();
 
-		modm::delayMilliseconds(1000);
+		modm::delay(1s);
 	}
 
 	return 0;