From 8450881d3e6e2d842c695194a9d51cd74c0762db Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:29:47 +0100 Subject: [PATCH] fix(boards): Fixes needed to pass CI all-boards-test --- .github/scripts/find_all_boards.sh | 5 +++++ cores/esp32/io_pin_remap.h | 4 ---- variants/imbrios-logsens-v1p1/pins_arduino.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/scripts/find_all_boards.sh b/.github/scripts/find_all_boards.sh index a2c53c212c5..b474a49bc2e 100755 --- a/.github/scripts/find_all_boards.sh +++ b/.github/scripts/find_all_boards.sh @@ -5,6 +5,11 @@ boards_array=() for line in `grep '.tarch=' boards.txt`; do board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1) + # skip esp32c2 as we dont build libs for it + if [ "$board_name" == "esp32c2" ]; then + echo "Skipping 'espressif:esp32:$board_name'" + continue + fi boards_array+=("espressif:esp32:$board_name") echo "Added 'espressif:esp32:$board_name' to array" done diff --git a/cores/esp32/io_pin_remap.h b/cores/esp32/io_pin_remap.h index 853cdfa7e81..c50d4207d31 100644 --- a/cores/esp32/io_pin_remap.h +++ b/cores/esp32/io_pin_remap.h @@ -100,11 +100,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber); #define spiAttachSCK(spi, sck) spiAttachSCK(spi, digitalPinToGPIONumber(sck)) #define spiAttachMISO(spi, miso) spiAttachMISO(spi, digitalPinToGPIONumber(miso)) #define spiAttachMOSI(spi, mosi) spiAttachMOSI(spi, digitalPinToGPIONumber(mosi)) -#define spiDetachSCK(spi, sck) spiDetachSCK(spi, digitalPinToGPIONumber(sck)) -#define spiDetachMISO(spi, miso) spiDetachMISO(spi, digitalPinToGPIONumber(miso)) -#define spiDetachMOSI(spi, mosi) spiDetachMOSI(spi, digitalPinToGPIONumber(mosi)) #define spiAttachSS(spi, cs_num, ss) spiAttachSS(spi, cs_num, digitalPinToGPIONumber(ss)) -#define spiDetachSS(spi, ss) spiDetachSS(spi, digitalPinToGPIONumber(ss)) // cores/esp32/esp32-hal-touch.h #define touchInterruptGetLastStatus(pin) touchInterruptGetLastStatus(digitalPinToGPIONumber(pin)) diff --git a/variants/imbrios-logsens-v1p1/pins_arduino.h b/variants/imbrios-logsens-v1p1/pins_arduino.h index 338b9151f7d..c35040857ca 100644 --- a/variants/imbrios-logsens-v1p1/pins_arduino.h +++ b/variants/imbrios-logsens-v1p1/pins_arduino.h @@ -45,7 +45,7 @@ static const uint8_t MOSI = 13; static const uint8_t MISO = 12; static const uint8_t SCK = 14; -static const uint8_t SPI_SS1 = 23; // SPI Chip Select - 1; connected to MicroSD Card on the LogSens V1.1 Board +static const uint8_t SS1 = 23; // SPI Chip Select - 1; connected to MicroSD Card on the LogSens V1.1 Board /* Software Controlled: IO, LEDs and Switches */ static const uint8_t BUZZER_CTRL = 19; // Signal connected to MOSFET gate pin to control conenctor (X8)