adc

Author: soburi

cores/arduino/Arduino.h

@@ -63,11 +63,23 @@ enum digitalPins {
 #endif
 
 #ifdef CONFIG_ADC
+
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), adc_pin_gpios)
 #define ZARD_AN_ENUMS(n, p, i) A##i = ZARD_GLOBAL_GPIO_NUM(n, p, i)
 enum analogPins {
   DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), adc_pin_gpios, ZARD_AN_ENUMS, (, )),
   NUM_OF_ANALOG_PINS
 };
+#elif DT_NODE_EXISTS(DT_NODELABEL(arduino_adc))
+#define ZARD_MKR_HDR_AN_ENUMS(n, p, i)                                                             \
+  A##i = UTIL_CAT(D, GET_ARG_N(1, DT_MAP_PARENT_SPECIFIER_ARGS_BY_IDX(n, p, i)))
+
+enum analogPins {
+  DT_FOREACH_PROP_ELEM_SEP(DT_NODELABEL(arduino_adc), io_channel_map, ZARD_MKR_HDR_AN_ENUMS, (, )),
+  NUM_OF_ANALOG_PINS
+};
+#endif
+
 #endif
 
 void interrupts(void);

cores/arduino/zephyrCommon.cpp

@@ -153,22 +153,44 @@ size_t pwm_pin_index(pin_size_t pinNumber) {
 
 #ifdef CONFIG_ADC
 
-#define ADC_DT_SPEC(n, p, i) ADC_DT_SPEC_GET_BY_IDX(n, i)
 #define ADC_CH_CFG(n, p, i) arduino_adc[i].channel_cfg
 
-const struct adc_dt_spec arduino_adc[] = {
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), adc_pin_gpios)
+#define ADC_DT_SPEC(n, p, i) ADC_DT_SPEC_GET_BY_IDX(n, i)
+
+constexpr struct adc_dt_spec arduino_adc[] = {
   DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), io_channels, ADC_DT_SPEC, (,))
 };
 
 /* io-channel-pins node provides a mapping digital pin numbers to adc channels */
-const pin_size_t arduino_analog_pins[] = {
+constexpr pin_size_t arduino_analog_pins[] = {
   DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), adc_pin_gpios, ZARD_GLOBAL_GPIO_NUM, (,))
 };
 
 struct adc_channel_cfg channel_cfg[] = {
   DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), io_channels, ADC_CH_CFG, (,))
 };
 
+#elif DT_NODE_EXISTS(DT_NODELABEL(arduino_adc))
+#define ADC_SPEC_ELEM(n, p, i)                                                                     \
+	ADC_DT_SPEC_STRUCT(DT_MAP_PARENT_ARG_BY_IDX(n, p, i),                                      \
+                           GET_ARG_N(1, DT_MAP_PARENT_SPECIFIER_ARGS_BY_IDX(n, p, i)))
+#define ZARD_ADC_PIN_ID(i, _) A##i
+
+constexpr struct adc_dt_spec arduino_adc[] = {
+  DT_FOREACH_PROP_ELEM_SEP(DT_NODELABEL(arduino_adc), io_channel_map, ADC_SPEC_ELEM, (,))
+};
+
+constexpr pin_size_t arduino_analog_pins[] = {
+  LISTIFY(DT_PROP_LEN(DT_NODELABEL(arduino_adc), io_channel_map), ZARD_ADC_PIN_ID, (,))
+};
+
+struct adc_channel_cfg channel_cfg[] = {
+  DT_FOREACH_PROP_ELEM_SEP(DT_NODELABEL(arduino_adc), io_channel_map, ADC_CH_CFG, (,))
+};
+
+#endif
+
 size_t analog_pin_index(pin_size_t pinNumber) {
   for(size_t i=0; i<ARRAY_SIZE(arduino_analog_pins); i++) {
     if (arduino_analog_pins[i] == pinNumber) {