map

Author: soburi

cores/arduino/Arduino.h

@@ -24,6 +24,7 @@
                              DT_PHANDLE_BY_IDX(n, p, i))                                           \
   DT_PHA_BY_IDX(n, p, i, pin)
 
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
 /*
  * expand as
  * enum digitalPins { D0, D1, ... };
@@ -33,6 +34,33 @@ enum digitalPins {
   DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios, ZARD_DN_ENUMS, (, )),
   NUM_OF_DIGITAL_PINS
 };
+#else
+
+#define ZARD_MKR_HDR_DN_ENUMS(n, p, i)                                                             \
+  D##i = DT_FOREACH_PROP_ELEM_VARGS(DT_PATH(zephyr_user), gpio_ports, ZARD_ACCUM_NGPIOS,           \
+                             DT_MAP_PARENT_ARG_BY_IDX(n, p, i))                                    \
+  GET_ARG_N(1, DT_MAP_PARENT_SPECIFIER_ARGS_BY_IDX(n, p, i))
+
+#if DT_NODE_EXISTS(DT_NODELABEL(arduino_header))
+#define ZARD_CONNECTOR arduino_header
+#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
+
+#ifdef ZARD_CONNECTOR
+enum digitalPins {
+  DT_FOREACH_PROP_ELEM_SEP(DT_NODELABEL(ZARD_CONNECTOR), gpio_map, ZARD_MKR_HDR_DN_ENUMS, (, )),
+  NUM_OF_DIGITAL_PINS
+};
+#endif
+
+#endif
 
 #ifdef CONFIG_ADC
 #define ZARD_AN_ENUMS(n, p, i) A##i = ZARD_GLOBAL_GPIO_NUM(n, p, i)

cores/arduino/zephyrCommon.cpp

@@ -79,9 +79,15 @@ constexpr const N max_in_list(const N max, const Head &head, const Tail &...tail
   return max_in_list((max >= head) ? max : head, tail...);
 }
 
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
 #define GPIO_NGPIOS(n, p, i) DT_PROP(DT_GPIO_CTLR_BY_IDX(n, p, i), ngpios)
 constexpr int max_ngpios = max_in_list(
   0, DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios, GPIO_NGPIOS, (, )));
+#elif defined(ZARD_CONNECTOR)
+#define MAP_NGPIOS(n, p, i) DT_PROP(DT_MAP_PARENT_ARG_BY_IDX(n, p, i), ngpios)
+constexpr int max_ngpios = max_in_list(
+  0, DT_FOREACH_PROP_ELEM_SEP(DT_NODELABEL(ZARD_CONNECTOR), gpio_map, MAP_NGPIOS, (, )));
+#endif
 
 /*
  * GPIO callback implementation
@@ -208,7 +214,11 @@ PinStatus digitalRead(pin_size_t pinNumber) {
 }
 
 #ifndef MAX_TONE_PINS
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
 #define MAX_TONE_PINS DT_PROP_LEN(DT_PATH(zephyr_user), digital_pin_gpios)
+#elif defined(ZARD_CONNECTOR)
+#define MAX_TONE_PINS DT_PROP_LEN(DT_NODELABEL(ZARD_CONNECTOR), gpio_map)
+#endif
 #endif
 
 struct pin_timer {