Partial commit: change references to Drivers/AT90USBXXX to Drivers/Peripheral.

pull/1469/head
Dean Camera 16 years ago
parent 8f6b4ddf76
commit 1c16ae399a

@ -46,7 +46,7 @@
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Drivers/AT90USBXXX/ADC.h> // ADC driver #include <LUFA/Drivers/Peripheral/ADC.h> // ADC driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
/* Macros: */ /* Macros: */

@ -39,7 +39,7 @@
/* Includes: */ /* Includes: */
#include <avr/io.h> #include <avr/io.h>
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> #include <LUFA/Drivers/Peripheral/Serial_Stream.h>
#include "EthernetProtocols.h" #include "EthernetProtocols.h"
#include "Ethernet.h" #include "Ethernet.h"

@ -56,7 +56,7 @@
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> #include <LUFA/Drivers/Peripheral/Serial_Stream.h>
/* Macros: */ /* Macros: */
/** Notification value to indicate that a frame is ready to be read by the host. */ /** Notification value to indicate that a frame is ready to be read by the host. */

@ -143,8 +143,8 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c \ $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
# List C++ source files here. (C dependencies are automatically generated.) # List C++ source files here. (C dependencies are automatically generated.)

@ -47,7 +47,7 @@
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/AT90USBXXX/Serial.h> // USART driver #include <LUFA/Drivers/Peripheral/Serial.h> // USART driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -127,7 +127,7 @@ SRC = $(TARGET).c \
Descriptors.c \ Descriptors.c \
RingBuff.c \ RingBuff.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \

@ -46,7 +46,7 @@
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -126,8 +126,8 @@ LUFA_PATH = ../../..
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \

@ -47,7 +47,7 @@
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -126,8 +126,8 @@ LUFA_PATH = ../../..
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \

@ -47,7 +47,7 @@
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -126,8 +126,8 @@ LUFA_PATH = ../../..
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \

@ -41,7 +41,7 @@
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -127,8 +127,8 @@ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
HIDReport.c \ HIDReport.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \

@ -50,7 +50,7 @@
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Drivers/Board/HWB.h> // Hardware Button driver #include <LUFA/Drivers/Board/HWB.h> // Hardware Button driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -127,8 +127,8 @@ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
MassStoreCommands.c \ MassStoreCommands.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \

@ -47,7 +47,7 @@
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -126,8 +126,8 @@ LUFA_PATH = ../../..
SRC = $(TARGET).c \ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \

@ -41,7 +41,7 @@
#include <LUFA/Version.h> // Library Version Information #include <LUFA/Version.h> // Library Version Information
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LEDs driver #include <LUFA/Drivers/Board/LEDs.h> // LEDs driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -127,8 +127,8 @@ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
HIDReport.c \ HIDReport.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \ $(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \

@ -48,7 +48,7 @@
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // Serial stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // Serial stream driver
#include <LUFA/Drivers/Board/LEDs.h> // LED driver #include <LUFA/Drivers/Board/LEDs.h> // LED driver
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -126,8 +126,8 @@ SRC = $(TARGET).c \
ConfigDescriptor.c \ ConfigDescriptor.c \
StillImageCommands.c \ StillImageCommands.c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \

@ -130,7 +130,7 @@ TASK(TestApp_CheckTemp)
if (Scheduler_HasDelayElapsed(10000, &DelayCounter)) if (Scheduler_HasDelayElapsed(10000, &DelayCounter))
{ {
printf_P(PSTR("Current temperature: %d Degrees Celcius\r\n\r\n"), printf_P(PSTR("Current temperature: %d Degrees Celcius\r\n\r\n"),
(int)Temperature_GetTemperature()); (int8_t)Temperature_GetTemperature());
/* Reset the delay counter, ready to count another 10000 tick interval */ /* Reset the delay counter, ready to count another 10000 tick interval */
Scheduler_ResetDelay(&DelayCounter); Scheduler_ResetDelay(&DelayCounter);

@ -47,8 +47,8 @@
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management
#include <LUFA/MemoryAllocator/DynAlloc.h> // Auto-defragmenting Dynamic Memory allocation #include <LUFA/MemoryAllocator/DynAlloc.h> // Auto-defragmenting Dynamic Memory allocation
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Drivers/AT90USBXXX/ADC.h> // ADC driver #include <LUFA/Drivers/Peripheral/ADC.h> // ADC driver
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // USART Stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // USART Stream driver
#include <LUFA/Drivers/Board/Joystick.h> // Joystick driver #include <LUFA/Drivers/Board/Joystick.h> // Joystick driver
#include <LUFA/Drivers/Board/LEDs.h> // LED driver #include <LUFA/Drivers/Board/LEDs.h> // LED driver
#include <LUFA/Drivers/Board/HWB.h> // Hardware Button driver #include <LUFA/Drivers/Board/HWB.h> // Hardware Button driver

@ -42,7 +42,7 @@
#include <LUFA/Common/Common.h> // Commonly used macros #include <LUFA/Common/Common.h> // Commonly used macros
#include <LUFA/Drivers/USB/USB.h> // USB Functionality #include <LUFA/Drivers/USB/USB.h> // USB Functionality
#include <LUFA/Drivers/Board/LEDs.h> // LED driver #include <LUFA/Drivers/Board/LEDs.h> // LED driver
#include <LUFA/Drivers/AT90USBXXX/Serial_Stream.h> // USART Stream driver #include <LUFA/Drivers/Peripheral/Serial_Stream.h> // USART Stream driver
#include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes #include <LUFA/Drivers/Misc/TerminalCodes.h> // ANSI Terminal Escape Codes
#include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management #include <LUFA/Scheduler/Scheduler.h> // Simple scheduler for task management

@ -129,8 +129,8 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \ $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c \
$(LUFA_PATH)/LUFA/MemoryAllocator/DynAlloc.c \ $(LUFA_PATH)/LUFA/MemoryAllocator/DynAlloc.c \
$(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c \ $(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial_Stream.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial_Stream.c \
$(LUFA_PATH)/LUFA/Drivers/AT90USBXXX/Serial.c \ $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \

File diff suppressed because one or more lines are too long

@ -47,6 +47,7 @@
* - Updated library doxygen documentation, added groups, changed documentation macro functions to real functions for clarity * - Updated library doxygen documentation, added groups, changed documentation macro functions to real functions for clarity
* - Removed old endpoint and pipe aliased read/write/discard routines which did not have an explicit endian specifier for clarity * - Removed old endpoint and pipe aliased read/write/discard routines which did not have an explicit endian specifier for clarity
* - Removed the ButtLoadTag.h header file, as no one used for its intended purpose anyway * - Removed the ButtLoadTag.h header file, as no one used for its intended purpose anyway
* - Renamed the main Drivers/AT90USBXXX directory to Drivers/Peripheral
* *
* *
* \section Sec_ChangeLog090401 Version 090401 * \section Sec_ChangeLog090401 Version 090401

@ -34,13 +34,13 @@
* *
* This folder contains drivers for aspects other than the USB interface, board hardware or AVR peripherals. * This folder contains drivers for aspects other than the USB interface, board hardware or AVR peripherals.
* *
* \dir Drivers/AT90USBXXX * \dir Drivers/Peripheral
* \brief USB AVR peripheral driver files. * \brief USB AVR peripheral driver files.
* *
* This folder contains drivers for several of the AVR internal peripherals such as the USART, compatible with * This folder contains drivers for several of the AVR internal peripherals such as the USART, compatible with
* all USB AVR models. * all USB AVR models.
* *
* \dir Drivers/AT90USBXXX/AT90USBXXX67 * \dir Drivers/Peripheral/AT90USBXXX67
* \brief AT90USBXXX6, AT90USBXXX7 and ATMEGAXXU4 AVR model peripheral driver files. Its original name is due to legacy * \brief AT90USBXXX6, AT90USBXXX7 and ATMEGAXXU4 AVR model peripheral driver files. Its original name is due to legacy
* reasons. * reasons.
* *

@ -58,7 +58,7 @@
#endif #endif
/* Includes: */ /* Includes: */
#include "../AT90USBXXX/SPI.h" #include "../Peripheral/SPI.h"
#include "../../Common/Common.h" #include "../../Common/Common.h"
/* Enable C linkage for C++ Compilers: */ /* Enable C linkage for C++ Compilers: */

@ -52,8 +52,8 @@
/* Includes: */ /* Includes: */
#include <avr/pgmspace.h> #include <avr/pgmspace.h>
#include "../AT90USBXXX/ADC.h"
#include "../../Common/Common.h" #include "../../Common/Common.h"
#include "../Peripheral/ADC.h"
#if !defined(BOARD) #if !defined(BOARD)
#error #error BOARD must be set in makefile to a value specified in BoardTypes.h. #error #error BOARD must be set in makefile to a value specified in BoardTypes.h.

@ -416,9 +416,9 @@
#define Endpoint_HasEndpointInterrupted(n) ((UEINT & (1 << n)) ? true : false) #define Endpoint_HasEndpointInterrupted(n) ((UEINT & (1 << n)) ? true : false)
#define Endpoint_IsINReady() ((UEINTX & (1 << TXINI)) ? true : false) #define Endpoint_IsINReady() ((UEINTX & (1 << TXINI)) ? true : false)
#define Endpoint_IsOUTReceived() ((UEINTX & (1 << RXOUTI)) ? true : false) #define Endpoint_IsOUTReceived() ((UEINTX & (1 << RXOUTI)) ? true : false)
#define Endpoint_IsSETUPReceived() ((UEINTX & (1 << RXSTPI)) ? true : false) #define Endpoint_IsSETUPReceived() ((UEINTX & (1 << RXSTPI)) ? true : false)
@ -428,9 +428,11 @@
#define Endpoint_ClearControlOUT() MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE #define Endpoint_ClearControlOUT() MACROS{ UEINTX &= ~(1 << RXOUTI); }MACROE
#define Endpoint_ClearIN() MACROS{ UEINTX &= ~(1 << TXINI); UEINTX &= ~(1 << FIFOCON); }MACROE #define Endpoint_ClearIN() MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << TXINI)); \
UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE
#define Endpoint_ClearOUT() MACROS{ UEINTX &= ~(1 << RXOUTI); UEINTX &= ~(1 << FIFOCON); }MACROE #define Endpoint_ClearOUT() MACROS{ uint8_t Temp = UEINTX; UEINTX = (Temp & ~(1 << RXOUTI)); \
UEINTX = (Temp & ~(1 << FIFOCON)); }MACROE
#define Endpoint_StallTransaction() MACROS{ UECONX |= (1 << STALLRQ); }MACROE #define Endpoint_StallTransaction() MACROS{ UECONX |= (1 << STALLRQ); }MACROE

@ -553,15 +553,20 @@
#define Pipe_IsSETUPSent() ((UPINTX & (1 << TXSTPI)) ? true : false) #define Pipe_IsSETUPSent() ((UPINTX & (1 << TXSTPI)) ? true : false)
#define Pipe_ClearIN() MACROS{ UPINTX &= ~(1 << RXINI); UPINTX &= ~(1 << FIFOCON); }MACROE #define Pipe_ClearIN() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << RXINI)); \
UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
#define Pipe_ClearControlIN() MACROS{ UPINTX &= ~(1 << RXINI); UPINTX &= ~(1 << FIFOCON); }MACROE #define Pipe_ClearControlIN() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << RXINI)); \
UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
#define Pipe_ClearOUT() MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE #define Pipe_ClearOUT() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXOUTI)); \
UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
#define Pipe_ClearControlOUT() MACROS{ UPINTX &= ~(1 << TXOUTI); UPINTX &= ~(1 << FIFOCON); }MACROE #define Pipe_ClearControlOUT() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXOUTI)); \
UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
#define Pipe_ClearControlSETUP() MACROS{ UPINTX &= ~(1 << TXSTPI); UPINTX &= ~(1 << FIFOCON); }MACROE #define Pipe_ClearControlSETUP() MACROS{ uint8_t Temp = UPINTX; UPINTX = (Temp & ~(1 << TXSTPI)); \
UPINTX = (Temp & ~(1 << FIFOCON)); }MACROE
#define Pipe_IsNAKReceived() ((UPINTX & (1 << NAKEDI)) ? true : false) #define Pipe_IsNAKReceived() ((UPINTX & (1 << NAKEDI)) ? true : false)

@ -60,7 +60,7 @@
#endif #endif
/* Includes: */ /* Includes: */
#include "Highlevel/USBMode.h" #include "HighLevel/USBMode.h"
#include "HighLevel/USBTask.h" #include "HighLevel/USBTask.h"
#include "HighLevel/USBInterrupt.h" #include "HighLevel/USBInterrupt.h"
#include "HighLevel/Events.h" #include "HighLevel/Events.h"

@ -9,7 +9,7 @@
* Functions, macros, variables, enums and types related to the control of physical board hardware. * Functions, macros, variables, enums and types related to the control of physical board hardware.
*/ */
/** @defgroup Group_SubsystemDrivers Subsystem Drivers /** @defgroup Group_ChipPeripheralDrivers On-chip Peripheral Drivers
* *
* Functions, macros, variables, enums and types related to the control of AVR subsystems. * Functions, macros, variables, enums and types related to the control of AVR subsystems.
*/ */

@ -15,6 +15,7 @@
* <b>All</b> * <b>All</b>
* - The ButtLoadTag.h header has been removed, as it was never used for its intended purpose. Projects should either remove all * - The ButtLoadTag.h header has been removed, as it was never used for its intended purpose. Projects should either remove all
* BUTTLOADTAG elements, or download and extract ButtLoadTag.h header from the ButtLoad project. * BUTTLOADTAG elements, or download and extract ButtLoadTag.h header from the ButtLoad project.
* - The Drivers/AT90USBXXX directory has been renamed to Drivers/Peripheral.
* *
* <b>Library Demos</b> * <b>Library Demos</b>
* - Most demos, bootloaders and applications have had significant changes from previous versions. Applications built off of any * - Most demos, bootloaders and applications have had significant changes from previous versions. Applications built off of any
@ -53,6 +54,8 @@
* been removed for clarity. Existing projects should use the "_LE" suffix on such calls to use the explicit Little Endian versions. * been removed for clarity. Existing projects should use the "_LE" suffix on such calls to use the explicit Little Endian versions.
* - The Host_IsResetBusDone() macro has been renamed to Host_IsBusResetComplete(). * - The Host_IsResetBusDone() macro has been renamed to Host_IsBusResetComplete().
* - The Pipe_Ignore_Word() function has been renamed to Pipe_Discard_Word() to remain consistent with the rest of the pipe API. * - The Pipe_Ignore_Word() function has been renamed to Pipe_Discard_Word() to remain consistent with the rest of the pipe API.
* - It is no longer needed to manually include the headers from LUFA/Drivers/USB/Class, as they are now included along with the rest
* of the USB headers when LUFA/Drivers/USB/USB.h is included.
* *
* *
* \section Sec_Migration090401 Migrating from 090209 to 090401 * \section Sec_Migration090401 Migrating from 090209 to 090401

@ -114,7 +114,7 @@
* } * }
* \endcode * \endcode
*/ */
#define TASK_LIST extern TaskEntry_t Scheduler_TaskList[]; TaskEntry_t Scheduler_TaskList[] = #define TASK_LIST TaskEntry_t Scheduler_TaskList[] =
/** Constant, giving the maximum delay in scheduler ticks which can be stored in a variable of type /** Constant, giving the maximum delay in scheduler ticks which can be stored in a variable of type
* SchedulerDelayCounter_t. * SchedulerDelayCounter_t.
@ -127,16 +127,23 @@
/** Task status mode constant, for passing to Scheduler_SetTaskMode() or Scheduler_SetGroupTaskMode(). */ /** Task status mode constant, for passing to Scheduler_SetTaskMode() or Scheduler_SetGroupTaskMode(). */
#define TASK_STOP false #define TASK_STOP false
/** Starts the scheduler in its infinite loop, executing running tasks. This should be placed at the end /* Psuedo-Functions: */
* of the user application's main() function, as it can never return to the calling function. #if defined(__DOXYGEN__)
*/ /** Starts the scheduler in its infinite loop, executing running tasks. This should be placed at the end
#define Scheduler_Start() Scheduler_GoSchedule(TOTAL_TASKS); * of the user application's main() function, as it can never return to the calling function.
*/
/** Initializes the scheduler so that the scheduler functions can be called before the scheduler itself void Scheduler_Start(void);
* is started. This must be executed before any scheduler function calls other than Scheduler_Start(),
* and can be omitted if no such functions could be called before the scheduler is started. /** Initializes the scheduler so that the scheduler functions can be called before the scheduler itself
*/ * is started. This must be executed before any scheduler function calls other than Scheduler_Start(),
#define Scheduler_Init() Scheduler_InitScheduler(TOTAL_TASKS); * and can be omitted if no such functions could be called before the scheduler is started.
*/
void Scheduler_Init(void);
#else
#define Scheduler_Start() Scheduler_GoSchedule(TOTAL_TASKS);
#define Scheduler_Init() Scheduler_InitScheduler(TOTAL_TASKS);
#endif
/* Type Defines: */ /* Type Defines: */
/** Type define for a pointer to a scheduler task. */ /** Type define for a pointer to a scheduler task. */

@ -23,8 +23,8 @@ LUFA_SRC_FILES = ./Drivers/USB/LowLevel/LowLevel.c \
./Scheduler/Scheduler.c \ ./Scheduler/Scheduler.c \
./MemoryAllocator/DynAlloc.c \ ./MemoryAllocator/DynAlloc.c \
./Drivers/Board/Temperature.c \ ./Drivers/Board/Temperature.c \
./Drivers/AT90USBXXX/Serial.c \ ./Drivers/Peripheral/Serial.c \
./Drivers/AT90USBXXX/Serial_Stream.c \ ./Drivers/Peripheral/Serial_Stream.c \
all: all:

Loading…
Cancel
Save