x

Author: soburi

cores/arduino/Arduino.h

@@ -14,30 +14,30 @@
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/kernel.h>
 
-#define SUM_NGPIOS(i, n, p)   DT_PROP(DT_PROP_BY_IDX(n, p, i), ngpios) +
-#define ACCUM_NGPIOS(n, p, i) LISTIFY(i, SUM_NGPIOS, (), n, p)
+#define ADD_NGPIOS(i, n, p)   DT_PROP(DT_PROP_BY_IDX(n, p, i), ngpios) +
+#define ACCUM_NGPIOS(n, p, i) LISTIFY(i, ADD_NGPIOS, (), n, p)
 #define ACCUM_NGPIOS_CHECK(n, p, i, node)                                                          \
-	COND_CODE_1(DT_SAME_NODE(DT_PROP_BY_IDX(n, p, i), node),                     \
-              (ACCUM_NGPIOS(n, p, i)), ())
+	COND_CODE_1(DT_SAME_NODE(DT_PROP_BY_IDX(n, p, i), node), (ACCUM_NGPIOS(n, p, i)), ())
 #define FIND_GPIO_IDX(node)                                                                        \
 	DT_FOREACH_PROP_ELEM_VARGS(DT_PATH(zephyr_user), gpios, ACCUM_NGPIOS_CHECK, node)
 
-#ifndef LED_BUILTIN
+#define PROP_NGPIOS(n, p, i) DT_PROP(DT_PROP_BY_IDX(n, p, i), ngpios)
+
+#define GPIO_PIN_NUMS \
+	(DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), gpios, PROP_NGPIOS, (+)))
 
+#ifndef LED_BUILTIN
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), builtin_led_gpios) &&                                   \
 	(DT_PROP_LEN(DT_PATH(zephyr_user), builtin_led_gpios) > 0)
-
 #define LED_BUILTIN                                                                                \
 	(FIND_GPIO_IDX(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), builtin_led_gpios, 0))              \
 		 DT_PHA_BY_IDX(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), builtin_led_gpios, 0),      \
 			       pin))
-/* If digital-pin-gpios is not defined, tries to use the led0 alias */
 #elif DT_NODE_EXISTS(DT_ALIAS(led0))
 #define LED_BUILTIN                                                                                \
 	(FIND_GPIO_IDX(DT_PHANDLE(DT_ALIAS(led0), gpios)) DT_PHA(DT_ALIAS(led0), gpios, pin))
-#endif // builtin_led_gpios
-
-#endif // LED_BUILTIN
+#endif
+#endif
 
 #define DN_ENUMS(n, p, i)                                                                          \
 	D##i = FIND_GPIO_IDX(DT_PHANDLE_BY_IDX(n, p, i)) DT_PHA_BY_IDX(n, p, i, pin)

cores/arduino/zephyrCommon.cpp

@@ -207,8 +207,8 @@ PinStatus digitalRead(pin_size_t pinNumber) {
   return (gpio_pin_get_dt(&spec) == 1) ? HIGH : LOW;
 }
 
-struct k_timer arduino_pin_timers[pin_num];
-struct k_timer arduino_pin_timers_timeout[pin_num];
+struct k_timer arduino_pin_timers[GPIO_PIN_NUMS];
+struct k_timer arduino_pin_timers_timeout[GPIO_PIN_NUMS];
 
 void tone_expiry_cb(struct k_timer *timer) {
   const struct gpio_dt_spec *spec = (gpio_dt_spec*)k_timer_user_data_get(timer);