Upgrade arduino-hal to latest version.

Author: Cryptjar

Cargo.toml

@@ -52,8 +52,18 @@ ufmt = "0.1.0"
 version = "1.0"
 default-features = false
 
+[dev-dependencies.avr-device]
+version = "0.3"
+features = ["atmega328p", "rt"]
 
-[dev-dependencies.arduino-uno]
+[dev-dependencies.arduino-hal]
 # It is not yet available via crates.io
 git = "https://github.com/Rahix/avr-hal.git"
-rev = "0c6cf1675c2724354f1adeaeee69992acd371e80"
+rev = "e897783816437a677aa577ddfdaa34e9a1e86d96"
+features = ["arduino-uno"]
+
+[dev-dependencies.atmega-hal]
+# It is not yet available via crates.io
+git = "https://github.com/Rahix/avr-hal.git"
+rev = "e897783816437a677aa577ddfdaa34e9a1e86d96"
+

examples/printer/mod.rs

@@ -10,11 +10,21 @@
 
 // Import the Arduino libraries, interestingly they don't cause problems perse
 // on other architectures. Through, we will not use there.
-use arduino_uno::prelude::*;
+use arduino_hal::port::mode::AnyInput;
+use arduino_hal::port::mode::Input;
+use arduino_hal::port::mode::Output;
+use arduino_hal::port::Pin;
+use arduino_hal::prelude::*;
 
 
 #[cfg(target_arch = "avr")]
-pub struct Printer(pub arduino_uno::Serial<arduino_uno::hal::port::mode::Floating>);
+pub struct Printer(
+	pub  arduino_hal::usart::Usart<
+		avr_device::atmega328p::USART0,
+		Pin<Input<AnyInput>, atmega_hal::port::PD0>,
+		Pin<Output, atmega_hal::port::PD1>,
+	>,
+);
 #[cfg(not(target_arch = "avr"))]
 pub struct Printer;
 

examples/uno-serial.rs

@@ -33,7 +33,7 @@
 
 // Define no_std only for AVR
 #![cfg_attr(target_arch = "avr", no_std)]
-#![no_main]
+#![cfg_attr(target_arch = "avr", no_main)]
 
 
 use avr_progmem::progmem;
@@ -55,23 +55,17 @@ progmem! {
 mod printer;
 use printer::Printer;
 
-#[no_mangle]
+#[cfg_attr(target_arch = "avr", arduino_hal::entry)]
 fn main() -> ! {
 	let mut printer = {
 		#[cfg(target_arch = "avr")]
 		{
 			// Initialize the USB-Serial output on the Arduino Uno
 
-			let dp = arduino_uno::Peripherals::take().unwrap();
+			let dp = arduino_hal::Peripherals::take().unwrap();
+			let pins = arduino_hal::pins!(dp);
+			let serial = arduino_hal::default_serial!(dp, pins, 9600);
 
-			let mut pins = arduino_uno::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD);
-
-			let serial = arduino_uno::Serial::new(
-				dp.USART0,
-				pins.d0,
-				pins.d1.into_output(&mut pins.ddr),
-				9600,
-			);
 			Printer(serial)
 		}
 		#[cfg(not(target_arch = "avr"))]

examples/uno-string.rs

@@ -5,7 +5,7 @@
 
 // Define no_std only for AVR
 #![cfg_attr(target_arch = "avr", no_std)]
-#![no_main]
+#![cfg_attr(target_arch = "avr", no_main)]
 //
 // To unwrap the Option in const context
 #![feature(const_option)]
@@ -46,23 +46,17 @@ temporary DRAM necessary.
 mod printer;
 use printer::Printer;
 
-#[no_mangle]
+#[cfg_attr(target_arch = "avr", arduino_hal::entry)]
 fn main() -> ! {
 	let mut printer = {
 		#[cfg(target_arch = "avr")]
 		{
 			// Initialize the USB-Serial output on the Arduino Uno
 
-			let dp = arduino_uno::Peripherals::take().unwrap();
+			let dp = arduino_hal::Peripherals::take().unwrap();
+			let pins = arduino_hal::pins!(dp);
+			let serial = arduino_hal::default_serial!(dp, pins, 9600);
 
-			let mut pins = arduino_uno::Pins::new(dp.PORTB, dp.PORTC, dp.PORTD);
-
-			let serial = arduino_uno::Serial::new(
-				dp.USART0,
-				pins.d0,
-				pins.d1.into_output(&mut pins.ddr),
-				9600,
-			);
 			Printer(serial)
 		}
 		#[cfg(not(target_arch = "avr"))]