From 5aad22c32cffafde42ad107652215cf8d4abf6ca Mon Sep 17 00:00:00 2001 From: "matthias.ringwald@gmail.com" Date: Mon, 21 Jan 2013 14:05:39 +0000 Subject: [PATCH] timer handler renamed into heartbeat handler --- MSP-EXP430F5438-CC256x/example/Makefile | 2 +- MSP-EXP430F5438-CC256x/example/led_counter.c | 4 ++-- MSP-EXP430F5438-CC256x/example/spp_counter.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MSP-EXP430F5438-CC256x/example/Makefile b/MSP-EXP430F5438-CC256x/example/Makefile index 525fc14b8..cf3cc54bc 100644 --- a/MSP-EXP430F5438-CC256x/example/Makefile +++ b/MSP-EXP430F5438-CC256x/example/Makefile @@ -28,7 +28,7 @@ CORE = \ COMMON = \ ../src/hal_uart_dma.c \ ${BTSTACK_ROOT}/chipset-cc256x/bt_control_cc256x.c \ - ${BTSTACK_ROOT}/chipset-cc256x/bluetooth_init_cc2560_2.42.c \ + ${BTSTACK_ROOT}/chipset-cc256x/bluetooth_init_cc2560A_2.1.c \ ${BTSTACK_ROOT}/src/hci.c \ ${BTSTACK_ROOT}/src/hci_cmds.c \ ${BTSTACK_ROOT}/src/hci_dump.c \ diff --git a/MSP-EXP430F5438-CC256x/example/led_counter.c b/MSP-EXP430F5438-CC256x/example/led_counter.c index ba3ff70fe..54a25dd70 100644 --- a/MSP-EXP430F5438-CC256x/example/led_counter.c +++ b/MSP-EXP430F5438-CC256x/example/led_counter.c @@ -30,7 +30,7 @@ static void run_loop_register_timer(timer_source_t *timer, uint16_t period){ run_loop_add_timer(timer); } -static void timer_handler(timer_source_t *ts){ +static void heartbeat_handler(timer_source_t *ts){ // increment counter char lineBuffer[30]; sprintf(lineBuffer, "BTstack counter %04u\n\r", ++counter); @@ -45,7 +45,7 @@ static void timer_handler(timer_source_t *ts){ static void timer_setup(){ // set one-shot timer - heartbeat.process = &timer_handler; + heartbeat.process = &heartbeat_handler; run_loop_register_timer(&heartbeat, HEARTBEAT_PERIOD_MS); } diff --git a/MSP-EXP430F5438-CC256x/example/spp_counter.c b/MSP-EXP430F5438-CC256x/example/spp_counter.c index 1d7b14203..628439b98 100644 --- a/MSP-EXP430F5438-CC256x/example/spp_counter.c +++ b/MSP-EXP430F5438-CC256x/example/spp_counter.c @@ -145,7 +145,7 @@ static void run_loop_register_timer(timer_source_t *timer, uint16_t period){ run_loop_add_timer(timer); } -static void timer_handler(timer_source_t *ts){ +static void heartbeat_handler(timer_source_t *ts){ // re-register timer real_counter++; run_loop_register_timer(ts, HEARTBEAT_PERIOD_MS); @@ -153,7 +153,7 @@ static void timer_handler(timer_source_t *ts){ static void timer_setup(){ // set one-shot timer - heartbeat.process = &timer_handler; + heartbeat.process = &heartbeat_handler; run_loop_register_timer(&heartbeat, HEARTBEAT_PERIOD_MS); }