Test

hil-test/README.md

@@ -79,7 +79,7 @@ Our self-hosted runners have the following setup:
 - ESP32-C6 (`esp32c6-usb`):
   - Devkit: `ESP32-C6-DevKitC-1 V1.2` connected via USB-Serial-JTAG (`USB` port).
     - `GPIO2` and `GPIO3` are connected.
-    - `GPIO5` and `GPIO6` are connected.
+    - `GPIO4` and `GPIO5` are connected.
   - RPi: Raspbian 12 configured with the following [setup]
 - ESP32-H2 (`esp32h2-usb`):
   - Devkit: `ESP32-H2-DevKitM-1` connected via USB-Serial-JTAG (`USB` port).

hil-test/src/lib.rs

@@ -22,3 +22,45 @@ unsafe impl defmt::Logger for Logger {
 use defmt_rtt as _;
 // Make sure esp_backtrace is not removed.
 use esp_backtrace as _;
+
+use cfg_if::cfg_if;
+// Define type aliases and macros for conditional pin assignments
+cfg_if! {
+    if #[cfg(any(feature = "esp32", feature = "esp32s2", feature = "esp32s3"))] {
+        // Type alias for I2C pin configuration on S2 and S3 using GPIOs 2 and 3
+        pub type I2C_SCL_Pin = esp_hal::gpio::Gpio2;
+        pub type I2C_SDA_Pin = esp_hal::gpio::Gpio3;
+
+        // SPI pin aliases for avoiding conflicts with I2C on S2 and S3
+        pub type MFU_Pin1 = esp_hal::gpio::Gpio9;
+        pub type MFU_Pin2 = esp_hal::gpio::Gpio10;
+    } else if #[cfg(any(feature = "esp32c6"))] {
+        // Type alias for I2C pin configuration on C6 using GPIOs 6 and 7
+        pub type I2C_SCL_Pin = esp_hal::gpio::Gpio7;
+        pub type I2C_SDA_Pin = esp_hal::gpio::Gpio6;
+
+        /// SPI_MISO pin alias for avoiding conflicts with I2C on C6
+        pub type SPI_MISO_Pin = esp_hal::gpio::Gpio4;
+        /// SPI_MOSI pin alias for avoiding conflicts with I2C on C6
+        pub type SPI_MOSI_Pin = esp_hal::gpio::Gpio5;
+
+        /// Most
+        pub type MFU_Pin1 = esp_hal::gpio::Gpio2;
+        pub type MFU_Pin2 = esp_hal::gpio::Gpio3;
+    } else if #[cfg(any(feature = "esp32h2"))] {
+        // Type alias for I2C pin configuration on H2 using GPIOs 6 and 7
+        pub type I2C_SCL_Pin = esp_hal::gpio::Gpio6;
+        pub type I2C_SDA_Pin = esp_hal::gpio::Gpio7;
+
+        pub type MFU_Pin1 = esp_hal::gpio::Gpio2;
+        pub type MFU_Pin2 = esp_hal::gpio::Gpio3;
+        // No special pin assignments needed for SPI on H2
+    } else {
+        // Default case for other chips
+        pub type I2C_SCL_Pin = esp_hal::gpio::Gpio4;
+        pub type I2C_SDA_Pin = esp_hal::gpio::Gpio5;
+
+        pub type MFU_Pin1 = esp_hal::gpio::Gpio2;
+        pub type MFU_Pin2 = esp_hal::gpio::Gpio3;
+    }
+}

hil-test/tests/i2c.rs

@@ -1,4 +1,4 @@
-//! TWAI test
+//! I2C test
 //!
 //! Folowing pins are used:
 //! SCL    GPIO4
@@ -24,44 +24,40 @@ use nb::block;
 struct Context {
     i2c: I2C<'static, I2C0, Blocking>,
 }
+#[cfg(test)]
+#[embedded_test::tests]
+mod tests {
+    use defmt::assert_ne;
+
+    use super::*;
 
-impl Context {
-    pub fn init() -> Self {
+    #[init]
+    fn init() -> Context {
         let peripherals = Peripherals::take();
         let system = SystemControl::new(peripherals.SYSTEM);
         let clocks = ClockControl::boot_defaults(system.clock_control).freeze();
 
         let io = Io::new(peripherals.GPIO, peripherals.IO_MUX);
 
+        let scl = unsafe { hil_test::I2C_SCL_Pin::steal() };
+        let sda = unsafe { hil_test::I2C_SDA_Pin::steal() };
+
         // Create a new peripheral object with the described wiring and standard
         // I2C clock speed:
         let mut i2c = I2C::new(
             peripherals.I2C0,
-            io.pins.gpio4,
-            io.pins.gpio7,
+            sda,
+            scl,
             100.kHz(),
             &clocks,
         );
 
         Context { i2c }
     }
-}
-
-#[cfg(test)]
-#[embedded_test::tests]
-mod tests {
-    use defmt::assert_ne;
-
-    use super::*;
-
-    #[init]
-    fn init() -> Context {
-        Context::init()
-    }
 
     #[test]
     #[timeout(3)]
-    fn test_measures(mut ctx: Context) {
+    fn test_read_cali(mut ctx: Context) {
         let mut read_data = [0u8; 22];
 
         ctx.i2c.write_read(0x77, &[0xaa], &mut read_data).ok();

hil-test/tests/spi_full_duplex_dma_async.rs

@@ -77,7 +77,7 @@ mod tests {
         let sclk = io.pins.gpio0;
         let mosi_mirror = io.pins.gpio2;
         let mosi = io.pins.gpio3;
-        let miso = io.pins.gpio6;
+        let miso = unsafe { hil_test::SPI_MISO_Pin::steal() };
         let cs = io.pins.gpio8;
 
         let mut out_pin = Output::new(io.pins.gpio5, Level::Low);

hil-test/tests/spi_full_duplex_dma_pcnt.rs

@@ -69,7 +69,7 @@ mod tests {
         let io = Io::new(peripherals.GPIO, peripherals.IO_MUX);
         let sclk = io.pins.gpio0;
         let mosi = io.pins.gpio3;
-        let miso = io.pins.gpio6;
+        let miso = unsafe { hil_test::SPI_MISO_Pin::steal() };
         let cs = io.pins.gpio8;
 
         let dma = Dma::new(peripherals.DMA);

hil-test/tests/uart.rs

@@ -1,7 +1,7 @@
 //! UART Test
 //!
 //! Folowing pins are used:
-//! TX    GPIP2
+//! TX    GPIO2
 //! RX    GPIO3
 //!
 //! Connect TX (GPIO2) and RX (GPIO3) pins.