From 4f48b8b51aa2e3f108c778c5190bce55761b5d3c Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 23 Nov 2018 11:46:21 +0700 Subject: [PATCH] rename led blink fast name --- .../libraries/bootloader_dfu/dfu_transport_ble.c | 4 ++-- .../libraries/bootloader_dfu/dfu_transport_serial.c | 4 ++-- src/boards.c | 7 ++++++- src/boards.h | 4 +--- src/boards/feather_nrf52840_express.h | 5 +++-- src/main.c | 8 ++++---- src/usb/uf2/ghostfat.c | 4 ++-- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c b/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c index f705456..ac33c51 100644 --- a/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c +++ b/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c @@ -589,7 +589,7 @@ static void on_dfu_evt(ble_dfu_t * p_dfu, ble_dfu_evt_t * p_evt) break; case BLE_DFU_PACKET_WRITE: - led_blink_fast(true); + led_red_blink_fast(true); on_dfu_pkt_write(p_dfu, p_evt); break; @@ -750,7 +750,7 @@ static void on_ble_evt(ble_evt_t * p_ble_evt) m_direct_adv_cnt = APP_DIRECTED_ADV_TIMEOUT; - led_blink_fast(false); + led_red_blink_fast(false); err_code = sd_ble_gatts_sys_attr_get(m_conn_handle, sys_attr, diff --git a/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c b/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c index b66d59a..bef9da5 100644 --- a/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c +++ b/lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c @@ -227,14 +227,14 @@ static void process_dfu_packet(void * p_event_data, uint16_t event_size) retval = dfu_init_pkt_complete(); APP_ERROR_CHECK(retval); - led_blink_fast(true); + led_red_blink_fast(true); break; case STOP_DATA_PACKET: (void)dfu_image_validate(); (void)dfu_image_activate(); - led_blink_fast(false); + led_red_blink_fast(false); // Break the loop by returning. return; diff --git a/src/boards.c b/src/boards.c index d96042f..d0b203d 100644 --- a/src/boards.c +++ b/src/boards.c @@ -81,6 +81,11 @@ void board_init(void) // use PMW0 for LED RED led_pwm_init(LED_RED); +// use neopixel for use enumeration +#ifdef LED_NEOPIXEL + +#endif + // Init scheduler APP_SCHED_INIT(SCHED_MAX_EVENT_DATA_SIZE, SCHED_QUEUE_SIZE); @@ -170,7 +175,7 @@ void led_pwm_enable(uint32_t led_pin) } -void led_blink_fast(bool enable) +void led_red_blink_fast(bool enable) { if ( enable ) { diff --git a/src/boards.h b/src/boards.h index ca9e4e9..4194202 100644 --- a/src/boards.h +++ b/src/boards.h @@ -34,8 +34,6 @@ #define LED_RED LED_1 #define LED_BLUE LED_2 - - // Helper function #define memclr(buffer, size) memset(buffer, 0, size) #define varclr(_var) memclr(_var, sizeof(*(_var))) @@ -71,7 +69,7 @@ void led_pwm_teardown(uint32_t led_pin); void led_pwm_disable(uint32_t led_pin); void led_pwm_enable(uint32_t led_pin); -void led_blink_fast(bool enable); +void led_red_blink_fast(bool enable); //--------------------------------------------------------------------+ // BUTTONS diff --git a/src/boards/feather_nrf52840_express.h b/src/boards/feather_nrf52840_express.h index dc2146b..ddc83d0 100644 --- a/src/boards/feather_nrf52840_express.h +++ b/src/boards/feather_nrf52840_express.h @@ -43,8 +43,9 @@ /* LED *------------------------------------------------------------------*/ #define LEDS_NUMBER 2 -#define LED_1 _PINNUM(1, 2) // P1.02 -#define LED_2 _PINNUM(1, 10) // P1.10 +#define LED_1 _PINNUM(1, 15) +#define LED_2 _PINNUM(1, 10) +#define LED_NEOPIXEL 16 #define LED_STATE_ON 1 /*------------------------------------------------------------------*/ diff --git a/src/main.c b/src/main.c index 8336bdd..02be46c 100644 --- a/src/main.c +++ b/src/main.c @@ -170,12 +170,12 @@ int main(void) // When updating SoftDevice, bootloader will reset before swapping SD if (bootloader_dfu_sd_in_progress()) { - led_blink_fast(true); + led_red_blink_fast(true); APP_ERROR_CHECK( bootloader_dfu_sd_update_continue() ); APP_ERROR_CHECK( bootloader_dfu_sd_update_finalize() ); - led_blink_fast(false); + led_red_blink_fast(false); } /*------------- Determine DFU mode (Serial, OTA, FRESET or normal) -------------*/ @@ -268,7 +268,7 @@ int main(void) void adafruit_factory_reset(void) { // Blink fast RED and turn on BLUE when erasing - led_blink_fast(true); + led_red_blink_fast(true); led_on(LED_BLUE); // clear all App Data if any @@ -281,7 +281,7 @@ void adafruit_factory_reset(void) nrf_nvmc_page_erase(DFU_BANK_0_REGION_START); // back to normal - led_blink_fast(false); + led_red_blink_fast(false); led_off(LED_BLUE); } diff --git a/src/usb/uf2/ghostfat.c b/src/usb/uf2/ghostfat.c index 0676854..329c6e2 100644 --- a/src/usb/uf2/ghostfat.c +++ b/src/usb/uf2/ghostfat.c @@ -235,7 +235,7 @@ void read_block(uint32_t block_no, uint8_t *data) { /** uf2 upgrade complete -> inform bootloader to update setting and reset */ static void uf2_write_complete(uint32_t numBlocks) { - led_blink_fast(false); + led_red_blink_fast(false); dfu_update_status_t update_status; @@ -285,7 +285,7 @@ int write_block(uint32_t block_no, uint8_t *data, bool quiet/*, WriteState *stat static bool first_write = true; if ( first_write ) { first_write = false; - led_blink_fast(true); + led_red_blink_fast(true); } flash_nrf5x_write(bl->targetAddr, bl->data, bl->payloadSize, true);