From 1a03073af3533014fc02ceaa1dfc0e787f52e0d7 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 12 May 2025 16:16:24 +0200 Subject: [PATCH] boards/esp32s2-lilygo-ttgo-t8: completion of Arduino I/O mapping Migration to the new Arduino I/O mapping, which was not fully covered in PR #19759 when the new Arduino I/O mapping was introduced and the feature handling was changed. --- .../esp32s2-lilygo-ttgo-t8/Makefile.features | 7 ++ .../include/arduino_iomap.h | 85 +++++++++++++++---- .../include/periph_conf.h | 2 +- 3 files changed, 75 insertions(+), 19 deletions(-) diff --git a/boards/esp32s2-lilygo-ttgo-t8/Makefile.features b/boards/esp32s2-lilygo-ttgo-t8/Makefile.features index 024e2119d7..42ca342112 100644 --- a/boards/esp32s2-lilygo-ttgo-t8/Makefile.features +++ b/boards/esp32s2-lilygo-ttgo-t8/Makefile.features @@ -14,7 +14,14 @@ FEATURES_PROVIDED += periph_spi FEATURES_PROVIDED += periph_usbdev # other features provided by the board +FEATURES_PROVIDED += arduino_analog +FEATURES_PROVIDED += arduino_dac +FEATURES_PROVIDED += arduino_i2c FEATURES_PROVIDED += arduino_pins +FEATURES_PROVIDED += arduino_pwm +FEATURES_PROVIDED += arduino_spi +FEATURES_PROVIDED += arduino_uart + FEATURES_PROVIDED += esp_rtc_timer_32k FEATURES_PROVIDED += sdcard_spi FEATURES_PROVIDED += tinyusb_device diff --git a/boards/esp32s2-lilygo-ttgo-t8/include/arduino_iomap.h b/boards/esp32s2-lilygo-ttgo-t8/include/arduino_iomap.h index 22adb1e91b..3d881063cf 100644 --- a/boards/esp32s2-lilygo-ttgo-t8/include/arduino_iomap.h +++ b/boards/esp32s2-lilygo-ttgo-t8/include/arduino_iomap.h @@ -26,13 +26,16 @@ extern "C" { #endif +#define ARDUINO_UART_D0D1 UART_DEV(0) /**< Arduino UART interface */ +#define ARDUINO_SPI_D11D12D13 SPI_DEV(0) /**< Arduino SPI bus */ + /** * @name Mapping of MCU pins to Arduino pins * @{ */ #define ARDUINO_PIN_0 GPIO44 /**< Arduino pin 0 (RxD) */ #define ARDUINO_PIN_1 GPIO43 /**< Arduino pin 1 (TxD) */ -#define ARDUINO_PIN_2 GPIO21 /**< Arduino pin 2 */ +#define ARDUINO_PIN_2 GPIO0 /**< Arduino pin 2 (BTN0) */ #define ARDUINO_PIN_3 GPIO39 /**< Arduino pin 3 (PWM) */ #define ARDUINO_PIN_4 GPIO21 /**< Arduino pin 4 */ #define ARDUINO_PIN_5 GPIO40 /**< Arduino pin 5 (PWM) */ @@ -41,34 +44,80 @@ extern "C" { #define ARDUINO_PIN_8 GPIO18 /**< Arduino pin 8 */ #define ARDUINO_PIN_9 GPIO42 /**< Arduino pin 9 (PWM) */ -#define ARDUINO_PIN_10 GPIO38 /**< Arduino pin 10 (CS0 / PWM) */ -#define ARDUINO_PIN_11 GPIO35 /**< Arduino pin 11 (MOSI / PWM) */ -#define ARDUINO_PIN_12 GPIO37 /**< Arduino pin 12 (MISO) */ -#define ARDUINO_PIN_13 GPIO36 /**< Arduino pin 13 (SCK) */ +#define ARDUINO_PIN_10 GPIO10 /**< Arduino pin 10 (CS0 / SD Card) */ +#define ARDUINO_PIN_11 GPIO11 /**< Arduino pin 11 (MOSI) */ +#define ARDUINO_PIN_12 GPIO13 /**< Arduino pin 12 (MISO) */ +#define ARDUINO_PIN_13 GPIO12 /**< Arduino pin 13 (SCK) */ /* analog pins as digital pin: */ -#define ARDUINO_PIN_14 GPIO1 /**< Arduino pin A0 */ -#define ARDUINO_PIN_15 GPIO2 /**< Arduino pin A1 */ -#define ARDUINO_PIN_16 GPIO4 /**< Arduino pin A2 */ -#define ARDUINO_PIN_17 GPIO5 /**< Arduino pin A3 */ +#define ARDUINO_PIN_14 GPIO1 /**< Arduino pin 14 (A0) */ +#define ARDUINO_PIN_15 GPIO2 /**< Arduino pin 15 (A1) */ +#define ARDUINO_PIN_16 GPIO4 /**< Arduino pin 16 (A2) */ +#define ARDUINO_PIN_17 GPIO5 /**< Arduino pin 17 (A3)*/ -#define ARDUINO_PIN_18 GPIO7 /**< Arduino pin A4 (SDA) */ -#define ARDUINO_PIN_19 GPIO8 /**< Arduino pin A5 (SCL) */ +#define ARDUINO_PIN_18 GPIO7 /**< Arduino pin 18 (A4 / SDA) */ +#define ARDUINO_PIN_19 GPIO8 /**< Arduino pin 19 (A5 / SCL) */ -#define ARDUINO_PIN_LAST 19 +#define ARDUINO_PIN_20 GPIO17 /**< Arduino pin 20 (DAC0) */ +#define ARDUINO_PIN_21 GPIO18 /**< Arduino pin 21 (DAC1) */ + +#define ARDUINO_PIN_LAST 21 /**< Last Arduino pin index */ /** @} */ /** * @name Aliases for analog pins * @{ */ -#define ARDUINO_PIN_A0 ARDUINO_PIN_14 -#define ARDUINO_PIN_A1 ARDUINO_PIN_15 -#define ARDUINO_PIN_A2 ARDUINO_PIN_16 -#define ARDUINO_PIN_A3 ARDUINO_PIN_17 +#define ARDUINO_PIN_A0 ARDUINO_PIN_14 /**< Arduino pin A0 */ +#define ARDUINO_PIN_A1 ARDUINO_PIN_15 /**< Arduino pin A1 */ +#define ARDUINO_PIN_A2 ARDUINO_PIN_16 /**< Arduino pin A2 */ +#define ARDUINO_PIN_A3 ARDUINO_PIN_17 /**< Arduino pin A3 */ +#define ARDUINO_PIN_A4 ARDUINO_PIN_18 /**< Arduino pin A4 */ +#define ARDUINO_PIN_A5 ARDUINO_PIN_19 /**< Arduino pin A5 */ -#define ARDUINO_PIN_A4 ARDUINO_PIN_18 -#define ARDUINO_PIN_A5 ARDUINO_PIN_19 +#define ARDUINO_PIN_DAC0 ARDUINO_PIN_20 /**< Arduino pin DAC0 */ +#define ARDUINO_PIN_DAC1 ARDUINO_PIN_21 /**< Arduino pin DAC1 */ +/** @} */ + +/** + * @name Mapping of Arduino analog pins to RIOT ADC lines + * @{ + */ +#define ARDUINO_A0 ADC_LINE(0) /**< ADC line for Arduino pin A0 */ +#define ARDUINO_A1 ADC_LINE(1) /**< ADC line for Arduino pin A1 */ +#define ARDUINO_A2 ADC_LINE(2) /**< ADC line for Arduino pin A2 */ +#define ARDUINO_A3 ADC_LINE(3) /**< ADC line for Arduino pin A3 */ +#define ARDUINO_A4 ADC_LINE(5) /**< ADC line for Arduino pin A4 */ +#define ARDUINO_A5 ADC_LINE(6) /**< ADC line for Arduino pin A5 */ + +#define ARDUINO_ANALOG_PIN_LAST 5 +/** @} */ + +/** + * @name Mapping of Arduino DAC pins to RIOT DAC lines + * @{ + */ +#define ARDUINO_DAC0 DAC_LINE(0) /**< DAC line for Arduino pin DAC0 */ +#define ARDUINO_DAC1 DAC_LINE(1) /**< DAC line for Arduino pin DAC1 */ + +#define ARDUINO_DAC_PIN_LAST 1 /**< Last Arduino DAC pin index */ +/** @} */ + +/** + * @name Mapping of Arduino pins to RIOT PWM dev and channel pairs + * @{ + */ +#define ARDUINO_PIN_3_PWM_DEV PWM_DEV(0) /**< PWM device for Arduino pin 3 */ +#define ARDUINO_PIN_3_PWM_CHAN 0 /**< PWM channel for Arduino pin 3 */ + +#define ARDUINO_PIN_5_PWM_DEV PWM_DEV(0) /**< PWM device for Arduino pin 5 */ +#define ARDUINO_PIN_5_PWM_CHAN 1 /**< PWM channel for Arduino pin 5 */ + +#define ARDUINO_PIN_6_PWM_DEV PWM_DEV(0) /**< PWM device for Arduino pin 6 */ +#define ARDUINO_PIN_6_PWM_CHAN 2 /**< PWM channel for Arduino pin 6 */ + +#define ARDUINO_PIN_9_PWM_DEV PWM_DEV(0) /**< PWM device for Arduino pin 9 */ +#define ARDUINO_PIN_9_PWM_CHAN 3 /**< PWM channel for Arduino pin 9 */ /** @} */ #ifdef __cplusplus diff --git a/boards/esp32s2-lilygo-ttgo-t8/include/periph_conf.h b/boards/esp32s2-lilygo-ttgo-t8/include/periph_conf.h index 0804962966..79c06b9cd3 100644 --- a/boards/esp32s2-lilygo-ttgo-t8/include/periph_conf.h +++ b/boards/esp32s2-lilygo-ttgo-t8/include/periph_conf.h @@ -169,7 +169,7 @@ extern "C" { #define SPI1_MOSI GPIO11 /**< SPI MOSI */ #endif #ifndef SPI1_CS0 -#define SPI1_CS0 GPIO10 /**< SPI CS0 used for Display */ +#define SPI1_CS0 GPIO10 /**< SPI CS0 used for SD Card */ #endif /** @} */