# HG changeset patch # User ethanzonca@CL-SEC241-08.cedarville.edu # Date 2012-10-29 19:53:54 # Node ID db6685a2165ed9a34c47d3b80fb68fbe3d504de1 # Parent ed10eff104e970f96671210fc39947aace7fccc7 Added afsk code, which is tested and works on the micro 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 @@ -7,7 +7,7 @@ // ************* Macros *************** -#define SERIAL_RX_HASBYTES UCSR0A & _BV(RXC) +#define SERIAL_RX_HASBYTES UCSR0A & _BV(RXC0) #define MAX_CMD_LEN 16 #define BROADCAST_ADDR 0 //public address #include diff --git a/master/master/master.c b/master/master/master.c --- a/master/master/master.c +++ b/master/master/master.c @@ -13,7 +13,7 @@ #include "lib/serial.h" #include "lib/afsk.h" - +#include "lib/led.h" void micro_setup() { // Generic microcontroller config options