From 41cd8b0ffb46f3f88442b319ffe4a506b59fbc0b Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 12 May 2025 08:30:43 +0200 Subject: [PATCH] boards/esp32c3-wemos-mini: 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. --- boards/esp32c3-wemos-mini/Makefile.features | 5 ++ .../include/arduino_iomap.h | 90 +++++++++++++------ 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/boards/esp32c3-wemos-mini/Makefile.features b/boards/esp32c3-wemos-mini/Makefile.features index c857e9e2cd..a611f116a8 100644 --- a/boards/esp32c3-wemos-mini/Makefile.features +++ b/boards/esp32c3-wemos-mini/Makefile.features @@ -12,4 +12,9 @@ FEATURES_PROVIDED += periph_spi # unique features provided by the board FEATURES_PROVIDED += esp_jtag +FEATURES_PROVIDED += arduino_analog +FEATURES_PROVIDED += arduino_i2c FEATURES_PROVIDED += arduino_pins +FEATURES_PROVIDED += arduino_pwm +FEATURES_PROVIDED += arduino_spi +FEATURES_PROVIDED += arduino_uart diff --git a/boards/esp32c3-wemos-mini/include/arduino_iomap.h b/boards/esp32c3-wemos-mini/include/arduino_iomap.h index aea991ebc2..4aee76c2c1 100644 --- a/boards/esp32c3-wemos-mini/include/arduino_iomap.h +++ b/boards/esp32c3-wemos-mini/include/arduino_iomap.h @@ -26,43 +26,55 @@ extern "C" { #endif +#define ARDUINO_UART_D0D1 UART_DEV(0) /**< Arduino UART interface */ +#define ARDUINO_SPI_D11D12D13 SPI_DEV(0) /**< Arduino SPI bus */ + +#ifdef MODULE_ESP32C3_WEMOS_MINI_V1_0_0 +# define ARDUINO_LED (5) /**< LED is connected to Arduino pin 5 */ +#endif + /** * @name Mapping of MCU pins to Arduino pins * @{ */ #define ARDUINO_PIN_0 GPIO20 /**< Arduino pin 0 (RxD) */ #define ARDUINO_PIN_1 GPIO21 /**< Arduino pin 1 (TxD) */ -#define ARDUINO_PIN_2 GPIO9 /**< Arduino pin 2 */ +#define ARDUINO_PIN_2 GPIO9 /**< Arduino pin 2 (BTN0) */ #define ARDUINO_PIN_3 GPIO6 /**< Arduino pin 3 (PWM) */ #ifdef MODULE_ESP32C3_WEMOS_MINI_V1_0_0 -# define ARDUINO_PIN_5 GPIO7 /**< Arduino pin 5 (PWM) */ -# define ARDUINO_PIN_6 GPIO1 /**< Arduino pin 6 (PWM) */ -# define ARDUINO_PIN_7 GPIO0 /**< Arduino pin 7 */ -#else /* MODULE_ESP32C3_WEMOS_MINI_V2_1_0 */ -# define ARDUINO_PIN_6 GPIO2 /**< Arduino pin 6 (PWM) */ -# define ARDUINO_PIN_7 GPIO3 /**< Arduino pin 7 */ -#endif -#ifdef MODULE_ESP32C3_WEMOS_MINI_V1_0_0 -# define ARDUINO_PIN_10 GPIO5 /**< Arduino pin 10 (CS0 / PWM) */ -# define ARDUINO_PIN_11 GPIO4 /**< Arduino pin 11 (MOSI / PWM) */ +# define ARDUINO_PIN_4 GPIO0 /**< Arduino pin 4 */ +# define ARDUINO_PIN_5 GPIO1 /**< Arduino pin 5 (PWM/LED) */ +# define ARDUINO_PIN_6 GPIO7 /**< Arduino pin 6 (PWM) */ + +# define ARDUINO_PIN_10 GPIO5 /**< Arduino pin 10 (CS0) */ +# define ARDUINO_PIN_11 GPIO4 /**< Arduino pin 11 (MOSI) */ # define ARDUINO_PIN_12 GPIO3 /**< Arduino pin 12 (MISO) */ # define ARDUINO_PIN_13 GPIO2 /**< Arduino pin 13 (SCK) */ + #else /* MODULE_ESP32C3_WEMOS_MINI_V2_1_0 */ -# define ARDUINO_PIN_10 GPIO5 /**< Arduino pin 10 (CS0 / PWM) */ -# define ARDUINO_PIN_11 GPIO4 /**< Arduino pin 11 (MOSI / PWM) */ + +# define ARDUINO_PIN_4 GPIO7 /**< Arduino pin 4 (RGB LED) */ +# define ARDUINO_PIN_6 GPIO2 /**< Arduino pin 5 (PWM) */ +# define ARDUINO_PIN_7 GPIO3 /**< Arduino pin 6 (PWM) */ + +# define ARDUINO_PIN_10 GPIO5 /**< Arduino pin 10 (CS0) */ +# define ARDUINO_PIN_11 GPIO4 /**< Arduino pin 11 (MOSI) */ # define ARDUINO_PIN_12 GPIO0 /**< Arduino pin 12 (MISO) */ # define ARDUINO_PIN_13 GPIO1 /**< Arduino pin 13 (SCK) */ + #endif +/* Arduino pins 7 ... 9 are not available */ + /* analog pins as digital pin: */ -#define ARDUINO_PIN_14 GPIO0 /**< Arduino pin A0 */ -#define ARDUINO_PIN_15 GPIO1 /**< Arduino pin A1 */ -#define ARDUINO_PIN_16 GPIO2 /**< Arduino pin A2 */ -#define ARDUINO_PIN_17 GPIO3 /**< Arduino pin A3 */ -#define ARDUINO_PIN_18 GPIO4 /**< Arduino pin A4 (SDA) */ -#define ARDUINO_PIN_19 GPIO5 /**< Arduino pin A5 (SCL) */ +#define ARDUINO_PIN_14 GPIO0 /**< Arduino pin 14 (A0) */ +#define ARDUINO_PIN_15 GPIO1 /**< Arduino pin 15 (A1) */ +#define ARDUINO_PIN_16 GPIO2 /**< Arduino pin 16 (A2) */ +#define ARDUINO_PIN_17 GPIO3 /**< Arduino pin 17 (A3) */ +#define ARDUINO_PIN_18 GPIO4 /**< Arduino pin 18 (A4) */ +#define ARDUINO_PIN_19 GPIO5 /**< Arduino pin 19 (A5) */ #define ARDUINO_PIN_LAST 19 /** @} */ @@ -71,12 +83,40 @@ extern "C" { * @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_A4 ARDUINO_PIN_18 -#define ARDUINO_PIN_A5 ARDUINO_PIN_19 +#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 */ +/** @} */ + +/** + * @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(4) /**< ADC line for Arduino pin A4 */ +#define ARDUINO_A5 ADC_LINE(5) /**< ADC line for Arduino pin A5 */ + +#define ARDUINO_ANALOG_PIN_LAST 5 +/** @} */ + +/** + * @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 1 /**< 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 0 /**< 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 */ /** @} */ #ifdef __cplusplus