From 8786955225586044754ac2ace74b0f6273768b1d Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 7 Aug 2018 22:00:35 +0700 Subject: [PATCH] clean up bsp --- src/boards.h | 5 ++++- src/main.c | 20 +++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/boards.h b/src/boards.h index 4a4c98b..b7a4a81 100644 --- a/src/boards.h +++ b/src/boards.h @@ -36,7 +36,10 @@ #define bit(b) (1UL << (b)) -void led_control(uint32_t pin, bool state); +static inline void led_control(uint32_t pin, bool state) +{ + nrf_gpio_pin_write(pin, state ? LED_STATE_ON : (1-LED_STATE_ON)); +} static inline void led_on(uint32_t pin) { diff --git a/src/main.c b/src/main.c index c78af08..fb8e3a8 100644 --- a/src/main.c +++ b/src/main.c @@ -31,6 +31,7 @@ #include #include #include + #include "nrfx.h" #include "nrfx_power.h" @@ -51,6 +52,7 @@ #include "app_scheduler.h" #include "app_timer.h" #include "nrf_error.h" + #include "boards.h" #include "pstorage_platform.h" @@ -145,17 +147,6 @@ bool button_pressed(uint32_t pin) return (nrf_gpio_pin_read(pin) == 0) ? true : false; } -static void led_pin_init(uint32_t pin) -{ - nrf_gpio_cfg_output(pin); - led_off(pin); -} - -void led_control(uint32_t pin, bool state) -{ - nrf_gpio_pin_write(pin, state ? LED_STATE_ON : (1-LED_STATE_ON)); -} - /* * Blinking function, there are a few patterns @@ -214,8 +205,11 @@ void board_init(void) button_pin_init(FRESET_BUTTON); NRFX_DELAY_US(100); // wait for the pin state is stable - led_pin_init(LED_RED); - led_pin_init(LED_BLUE); + // LED init + nrf_gpio_cfg_output(LED_RED); + nrf_gpio_cfg_output(LED_BLUE); + led_off(LED_RED); + led_off(LED_BLUE); // Init scheduler and timer (use scheduler) APP_SCHED_INIT(SCHED_MAX_EVENT_DATA_SIZE, SCHED_QUEUE_SIZE);