Merge pull request #751 from jannic/issue-749

thejpster · web-flow · commit bbdc2e95174a · 2024-01-06T12:27:30.000Z
diff --git a/rp2040-hal/examples/adc.rs b/rp2040-hal/examples/adc.rs
@@ -68,7 +68,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The delay object lets us wait for specified amounts of time (in
diff --git a/rp2040-hal/examples/adc_fifo_dma.rs b/rp2040-hal/examples/adc_fifo_dma.rs
@@ -69,7 +69,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The delay object lets us wait for specified amounts of time (in
diff --git a/rp2040-hal/examples/adc_fifo_irq.rs b/rp2040-hal/examples/adc_fifo_irq.rs
@@ -80,7 +80,6 @@ mod app {
             &mut resets,
             &mut watchdog,
         )
-        .ok()
         .unwrap();
         let sio = hal::Sio::new(c.device.SIO);
         let pins = hal::gpio::Pins::new(
diff --git a/rp2040-hal/examples/adc_fifo_poll.rs b/rp2040-hal/examples/adc_fifo_poll.rs
@@ -67,7 +67,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The delay object lets us wait for specified amounts of time (in
diff --git a/rp2040-hal/examples/blinky.rs b/rp2040-hal/examples/blinky.rs
@@ -61,7 +61,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     let mut timer = rp2040_hal::Timer::new(pac.TIMER, &mut pac.RESETS, &clocks);
diff --git a/rp2040-hal/examples/dht11.rs b/rp2040-hal/examples/dht11.rs
@@ -67,7 +67,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/gpio_dyn_pin_array.rs b/rp2040-hal/examples/gpio_dyn_pin_array.rs
@@ -68,7 +68,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // We will use the RP2040 timer peripheral as our delay source
diff --git a/rp2040-hal/examples/gpio_in_out.rs b/rp2040-hal/examples/gpio_in_out.rs
@@ -61,7 +61,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/gpio_irq_example.rs b/rp2040-hal/examples/gpio_irq_example.rs
@@ -104,7 +104,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/i2c.rs b/rp2040-hal/examples/i2c.rs
@@ -63,7 +63,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/lcd_display.rs b/rp2040-hal/examples/lcd_display.rs
@@ -67,7 +67,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The delay object lets us wait for specified amounts of time (in
diff --git a/rp2040-hal/examples/mem_to_mem_dma.rs b/rp2040-hal/examples/mem_to_mem_dma.rs
@@ -41,7 +41,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // Setup the pins.
diff --git a/rp2040-hal/examples/multicore_fifo_blink.rs b/rp2040-hal/examples/multicore_fifo_blink.rs
@@ -105,7 +105,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     let sys_freq = clocks.system_clock.freq().to_Hz();
diff --git a/rp2040-hal/examples/multicore_polyblink.rs b/rp2040-hal/examples/multicore_polyblink.rs
@@ -84,7 +84,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // Set up the GPIO pins
diff --git a/rp2040-hal/examples/pwm_blink.rs b/rp2040-hal/examples/pwm_blink.rs
@@ -71,7 +71,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/pwm_blink_embedded_hal_1.rs b/rp2040-hal/examples/pwm_blink_embedded_hal_1.rs
@@ -71,7 +71,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/pwm_irq_input.rs b/rp2040-hal/examples/pwm_irq_input.rs
@@ -108,7 +108,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/rom_funcs.rs b/rp2040-hal/examples/rom_funcs.rs
@@ -70,7 +70,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/rtc_irq_example.rs b/rp2040-hal/examples/rtc_irq_example.rs
@@ -83,7 +83,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/spi.rs b/rp2040-hal/examples/spi.rs
@@ -65,7 +65,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // The single-cycle I/O block controls our GPIO pins
diff --git a/rp2040-hal/examples/spi_dma.rs b/rp2040-hal/examples/spi_dma.rs
@@ -45,7 +45,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // Setup the pins.
diff --git a/rp2040-hal/examples/uart.rs b/rp2040-hal/examples/uart.rs
@@ -68,7 +68,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     let mut delay = cortex_m::delay::Delay::new(core.SYST, clocks.system_clock.freq().to_Hz());
diff --git a/rp2040-hal/examples/uart_dma.rs b/rp2040-hal/examples/uart_dma.rs
@@ -68,7 +68,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     let mut delay = cortex_m::delay::Delay::new(core.SYST, clocks.system_clock.freq().to_Hz());
diff --git a/rp2040-hal/examples/vector_table.rs b/rp2040-hal/examples/vector_table.rs
@@ -93,7 +93,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     // Create simple delay
diff --git a/rp2040-hal/examples/watchdog.rs b/rp2040-hal/examples/watchdog.rs
@@ -65,7 +65,6 @@ fn main() -> ! {
         &mut pac.RESETS,
         &mut watchdog,
     )
-    .ok()
     .unwrap();
 
     let mut delay = cortex_m::delay::Delay::new(core.SYST, clocks.system_clock.freq().to_Hz());
diff --git a/rp2040-hal/src/clocks/mod.rs b/rp2040-hal/src/clocks/mod.rs
@@ -256,6 +256,7 @@ impl ShareableClocks {
 /// Something when wrong setting up the clock
 #[non_exhaustive]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum ClockError {
     /// The frequency desired is higher than the source frequency
     CantIncreaseFreq,
@@ -488,6 +489,8 @@ impl ClocksManager {
 }
 
 /// Possible init errors
+#[derive(Debug)]
+#[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum InitError {
     /// Something went wrong setting up the Xosc
     XoscErr(XoscError),

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ fn main() -> ! {`
`68`	`68`	`&mut pac.RESETS,`
`69`	`69`	`&mut watchdog,`
`70`	`70`	`)`
`71`		`- .ok()`
`72`	`71`	`.unwrap();`
`73`	`72`
`74`	`73`	`// The delay object lets us wait for specified amounts of time (in`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ fn main() -> ! {`
`69`	`69`	`&mut pac.RESETS,`
`70`	`70`	`&mut watchdog,`
`71`	`71`	`)`
`72`		`- .ok()`
`73`	`72`	`.unwrap();`
`74`	`73`
`75`	`74`	`// The delay object lets us wait for specified amounts of time (in`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ mod app {`
`80`	`80`	`&mut resets,`
`81`	`81`	`&mut watchdog,`
`82`	`82`	`)`
`83`		`- .ok()`
`84`	`83`	`.unwrap();`
`85`	`84`	`let sio = hal::Sio::new(c.device.SIO);`
`86`	`85`	`let pins = hal::gpio::Pins::new(`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ fn main() -> ! {`
`67`	`67`	`&mut pac.RESETS,`
`68`	`68`	`&mut watchdog,`
`69`	`69`	`)`
`70`		`- .ok()`
`71`	`70`	`.unwrap();`
`72`	`71`
`73`	`72`	`// The delay object lets us wait for specified amounts of time (in`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ fn main() -> ! {`
`61`	`61`	`&mut pac.RESETS,`
`62`	`62`	`&mut watchdog,`
`63`	`63`	`)`
`64`		`- .ok()`
`65`	`64`	`.unwrap();`
`66`	`65`
`67`	`66`	`let mut timer = rp2040_hal::Timer::new(pac.TIMER, &mut pac.RESETS, &clocks);`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,6 @@ fn main() -> ! {`
`104`	`104`	`&mut pac.RESETS,`
`105`	`105`	`&mut watchdog,`
`106`	`106`	`)`
`107`		`- .ok()`
`108`	`107`	`.unwrap();`
`109`	`108`
`110`	`109`	`// The single-cycle I/O block controls our GPIO pins`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ fn main() -> ! {`
`63`	`63`	`&mut pac.RESETS,`
`64`	`64`	`&mut watchdog,`
`65`	`65`	`)`
`66`		`- .ok()`
`67`	`66`	`.unwrap();`
`68`	`67`
`69`	`68`	`// The single-cycle I/O block controls our GPIO pins`