# HG changeset patch
# User ethanzonca@CL-SEC241-08.cedarville.edu
# Date 2012-11-30 16:41:40
# Node ID 6023002a8b9ec5531ccccc075ff58b8f73292834
# Parent  95c4c7f33ecb761dfd52aaab566b817ffa0cc0f0

Serial rate increased to 115.2, removed debug output causing freezes

diff --git a/master/master/config.h b/master/master/config.h
--- a/master/master/config.h
+++ b/master/master/config.h
@@ -60,8 +60,8 @@
 // USART config (serial.c)
 // --------------------------------------------------------------------------
 
-#define USART0_BAUDRATE 9600
-#define USART1_BAUDRATE 9600
+#define USART0_BAUDRATE 115200
+#define USART1_BAUDRATE 115200
 
 
 // --------------------------------------------------------------------------
diff --git a/master/master/lib/looptime.c b/master/master/lib/looptime.c
--- a/master/master/lib/looptime.c
+++ b/master/master/lib/looptime.c
@@ -11,13 +11,13 @@
  */
 
 #include "../config.h"
+#include "looptime.h"
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <util/delay.h>
+
 volatile uint32_t millis = 0; // Milliseconds since initialization
 
-
-
 void time_setup() 
 {
 	DDRA = 0xff;
@@ -31,7 +31,6 @@ void time_setup()
 	TIMSK0 |= (1 << TOIE0); // enable overflow interrupt
 }
 
-
 ISR(TIMER0_OVF_vect) 
 {
 	millis = millis + 1;
diff --git a/master/master/lib/looptime.h b/master/master/lib/looptime.h
--- a/master/master/lib/looptime.h
+++ b/master/master/lib/looptime.h
@@ -13,9 +13,9 @@
 #ifndef LOOPTIME_H_
 #define LOOPTIME_H_
 
+#include <inttypes.h>
 
 void time_setup();
-
 uint32_t time_millis();
 
 #endif /* LOOPTIME_H_ */
\ No newline at end of file
diff --git a/master/master/lib/serparser.c b/master/master/lib/serparser.c
--- a/master/master/lib/serparser.c
+++ b/master/master/lib/serparser.c
@@ -32,7 +32,7 @@ uint8_t parserState = STATE_RESET;
 uint8_t lastParserState = STATE_RESET;
 
 // Length of current payload data (and checksum)
-int dataLength = 0;
+uint8_t dataLength = 0;
 
 // Data and checksum of most recent transmission
 char receivedPayload[MAX_PAYLOAD_LEN];
@@ -69,8 +69,8 @@ ISR(USART0__RX_vect)
 	led_on(POWER);
 	buffer[bufferDataPosition % BUFFER_SIZE] = UDR0;
 	bufferDataPosition = (bufferDataPosition + 1) % BUFFER_SIZE;
-	sprintf(buffmeh, "bdp: %d, bpp: %d \r\n", bufferDataPosition, bufferParsePosition);
-	serial0_sendString((buffmeh));
+	/*sprintf(buffmeh, "bdp: %d, bpp: %d \r\n", bufferDataPosition, bufferParsePosition);
+	serial0_sendString((buffmeh)); */
 }
 
 
@@ -146,6 +146,8 @@ int serparser_parse(void)
 			{
 				#ifdef DEBUG
 				serial0_sendString("eof ok\r\n");
+				sprintf(buffmeh, "recvd %d bytes data\r\n", dataLength);
+				serial0_sendString((buffmeh));
 				#endif
 				if(bufferParsePosition == bufferDataPosition) 
 				{
@@ -173,7 +175,7 @@ int serparser_parse(void)
 				// Data buffer overrun protection
 				if(dataLength > MAX_PAYLOAD_LEN) {
 					#ifdef DEBUG
-					serial0_sendString("buf ovf\r\n");
+					serial0_sendString("data ovf\r\n");
 					#endif
 					setParserState(STATE_RESET);
 					return PARSERESULT_FAIL;