Merge upstream/main to incorporate LPUART constructor refactor (#51) and GPIO Drive/Slew fix (#57)

16 files changed, 18 insertions, 37 deletions

diff --git a/examples/src/bin/button.rs b/examples/src/bin/button.rs
index 2abfe0a9f..943edbb15 100644
--- a/examples/src/bin/button.rs
+++ b/examples/src/bin/button.rs
@@ -3,7 +3,7 @@
 
 use embassy_executor::Spawner;
 use embassy_time::Timer;
-use hal::gpio::{DriveStrength, Input, Pull, SlewRate};
+use hal::gpio::{Input, Pull};
 use {defmt_rtt as _, embassy_mcxa as hal, panic_probe as _};
 
 #[embassy_executor::main]
@@ -12,7 +12,9 @@ async fn main(_spawner: Spawner) {
 
     defmt::info!("Button example");
 
-    let monitor = Input::new(p.P1_7, Pull::Disabled, DriveStrength::Normal, SlewRate::Slow);
+    // This button is labeled "WAKEUP" on the FRDM-MCXA276
+    // The board already has a 10K pullup
+    let monitor = Input::new(p.P1_7, Pull::Disabled);
 
     loop {
         defmt::info!("Pin level is {:?}", monitor.get_level());
diff --git a/examples/src/bin/button_async.rs b/examples/src/bin/button_async.rs
index 1ecec2e48..6cc7b62cd 100644
--- a/examples/src/bin/button_async.rs
+++ b/examples/src/bin/button_async.rs
@@ -3,7 +3,7 @@
 
 use embassy_executor::Spawner;
 use embassy_time::Timer;
-use hal::gpio::{DriveStrength, Input, Pull, SlewRate};
+use hal::gpio::{Input, Pull};
 use {defmt_rtt as _, embassy_mcxa as hal, panic_probe as _};
 
 #[embassy_executor::main]
@@ -13,7 +13,8 @@ async fn main(_spawner: Spawner) {
     defmt::info!("GPIO interrupt example");
 
     // This button is labeled "WAKEUP" on the FRDM-MCXA276
-    let mut pin = Input::new(p.P1_7, Pull::Up, DriveStrength::Normal, SlewRate::Fast);
+    // The board already has a 10K pullup
+    let mut pin = Input::new(p.P1_7, Pull::Disabled);
 
     let mut press_count = 0u32;
 
diff --git a/examples/src/bin/dma_channel_link.rs b/examples/src/bin/dma_channel_link.rs
index 361c9ebc7..92c7a9681 100644
--- a/examples/src/bin/dma_channel_link.rs
+++ b/examples/src/bin/dma_channel_link.rs
@@ -120,8 +120,6 @@ async fn main(_spawner: Spawner) {
 
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: false,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/dma_interleave_transfer.rs b/examples/src/bin/dma_interleave_transfer.rs
index c0ebb0a46..7876e8978 100644
--- a/examples/src/bin/dma_interleave_transfer.rs
+++ b/examples/src/bin/dma_interleave_transfer.rs
@@ -84,8 +84,6 @@ async fn main(_spawner: Spawner) {
 
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: false,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/dma_mem_to_mem.rs b/examples/src/bin/dma_mem_to_mem.rs
index 72916384f..68f70e742 100644
--- a/examples/src/bin/dma_mem_to_mem.rs
+++ b/examples/src/bin/dma_mem_to_mem.rs
@@ -90,8 +90,6 @@ async fn main(_spawner: Spawner) {
     // Create UART for debug output
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: false,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/dma_memset.rs b/examples/src/bin/dma_memset.rs
index 9fbba85e9..95e365e47 100644
--- a/examples/src/bin/dma_memset.rs
+++ b/examples/src/bin/dma_memset.rs
@@ -83,8 +83,6 @@ async fn main(_spawner: Spawner) {
 
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: false,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/dma_ping_pong_transfer.rs b/examples/src/bin/dma_ping_pong_transfer.rs
index 692515441..f8f543382 100644
--- a/examples/src/bin/dma_ping_pong_transfer.rs
+++ b/examples/src/bin/dma_ping_pong_transfer.rs
@@ -142,8 +142,6 @@ async fn main(_spawner: Spawner) {
 
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: false,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/dma_scatter_gather.rs b/examples/src/bin/dma_scatter_gather.rs
index 9844071b7..4b26bc2ed 100644
--- a/examples/src/bin/dma_scatter_gather.rs
+++ b/examples/src/bin/dma_scatter_gather.rs
@@ -129,8 +129,6 @@ async fn main(_spawner: Spawner) {
 
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: false,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/dma_scatter_gather_builder.rs b/examples/src/bin/dma_scatter_gather_builder.rs
index d42ff841e..e483bb81f 100644
--- a/examples/src/bin/dma_scatter_gather_builder.rs
+++ b/examples/src/bin/dma_scatter_gather_builder.rs
@@ -87,8 +87,6 @@ async fn main(_spawner: Spawner) {
     // Create UART for debug output
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: false,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/dma_wrap_transfer.rs b/examples/src/bin/dma_wrap_transfer.rs
index 0babf4c20..82936d9d0 100644
--- a/examples/src/bin/dma_wrap_transfer.rs
+++ b/examples/src/bin/dma_wrap_transfer.rs
@@ -84,8 +84,6 @@ async fn main(_spawner: Spawner) {
 
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: false,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/hello.rs b/examples/src/bin/hello.rs
index f426d1898..e371d9413 100644
--- a/examples/src/bin/hello.rs
+++ b/examples/src/bin/hello.rs
@@ -2,27 +2,29 @@
 #![no_main]
 
 use embassy_executor::Spawner;
+use embassy_mcxa::clocks::config::Div8;
 use hal::lpuart::{Blocking, Config, Lpuart};
 use {defmt_rtt as _, embassy_mcxa as hal, panic_probe as _};
 
 /// Simple helper to write a byte as hex to UART
 fn write_hex_byte(uart: &mut Lpuart<'_, Blocking>, byte: u8) {
     const HEX_DIGITS: &[u8] = b"0123456789ABCDEF";
-    uart.write_byte(HEX_DIGITS[(byte >> 4) as usize]);
-    uart.write_byte(HEX_DIGITS[(byte & 0xF) as usize]);
+    let _ = uart.write_byte(HEX_DIGITS[(byte >> 4) as usize]);
+    let _ = uart.write_byte(HEX_DIGITS[(byte & 0xF) as usize]);
 }
 
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
-    let p = hal::init(hal::config::Config::default());
+    let mut cfg = hal::config::Config::default();
+    cfg.clock_cfg.sirc.fro_12m_enabled = true;
+    cfg.clock_cfg.sirc.fro_lf_div = Some(Div8::no_div());
+    let p = hal::init(cfg);
 
     defmt::info!("boot");
 
     // Create UART configuration
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: true,
         ..Default::default()
     };
 
@@ -97,7 +99,7 @@ async fn main(_spawner: Spawner) {
             // Regular character
             buffer[buf_idx] = byte;
             buf_idx += 1;
-            uart.write_byte(byte);
+            let _ = uart.write_byte(byte);
         }
     }
 }
diff --git a/examples/src/bin/i2c-scan-blocking.rs b/examples/src/bin/i2c-scan-blocking.rs
index 72f9d09e0..4e203597b 100644
--- a/examples/src/bin/i2c-scan-blocking.rs
+++ b/examples/src/bin/i2c-scan-blocking.rs
@@ -2,7 +2,7 @@
 #![no_main]
 
 use embassy_executor::Spawner;
-use embassy_mcxa::gpio::{DriveStrength, Pull, SlewRate};
+use embassy_mcxa::gpio::Pull;
 use embassy_mcxa::Input;
 use embassy_time::Timer;
 use hal::clocks::config::Div8;
@@ -25,7 +25,7 @@ async fn main(_spawner: Spawner) {
     // Note: P0_2 is connected to P1_8 on the FRDM_MCXA276 via a resistor, and
     // defaults to SWO on the debug peripheral. Explicitly make it a high-z
     // input.
-    let _pin = Input::new(p.P0_2, Pull::Disabled, DriveStrength::Normal, SlewRate::Slow);
+    let _pin = Input::new(p.P0_2, Pull::Disabled);
     let mut i2c = I2c::new_blocking(p.LPI2C2, p.P1_9, p.P1_8, config).unwrap();
 
     for addr in 0x01..=0x7f {
diff --git a/examples/src/bin/lpuart_buffered.rs b/examples/src/bin/lpuart_buffered.rs
index 7f77d557d..420589d00 100644
--- a/examples/src/bin/lpuart_buffered.rs
+++ b/examples/src/bin/lpuart_buffered.rs
@@ -27,8 +27,6 @@ async fn main(_spawner: Spawner) {
     // UART configuration (enable both TX and RX)
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: true,
         rx_fifo_watermark: 0,
         tx_fifo_watermark: 0,
         ..Default::default()
diff --git a/examples/src/bin/lpuart_dma.rs b/examples/src/bin/lpuart_dma.rs
index f4dfbcf39..5497f8646 100644
--- a/examples/src/bin/lpuart_dma.rs
+++ b/examples/src/bin/lpuart_dma.rs
@@ -41,8 +41,6 @@ async fn main(_spawner: Spawner) {
     // Create UART configuration
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: true,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/lpuart_polling.rs b/examples/src/bin/lpuart_polling.rs
index 9cea418cc..b80668834 100644
--- a/examples/src/bin/lpuart_polling.rs
+++ b/examples/src/bin/lpuart_polling.rs
@@ -19,8 +19,6 @@ async fn main(_spawner: Spawner) {
     // Create UART configuration
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: true,
         ..Default::default()
     };
 
diff --git a/examples/src/bin/lpuart_ring_buffer.rs b/examples/src/bin/lpuart_ring_buffer.rs
index 0946bad03..1d1a51970 100644
--- a/examples/src/bin/lpuart_ring_buffer.rs
+++ b/examples/src/bin/lpuart_ring_buffer.rs
@@ -19,10 +19,10 @@
 #![no_main]
 
 use embassy_executor::Spawner;
+use embassy_mcxa::bind_interrupts;
 use embassy_mcxa::clocks::config::Div8;
 use embassy_mcxa::dma::{DmaCh0InterruptHandler, DmaCh1InterruptHandler};
 use embassy_mcxa::lpuart::{Config, LpuartDma, LpuartTxDma};
-use embassy_mcxa::bind_interrupts;
 use {defmt_rtt as _, embassy_mcxa as hal, panic_probe as _};
 
 // Bind DMA channel interrupts
@@ -61,8 +61,6 @@ async fn main(_spawner: Spawner) {
     // Create UART configuration
     let config = Config {
         baudrate_bps: 115_200,
-        enable_tx: true,
-        enable_rx: true,
         ..Default::default()
     };