diff options
Diffstat (limited to 'Demos/Host/Incomplete/BluetoothHost')
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c | 2 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h | 2 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c (renamed from Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.c) | 0 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h (renamed from Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.h) | 0 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothClassCodes.h (renamed from Demos/Host/Incomplete/BluetoothHost/BluetoothClassCodes.h) | 0 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c (renamed from Demos/Host/Incomplete/BluetoothHost/BluetoothHCICommands.c) | 0 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h (renamed from Demos/Host/Incomplete/BluetoothHost/BluetoothHCICommands.h) | 0 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c (renamed from Demos/Host/Incomplete/BluetoothHost/BluetoothStack.c) | 0 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h (renamed from Demos/Host/Incomplete/BluetoothHost/BluetoothStack.h) | 0 | ||||
| -rw-r--r-- | Demos/Host/Incomplete/BluetoothHost/makefile | 8 |
10 files changed, 6 insertions, 6 deletions
diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c index 1aaa8141e..b8e87cb60 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c @@ -50,7 +50,6 @@ int main(void) LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
- /* Startup message */
puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY
"Bluetooth Host Demo running.\r\n" ESC_INVERSE_OFF));
@@ -111,6 +110,7 @@ void EVENT_USB_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode) {
puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
+ printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h index 890b3f155..d44a38a2a 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h @@ -38,7 +38,7 @@ #include <avr/power.h>
#include <stdio.h>
- #include "BluetoothStack.h"
+ #include "Lib/BluetoothStack.h"
#include "DeviceDescriptor.h"
#include "ConfigDescriptor.h"
diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c index 7697f88f5..7697f88f5 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h index 8c49e0972..8c49e0972 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothACLPackets.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.h diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothClassCodes.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothClassCodes.h index 5bbd4ef95..5bbd4ef95 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothClassCodes.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothClassCodes.h diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHCICommands.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c index ddd159ef7..ddd159ef7 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHCICommands.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHCICommands.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h index 673c6457a..673c6457a 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHCICommands.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothStack.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c index e2659102e..e2659102e 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothStack.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.c diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothStack.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h index dc397ecaa..dc397ecaa 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothStack.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h diff --git a/Demos/Host/Incomplete/BluetoothHost/makefile b/Demos/Host/Incomplete/BluetoothHost/makefile index 2bbcc3be4..bf63aee47 100644 --- a/Demos/Host/Incomplete/BluetoothHost/makefile +++ b/Demos/Host/Incomplete/BluetoothHost/makefile @@ -101,7 +101,7 @@ F_CPU = 8000000 #
# If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_CLOCK = 8000000
+F_CLOCK = $(F_CPU)
# Output format. (can be srec, ihex, binary)
@@ -133,9 +133,9 @@ LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" SRC = $(TARGET).c \
DeviceDescriptor.c \
ConfigDescriptor.c \
- BluetoothStack.c \
- BluetoothHCICommands.c \
- BluetoothACLPackets.c \
+ Lib/BluetoothStack.c \
+ Lib/BluetoothHCICommands.c \
+ Lib/BluetoothACLPackets.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/SerialStream.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
|