From: Dean Camera Date: Sun, 27 May 2012 19:12:07 +0000 (+0000) Subject: Merge in AppConfigHeaders branch to trunk, altering all projects and demos to use... X-Git-Tag: LUFA-120730~6 X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/2ff1370221d3650a6bc0523c93c2f0d37508f408?ds=sidebyside Merge in AppConfigHeaders branch to trunk, altering all projects and demos to use configuration headers for application and LUFA compile time settings, rather than defines in the project makefiles. --- 2ff1370221d3650a6bc0523c93c2f0d37508f408 diff --cc BuildTests/BoardDriverTest/makefile index c1adc67a9,c1adc67a9..cb1ed62bc --- a/BuildTests/BoardDriverTest/makefile +++ b/BuildTests/BoardDriverTest/makefile @@@ -31,23 -31,23 +31,23 @@@ makeboardlist testboards: @echo "buildtest:" > BuildMakefile -- @while read line; \ -- do \ ++ @while read line; \ ++ do \ build_cfg=`grep "$$line " BoardDeviceMap.cfg | grep -v "#" | cut -d'=' -f2- | sed 's/ //g'`; \ -- \ -- build_board=$$line; \ -- build_arch=`echo $$build_cfg | cut -d':' -f1`; \ -- build_mcu=`echo $$build_cfg | cut -d':' -f2`; \ -- \ -- if ( test -z "$$build_cfg" ); then \ -- echo "No matching information set for board $$build_board"; \ -- else \ -- echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu"; \ -- \ -- printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \ -- printf "\tmake -s -f makefile.%s clean\n" $$build_arch >> BuildMakefile; \ ++ \ ++ build_board=$$line; \ ++ build_arch=`echo $$build_cfg | cut -d':' -f1`; \ ++ build_mcu=`echo $$build_cfg | cut -d':' -f2`; \ ++ \ ++ if ( test -z "$$build_cfg" ); then \ ++ echo "No matching information set for board $$build_board"; \ ++ else \ ++ echo "Found board configuration for $$build_board - $$build_arch, $$build_mcu"; \ ++ \ ++ printf "\t@echo Building dummy project for $$build_board...\n" >> BuildMakefile; \ ++ printf "\tmake -s -f makefile.%s clean\n" $$build_arch >> BuildMakefile; \ printf "\tmake -s -f makefile.%s MCU=%s BOARD=%s elf\n\n" $$build_arch $$build_mcu $$build_board >> BuildMakefile; \ -- fi; \ ++ fi; \ done < BoardList.txt $(MAKE) -f BuildMakefile buildtest diff --cc LUFA.pnproj index 2a4959335,3cf240cd2..c3a61185b --- a/LUFA.pnproj +++ b/LUFA.pnproj @@@ -1,1 -1,1691 +1,1692 @@@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - ++ + diff --cc Maintenance/makefile index 19ea32b67,19ea32b67..0f126eb77 --- a/Maintenance/makefile +++ b/Maintenance/makefile @@@ -17,12 -17,12 +17,12 @@@ all # Update all Doxygen configuration files to the latest Doxygen version - force Markdown support to be disabled upgrade-doxygen: @echo Upgrading Doxygen.conf files... -- @for doxygen_conf in `find $(LUFA_ROOT) -name Doxygen.conf`; do \ -- doxygen -u $$doxygen_conf; \ ++ @for doxygen_conf in `find $(LUFA_ROOT) -name Doxygen.conf`; do \ ++ doxygen -u $$doxygen_conf; \ sed "s/MARKDOWN_SUPPORT *= *YES/MARKDOWN_SUPPORT = NO/1" $$doxygen_conf > $$doxygen_conf.new; \ -- sed "s/DISABLE_INDEX *= *NO/DISABLE_INDEX = YES/1" $$doxygen_conf.new > $$doxygen_conf.new2; \ -- mv -u $$doxygen_conf.new2 $$doxygen_conf; \ -- rm $$doxygen_conf.new; \ ++ sed "s/DISABLE_INDEX *= *NO/DISABLE_INDEX = YES/1" $$doxygen_conf.new > $$doxygen_conf.new2; \ ++ mv -u $$doxygen_conf.new2 $$doxygen_conf; \ ++ rm $$doxygen_conf.new; \ done; @echo Doxygen configuration update complete. @@@ -31,33 -31,33 +31,39 @@@ 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_files="$$source_files`basename $$c_source_file`<\/SOURCEFILE>"; \ -- gcc_source_files="$$gcc_source_files`basename $$c_source_file`<\/Name>"; \ -- done; \ -- for c_header_file in `find $$target_folder -name *.h`; do \ -- source_files="$$source_files`basename $$c_header_file`<\/HEADERFILE>"; \ -- gcc_source_files="$$gcc_source_files`basename $$c_header_file`<\/Name>"; \ -- done; \ -- for assembly_file in `find $$target_folder -name *.S`; do \ -- source_files="$$source_files`basename $$assembly_file`<\/OTHERFILE>"; \ -- gcc_source_files="$$gcc_source_files`basename $$assembly_file`<\/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; \ ++ 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; \ ++ 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. @@@ -66,12 -66,12 +72,12 @@@ check-documentation-placeholders: @echo Checking for release suitability... @if ( grep "XXXXXX" $(LUFA_ROOT)/LUFA/DoxygenPages/*.txt > /dev/null ;); then \ -- echo " ERROR: Doxygen documentation has not been updated for release!"; \ -- exit 1; \ ++ echo " ERROR: Doxygen documentation has not been updated for release!"; \ ++ exit 1; \ fi; -- @if ( grep "000000" $(LUFA_ROOT)/LUFA/Version.h > /dev/null ;); then \ -- echo " ERROR: Version header has not been updated for release!"; \ -- exit 1; \ ++ @if ( grep "000000" $(LUFA_ROOT)/LUFA/Version.h > /dev/null ;); then \ ++ echo " ERROR: Version header has not been updated for release!"; \ ++ exit 1; \ fi; @echo Done. diff --cc Projects/XPLAINBridge/XPLAINBridge.txt index b19ab4aca,bc0ca37d8..3074b7b2f --- a/Projects/XPLAINBridge/XPLAINBridge.txt +++ b/Projects/XPLAINBridge/XPLAINBridge.txt @@@ -89,18 -89,18 +89,30 @@@ * * RESET_TOGGLES_LIBUSB_COMPAT * Makefile LUFA_OPTS + * Define to make the /RESET line of the AVR toggle between Jungo and libUSB driver compatibility modes. Each time the AVR is + * reset externally via the reset pin, the compatibility mode will be toggled. The compatibility mode is preserved between + * power cycles and is not toggled via other forms of reset such as Watchdog or Brown Out. + * + * When this option is enabled, all board LEDs will flash twice on startup for Jungo compatibility mode, and five times for + * libUSB compatibility mode. + * + * \note This option is incompatible with \c LIBUSB_DRIVER_COMPAT. + * + * - * FIRMWARE_VERSION_MINOR ++ * RESET_TOGGLES_LIBUSB_COMPAT + * Makefile LUFA_OPTS + * Define to make the /RESET line of the AVR toggle between Jungo and libUSB driver compatibility modes. Each time the AVR is + * reset externally via the reset pin, the compatibility mode will be toggled. The compatibility mode is preserved between + * power cycles and is not toggled via other forms of reset such as Watchdog or Brown Out. + * + * When this option is enabled, all board LEDs will flash twice on startup for Jungo compatibility mode, and five times for + * libUSB compatibility mode. + * + * \note This option is incompatible with \c LIBUSB_DRIVER_COMPAT. + * + * + * FIRMWARE_VERSION_MINOR + * AppConfig.h * Define to set the minor firmware revision nunber reported to the host on request. By default this will use a firmware version compatible * with the latest Atmel IDE version, however if desired the reported minor value can be adjusted here. *