Skip to content

zephyrCommon: fix issues with invalid pin numbers #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soburi merged 1 commit into from
May 31, 2026
Merged

zephyrCommon: fix issues with invalid pin numbers #178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions cores/arduino/zephyrCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ static const struct gpio_dt_spec arduino_pins[] = {
DT_FOREACH_PROP_ELEM_SEP(
DT_PATH(zephyr_user), digital_pin_gpios, GPIO_DT_SPEC_GET_BY_IDX, (, ))};

#define RETURN_ON_INVALID_PIN(pinNumber, ...) \
do { \
if ((pin_size_t)(pinNumber) >= ARRAY_SIZE(arduino_pins)) { \
return __VA_ARGS__; \
} \
} while (0)

namespace {

#if DT_PROP_LEN(DT_PATH(zephyr_user), digital_pin_gpios) > 0
Expand Down Expand Up @@ -103,6 +110,8 @@ struct gpio_port_callback *find_gpio_port_callback(const struct device *dev) {
}

void setInterruptHandler(pin_size_t pinNumber, voidFuncPtr func) {
RETURN_ON_INVALID_PIN(pinNumber);

struct gpio_port_callback *pcb = find_gpio_port_callback(arduino_pins[pinNumber].port);

if (pcb) {
Expand Down Expand Up @@ -215,6 +224,8 @@ void yield(void) {
* A high physical level will be interpreted as value 1
*/
void pinMode(pin_size_t pinNumber, PinMode pinMode) {
RETURN_ON_INVALID_PIN(pinNumber);

if (pinMode == INPUT) { // input mode
gpio_pin_configure_dt(&arduino_pins[pinNumber], GPIO_INPUT | GPIO_ACTIVE_HIGH);
} else if (pinMode == INPUT_PULLUP) { // input with internal pull-up
Expand All @@ -229,10 +240,14 @@ void pinMode(pin_size_t pinNumber, PinMode pinMode) {
}

void digitalWrite(pin_size_t pinNumber, PinStatus status) {
RETURN_ON_INVALID_PIN(pinNumber);

gpio_pin_set_dt(&arduino_pins[pinNumber], status);
}

PinStatus digitalRead(pin_size_t pinNumber) {
RETURN_ON_INVALID_PIN(pinNumber, LOW);

return (gpio_pin_get_dt(&arduino_pins[pinNumber]) == 1) ? HIGH : LOW;
}

Expand Down Expand Up @@ -314,6 +329,8 @@ void tone_expiry_cb(struct k_timer *timer) {
}

void tone(pin_size_t pinNumber, unsigned int frequency, unsigned long duration) {
RETURN_ON_INVALID_PIN(pinNumber);

k_spinlock_key_t key;
uint64_t toggles_count;
struct pin_timer *pt;
Expand Down Expand Up @@ -372,6 +389,8 @@ void tone(pin_size_t pinNumber, unsigned int frequency, unsigned long duration)
}

void noTone(pin_size_t pinNumber) {
RETURN_ON_INVALID_PIN(pinNumber);

struct pin_timer *pt;
k_spinlock_key_t key;

Expand Down Expand Up @@ -563,6 +582,8 @@ int analogRead(pin_size_t pinNumber) {
#endif

void attachInterrupt(pin_size_t pinNumber, voidFuncPtr callback, PinStatus pinStatus) {
RETURN_ON_INVALID_PIN(pinNumber);

struct gpio_port_callback *pcb;
gpio_flags_t intmode = 0;

Expand Down Expand Up @@ -598,6 +619,8 @@ void attachInterrupt(pin_size_t pinNumber, voidFuncPtr callback, PinStatus pinSt
}

void detachInterrupt(pin_size_t pinNumber) {
RETURN_ON_INVALID_PIN(pinNumber);

setInterruptHandler(pinNumber, nullptr);
disableInterrupt(pinNumber);
}
Expand All @@ -621,6 +644,8 @@ long random(long max) {
#endif

unsigned long pulseIn(pin_size_t pinNumber, uint8_t state, unsigned long timeout) {
RETURN_ON_INVALID_PIN(pinNumber, LOW);

struct k_timer timer;
int64_t start, end, delta = 0;
const struct gpio_dt_spec *spec = &arduino_pins[pinNumber];
Expand Down Expand Up @@ -660,6 +685,8 @@ unsigned long pulseIn(pin_size_t pinNumber, uint8_t state, unsigned long timeout
}

void enableInterrupt(pin_size_t pinNumber) {
RETURN_ON_INVALID_PIN(pinNumber);

struct gpio_port_callback *pcb = find_gpio_port_callback(arduino_pins[pinNumber].port);

if (pcb) {
Expand All @@ -668,6 +695,8 @@ void enableInterrupt(pin_size_t pinNumber) {
}

void disableInterrupt(pin_size_t pinNumber) {
RETURN_ON_INVALID_PIN(pinNumber);

struct gpio_port_callback *pcb = find_gpio_port_callback(arduino_pins[pinNumber].port);

if (pcb) {
Expand All @@ -689,8 +718,10 @@ void noInterrupts(void) {
}
}

int digitalPinToInterrupt(pin_size_t pin) {
struct gpio_port_callback *pcb = find_gpio_port_callback(arduino_pins[pin].port);
int digitalPinToInterrupt(pin_size_t pinNumber) {
RETURN_ON_INVALID_PIN(pinNumber, -1);

struct gpio_port_callback *pcb = find_gpio_port_callback(arduino_pins[pinNumber].port);

return (pcb) ? pin : -1;
return (pcb) ? pinNumber : -1;
}
Loading