diff --git a/LUFA.pnproj b/LUFA.pnproj index 471346f7b0..0bd0677fcf 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/LUFA/DoxygenPages/BuildSystem.txt b/LUFA/DoxygenPages/BuildSystem.txt index 57dec54249..57a01d9444 100644 --- a/LUFA/DoxygenPages/BuildSystem.txt +++ b/LUFA/DoxygenPages/BuildSystem.txt @@ -25,7 +25,7 @@ * project's build makefile targets automatically. To call a build target, run make {TARGET_NAME} * from the command line, substituting in the appropriate target name. * - * \see \ref Sec_AppConfigParams for a copy of the sample LUFA project makefile. + * \see \ref Sec_AppMakefileParams for a copy of the sample LUFA project makefile. * * Each build module may have one or more mandatory parameters (GNU Make variables) which must * be supplied in the project makefile for the module to work, and one or more optional parameters which diff --git a/LUFA/DoxygenPages/CompilingApps.txt b/LUFA/DoxygenPages/CompilingApps.txt index 40e03a7aaa..71a7dc3f26 100644 --- a/LUFA/DoxygenPages/CompilingApps.txt +++ b/LUFA/DoxygenPages/CompilingApps.txt @@ -14,23 +14,23 @@ * compilation of LUFA based applications. * * \subsection SSec_PreqWindows Windows Prerequisites - * On Windows, you will need a copy of the latest Atmel Toolchain, either downloaded and installed as a standalone - * package, or installed as part of Atmel Studio. You will need to ensure that the "bin" directory of the toolchain - * is available in your system's PATH environment variable. + * On Windows, you will need a copy of the latest Atmel Toolchain (http://www.atmel.com/tools/ATMELAVRTOOLCHAINFORWINDOWS.aspx), + * either downloaded and installed as a standalone package, or installed as part of Atmel Studio. You will need to ensure + * that the "bin" directory of the toolchain is available in your system's PATH environment variable. * * In addition, you will need to install a ported version of the ZSH or BASH *nix shells, and a standard set of *nix * utilities such as cut, find and sed. These can be found in the "basic" system package of the * of the MinGW installer (http://www.mingw.org). Once installed, add the "msys\1.0\bin" of the MinGW installation * folder is added to your system's PATH environment variable. * - * The bootloaders currently also require the "bc" application, which can be installed from + * The bootloaders currently also require the \c bc command line application, which can be installed from * http://gnuwin32.sourceforge.net/downlinks/bc.php. Once installed add the "GnuWin32\bin" path of the GnuWin32 * installation folder to your system's PATH environment variable. * * \subsection SSec_PreqLinux Linux Prerequisites * On Linux systems you will need to install the latest Linux distribution of the standalone Atmel Toolchain from the - * Atmel website for general development, or use the latest avr-libc and avr-gcc packages for your chosen distribution's - * package manager. For full device support, the Atmel standalone package is recommended. + * Atmel website (http://www.atmel.com/tools/ATMELAVRTOOLCHAINFORLINUX.aspx), or use the latest avr-libc and avr-gcc packages + * for your chosen distribution's package manager. For full device support, the Atmel standalone Toolchain package is recommended. * * \section Sec_Compiling Compiling a LUFA Application * Compiling the LUFA demos, applications and/or bootloaders is very simple. LUFA comes with makefile scripts for diff --git a/LUFA/DoxygenPages/ConfiguringApps.txt b/LUFA/DoxygenPages/ConfiguringApps.txt index 976927ae01..ece9dd59be 100644 --- a/LUFA/DoxygenPages/ConfiguringApps.txt +++ b/LUFA/DoxygenPages/ConfiguringApps.txt @@ -18,7 +18,7 @@ * * \see \ref Page_BuildSystem for information on the LUFA build system. * - * \section Sec_AppConfigParams The Default Application Template + * \section Sec_AppMakefileParams The Default Application Makefile Template * * Below is a copy of the default LUFA application makefile, which can be used as a template for each application. * diff --git a/LUFA/DoxygenPages/VIDAndPIDValues.txt b/LUFA/DoxygenPages/VIDAndPIDValues.txt index 97a2260546..7791fb2aa2 100644 --- a/LUFA/DoxygenPages/VIDAndPIDValues.txt +++ b/LUFA/DoxygenPages/VIDAndPIDValues.txt @@ -17,402 +17,177 @@ * demos share the same VID/PID value. * * - * * - * - * - * + * + * + * * - * * - * - * - * - * - * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * + * + * + * + * + * + * * - * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * + * * - * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * + * * - * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * * - * - * - * + * + * + * * - * *
- * VID - * - * PID - * - * Usage - * VIDPIDUsage
- * 0x03EB - * - * 0x2040 - * - * Test VID/PID (See below) - *
- * 0x03EB - * - * 0x2041 - * - * Mouse Demo Application - * 0x03EB0x2040Test VID/PID (See \ref Sec_Test_VIDPID)
- * 0x03EB - * - * 0x2042 - * - * Keyboard Demo Application - * 0x03EB0x2041Mouse Demo Application
- * 0x03EB - * - * 0x2043 - * - * Joystick Demo Application - * 0x03EB0x2042Keyboard Demo Application
- * 0x03EB - * - * 0x2044 - * - * CDC Demo Application - * 0x03EB0x2043Joystick Demo Application
- * 0x03EB - * - * 0x2045 - * - * Mass Storage Demo Application - * 0x03EB0x2044CDC Demo Application
- * 0x03EB - * - * 0x2046 - * - * Audio Output Demo Application - * 0x03EB0x2045Mass Storage Demo Application
- * 0x03EB - * - * 0x2047 - * - * Audio Input Demo Application - * 0x03EB0x2046Audio Output Demo Application
- * 0x03EB - * - * 0x2048 - * - * MIDI Demo Application - * 0x03EB0x2047Audio Input Demo Application
- * 0x03EB - * - * 0x2049 - * - * MagStripe Project - * 0x03EB0x2048MIDI Demo Application
- * 0x03EB - * - * 0x204A - * - * CDC Bootloader - * 0x03EB0x2049MagStripe Project
- * 0x03EB - * - * 0x204B - * - * USB to Serial Demo Application - * 0x03EB0x204ACDC Bootloader
- * 0x03EB - * - * 0x204C - * - * RNDIS Demo Application - * 0x03EB0x204BUSB to Serial Demo Application
- * 0x03EB - * - * 0x204D - * - * Combined Keyboard and Mouse Demo Application - * 0x03EB0x204CRNDIS Demo Application
- * 0x03EB - * - * 0x204E - * - * Dual CDC Demo Application - * 0x03EB0x204DCombined Keyboard and Mouse Demo Application
- * 0x03EB - * 0x03EB0x204EDual CDC Demo Application
0x03EB * 0x204F * - * Generic HID Demo Application - * Generic HID Demo Application
- * 0x03EB - * - * 0x2060 - * - * Benito Programmer Project - * 0x03EB0x2060Benito Programmer Project
- * 0x03EB - * - * 0x2061 - * - * Combined Mass Storage and Keyboard Demo - * 0x03EB0x2061Combined Mass Storage and Keyboard Demo
- * 0x03EB - * - * 0x2062 - * - * Combined CDC and Mouse Demo - * 0x03EB0x2062Combined CDC and Mouse Demo
- * 0x03EB - * - * 0x2063 - * - * Mass Storage/HID Interface Datalogger Project - * 0x03EB0x2063Mass Storage/HID Interface Datalogger Project
- * 0x03EB - * - * 0x2064 - * - * Interfaceless Control-Only LUFA Devices - * 0x03EB0x2064Interfaceless Control-Only LUFA Devices
- * 0x03EB - * - * 0x2065 - * - * Test and Measurement Demo - * 0x03EB0x2065Test and Measurement Demo
- * 0x03EB - * 0x03EB * 0x2066 * - * Multiple Report Keyboard/Mouse HID Demo - * Multiple Report Keyboard/Mouse HID Demo
- * 0x03EB - * - * 0x2067 - * - * HID Class Bootloader - * 0x03EB0x2067HID Class Bootloader
- * 0x03EB - * - * 0x2068 - * - * Virtual Serial/Mass Storage Demo - * 0x03EB0x2068Virtual Serial/Mass Storage Demo
- * 0x03EB - * 0x03EB * 0x2069 * - * Webserver Project - * Webserver Project
- * 0x03EB - * - * 0x206A - * - * Media Control Project - * 0x03EB0x206AMedia Control Project
- * 0x03EB - * - * 0x206B - * - * Currently Unallocated - * 0x03EB0x206BCurrently Unallocated
- * 0x03EB - * - * 0x206C - * - * Currently Unallocated - * 0x03EB0x206CCurrently Unallocated
- * 0x03EB - * - * 0x206D - * - * Currently Unallocated - * 0x03EB0x206DCurrently Unallocated
- * 0x03EB - * - * 0x206E - * - * Currently Unallocated - * 0x03EB0x206ECurrently Unallocated
- * 0x03EB - * - * 0x206F - * - * Currently Unallocated - * 0x03EB0x206FCurrently Unallocated
* * \section Sec_Test_VIDPID The Test VID/PID Combination diff --git a/Maintenance/AS4Template.aps b/Maintenance/AS4Template.aps deleted file mode 100644 index d18aac75d6..0000000000 --- a/Maintenance/AS4Template.aps +++ /dev/null @@ -1 +0,0 @@ -%TARGET%%CREATED%%CREATED%2410%CREATED%44, 18, 0, 685AVR GCC%TARGET%.elffalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000%FILE_LIST%defaultYESmakefileatmega128111BootloaderCDC.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20100110\bin\avr-gcc.exeC:\WinAVR-20100110\utils\bin\make.exe%GCC_FILE_LIST% diff --git a/Maintenance/makefile b/Maintenance/makefile index 83d543fad8..b401f127e5 100644 --- a/Maintenance/makefile +++ b/Maintenance/makefile @@ -26,48 +26,6 @@ upgrade-doxygen: done; @echo Doxygen configuration update complete. -# Generate AVR Studio 4 project files for each project from a template -make-as4-projects: - @echo Creating AVR Studio 4 project files for Demos... - @for project_makefile in `find $(LUFA_ROOT)/Demos $(LUFA_ROOT)/Projects $(LUFA_ROOT)/Bootloaders -name makefile*`; do \ - target_name=`grep "TARGET *=" $$project_makefile | cut -d'=' -f2 | sed 's/ //g'`; \ - target_folder=`dirname $$project_makefile`; \ - as4_date=`date "+%-e-%b-%Y %-H:%-M:%-S"`; \ - \ - if ( test -n "$$target_name" ); then \ - echo Creating AS4 project for project $$target_name; \ - \ - source_files="`basename $$project_makefile`<\/OTHERFILE>"; \ - gcc_source_files=""; \ - for c_source_file in `find $$target_folder -name *.c`; do \ - source_filename=`basename $$c_source_file`; \ - \ - source_files="$$source_files$$source_filename<\/SOURCEFILE>"; \ - gcc_source_files="$$gcc_source_files$$source_filename<\/Name>"; \ - done; \ - for c_header_file in `find $$target_folder -name *.h`; do \ - source_filename=`basename $$c_header_file`; \ - \ - source_files="$$source_files$$source_filename<\/HEADERFILE>"; \ - gcc_source_files="$$gcc_source_files$$source_filename<\/Name>"; \ - done; \ - for assembly_file in `find $$target_folder -name *.S`; do \ - source_filename=`basename $$assembly_file`; \ - \ - source_files="$$source_files$$source_filename<\/OTHERFILE>"; \ - gcc_source_files="$$gcc_source_files$$source_filename<\/Name>"; \ - done; \ - \ - sed "s/%TARGET%/$$target_name/g" AS4Template.aps > $$target_folder/$$target_name.aps.new; \ - sed "s/%CREATED%/$$as4_date/g" $$target_folder/$$target_name.aps.new > $$target_folder/$$target_name.aps.new2; \ - sed "s/%FILE_LIST%/$$source_files/g" $$target_folder/$$target_name.aps.new2 > $$target_folder/$$target_name.aps.new3; \ - sed "s/%GCC_FILE_LIST%/$$gcc_source_files/g" $$target_folder/$$target_name.aps.new3 > $$target_folder/$$target_name.aps.new4; \ - mv $$target_folder/$$target_name.aps.new4 $$target_folder/$$target_name.aps; \ - rm $$target_folder/$$target_name.aps.new $$target_folder/$$target_name.aps.new2 $$target_folder/$$target_name.aps.new3; \ - fi; \ - done; - @echo AVR Studio 4 project generation complete. - # Make all possible bootloaders for all targets and configurations as set by the BootloaderTest build test # and store them in a seperate directory called "Bootloaders" make_bootloaders: