Re-enable S2

esp-rs · Aug 23, 2024 · 8868c03 · 8868c03
1 parent 49a3864
commit 8868c03
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/hil-test/tests/spi_full_duplex_dma.rs b/hil-test/tests/spi_full_duplex_dma.rs
@@ -8,7 +8,7 @@
 //!
 //! Connect MISO (GPIO2) and MOSI (GPIO3) pins.
 
-//% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s3
+//% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 
 #![no_std]
 #![no_main]
@@ -33,6 +33,7 @@ use hil_test as _;
 cfg_if::cfg_if! {
     if #[cfg(any(
         feature = "esp32",
+        feature = "esp32s2",
     ))] {
         use esp_hal::dma::Spi2DmaChannel as DmaChannel0;
     } else {
@@ -66,7 +67,7 @@ mod tests {
         let dma = Dma::new(peripherals.DMA);
 
         cfg_if::cfg_if! {
-            if #[cfg(feature = "esp32")] {
+            if #[cfg(any(feature = "esp32", feature = "esp32s2"))] {
                 let dma_channel = dma.spi2channel;
             } else {
                 let dma_channel = dma.channel0;

diff --git a/hil-test/tests/spi_full_duplex_dma_async.rs b/hil-test/tests/spi_full_duplex_dma_async.rs
@@ -14,7 +14,7 @@
 //!
 //! Connect PCNT (GPIO2) and MOSI (GPIO3) and MISO (GPIO6) and GPIO5 pins.
 
-//% CHIPS: esp32 esp32c6 esp32h2 esp32s3
+//% CHIPS: esp32 esp32c6 esp32h2 esp32s2 esp32s3
 
 #![no_std]
 #![no_main]
@@ -43,6 +43,7 @@ use hil_test as _;
 cfg_if::cfg_if! {
     if #[cfg(any(
         feature = "esp32",
+        feature = "esp32s2",
     ))] {
         use esp_hal::dma::Spi2DmaChannel as DmaChannel0;
     } else {
@@ -87,7 +88,7 @@ mod tests {
         let dma = Dma::new(peripherals.DMA);
 
         cfg_if::cfg_if! {
-            if #[cfg(feature = "esp32")] {
+            if #[cfg(any(feature = "esp32", feature = "esp32s2"))] {
                 let dma_channel = dma.spi2channel;
             } else {
                 let dma_channel = dma.channel0;

diff --git a/hil-test/tests/spi_full_duplex_dma_pcnt.rs b/hil-test/tests/spi_full_duplex_dma_pcnt.rs
@@ -12,7 +12,7 @@
 //!
 //! Connect MISO (GPIO2) and MOSI (GPIO3) pins.
 
-//% CHIPS: esp32 esp32c6 esp32h2 esp32s3
+//% CHIPS: esp32 esp32c6 esp32h2 esp32s2 esp32s3
 
 #![no_std]
 #![no_main]
@@ -42,6 +42,7 @@ use hil_test as _;
 cfg_if::cfg_if! {
     if #[cfg(any(
         feature = "esp32",
+        feature = "esp32s2",
     ))] {
         use esp_hal::dma::Spi2DmaChannel as DmaChannel0;
     } else {
@@ -78,7 +79,7 @@ mod tests {
         let dma = Dma::new(peripherals.DMA);
 
         cfg_if::cfg_if! {
-            if #[cfg(feature = "esp32")] {
+            if #[cfg(any(feature = "esp32", feature = "esp32s2"))] {
                 let dma_channel = dma.spi2channel;
             } else {
                 let dma_channel = dma.channel0;

diff --git a/hil-test/tests/spi_half_duplex_read.rs b/hil-test/tests/spi_half_duplex_read.rs
@@ -8,7 +8,7 @@
 //!
 //! Connect MISO (GPIO2) and GPIO (GPIO3) pins.
 
-//% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s3
+//% CHIPS: esp32 esp32c2 esp32c3 esp32c6 esp32h2 esp32s2 esp32s3
 
 #![no_std]
 #![no_main]
@@ -34,6 +34,7 @@ use hil_test as _;
 cfg_if::cfg_if! {
     if #[cfg(any(
         feature = "esp32",
+        feature = "esp32s2",
     ))] {
         use esp_hal::dma::Spi2DmaChannel as DmaChannel0;
     } else {
@@ -68,7 +69,7 @@ mod tests {
         let dma = Dma::new(peripherals.DMA);
 
         cfg_if::cfg_if! {
-            if #[cfg(feature = "esp32")] {
+            if #[cfg(any(feature = "esp32", feature = "esp32s2"))] {
                 let dma_channel = dma.spi2channel;
             } else {
                 let dma_channel = dma.channel0;

diff --git a/hil-test/tests/spi_half_duplex_write.rs b/hil-test/tests/spi_half_duplex_write.rs
@@ -8,7 +8,7 @@
 //!
 //! Connect MOSI (GPIO2) and PCNT (GPIO3) pins.
 
-//% CHIPS: esp32 esp32c6 esp32h2 esp32s3
+//% CHIPS: esp32 esp32c6 esp32h2 esp32s2 esp32s3
 
 #![no_std]
 #![no_main]
@@ -39,6 +39,7 @@ use hil_test as _;
 cfg_if::cfg_if! {
     if #[cfg(any(
         feature = "esp32",
+        feature = "esp32s2",
     ))] {
         use esp_hal::dma::Spi2DmaChannel as DmaChannel0;
     } else {
@@ -74,7 +75,7 @@ mod tests {
         let dma = Dma::new(peripherals.DMA);
 
         cfg_if::cfg_if! {
-            if #[cfg(feature = "esp32")] {
+            if #[cfg(any(feature = "esp32", feature = "esp32s2"))] {
                 let dma_channel = dma.spi2channel;
             } else {
                 let dma_channel = dma.channel0;