merge

juggled/Makefile

@@ -80,8 +80,8 @@ OBJDIR = .
 
 
 # List C source files here. (C dependencies are automatically generated.)
-FREAKUSB=../../root/freakusb
-CHIBI=../../root
+FREAKUSB=../../chibi/freakusb
+CHIBI=../../chibi
 SRC = $(TARGET).c \
 	adxl.c \
 	spi.c \
@@ -146,7 +146,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = $(FREAKUSB)/usb $(FREAKUSB)/class/CDC $(CHIBI)/chibi ../include
+EXTRAINCDIRS = $(FREAKUSB)/usb $(FREAKUSB)/class/CDC $(CHIBI)/chibi/hw/avrusb32/at86rf230 $(CHIBI)/chibi ../include
 
 #check which directories to include depending on part type
 ifeq ($(MCU), at90usb162)
@@ -470,8 +470,8 @@ end:
 
 
 # Display size of file.
+#HEXSIZE = $(SIZE) --target=ihex $(TARGET).hex
 HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
-#ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf
 ELFSIZE = $(SIZE) --target=elf32-avr $(TARGET).elf
 
 sizebefore:

stationary/Makefile

@@ -80,8 +80,8 @@ OBJDIR = .
 
 
 # List C source files here. (C dependencies are automatically generated.)
-FREAKUSB=../../root/freakusb
-CHIBI=../../root
+FREAKUSB=../../chibi/freakusb
+CHIBI=../../chibi
 SRC = $(TARGET).c \
 	$(FREAKUSB)/usb/usb.c \
 	$(FREAKUSB)/usb/ctrl.c \
@@ -144,7 +144,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = $(FREAKUSB)/usb $(FREAKUSB)/class/CDC $(CHIBI)/chibi ../include
+EXTRAINCDIRS = $(FREAKUSB)/usb $(FREAKUSB)/class/CDC $(CHIBI)/chibi/hw/avrusb32/at86rf230 $(CHIBI)/chibi ../include
 
 #check which directories to include depending on part type
 ifeq ($(MCU), at90usb162)
@@ -469,7 +469,7 @@ end:
 
 # Display size of file.
 HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
-#ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf
+#HEXSIZE = $(SIZE) --target=ihex $(TARGET).hex
 ELFSIZE = $(SIZE) --target=elf32-avr $(TARGET).elf
 
 sizebefore:

stationary/main.c

@@ -12,7 +12,7 @@
 #include "cmd_tbl.h"
 #include "cmd.h"
 #include "chb.h"
-#include "at86rf230/chb_drvr.h"
+#include "chb_drvr.h"
 
 #include "juggling.h"
 
@@ -83,6 +83,8 @@ int main()
             pcb->data_rcv = false;
             if (print_adxl)
                 printf_P(PSTR("got %d, %d, %d\n"), acc_X, acc_Y, acc_Z);
+            // clear the rx flag and reset the buffer (as per chb_demo.c)
+            chb_clr();
         }
 
         _delay_ms(10);