Skip to content

Support "file-less" configuration #151

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

Draft
soburi wants to merge 3 commits into
base: next
Choose a base branch
from
+784 −45
Draft

Support "file-less" configuration #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e6f4f5
variant: Adds support for Arduino Uno R4.
soburi Feb 9, 2026
b0d9151
cores: arduino: zephyrCommon Specify port/pin instead of gpio_dt_spec.
soburi Jan 30, 2026
dc41a17
cores: arduino: zephyrCommon: Generate config from connector definition
soburi Jan 30, 2026
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
115 changes: 113 additions & 2 deletions cores/arduino/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2022 Dhruva Gole
* Copyright (c) 2026 TOKITA Hiroshi
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand All @@ -14,6 +15,8 @@
#include <zephyr/drivers/adc.h>
#include <zephyr/drivers/i2c.h>

#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)

#define DIGITAL_PIN_EXISTS(n, p, i, dev, num) \
(((dev == DT_REG_ADDR(DT_PHANDLE_BY_IDX(n, p, i))) && \
(num == DT_PHA_BY_IDX(n, p, i, pin))) \
Expand Down Expand Up @@ -74,12 +77,107 @@

#define DN_ENUMS(n, p, i) D##i = i

#else

#if DT_NODE_EXISTS(DT_NODELABEL(arduino_header))
#define ZARD_CONNECTOR arduino_header

#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_0 D16
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_1 D17
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_2 D18
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_3 D19
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_4 D20
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_5 D21
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_6 D0
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_7 D1
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_8 D2
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_9 D3
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_10 D4
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_11 D5
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_12 D6
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_13 D7
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_14 D8
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_15 D9
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_16 D10
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_17 D11
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_18 D12
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_19 D13
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_20 D14
#define ZARD_ARDUINO_HEADER_R3_DIGITAL_MAP_21 D15

#elif DT_NODE_EXISTS(DT_NODELABEL(arduino_mkr_header))
#define ZARD_CONNECTOR arduino_mkr_header
#elif DT_NODE_EXISTS(DT_NODELABEL(arduino_nano_header))
#define ZARD_CONNECTOR arduino_nano_header
#elif DT_NODE_EXISTS(DT_NODELABEL(pico_header))
#define ZARD_CONNECTOR pico_header
#elif DT_NODE_EXISTS(DT_NODELABEL(boosterpack_header))
#define ZARD_CONNECTOR boosterpack_header
#endif

#if DT_NODE_EXISTS(DT_NODELABEL(arduino_adc))
#define ZARD_ADC_CONNECTOR arduino_adc
#endif

#if DT_NODE_EXISTS(DT_NODELABEL(arduino_pwm))
#define ZARD_PWM_CONNECTOR arduino_pwm
#endif

#define ZARD_CONNECTOR_PIN_NAME(node, num) \
UTIL_CAT(UTIL_CAT(ZARD_, UTIL_CAT(DT_STRING_UPPER_TOKEN_BY_IDX(node, compatible, 0), _DIGITAL_MAP_)), num)

#define ZARD_CHECK_GPIO_CTLR_OKAY(node_id) \
COND_CODE_1(DT_NODE_HAS_PROP(node_id, gpio_controller), (node_id,), ())

#define ZARD_ALL_OKAY_GPIO_CTLR DT_FOREACH_NODE(ZARD_CHECK_GPIO_CTLR_OKAY)

#define ZARD_IDX_IF_MATCH(i, n) \
COND_CODE_1(DT_SAME_NODE(n, GET_ARG_N(UTIL_INC(i), ZARD_ALL_OKAY_GPIO_CTLR)), (i), ())

#define ZARD_MATCH_IDX(n) \
LISTIFY(NUM_VA_ARGS_LESS_1(ZARD_ALL_OKAY_GPIO_CTLR), ZARD_IDX_IF_MATCH, (), n)

#define ZARD_GET_NGPIOS(i, ...) DT_PROP(GET_ARG_N(UTIL_INC(i), __VA_ARGS__), ngpios)
#define ZARD_SUM_NGPIOS(...) \
LISTIFY(NUM_VA_ARGS(__VA_ARGS__), ZARD_GET_NGPIOS, (+), __VA_ARGS__)

#define ZARD_GLOBAL_GPIO_OFFSET_(ph) \
ZARD_SUM_NGPIOS(GET_ARGS_FIRST_N(ZARD_MATCH_IDX(ph), ZARD_ALL_OKAY_GPIO_CTLR))

#define ZARD_GLOBAL_GPIO_OFFSET(ph) \
COND_CODE_1(IS_EQ(NUM_VA_ARGS(ZARD_GLOBAL_GPIO_OFFSET_(ph)), 0), \
(0), (ZARD_GLOBAL_GPIO_OFFSET_(ph)))


#define ZARD_CONN_DN_ENUMS(n, p, i) \
ZARD_CONNECTOR_PIN_NAME(DT_NODELABEL(ZARD_CONNECTOR), \
DT_MAP_ENTRY_CHILD_SPECIFIER_BY_IDX(n, p, i, 0)) = \
ZARD_GLOBAL_GPIO_OFFSET(DT_MAP_ENTRY_PARENT_BY_IDX(n, p, i)) + \
DT_MAP_ENTRY_PARENT_SPECIFIER_BY_IDX(n, p, i, 0)

#define ZARD_CONN_AN_ENUMS(n, p, i) \
UTIL_CAT(A, DT_MAP_ENTRY_CHILD_SPECIFIER_BY_IDX(n, p, i, 0)) = \
ZARD_GLOBAL_GPIO_OFFSET( \
DT_MAP_ENTRY_PARENT_BY_IDX(DT_NODELABEL(ZARD_CONNECTOR), gpio_map, i)) + \
DT_MAP_ENTRY_PARENT_SPECIFIER_BY_IDX(DT_NODELABEL(ZARD_CONNECTOR), gpio_map, i, 0)

#if DT_NODE_EXISTS(DT_ALIAS(led0))
#define ZARD_LED_BUILTIN \
ZARD_GLOBAL_GPIO_OFFSET(DT_PHANDLE_BY_IDX(DT_ALIAS(led0), gpios, 0)) + \
DT_PHA_BY_IDX(DT_ALIAS(led0), gpios, 0, pin)
#endif
#endif

/*
* expand as
* enum digitalPins { D0, D1, ... LED... NUM_OF_DIGITAL_PINS };
*/
enum digitalPins {
#if DT_PROP_LEN_OR(DT_PATH(zephyr_user), digital_pin_gpios, 0) > 0
DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios, DN_ENUMS, (, )),
#elif defined(ZARD_CONNECTOR)
DT_FOREACH_MAP_ENTRY_SEP(DT_NODELABEL(ZARD_CONNECTOR), gpio_map, ZARD_CONN_DN_ENUMS, (, )),
#endif
NUM_OF_DIGITAL_PINS
};

Expand All @@ -88,8 +186,21 @@ enum digitalPins {
#define AN_ENUMS(n, p, i) A ## i = DIGITAL_PIN_GPIOS_FIND_PIN( \
DT_REG_ADDR(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), p, i)), \
DT_PHA_BY_IDX(DT_PATH(zephyr_user), p, i, pin)),
enum analogPins { DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user),
adc_pin_gpios, AN_ENUMS) };
#define ZARD_AN_ENUM_GLOBAL(n, p, i) \
ZARD_GLOBAL_GPIO_OFFSET(DT_PHANDLE_BY_IDX(n, p, i)) + DT_PHA_BY_IDX(n, p, i, pin)
enum analogPins {
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), adc_pin_gpios)
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), adc_pin_gpios, AN_ENUMS)
#else
DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), adc_pin_gpios, ZARD_AN_ENUM_GLOBAL)
#endif
#elif defined(ZARD_ADC_CONNECTOR)
DT_FOREACH_MAP_ENTRY_SEP(DT_NODELABEL(ZARD_ADC_CONNECTOR), io_channel_map,
ZARD_CONN_AN_ENUMS, (, )),
#endif
NUM_OF_ANALOG_PINS
};

#endif

Expand Down
Loading
Loading