X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=main.c;h=20e26b01ab166dd77e65198e63eb17b50378c738;hp=2d1dd158f1a2c63d8b9936c7d564cc64400c62b9;hb=21d10011bc4b009d7a09131b955953fa7aba3815;hpb=a8c1b4c97c02a29a202362263597e90d36f25c18

diff --git a/main.c b/main.c
index 2d1dd15..20e26b0 100644
--- a/main.c
+++ b/main.c
@@ -52,16 +52,8 @@
 #include <rdline.h>
 #include <timer.h>
 
-#include "xbee_neighbor.h"
-#include "xbee_atcmd.h"
-#include "xbee_stats.h"
-#include "xbee_buf.h"
-#include "xbee_proto.h"
-#include "xbee.h"
-#include "cmdline.h"
-#include "callout.h"
-#include "rc_proto.h"
-#include "spi_servo.h"
+#include "eeprom_config.h"
+#include "beep.h"
 #include "main.h"
 
 struct xbeeboard xbeeboard;
@@ -256,7 +248,7 @@ int xbee_recv_data(struct xbee_recv_hdr *recvframe, unsigned len)
 			val += 512;
 			spi_servo_set(0, val);
 			break;
-				  }
+		}
 		case RC_PROTO_TYPE_RANGE: {
 			struct rc_proto_range *rcr =
 				(struct rc_proto_range *) recvframe->data;
@@ -562,6 +554,11 @@ void xbee_mainloop(void)
 			/* from cmdline to xbee */
 			c = cmdline_dev_recv(NULL);
 			if (c == 4) { /* CTRL-d */
+				xbee_dev_send('A', NULL);
+				xbee_dev_send('T', NULL);
+				xbee_dev_send('C', NULL);
+				xbee_dev_send('N', NULL);
+				xbee_dev_send('\n', NULL);
 				xbee_raw = 0;
 				rdline_newline(&xbeeboard.rdl,
 					       xbeeboard.prompt);
@@ -593,6 +590,8 @@ static void main_timer_interrupt(void)
 	static uint16_t cycles;
 	static uint8_t cpt;
 
+	cpt++;
+
 	/* interrupt every 2048 cycles */
 	cycles += 2048;
 	if (cycles >= 12000) {
@@ -606,6 +605,11 @@ static void main_timer_interrupt(void)
 	else
 		LED1_OFF();
 
+	if (cpt & beep_mask)
+		BUZZER_ON();
+	else
+		BUZZER_OFF();
+
 	/* call scheduler every 682us with interrupt unlocked */
 	sei();
 	if ((cpt & 0x3) == 0)
@@ -619,7 +623,7 @@ int main(void)
 	int8_t err;
 	struct xbee_dev dev;
 
-	DDRA = 0x07; /* LEDs */
+	DDRA = 0x07 /* LEDs */ | 0x10 /* buzzer */;
 
 	uart_init();
 	uart_register_rx_event(CMDLINE_UART, emergency);
@@ -632,6 +636,7 @@ int main(void)
 
 	cmdline_init();
 	spi_servo_init();
+	beep_init();
 
 	printf_P(PSTR("\r\n"));
 	rdline_newline(&xbeeboard.rdl, xbeeboard.prompt);
@@ -656,9 +661,9 @@ int main(void)
 		fprintf(stderr, "cannot register default channel\n");
 		return -1;
 	}
-
 	sei();
 
+	eeprom_load_config();
 	xbee_mainloop();
 	return 0;
 }