x

Author: soburi

cores/arduino/Arduino.h

@@ -27,6 +27,14 @@
 #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_ADD_NGPIOS(i, n, p) DT_PROP(DT_PROP_BY_IDX(n, p, i), ngpios) +
 #define ZARD_ACCUM_NGPIOS(n, p, i, nd)                                                             \
   COND_CODE_1(DT_SAME_NODE(DT_PROP_BY_IDX(n, p, i), nd),                                           \
@@ -74,10 +82,6 @@ enum analogPins {
 };
 #else
 
-#if DT_NODE_EXISTS(DT_NODELABEL(arduino_adc))
-#define ZARD_ADC_CONNECTOR arduino_adc
-#endif
-
 #define ZARD_MKR_ADC_AN_ENUMS(n, p, i)                                                             \
 	UTIL_CAT(A, DT_MAP_ENTRY_CHILD_SPECIFIER_BY_IDX(n, p, i, 0)) =                             \
 		ZARD_GLOBAL_GPIO_NUM_(DT_MAP_ENTRY_PARENT_BY_IDX(DT_NODELABEL(ZARD_CONNECTOR), gpio_map, i))                         \

cores/arduino/zephyrCommon.cpp

@@ -148,10 +148,18 @@ const struct pwm_dt_spec arduino_pwm[] = {
   DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), pwms, PWM_DT_SPEC, (,))
 };
 
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), pwm_pin_gpios)
 /* pwm-pins node provides a mapping digital pin numbers to pwm channels */
 const pin_size_t arduino_pwm_pins[] = {
   DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), pwm_pin_gpios, ZARD_GLOBAL_GPIO_NUM, (,))
 };
+#else
+#define ZARD_PWM_CONNECTOR_PINNUM(n, p, i) DT_MAP_ENTRY_CHILD_SPECIFIER_BY_IDX(n, p, i, 0)
+const pin_size_t arduino_pwm_pins[] = {
+  DT_FOREACH_MAP_ENTRY_SEP(DT_NODELABEL(ZARD_PWM_CONNECTOR), pwm_map, ZARD_PWM_CONNECTOR_PINNUM, (, )),
+};
+
+#endif
 
 size_t pwm_pin_index(pin_size_t pinNumber) {
   for(size_t i=0; i<ARRAY_SIZE(arduino_pwm_pins); i++) {
@@ -179,7 +187,7 @@ const pin_size_t arduino_analog_pins[] = {
   DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), adc_pin_gpios, ZARD_GLOBAL_GPIO_NUM, (,))
 };
 #else
-#define ZARD_ADC_CONNECTOR_AN(n, p, i) UTIL_CAT(A, i)
+#define ZARD_ADC_CONNECTOR_AN(n, p, i) DT_MAP_ENTRY_CHILD_SPECIFIER_BY_IDX(n, p, i, 0)
 const pin_size_t arduino_analog_pins[] = {
   DT_FOREACH_MAP_ENTRY_SEP(DT_NODELABEL(ZARD_ADC_CONNECTOR), io_channel_map, ZARD_ADC_CONNECTOR_AN, (, )),
 };