Skip to content

Commit 0edd23c

Browse files
Copilotsoburi
andcommitted
Fix ADC/PWM provisioning to be independent of pin association
Co-authored-by: soburi <458281+soburi@users.noreply.github.com>
1 parent 12498c5 commit 0edd23c

1 file changed

Lines changed: 0 additions & 18 deletions

File tree

cores/arduino/zephyrCommon.cpp

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -242,14 +242,8 @@ void handleGpioCallback(const struct device *port, struct gpio_callback *cb, uin
242242
())
243243

244244
const struct pwm_dt_spec arduino_pwm[] = {
245-
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), pwm_pin_gpios)
246-
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
247245
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), pwms)
248246
DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), pwms, PWM_DT_SPEC)
249-
#endif
250-
#else // global pin rule
251-
//TODO
252-
#endif
253247
#elif defined(ZARD_PWM_CONNECTOR)
254248
DT_FOREACH_MAP_ENTRY(DT_NODELABEL(ZARD_PWM_CONNECTOR), pwm_map, PWM_CONN_CHANNEL_DT)
255249
#endif
@@ -301,14 +295,8 @@ size_t pwm_pin_index(pin_size_t pinNumber) {
301295
())
302296

303297
const struct adc_dt_spec arduino_adc[] = {
304-
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), adc_pin_gpios)
305-
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
306298
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), io_channels)
307299
DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), io_channels, ADC_DT_SPEC)
308-
#endif
309-
#else //global pin rule
310-
//TODO
311-
#endif
312300
#elif defined(ZARD_ADC_CONNECTOR)
313301
DT_FOREACH_MAP_ENTRY(DT_NODELABEL(ZARD_ADC_CONNECTOR), io_channel_map, ADC_CONN_CHANNEL_DT)
314302
#endif
@@ -324,14 +312,8 @@ const pin_size_t arduino_analog_pins[] = {
324312
};
325313

326314
struct adc_channel_cfg channel_cfg[ARRAY_SIZE(arduino_analog_pins)] = {
327-
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), adc_pin_gpios)
328-
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
329315
#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), io_channels)
330316
DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), io_channels, ADC_CH_CFG)
331-
#endif
332-
#else // global pin rule
333-
// TODO
334-
#endif
335317
#elif defined(ZARD_ADC_CONNECTOR)
336318
DT_FOREACH_MAP_ENTRY(DT_NODELABEL(ZARD_ADC_CONNECTOR), io_channel_map, ADC_CONN_CHANNEL_CFG)
337319
#endif

0 commit comments

Comments
 (0)