x

Author: soburi

cores/arduino/zephyrCommon.cpp

@@ -51,9 +51,19 @@ constexpr inline pin_size_t port_idx(pin_size_t gpin)
   return port_index_recursive(local_gpio_port(gpin), gpios, 0, ARRAY_SIZE(gpios));
 }
 
+constexpr inline pin_size_t end_accum_recursive(const uint32_t accum, const uint32_t *end, size_t n)
+{
+  return (n == 0) ? accum : end_accum_recursive(accum + end[0], end + 1, n - 1);
+}
+
+constexpr inline pin_size_t end_accum(size_t n)
+{
+  return end_accum_recursive(0, pins, n);
+}
+
 constexpr inline pin_size_t local_gpio_pin(pin_size_t gpin)
 {
-  return port_idx(gpin) == pin_size_t(-1) ? pin_size_t(-1) : gpin - pins[port_idx(gpin)];
+  return port_idx(gpin) == pin_size_t(-1) ? pin_size_t(-1) : gpin - end_accum(port_idx(gpin));
 }
 
 constexpr inline pin_size_t global_gpio_pin_(size_t port_idx, pin_size_t lpin)
@@ -252,7 +262,7 @@ static bool interrupts_disabled = false;
 
 #define Dx(x) D ## x
 #define DXx(x) DX ## x
-#define PRINT_PIN(p, _) printf(STRINGIFY(DXX(p)) "%p:%d - %p:%d\n", arduino_pins[Dx(p)].port, arduino_pins[Dx(p)].pin, 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)));
 
 void yield(void) {