From 373125df79edd20e12e20b01a9b142f2f46060b7 Mon Sep 17 00:00:00 2001 From: bkleiner Date: Sun, 13 Aug 2023 03:14:02 +0200 Subject: [PATCH] make rx_aux_on a macro --- src/flight/imu.c | 1 + src/io/buzzer.c | 3 ++- src/rx/rx.c | 4 ---- src/rx/rx.h | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/flight/imu.c b/src/flight/imu.c index 01fc3309b..e14b924e5 100644 --- a/src/flight/imu.c +++ b/src/flight/imu.c @@ -5,6 +5,7 @@ #include #include +#include "core/profile.h" #include "core/project.h" #include "driver/time.h" #include "flight/control.h" diff --git a/src/io/buzzer.c b/src/io/buzzer.c index 22d125a02..d2e3f5bd4 100644 --- a/src/io/buzzer.c +++ b/src/io/buzzer.c @@ -1,6 +1,7 @@ #include "io/buzzer.h" +#include "core/profile.h" #include "core/project.h" #include "driver/gpio.h" #include "driver/time.h" @@ -39,7 +40,7 @@ void buzzer_init() { gpio_init.mode = GPIO_OUTPUT; gpio_init.output = GPIO_PUSHPULL; gpio_init.pull = GPIO_NO_PULL; - gpio_pin_init( target.buzzer.pin, gpio_init); + gpio_pin_init(target.buzzer.pin, gpio_init); buzzer_off(); } diff --git a/src/rx/rx.c b/src/rx/rx.c index 3b99aab07..c9e701a8e 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -26,10 +26,6 @@ static uint32_t frames_received = 0; static filter_lp_pt2 rx_filter; static filter_state_t rx_filter_state[4]; -uint8_t rx_aux_on(aux_function_t function) { - return state.aux[profile.receiver.aux[function]]; -} - void rx_lqi_lost_packet() { frames_missed++; diff --git a/src/rx/rx.h b/src/rx/rx.h index 235abb321..302285a9c 100644 --- a/src/rx/rx.h +++ b/src/rx/rx.h @@ -76,7 +76,7 @@ typedef enum { AUX_FUNCTION_MAX } __attribute__((__packed__)) aux_function_t; -uint8_t rx_aux_on(aux_function_t function); +#define rx_aux_on(function) (state.aux[profile.receiver.aux[(function)]]) void rx_init(); void rx_update();