From 5b56aa779c0065a72a34932479481d0275ac5de3 Mon Sep 17 00:00:00 2001 From: Kirill Mikhailov Date: Wed, 4 Sep 2024 14:30:14 +0200 Subject: [PATCH] Addressing reviews --- hil-test/README.md | 7 +++---- hil-test/src/lib.rs | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hil-test/README.md b/hil-test/README.md index 0cd9095fc0c..dd3fb541120 100644 --- a/hil-test/README.md +++ b/hil-test/README.md @@ -68,7 +68,7 @@ The [`hil.yml`] workflow builds the test suite for all our available targets and Our self-hosted runners have the following setup: - ESP32-C2 (`esp32c2-jtag`): - Devkit: `ESP8684-DevKitM-1` connected via UART. - - `GPIO18` and `GPIO19` are I2C pins. + - `GPIO18` and `GPIO9` are I2C pins. - `GPIO2` and `GPIO3` are connected. - Probe: `ESP-Prog` connected with the [following connections][connection_c2] - RPi: Raspbian 12 configured with the following [setup] @@ -85,15 +85,14 @@ Our self-hosted runners have the following setup: - RPi: Raspbian 12 configured with the following [setup] - ESP32-H2 (`esp32h2-usb`): - Devkit: `ESP32-H2-DevKitM-1` connected via USB-Serial-JTAG (`USB` port). - - `GPIO4` and `GPIO22` are I2C pins. + - `GPIO12` and `GPIO22` are I2C pins. - `GPIO2` and `GPIO3` are connected. - - `GPIO5` and `GPIO8` are connected. + - `GPIO4` and `GPIO5` are connected. - RPi: Raspbian 12 configured with the following [setup] - ESP32-S2 (`esp32s2-jtag`): - Devkit: `ESP32-S2-Saola-1` connected via UART. - `GPIO2` and `GPIO3` are I2C pins. - `GPIO9` and `GPIO10` are connected. - - `GPIO5` and `GPIO6` are connected. - Probe: `ESP-Prog` connected with the [following connections][connection_s2] - RPi: Raspbian 12 configured with the following [setup] - ESP32-S3 (`esp32s3-usb`): diff --git a/hil-test/src/lib.rs b/hil-test/src/lib.rs index 854339337c1..b00876759d6 100644 --- a/hil-test/src/lib.rs +++ b/hil-test/src/lib.rs @@ -47,11 +47,12 @@ macro_rules! i2c_pins { macro_rules! common_test_pins { ($io:expr) => {{ cfg_if::cfg_if! { - if #[cfg(not(any(esp32s2, esp32s3)))] { - ($io.pins.gpio2, $io.pins.gpio3) - } else if #[cfg(any(esp32s2, esp32s3))] { + if #[cfg(any(esp32s2, esp32s3))] { ($io.pins.gpio9, $io.pins.gpio10) } + else { + ($io.pins.gpio2, $io.pins.gpio3) + } } }}; }