x

Author: soburi

cores/arduino/Arduino.h

@@ -26,6 +26,8 @@
 #define GPIO_PIN_NUMS \
 	(DT_FOREACH_PROP_ELEM_SEP(DT_PATH(zephyr_user), gpios, PROP_NGPIOS, (+)))
 
+#define GPIO_PORT_NUMS DT_PROP_LEN(DT_PATH(zephyr_user), gpios)
+
 #ifndef LED_BUILTIN
 #if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), builtin_led_gpios) &&                                   \
 	(DT_PROP_LEN(DT_PATH(zephyr_user), builtin_led_gpios) > 0)

cores/arduino/zephyrCommon.cpp

@@ -7,7 +7,6 @@
 #include <Arduino.h>
 #include "zephyrInternal.h"
 
-
 namespace {
 struct gpio_dt_spec local_gpio_dt(int) {
   struct gpio_dt_spec sp = {0};
@@ -26,10 +25,6 @@ constexpr pin_size_t global_gpio_pin(struct device* port, int pin) {
   return pin;
 }
 
-static const uint32_t xpins[] = {16u, 32u}; // exclusive-upper
-static const int port_num = sizeof(xpins) / sizeof(xpins[0]);
-static const int pin_num = 32u;
-
 template <class N, class Head> constexpr const N max_in_list(const N max, const Head &head)
 {
   return (max >= head) ? max : head;
@@ -59,7 +54,7 @@ struct gpio_port_callback {
   struct arduino_callback handlers[max_ngpios];
   gpio_port_pins_t pins;
   const struct device *dev;
-} port_callback[port_num] = {0};
+} port_callback[GPIO_PORT_NUMS] = {0};
 
 struct gpio_port_callback *find_gpio_port_callback(const struct device *dev)
 {
@@ -185,39 +180,37 @@ void yield(void) {
  *  A high physical level will be interpreted as value 1
  */
 void pinMode(pin_size_t pinNumber, PinMode pinMode) {
-  const gpio_dt_spec spec = local_gpio_dt(pinNumber);
   if (pinMode == INPUT) { // input mode
-    gpio_pin_configure_dt(&spec, GPIO_INPUT | GPIO_ACTIVE_HIGH);
+    gpio_pin_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber),
+                          GPIO_INPUT | GPIO_ACTIVE_HIGH);
   } else if (pinMode == INPUT_PULLUP) { // input with internal pull-up
-    gpio_pin_configure_dt(&spec, GPIO_INPUT | GPIO_PULL_UP | GPIO_ACTIVE_HIGH);
+    gpio_pin_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber),
+                          GPIO_INPUT | GPIO_PULL_UP | GPIO_ACTIVE_HIGH);
   } else if (pinMode == INPUT_PULLDOWN) { // input with internal pull-down
-    gpio_pin_configure_dt(&spec, GPIO_INPUT | GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH);
+    gpio_pin_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber),
+                          GPIO_INPUT | GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH);
   } else if (pinMode == OUTPUT) { // output mode
-    gpio_pin_configure_dt(&spec, GPIO_OUTPUT_LOW | GPIO_ACTIVE_HIGH);
+    gpio_pin_configure(local_gpio_port(pinNumber), local_gpio_pin(pinNumber),
+                          GPIO_OUTPUT_LOW | GPIO_ACTIVE_HIGH);
   }
 }
 
 void digitalWrite(pin_size_t pinNumber, PinStatus status) {
-  const gpio_dt_spec spec = local_gpio_dt(pinNumber);
-  gpio_pin_set_dt(&spec, status);
+  gpio_pin_set(local_gpio_port(pinNumber), local_gpio_pin(pinNumber), status);
 }
 
 PinStatus digitalRead(pin_size_t pinNumber) {
-  const gpio_dt_spec spec = local_gpio_dt(pinNumber);
-  return (gpio_pin_get_dt(&spec) == 1) ? HIGH : LOW;
+  return (gpio_pin_get(local_gpio_port(pinNumber), local_gpio_pin(pinNumber)) == 1) ? HIGH : LOW;
 }
 
-struct k_timer arduino_pin_timers[GPIO_PIN_NUMS];
-struct k_timer arduino_pin_timers_timeout[GPIO_PIN_NUMS];
-
 void tone_expiry_cb(struct k_timer *timer) {
-  const struct gpio_dt_spec *spec = (gpio_dt_spec*)k_timer_user_data_get(timer);
-  gpio_pin_toggle_dt(spec);
+  struct pin_timer* pt = (struct pin_timer*)k_timer_user_data_get(timer);
+  gpio_pin_toggle(pt->gpio, pt->pin);
 }
 
 void tone_timeout_cb(struct k_timer *timer) {
-  pin_size_t pinNumber = (pin_size_t)(uintptr_t)k_timer_user_data_get(timer);
-  noTone(pinNumber);
+  struct pin_timer* pt = (struct pin_timer*)k_timer_user_data_get(timer);
+  noTone(global_gpio_pin(pt->gpio, pt->pin));
 }
 
 void tone(pin_size_t pinNumber, unsigned int frequency, unsigned long duration) {
@@ -228,7 +221,7 @@ void tone(pin_size_t pinNumber, unsigned int frequency, unsigned long duration)
   pinMode(pinNumber, OUTPUT);
 
   if (frequency == 0) {
-    gpio_pin_set_dt(&spec, 0);
+    gpio_pin_set(local_gpio_port(pinNumber), local_gpio_pin(pinNumber), 0);
     return;
   }
 
@@ -410,31 +403,30 @@ long random(long max) {
 unsigned long pulseIn(pin_size_t pinNumber, uint8_t state, unsigned long timeout) {
   struct k_timer timer;
   int64_t start, end, delta = 0;
-  const struct gpio_dt_spec spec = local_gpio_dt(pinNumber);
 
   k_timer_init(&timer, NULL, NULL);
   k_timer_start(&timer, K_MSEC(timeout), K_NO_WAIT);
 
-  if (!gpio_is_ready_dt(&spec)) {
+  if (!device_is_ready(local_gpio_port(pinNumber))) {
     goto cleanup;
   }
 
-  if (!gpio_pin_is_input_dt(&spec)) {
+  if (!device_is_ready(local_gpio_port(pinNumber))) {
     goto cleanup;
   }
 
-  while(gpio_pin_get_dt(&spec) == state && k_timer_status_get(&timer) == 0);
+  while(gpio_pin_get(local_gpio_port(pinNumber), local_gpio_pin(pinNumber)) == state && k_timer_status_get(&timer) == 0);
   if (k_timer_status_get(&timer) > 0) {
     goto cleanup;
   }
 
-  while(gpio_pin_get_dt(&spec) != state && k_timer_status_get(&timer) == 0);
+  while(gpio_pin_get(local_gpio_port(pinNumber), local_gpio_pin(pinNumber)) != state && k_timer_status_get(&timer) == 0);
   if (k_timer_status_get(&timer) > 0) {
     goto cleanup;
   }
 
   start = k_uptime_ticks();
-  while(gpio_pin_get_dt(&spec) == state && k_timer_status_get(&timer) == 0);
+  while(gpio_pin_get(local_gpio_port(pinNumber), local_gpio_pin(pinNumber)) == state && k_timer_status_get(&timer) == 0);
   if (k_timer_status_get(&timer) > 0) {
     goto cleanup;
   }