x

Author: soburi

cores/arduino/zephyrCommon.cpp

@@ -16,7 +16,11 @@ constexpr struct device * local_gpio_port(int) {
   return nullptr;
 }
 
-constexpr pin_size_t global_gpio_pin(struct device* port, int pin) {
+constexpr uint32_t local_gpio_dt_flags(int) {
+  return 0;
+}
+
+constexpr pin_size_t global_gpio_pin(const struct device* port, int pin) {
   return pin;
 }
 
@@ -150,8 +154,8 @@ struct pin_timer {
 	struct gpio_dt_spec spec;
 };
 
-struct pin_timer arduino_pin_timers[ARRAY_SIZE(arduino_pins)];
-struct pin_timer arduino_pin_timers_timeout[ARRAY_SIZE(arduino_pins)];
+struct pin_timer arduino_pin_timers[GPIO_PORT_NUMS];
+struct pin_timer arduino_pin_timers_timeout[GPIO_PORT_NUMS];
 
 void tone_expiry_cb(struct k_timer *timer) {
   struct pin_timer* pt = (struct pin_timer*)k_timer_user_data_get(timer);
@@ -160,17 +164,7 @@ void tone_expiry_cb(struct k_timer *timer) {
 
 void tone_timeout_cb(struct k_timer *timer) {
   struct pin_timer* pt = (struct pin_timer*)k_timer_user_data_get(timer);
-  noTone(pt->spec.pin);
-}
-
-void tone_expiry_cb(struct k_timer *timer) {
-  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) {
-  struct pin_timer* pt = (struct pin_timer*)k_timer_user_data_get(timer);
-  noTone(global_gpio_pin(pt->gpio, pt->pin));
+  noTone(global_gpio_pin(pt->spec.port, pt->spec.pin));
 }
 
 } // namespace
@@ -210,28 +204,32 @@ PinStatus digitalRead(pin_size_t pinNumber) {
 
 void tone(pin_size_t pinNumber, unsigned int frequency, unsigned long duration) {
   struct k_timer *timer = &arduino_pin_timers[pinNumber].timer;
-  const struct gpio_dt_spec *spec = &arduino_pins[pinNumber].spec;
+  const struct gpio_dt_spec *spec = &arduino_pin_timers[pinNumber].spec;
   k_timeout_t timeout;
 
+  arduino_pin_timers[pinNumber].spec.port = local_gpio_port(pinNumber);
+  arduino_pin_timers[pinNumber].spec.pin  = local_gpio_pin(pinNumber);
+  arduino_pin_timers[pinNumber].spec.dt_flags = local_gpio_dt_flags(pinNumber);
+
   pinMode(pinNumber, OUTPUT);
 
   if (frequency == 0) {
-    gpio_pin_set(local_gpio_port(pinNumber), local_gpio_pin(pinNumber), 0);
+    gpio_pin_set_dt(&arduino_pin_timers[pinNumber].spec, 0);
     return;
   }
 
   timeout = K_NSEC(NSEC_PER_SEC / (2 * frequency));
 
   k_timer_init(timer, tone_expiry_cb, NULL);
   k_timer_user_data_set(timer, &arduino_pin_timers[pinNumber]);
-  gpio_pin_set_dt(spec, 1);
+  gpio_pin_set_dt(&arduino_pin_timers[pinNumber].spec, 1);
   k_timer_start(timer, timeout, timeout);
 
   if(duration > 0) {
     timer = &arduino_pin_timers_timeout[pinNumber].timer;
-    arduino_pin_timers_timeout[pinNumber].spec.port = nullptr;
-    arduino_pin_timers_timeout[pinNumber].spec.pin = pinNumber;
-    arduino_pin_timers_timeout[pinNumber].spec.dt_flags = 0;
+    arduino_pin_timers_timeout[pinNumber].spec.port = local_gpio_port(pinNumber);
+    arduino_pin_timers_timeout[pinNumber].spec.pin  = local_gpio_pin(pinNumber);
+    arduino_pin_timers_timeout[pinNumber].spec.dt_flags = local_gpio_dt_flags(pinNumber);
     k_timer_init(timer, tone_timeout_cb, NULL);
     k_timer_user_data_set(timer, &arduino_pin_timers_timeout[pinNumber]);
     k_timer_start(timer, K_MSEC(duration), K_NO_WAIT);
@@ -240,7 +238,7 @@ void tone(pin_size_t pinNumber, unsigned int frequency, unsigned long duration)
 
 void noTone(pin_size_t pinNumber) {
   k_timer_stop(&arduino_pin_timers[pinNumber].timer);
-  gpio_pin_set_dt(&arduino_pins[pinNumber], 0);
+  gpio_pin_set_dt(&arduino_pin_timers[pinNumber].spec, 0);
 }
 
 void delay(unsigned long ms) { k_sleep(K_MSEC(ms)); }