finish

JurajSadel · JurajSadel · commit 6e3b8a00310e · 2024-09-06T09:00:48.000+02:00
diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
@@ -172,8 +172,8 @@ jobs:
           # Xtensa devices:
           - soc: esp32
             runner: esp32-jtag
-            usb: USB1 # ESP32 HIL TODO
             host: aarch64
+            hubs: "1 3"
           - soc: esp32s2
             runner: esp32s2-jtag
             host: armv7
diff --git a/hil-test/src/lib.rs b/hil-test/src/lib.rs
@@ -30,6 +30,8 @@ macro_rules! i2c_pins {
         cfg_if::cfg_if! {
             if #[cfg(any(esp32s2, esp32s3))] {
                 ($io.pins.gpio2, $io.pins.gpio3)
+            } else if #[cfg(esp32)] {
+                ($io.pins.gpio32, $io.pins.gpio33)
             } else if #[cfg(esp32c6)] {
                 ($io.pins.gpio6, $io.pins.gpio7)
             } else if #[cfg(esp32h2)] {
@@ -49,7 +51,11 @@ macro_rules! common_test_pins {
         cfg_if::cfg_if! {
             if #[cfg(any(esp32s2, esp32s3))] {
                 ($io.pins.gpio9, $io.pins.gpio10)
-            } else {
+            }
+            else if #[cfg(esp32)] {
+                ($io.pins.gpio26, $io.pins.gpio27)
+            }
+            else {
                 ($io.pins.gpio2, $io.pins.gpio3)
             }
         }
diff --git a/hil-test/tests/embassy_timers_executors.rs b/hil-test/tests/embassy_timers_executors.rs
@@ -12,17 +12,20 @@ use esp_hal::{
     interrupt::software::SoftwareInterruptControl,
     peripherals::Peripherals,
     prelude::*,
-    timer::{timg::TimerGroup, ErasedTimer, OneShotTimer, PeriodicTimer},
+    timer::{timg::TimerGroup, OneShotTimer, PeriodicTimer},
 };
 #[cfg(not(feature = "esp32"))]
 use esp_hal::{
+    interrupt::software::SoftwareInterruptControl,
     interrupt::Priority,
     timer::systimer::{Alarm, FrozenUnit, Periodic, SystemTimer, Target},
+    timer::ErasedTimer,
 };
 #[cfg(not(feature = "esp32"))]
 use esp_hal_embassy::InterruptExecutor;
 use hil_test as _;
 
+#[cfg(not(feature = "esp32"))]
 macro_rules! mk_static {
     ($t:ty,$val:expr) => {{
         static STATIC_CELL: static_cell::StaticCell<$t> = static_cell::StaticCell::new();
@@ -123,7 +126,9 @@ fn set_up_embassy_with_systimer(peripherals: Peripherals) {
 #[embedded_test::tests(executor = esp_hal_embassy::Executor::new())]
 mod test {
     use super::*;
-    use crate::{test_cases::*, test_helpers::*};
+    use crate::test_cases::*;
+    #[cfg(not(feature = "esp32"))]
+    use crate::test_helpers::*;
 
     #[init]
     fn init() -> Peripherals {
diff --git a/hil-test/tests/gpio.rs b/hil-test/tests/gpio.rs
@@ -1,8 +1,8 @@
 //! GPIO Test
 //!
 //! Folowing pins are used:
-//! GPIO2 / GPIO9 (esp32s2 and esp32s3)
-//! GPIO3 / GPIO10 (esp32s2 and esp32s3)
+//! GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
+//! GPIO3 / GPIO10 / GPIO26 (esp32s2 / esp32s3 / esp32)
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 //% FEATURES: generic-queue
@@ -13,10 +13,6 @@
 use core::cell::RefCell;
 
 use critical_section::Mutex;
-#[cfg(feature = "esp32")]
-use esp_hal::gpio::Gpio4;
-#[cfg(not(feature = "esp32"))]
-use esp_hal::gpio::Gpio3;
 use esp_hal::{
     delay::Delay,
     gpio::{AnyPin, ErasedPin, Input, Io, Level, Output, Pin, Pull},
diff --git a/hil-test/tests/i2c.rs b/hil-test/tests/i2c.rs
@@ -4,12 +4,14 @@
 //! SDA     GPIO2   (esp32s2 and esp32s3)
 //!         GPIO6   (esp32c6)
 //!         GPIO18  (esp32c2)
-//!         GPIO4   (esp32, esp32h2 and esp32c3)
+//!         GPIO4   (esp32h2 and esp32c3)
+//!         GPIO32  (esp32)
 //!
 //! SCL     GPIO3   (esp32s2 and esp32s3)
-//!         GPIO7   (esp32c6, esp32 and esp32c3)
+//!         GPIO7   (esp32c6 and esp32c3)
 //!         GPIO22  (esp32h2)
 //!         GPIO19  (esp32c2)
+//!         GPIO33  (esp32)
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 
diff --git a/hil-test/tests/pcnt.rs b/hil-test/tests/pcnt.rs
@@ -2,6 +2,7 @@
 //!
 //! It's assumed GPIO2 is connected to GPIO3
 //! (GPIO9 and GPIO10 for esp32s2 and esp32s3)
+//! (GPIO26 and GPIO27 for esp32)
 
 //% CHIPS: esp32 esp32c6 esp32h2 esp32s2 esp32s3
 
diff --git a/hil-test/tests/qspi_read.rs b/hil-test/tests/qspi_read.rs
@@ -7,7 +7,7 @@
 //!
 //! Connect MISO and GPIO pins.
 
-//% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
+//% CHIPS: esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 
 #![no_std]
 #![no_main]
diff --git a/hil-test/tests/qspi_write.rs b/hil-test/tests/qspi_write.rs
@@ -9,7 +9,7 @@
 //!
 //! Connect MOSI and PCNT pins.
 
-//% CHIPS: esp32 esp32c6 esp32h2 esp32s2 esp32s3
+//% CHIPS: esp32c6 esp32h2 esp32s2 esp32s3
 
 #![no_std]
 #![no_main]
diff --git a/hil-test/tests/qspi_write_read.rs b/hil-test/tests/qspi_write_read.rs
@@ -9,7 +9,7 @@
 //!
 //! Connect MOSI/MISO and GPIO pins.
 
-//% CHIPS: esp32 esp32c6 esp32h2 esp32s2 esp32s3
+//% CHIPS: esp32c6 esp32h2 esp32s2 esp32s3
 
 #![no_std]
 #![no_main]
diff --git a/hil-test/tests/rmt.rs b/hil-test/tests/rmt.rs
@@ -2,6 +2,7 @@
 //!
 //! It's assumed GPIO2 is connected to GPIO3
 //! (GPIO9 and GPIO10 for esp32s2 and esp32s3)
+//! (GPIO26 and GPIO27 for esp32)
 
 //% CHIPS: esp32 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 
diff --git a/hil-test/tests/spi_full_duplex.rs b/hil-test/tests/spi_full_duplex.rs
@@ -2,9 +2,8 @@
 //!
 //! Folowing pins are used:
 //! SCLK    GPIO0
-//! MISO    GPIO2 / GPIO9 (esp32s2 and esp32s3)
-//! MOSI    GPIO3 / GPIO10 (esp32s2 and esp32s3)
-//! CS      GPIO8
+//! MISO    GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
+//! MOSI    GPIO3 / GPIO10 / GPIO27 (esp32s2 / esp32s3 / esp32)
 //!
 //! Connect MISO and MOSI pins.
 
@@ -40,14 +39,11 @@ mod tests {
 
         let sclk = io.pins.gpio0;
         let (miso, mosi) = hil_test::common_test_pins!(io);
-        let cs = io.pins.gpio8;
-
-        let spi = Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0).with_pins(
-            Some(sclk),
-            Some(mosi),
-            Some(miso),
-            Some(cs),
-        );
+
+        let spi = Spi::new(peripherals.SPI2, 1000u32.kHz(), SpiMode::Mode0, &clocks)
+            .with_sck(sclk)
+            .with_mosi(mosi)
+            .with_miso(miso);
 
         Context { spi }
     }
diff --git a/hil-test/tests/spi_full_duplex_dma.rs b/hil-test/tests/spi_full_duplex_dma.rs
@@ -2,16 +2,13 @@
 //!
 //! Folowing pins are used:
 //! SCLK    GPIO0
-//! MISO    GPIO2 / GPIO9 (esp32s2 and esp32s3)
-//! MOSI    GPIO3 / GPIO10 (esp32s2 and esp32s3)
-//! CS      GPIO8
+//! MISO    GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
+//! MOSI    GPIO3 / GPIO10 / GPIO27 (esp32s2 / esp32s3 / esp32)
 //!
 //! Connect MISO and MOSI pins.
 
 //% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 
-//% FEATURES: defmt
-
 #![no_std]
 #![no_main]
 
@@ -59,7 +56,7 @@ mod tests {
         let io = Io::new(peripherals.GPIO, peripherals.IO_MUX);
         let sclk = io.pins.gpio0;
         let (miso, mosi) = hil_test::common_test_pins!(io);
-        let cs = io.pins.gpio8;
+        // let cs = io.pins.gpio8;
 
         let dma = Dma::new(peripherals.DMA);
 
@@ -71,8 +68,10 @@ mod tests {
             }
         }
 
-        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0)
-            .with_pins(Some(sclk), Some(mosi), Some(miso), Some(cs))
+        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0, &clocks)
+            .with_sck(sclk)
+            .with_mosi(mosi)
+            .with_miso(miso)
             .with_dma(dma_channel.configure(false, DmaPriority::Priority0));
 
         Context { spi }
diff --git a/hil-test/tests/spi_full_duplex_dma_async.rs b/hil-test/tests/spi_full_duplex_dma_async.rs
@@ -4,7 +4,6 @@
 //! SCLK    GPIO0
 //! MOSI    GPIO3 / GPIO10 (esp32s3)
 //! MISO    GPIO4
-//! CS      GPIO8
 //!
 //! PCNT    GPIO2 / GPIO9 (esp32s3)
 //! OUTPUT  GPIO5 (helper to keep MISO LOW)
@@ -99,8 +98,10 @@ mod tests {
         let dma_tx_buf = DmaTxBuf::new(tx_descriptors, tx_buffer).unwrap();
         let dma_rx_buf = DmaRxBuf::new(rx_descriptors, rx_buffer).unwrap();
 
-        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0)
-            .with_pins(Some(sclk), Some(mosi), Some(miso), Some(cs))
+        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0, &clocks)
+            .with_sck(sclk)
+            .with_mosi(mosi)
+            .with_miso(miso)
             .with_dma(dma_channel.configure_for_async(false, DmaPriority::Priority0))
             .with_buffers(dma_tx_buf, dma_rx_buf);
 
diff --git a/hil-test/tests/spi_full_duplex_dma_pcnt.rs b/hil-test/tests/spi_full_duplex_dma_pcnt.rs
@@ -3,7 +3,6 @@
 //! Folowing pins are used:
 //! SCLK    GPIO0
 //! MOSI    GPIO3 / GPIO10 (esp32s3)
-//! CS      GPIO8
 //! PCNT    GPIO2 / GPIO9 (esp32s3)
 //! OUTPUT  GPIO5 (helper to keep MISO LOW)
 //!
@@ -70,7 +69,6 @@ mod tests {
         let sclk = io.pins.gpio0;
         let (mosi_mirror, mosi) = hil_test::common_test_pins!(io);
         let miso = io.pins.gpio4;
-        let cs = io.pins.gpio8;
 
         let dma = Dma::new(peripherals.DMA);
 
@@ -82,8 +80,10 @@ mod tests {
             }
         }
 
-        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0)
-            .with_pins(Some(sclk), Some(mosi), Some(miso), Some(cs))
+        let spi = Spi::new(peripherals.SPI2, 100.kHz(), SpiMode::Mode0, &clocks)
+            .with_sck(sclk)
+            .with_mosi(mosi)
+            .with_miso(miso)
             .with_dma(dma_channel.configure(false, DmaPriority::Priority0));
 
         let pcnt = Pcnt::new(peripherals.PCNT);
diff --git a/hil-test/tests/spi_half_duplex_read.rs b/hil-test/tests/spi_half_duplex_read.rs
@@ -2,9 +2,9 @@
 //!
 //! Folowing pins are used:
 //! SCLK    GPIO0
-//! MISO    GPIO2 / GPIO9 (esp32s2 and esp32s3)
+//! MISO    GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
 //!
-//! GPIO    GPIO3 / GPIO10 (esp32s2 and esp32s3)
+//! GPIO    GPIO3 / GPIO10 / GPIO27 (esp32s2 / esp32s3 /esp32)
 //!
 //! Connect MISO and GPIO pins.
 
diff --git a/hil-test/tests/spi_half_duplex_write.rs b/hil-test/tests/spi_half_duplex_write.rs
@@ -2,9 +2,9 @@
 //!
 //! Following pins are used:
 //! SCLK    GPIO0
-//! MOSI    GPIO2 / GPIO9 (esp32s2 and esp32s3)
+//! MOSI    GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
 //!
-//! PCNT    GPIO3 / GPIO10 (esp32s2 and esp32s3)
+//! PCNT    GPIO3 / GPIO10 / GPIO27 (esp32s2 / esp32s3 / esp32)
 //!
 //! Connect MOSI and PCNT pins.
 
diff --git a/hil-test/tests/twai.rs b/hil-test/tests/twai.rs
@@ -1,8 +1,8 @@
 //! TWAI test
 //!
 //! Folowing pins are used:
-//! TX    GPIO2 / GPIO9 (esp32s2 and esp32s3)
-//! RX    GPIO3 / GPIO10 (esp32s2 and esp32s3)
+//! TX    GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
+//! RX    GPIO3 / GPIO10 / GPIO27 (esp32s2 / esp32s3 / esp32)
 //!
 //! Connect TX and RX pins.
 
diff --git a/hil-test/tests/uart.rs b/hil-test/tests/uart.rs
@@ -1,8 +1,8 @@
 //! UART Test
 //!
 //! Folowing pins are used:
-//! TX    GPIO2 / GPIO9 (esp32s2 and esp32s3)
-//! RX    GPIO3 / GPIO10 (esp32s2 and esp32s3)
+//! TX    GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
+//! RX    GPIO3 / GPIO10 / GPIO27 (esp32s2 / esp32s3 / esp32)
 //!
 //! Connect TX and RX pins.
 
diff --git a/hil-test/tests/uart_async.rs b/hil-test/tests/uart_async.rs
@@ -1,8 +1,8 @@
 //! UART Test
 //!
 //! Folowing pins are used:
-//! TX    GPIO2 / GPIO9 (esp32s2 and esp32s3)
-//! RX    GPIO3 / GPIO10 (esp32s2 and esp32s3)
+//! TX    GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
+//! RX    GPIO3 / GPIO10 / GPIO27 (esp32s2 / esp32s3 / esp32)
 //!
 //! Connect TX and RX pins.
 
diff --git a/hil-test/tests/uart_tx_rx.rs b/hil-test/tests/uart_tx_rx.rs
@@ -1,8 +1,8 @@
 //! UART TX/RX Test
 //!
 //! Folowing pins are used:
-//! TX    GPIO2 / GPIO9 (esp32s2 and esp32s3)
-//! RX    GPIO3 / GPIO10 (esp32s2 and esp32s3)
+//! TX    GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
+//! RX    GPIO3 / GPIO10 / GPIO27 (esp32s2 / esp32s3 / esp32)
 //!
 //! Connect TX and RX pins.
 
diff --git a/hil-test/tests/uart_tx_rx_async.rs b/hil-test/tests/uart_tx_rx_async.rs
@@ -1,8 +1,8 @@
 //! UART TX/RX Async Test
 //!
 //! Folowing pins are used:
-//! TX    GPIO2 / GPIO9 (esp32s2 and esp32s3)
-//! RX    GPIO3 / GPIO10 (esp32s2 and esp32s3)
+//! TX    GPIO2 / GPIO9 / GPIO26  (esp32s2 / esp32s3 / esp32)
+//! RX    GPIO3 / GPIO10 / GPIO27 (esp32s2 / esp32s3 / esp32)
 //!
 //! Connect TX and RX pins.
 
