diff --git a/.gitignore b/.gitignore
index 9dd1fd55a..6ec64860a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 rust/Cargo.lock
+_codeql_*
diff --git a/cores/arduino/zephyrCommon.cpp b/cores/arduino/zephyrCommon.cpp
index d609950f4..353f2d3f0 100644
--- a/cores/arduino/zephyrCommon.cpp
+++ b/cores/arduino/zephyrCommon.cpp
@@ -246,6 +246,8 @@ const struct pwm_dt_spec arduino_pwm[] = {
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), pwms)
 	DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), pwms, PWM_DT_SPEC)
+#elif defined(ZARD_PWM_CONNECTOR)
+	DT_FOREACH_MAP_ENTRY(DT_NODELABEL(ZARD_PWM_CONNECTOR), pwm_map, PWM_CONN_CHANNEL_DT)
 #endif
 #else // global pin rule
 	//TODO
@@ -305,6 +307,8 @@ const struct adc_dt_spec arduino_adc[] = {
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), io_channels)
   DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), io_channels, ADC_DT_SPEC)
+#elif defined(ZARD_ADC_CONNECTOR)
+  DT_FOREACH_MAP_ENTRY(DT_NODELABEL(ZARD_ADC_CONNECTOR), io_channel_map, ADC_CONN_CHANNEL_DT)
 #endif
 #else //global pin rule
       //TODO
@@ -328,6 +332,8 @@ struct adc_channel_cfg channel_cfg[ARRAY_SIZE(arduino_analog_pins)] = {
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), digital_pin_gpios)
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), io_channels)
   DT_FOREACH_PROP_ELEM(DT_PATH(zephyr_user), io_channels, ADC_CH_CFG)
+#elif defined(ZARD_ADC_CONNECTOR)
+  DT_FOREACH_MAP_ENTRY(DT_NODELABEL(ZARD_ADC_CONNECTOR), io_channel_map, ADC_CONN_CHANNEL_CFG)
 #endif
 #else // global pin rule
       // TODO