diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2009-03-04 08:03:13 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-03-04 08:03:13 +0000 |
commit | 7e7124e40ba2155c5ee4348701be30d3790edca3 (patch) | |
tree | 7c8d7f6fb75555874b10577e2937e00a3deec284 /Demos/BluetoothHost | |
parent | 5e787a4bb04f8a27f9300077361403adf2e92b3f (diff) | |
download | lufa-7e7124e40ba2155c5ee4348701be30d3790edca3.tar.gz lufa-7e7124e40ba2155c5ee4348701be30d3790edca3.tar.bz2 lufa-7e7124e40ba2155c5ee4348701be30d3790edca3.zip |
Updated makefiles to reflect new dfu-ee programming target invocations (supplied by Opendous, Inc.).
Renamed the ATTR_ALWAYSINLINE function attribute macro to ATTR_ALWAYS_INLINE to match the style of the other function attribute macro names.
Added ATTR_ALWAYS_INLINE attribute to several inlined library functions, to ensure they are inlined in all circumstances.
Cleanups to Endpoint.h and Pipe.h. Added better documentation for the endpoint and pipe interrupts.
Diffstat (limited to 'Demos/BluetoothHost')
-rw-r--r-- | Demos/BluetoothHost/BluetoothHost.c | 4 | ||||
-rw-r--r-- | Demos/BluetoothHost/makefile | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/Demos/BluetoothHost/BluetoothHost.c b/Demos/BluetoothHost/BluetoothHost.c index 0f9eb4a9e..50bd1a8fe 100644 --- a/Demos/BluetoothHost/BluetoothHost.c +++ b/Demos/BluetoothHost/BluetoothHost.c @@ -62,9 +62,9 @@ TASK_LIST Bluetooth_Device_t Bluetooth_DeviceConfiguration =
{
- Class: (DEVICE_CLASS_SERVICE_CAPTURING | DEVICE_CLASS_MAJOR_COMPUTER | DEVICE_CLASS_MINOR_COMPUTER_PALM),
+ Class: (DEVICE_CLASS_SERVICE_CAPTURING | DEVICE_CLASS_MAJOR_COMPUTER | DEVICE_CLASS_MINOR_COMPUTER_PALM),
PINCode: "0000",
- Name: "LUFA Bluetooth Demo"
+ Name: "LUFA Bluetooth Demo"
};
diff --git a/Demos/BluetoothHost/makefile b/Demos/BluetoothHost/makefile index 189c84e1c..0adac4bcd 100644 --- a/Demos/BluetoothHost/makefile +++ b/Demos/BluetoothHost/makefile @@ -540,10 +540,10 @@ flip-ee: $(TARGET).hex $(TARGET).eep batchisp -hardware usb -device $(MCU) -operation start reset 0
dfu-ee: $(TARGET).hex $(TARGET).eep
- dfu-programmer $(MCU) erase
- dfu-programmer $(MCU) eeprom --debug 1 $(TARGET).eep
+ dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep
dfu-programmer $(MCU) reset
+
# Generate avr-gdb config/init file which does the following:
# define the reset signal, load the target file, connect to target, and set
# a breakpoint at main().
@@ -677,15 +677,16 @@ $(OBJDIR)/%.o : %.S $(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@
-## Target: clean project.
+# Target: clean project.
clean: begin clean_list clean_binary end
clean_binary:
$(REMOVE) $(TARGET).hex
-
+
clean_list:
@echo $(MSG_CLEANING)
$(REMOVE) $(TARGET).eep
+ $(REMOVE) $(TARGET)eep.hex
$(REMOVE) $(TARGET).cof
$(REMOVE) $(TARGET).elf
$(REMOVE) $(TARGET).map
@@ -698,11 +699,15 @@ clean_list: $(REMOVE) $(SRC:.c=.i)
$(REMOVEDIR) .dep
+
doxygen:
@echo Generating Project Documentation...
@doxygen Doxygen.conf
@echo Documentation Generation Complete.
+clean_doxygen:
+ rm -rf Documentation
+
# Create object files directory
$(shell mkdir $(OBJDIR) 2>/dev/null)
@@ -716,4 +721,4 @@ $(shell mkdir $(OBJDIR) 2>/dev/null) finish end sizebefore sizeafter gccversion \
build elf hex eep lss sym coff extcoff \
clean clean_list clean_binary program debug \
-gdb-config doxygen
+gdb-config doxygen dfu flip flip-ee dfu-ee
|