digital

Author: soburi

cores/arduino/Arduino.h

@@ -43,21 +43,13 @@
 #endif
 #endif // LED_BUILTIN
 
-#define DN_ENUMS(n, p, i) D##i = i
-
 /*
  * expand as
  * enum digitalPins { D0, D1, ... };
  */
-#define ZARD_DN_ENUMS(n, p, i) DX##i = ZARD_GLOBAL_GPIO_NUM(n, p, i)
-enum digitalPinsx {
-  DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios, ZARD_DN_ENUMS, (,))
-  , NUM_OF_DIGIAL_PINSX
-};
-
+#define ZARD_DN_ENUMS(n, p, i) D##i = ZARD_GLOBAL_GPIO_NUM(n, p, i)
 enum digitalPins {
-	DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios, DN_ENUMS, (, )),
-	NUM_OF_DIGITAL_PINS
+  DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), digital_pin_gpios, ZARD_DN_ENUMS, (,))
 };
 
 #ifdef CONFIG_ADC

cores/arduino/zephyrCommon.cpp

@@ -534,7 +534,8 @@ int digitalPinToInterrupt(pin_size_t pin) {
 
 #define Dx(x) D ## x
 #define DXx(x) DX ## x
-#define PRINT_PIN(p, _) printf(STRINGIFY(Dx(p)) ":%d:%p:%d - " STRINGIFY(DXx(p)) ":%d:%p:%d\n", Dx(p), arduino_pins[Dx(p)].port, arduino_pins[Dx(p)].pin, DXx(p), local_gpio_port(DXx(p)), local_gpio_pin(DXx(p)));
+//#define PRINT_PIN(p, _) printf(STRINGIFY(Dx(p)) ":%d:%p:%d - " STRINGIFY(DXx(p)) ":%d:%p:%d\n", Dx(p), arduino_pins[Dx(p)].port, arduino_pins[Dx(p)].pin, DXx(p), local_gpio_port(DXx(p)), local_gpio_pin(DXx(p)));
+#define PRINT_PIN(p, _) printf(STRINGIFY(Dx(p)) ":%d:%p:%d\n", Dx(p), local_gpio_port(Dx(p)), local_gpio_pin(Dx(p)));
 
 void debug_dump(void) {
 	int x = LED_BUILTIN;