git.droids-corp.org
/
protos
/
xbee-avr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add code to control the audio buzzer
[protos/xbee-avr.git]
/
main.c
diff --git
a/main.c
b/main.c
index
0e52717
..
8e2aa0e
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-52,6
+52,7
@@
#include <rdline.h>
#include <timer.h>
#include <rdline.h>
#include <timer.h>
+#include "beep.h"
#include "main.h"
struct xbeeboard xbeeboard;
#include "main.h"
struct xbeeboard xbeeboard;
@@
-588,6
+589,8
@@
static void main_timer_interrupt(void)
static uint16_t cycles;
static uint8_t cpt;
static uint16_t cycles;
static uint8_t cpt;
+ cpt++;
+
/* interrupt every 2048 cycles */
cycles += 2048;
if (cycles >= 12000) {
/* interrupt every 2048 cycles */
cycles += 2048;
if (cycles >= 12000) {
@@
-601,6
+604,11
@@
static void main_timer_interrupt(void)
else
LED1_OFF();
else
LED1_OFF();
+ if (cpt & beep_mask)
+ BUZZER_ON();
+ else
+ BUZZER_OFF();
+
/* call scheduler every 682us with interrupt unlocked */
sei();
if ((cpt & 0x3) == 0)
/* call scheduler every 682us with interrupt unlocked */
sei();
if ((cpt & 0x3) == 0)
@@
-614,7
+622,7
@@
int main(void)
int8_t err;
struct xbee_dev dev;
int8_t err;
struct xbee_dev dev;
- DDRA = 0x07
; /* LEDs */
+ DDRA = 0x07
/* LEDs */ | 0x10 /* buzzer */;
uart_init();
uart_register_rx_event(CMDLINE_UART, emergency);
uart_init();
uart_register_rx_event(CMDLINE_UART, emergency);
@@
-627,6
+635,7
@@
int main(void)
cmdline_init();
spi_servo_init();
cmdline_init();
spi_servo_init();
+ beep_init();
printf_P(PSTR("\r\n"));
rdline_newline(&xbeeboard.rdl, xbeeboard.prompt);
printf_P(PSTR("\r\n"));
rdline_newline(&xbeeboard.rdl, xbeeboard.prompt);