Skip to content

Commit 48c8301

Browse files
committed
cores: Define invalid_pin_number
Define `invalid_pin_number` and replace `pin_size_t(-1)`. Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
1 parent ab5ff58 commit 48c8301

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

cores/arduino/Tone.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace {
2424
static struct pin_timer {
2525
struct k_timer timer;
2626
uint32_t count{0};
27-
pin_size_t pin{pin_size_t(-1)};
27+
pin_size_t pin{invalid_pin_number};
2828
bool infinity{false};
2929
bool timer_initialized{false};
3030
struct k_spinlock lock{};
@@ -54,7 +54,7 @@ static struct pin_timer *find_pin_timer(pin_size_t pinNumber, bool active_only)
5454
for (size_t i = 0; i < ARRAY_SIZE(arduino_pin_timers); i++) {
5555
k_spinlock_key_t key = k_spin_lock(&arduino_pin_timers[i].lock);
5656

57-
if (arduino_pin_timers[i].pin == pin_size_t(-1)) {
57+
if (arduino_pin_timers[i].pin == invalid_pin_number) {
5858
arduino_pin_timers[i].pin = pinNumber;
5959
k_spin_unlock(&arduino_pin_timers[i].lock, key);
6060
return &arduino_pin_timers[i];
@@ -72,16 +72,16 @@ void tone_expiry_cb(struct k_timer *timer) {
7272
pin_size_t pin = pt->pin;
7373

7474
if (pt->count == 0 && !pt->infinity) {
75-
if (pin != pin_size_t(-1)) {
75+
if (pin != invalid_pin_number) {
7676
gpio_pin_set_dt(&arduino_pins[pin], 0);
7777
}
7878

7979
k_timer_stop(timer);
8080
pt->count = 0;
8181
pt->infinity = false;
82-
pt->pin = pin_size_t(-1);
82+
pt->pin = invalid_pin_number;
8383
} else {
84-
if (pin != pin_size_t(-1)) {
84+
if (pin != invalid_pin_number) {
8585
gpio_pin_toggle_dt(&arduino_pins[pin]);
8686
}
8787
pt->count--;
@@ -126,7 +126,7 @@ void tone(pin_size_t pinNumber, unsigned int frequency, unsigned long duration)
126126
key = k_spin_lock(&pt->lock);
127127
pt->count = 0;
128128
pt->infinity = false;
129-
pt->pin = pin_size_t(-1);
129+
pt->pin = invalid_pin_number;
130130
k_spin_unlock(&pt->lock, key);
131131

132132
gpio_pin_set_dt(&arduino_pins[pinNumber], 0);
@@ -175,7 +175,7 @@ void noTone(pin_size_t pinNumber) {
175175
k_timer_stop(&pt->timer);
176176
pt->count = 0;
177177
pt->infinity = false;
178-
pt->pin = pin_size_t(-1);
178+
pt->pin = invalid_pin_number;
179179
k_spin_unlock(&pt->lock, key);
180180

181181
gpio_pin_set_dt(&arduino_pins[pinNumber], 0);

cores/arduino/wiring_private.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
namespace zephyr {
3131
namespace arduino {
3232

33+
constexpr pin_size_t invalid_pin_number = pin_size_t(-1);
34+
3335
constexpr struct gpio_dt_spec arduino_pins[] = {
3436
DT_FOREACH_PROP_ELEM_SEP(
3537
DT_PATH(zephyr_user), digital_pin_gpios, GPIO_DT_SPEC_GET_BY_IDX, (, ))};

0 commit comments

Comments
 (0)