Skip to content

boards,sys/arduino: major clean up #19759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2023
Merged

boards,sys/arduino: major clean up #19759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
043e8cc
boards,sys/arduino: major clean up
maribu Jun 23, 2023
efb3a32
dist/tools/doccheck: update exclude patterns
maribu Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion boards/adafruit-grand-central-m4-express/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ config BOARD_ADAFRUIT_GRAND_CENTRAL_M4_EXPRESS
bool
default y
select CPU_MODEL_SAMD51P20A
select HAS_ARDUINO
select HAS_ARDUINO_ANALOG
select HAS_ARDUINO_PINS
select HAS_HIGHLEVEL_STDIO
select HAS_PERIPH_ADC
select HAS_PERIPH_DAC
Expand Down
3 changes: 2 additions & 1 deletion boards/adafruit-grand-central-m4-express/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev

# other board features
FEATURES_PROVIDED += arduino
FEATURES_PROVIDED += arduino_analog
FEATURES_PROVIDED += arduino_pins
FEATURES_PROVIDED += sdcard_spi
73 changes: 0 additions & 73 deletions boards/adafruit-grand-central-m4-express/include/arduino_board.h
View file
Open in desktop

This file was deleted.

34 changes: 25 additions & 9 deletions ...ntral-m4-express/include/arduino_pinmap.h → ...entral-m4-express/include/arduino_iomap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* @author Gunar Schorcht <[email protected]>
*/

#ifndef ARDUINO_PINMAP_H
#define ARDUINO_PINMAP_H
#ifndef ARDUINO_IOMAP_H
#define ARDUINO_IOMAP_H

#include "periph/gpio.h"
#include "periph/adc.h"
Expand Down Expand Up @@ -49,12 +49,26 @@ extern "C" {
#define ARDUINO_PIN_14 GPIO_PIN(PB, 20)
#define ARDUINO_PIN_15 GPIO_PIN(PB, 21)

#define ARDUINO_PIN_A0 GPIO_PIN(PA, 3)
#define ARDUINO_PIN_A1 GPIO_PIN(PC, 0)
#define ARDUINO_PIN_A2 GPIO_PIN(PC, 3)
#define ARDUINO_PIN_A3 GPIO_PIN(PC, 1)
#define ARDUINO_PIN_A4 GPIO_PIN(PC, 4)
#define ARDUINO_PIN_A5 GPIO_PIN(PC, 5)
#define ARDUINO_PIN_16 GPIO_PIN(PA, 3)
#define ARDUINO_PIN_17 GPIO_PIN(PC, 0)
#define ARDUINO_PIN_18 GPIO_PIN(PC, 3)
#define ARDUINO_PIN_19 GPIO_PIN(PC, 1)
#define ARDUINO_PIN_20 GPIO_PIN(PC, 4)
#define ARDUINO_PIN_21 GPIO_PIN(PC, 5)

#define ARDUINO_PIN_LAST 21
/** @} */

/**
* @name Aliases for analog pins
* @{
*/
#define ARDUINO_PIN_A0 ARDUINO_PIN_16
#define ARDUINO_PIN_A1 ARDUINO_PIN_17
#define ARDUINO_PIN_A2 ARDUINO_PIN_18
#define ARDUINO_PIN_A3 ARDUINO_PIN_19
#define ARDUINO_PIN_A4 ARDUINO_PIN_20
#define ARDUINO_PIN_A5 ARDUINO_PIN_21
/** @} */

/**
Expand All @@ -67,11 +81,13 @@ extern "C" {
#define ARDUINO_A3 ADC_LINE(3)
#define ARDUINO_A4 ADC_LINE(4)
#define ARDUINO_A5 ADC_LINE(5)

#define ARDUINO_ANALOG_PIN_LAST 5
/** @} */

#ifdef __cplusplus
}
#endif

#endif /* ARDUINO_PINMAP_H */
#endif /* ARDUINO_IOMAP_H */
/** @} */
1 change: 1 addition & 0 deletions boards/arduino-duemilanove/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ config BOARD_ARDUINO_DUEMILANOVE
select BOARD_COMMON_ARDUINO_ATMEGA
select CPU_MODEL_ATMEGA328P
select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
select HAS_ARDUINO_SHIELD_UNO

config BOARD
default "arduino-duemilanove" if BOARD_ARDUINO_DUEMILANOVE
Expand Down
1 change: 1 addition & 0 deletions boards/arduino-duemilanove/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CPU = atmega328p

FEATURES_PROVIDED += arduino_shield_uno
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
1 change: 1 addition & 0 deletions boards/arduino-leonardo/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ config BOARD_ARDUINO_LEONARDO
select BOARD_COMMON_ARDUINO_ATMEGA
select CPU_MODEL_ATMEGA32U4
select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
select HAS_ARDUINO_SHIELD_UNO

source "$(RIOTBOARD)/common/arduino-atmega/Kconfig"
1 change: 1 addition & 0 deletions boards/arduino-leonardo/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CPU = atmega32u4

FEATURES_PROVIDED += arduino_shield_uno
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
2 changes: 2 additions & 0 deletions boards/arduino-mega2560/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,7 @@ config BOARD_ARDUINO_MEGA2560
select CPU_MODEL_ATMEGA2560
select BOARD_COMMON_ARDUINO_ATMEGA
select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
select HAS_ARDUINO_SHIELD_MEGA
select HAS_ARDUINO_SHIELD_UNO

source "$(RIOTBOARD)/common/arduino-atmega/Kconfig"
3 changes: 3 additions & 0 deletions boards/arduino-mega2560/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
CPU = atmega2560

FEATURES_PROVIDED += arduino_shield_mega
FEATURES_PROVIDED += arduino_shield_uno

include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
5 changes: 0 additions & 5 deletions boards/arduino-mkr1000/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
extern "C" {
#endif

/**
* @brief The on-board LED is connected to pin 6 on this board
*/
#define ARDUINO_LED (6U)

/**
* @name LED pin definitions and handlers
* @{
Expand Down
5 changes: 0 additions & 5 deletions boards/arduino-mkrfox1200/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ extern "C" {
#define ATA8520E_PARAM_RESET_PIN GPIO_PIN(PA, 27)
/** @} */

/**
* @brief The on-board LED is connected to pin 6 on this board
*/
#define ARDUINO_LED (6U)

/**
* @name LED pin definitions and handlers
* @{
Expand Down
5 changes: 0 additions & 5 deletions boards/arduino-mkrwan1300/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
extern "C" {
#endif

/**
* @brief The on-board LED is connected to pin 6 on this board
*/
#define ARDUINO_LED (6U)

/**
* @name LED pin definitions and handlers
* @{
Expand Down
1 change: 1 addition & 0 deletions boards/arduino-nano/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ config BOARD_ARDUINO_NANO
select BOARD_COMMON_ARDUINO_ATMEGA
select CPU_MODEL_ATMEGA328P
select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
select HAS_ARDUINO_SHIELD_NANO

config BOARD
default "arduino-nano" if BOARD_ARDUINO_NANO
Expand Down
1 change: 1 addition & 0 deletions boards/arduino-nano/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CPU = atmega328p

FEATURES_PROVIDED += arduino_shield_nano
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
1 change: 1 addition & 0 deletions boards/arduino-uno/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ config BOARD_ARDUINO_UNO
select CPU_MODEL_ATMEGA328P
select BOARD_COMMON_ARDUINO_ATMEGA
select MODULE_BOARDS_COMMON_ARDUINO-ATMEGA if TEST_KCONFIG
select HAS_ARDUINO_SHIELD_UNO

config BOARD
default "arduino-uno" if BOARD_ARDUINO_UNO
Expand Down
1 change: 1 addition & 0 deletions boards/arduino-uno/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CPU = atmega328p

FEATURES_PROVIDED += arduino_shield_uno
include $(RIOTBOARD)/common/arduino-atmega/Makefile.features
7 changes: 6 additions & 1 deletion boards/common/arduino-atmega/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@ config BOARD_COMMON_ARDUINO_ATMEGA
select HAS_PERIPH_TIMER
select HAS_PERIPH_UART
# Various other features (if any)
select HAS_ARDUINO
select HAS_ARDUINO_ANALOG
select HAS_ARDUINO_I2C
select HAS_ARDUINO_PINS
select HAS_ARDUINO_PWM
select HAS_ARDUINO_SHIELD_ISP
select HAS_ARDUINO_SPI
select HAS_ARDUINO_UART

select HAVE_SAUL_GPIO

Expand Down
7 changes: 6 additions & 1 deletion boards/common/arduino-atmega/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,10 @@ FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart

# Various other features (if any)
FEATURES_PROVIDED += arduino
FEATURES_PROVIDED += arduino_analog
FEATURES_PROVIDED += arduino_i2c
FEATURES_PROVIDED += arduino_pins
FEATURES_PROVIDED += arduino_pwm
FEATURES_PROVIDED += arduino_shield_isp
FEATURES_PROVIDED += arduino_spi
FEATURES_PROVIDED += arduino_uart
Loading