diff --git a/LUFA/Doxygen.conf b/LUFA/Doxygen.conf
index 5c40192f42..b498412b1e 100644
--- a/LUFA/Doxygen.conf
+++ b/LUFA/Doxygen.conf
@@ -919,7 +919,7 @@ HTML_FOOTER = ./DoxygenPages/Style/Footer.htm
# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
# tag will in the future become obsolete.
-HTML_STYLESHEET =
+HTML_STYLESHEET =
# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
# user-defined cascading style sheet that is included after the standard
@@ -1581,7 +1581,7 @@ TAGFILES =
# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
-GENERATE_TAGFILE =
+GENERATE_TAGFILE = Documentation/lufa_doc_tags.xml
# If the ALLEXTERNALS tag is set to YES all external classes will be listed
# in the class index. If set to NO only the inherited external classes
diff --git a/LUFA/StudioIntegration/lufa.xml b/LUFA/StudioIntegration/lufa.xml
new file mode 100644
index 0000000000..0bb02bfd45
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa.xml
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LUFA/StudioIntegration/lufa_common.xml b/LUFA/StudioIntegration/lufa_common.xml
new file mode 100644
index 0000000000..cd4c413213
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_common.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_board.xml b/LUFA/StudioIntegration/lufa_drivers_board.xml
new file mode 100644
index 0000000000..e50db71df1
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_board.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_board_avr8_usbkey.xml b/LUFA/StudioIntegration/lufa_drivers_board_avr8_usbkey.xml
new file mode 100644
index 0000000000..af63fb82f7
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_board_avr8_usbkey.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_board_none.xml b/LUFA/StudioIntegration/lufa_drivers_board_none.xml
new file mode 100644
index 0000000000..1430957d96
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_board_none.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_misc.xml b/LUFA/StudioIntegration/lufa_drivers_misc.xml
new file mode 100644
index 0000000000..d2491d1e4e
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_misc.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_peripheral.xml b/LUFA/StudioIntegration/lufa_drivers_peripheral.xml
new file mode 100644
index 0000000000..ab7cc19a21
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_peripheral.xml
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb.xml b/LUFA/StudioIntegration/lufa_drivers_usb.xml
new file mode 100644
index 0000000000..f995f3e29e
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_class.xml b/LUFA/StudioIntegration/lufa_drivers_usb_class.xml
new file mode 100644
index 0000000000..8bc4f3b2ce
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_class.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core.xml
new file mode 100644
index 0000000000..2945177a18
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_core.xml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
new file mode 100644
index 0000000000..74088e622e
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
new file mode 100644
index 0000000000..e0bead293f
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core_xmega.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core_xmega.xml
new file mode 100644
index 0000000000..b6a0bd0a0a
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_core_xmega.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_extension_transform.xslt b/LUFA/StudioIntegration/lufa_extension_transform.xslt
new file mode 100644
index 0000000000..0cadefdb1a
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_extension_transform.xslt
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ This file has been automatically generated from the LUFA Atmel Studio integration XML files.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .
+
+ .
+
+
+
+
+
+
+
+
+
+ /html/
+
+
+
+
diff --git a/LUFA/StudioIntegration/lufa_filelist_transform.xslt b/LUFA/StudioIntegration/lufa_filelist_transform.xslt
new file mode 100644
index 0000000000..1482f4db90
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_filelist_transform.xslt
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+ Sourced from
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LUFA/StudioIntegration/lufa_indent_transform.xslt b/LUFA/StudioIntegration/lufa_indent_transform.xslt
new file mode 100644
index 0000000000..ccd7389056
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_indent_transform.xslt
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_module_transform.xslt b/LUFA/StudioIntegration/lufa_module_transform.xslt
new file mode 100644
index 0000000000..8efc706c4e
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_module_transform.xslt
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ This file has been automatically generated from the LUFA Atmel Studio integration XML files.
+
+
+
+
+
+ Sourced from
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LUFA/StudioIntegration/lufa_platform.xml b/LUFA/StudioIntegration/lufa_platform.xml
new file mode 100644
index 0000000000..a77f2d8525
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_platform.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_platform_uc3.xml b/LUFA/StudioIntegration/lufa_platform_uc3.xml
new file mode 100644
index 0000000000..0401633d02
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_platform_uc3.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_platform_xmega.xml b/LUFA/StudioIntegration/lufa_platform_xmega.xml
new file mode 100644
index 0000000000..68f4f587fc
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_platform_xmega.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/lufa_toolchain.xml b/LUFA/StudioIntegration/lufa_toolchain.xml
new file mode 100644
index 0000000000..dfe444264c
--- /dev/null
+++ b/LUFA/StudioIntegration/lufa_toolchain.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
new file mode 100644
index 0000000000..0f0f77bbb3
--- /dev/null
+++ b/LUFA/StudioIntegration/makefile
@@ -0,0 +1,57 @@
+#
+# LUFA Library
+# Copyright (C) Dean Camera, 2012.
+#
+# dean [at] fourwalledcubicle [dot] com
+# www.lufa-lib.org
+#
+# ---------------------------------------
+# Makefile for the LUFA Atmel Studio Integration.
+# ---------------------------------------
+
+LUFA_ROOT := ../
+DOXYGEN_TAG_FILE_XML := $(LUFA_ROOT)/Documentation/lufa_doc_tags.xml
+TEMP_MANIFEST_XML := manifest.xml
+EXTENSION_OUTPUT_XML := $(LUFA_ROOT)/../extension.xml
+MODULE_OUTPUT_XML := $(LUFA_ROOT)/asf.xml
+XML_FILES := $(filter-out $(TEMP_MANIFEST_FILE), $(shell ls *.xml))
+LUFA_VERSION_NUM := $(shell grep LUFA_VERSION_STRING $(LUFA_ROOT)/Version.h | cut -d'"' -f2)
+
+all: check_filenames generate_xml
+
+clean:
+ @rm $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML)
+
+$(DOXYGEN_TAG_FILE_XML):
+ make -C ../ doxygen
+
+$(TEMP_MANIFEST_XML): $(DOXYGEN_TAG_FILE_XML)
+ @echo "Generating Manifest XML..."
+
+ @printf "\n" $(LUFA_VERSION_NUM) $(DOXYGEN_TAG_FILE_XML) > $@
+ @for i in $(XML_FILES); do \
+ printf "\t\n" $$i >> $@; \
+ done;
+ @echo '' >> $@
+
+ @echo "Manifest XML file generated."
+
+generate_xml: $(TEMP_MANIFEST_XML)
+ @echo "Processing asf.xml file..."
+ @xsltproc lufa_module_transform.xslt $< | xsltproc lufa_indent_transform.xslt - > $(MODULE_OUTPUT_XML)
+ @echo "Atmel Studio asf.xml file generated."
+
+ @echo "Processing extension.xml file..."
+ @xsltproc lufa_extension_transform.xslt $< | xsltproc lufa_indent_transform.xslt - > $(EXTENSION_OUTPUT_XML)
+ @echo "Atmel Studio extension.xml file generated."
+
+ @rm $(TEMP_MANIFEST_XML)
+
+check_filenames: $(TEMP_MANIFEST_XML)
+ @for i in `xsltproc lufa_filelist_transform.xslt manifest.xml | grep -v "^<" | sed -e "/^$$/d"`; do \
+ if ( ! test -f "$(LUFA_ROOT)/$$i" ); then \
+ echo "Source file $$i does not exist!"; \
+ fi; \
+ done;
+
+.PHONY: all clean check_filenames generate_xml
\ No newline at end of file
diff --git a/LUFA/makefile b/LUFA/makefile
index d55291cf92..08d986cbad 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -10,7 +10,7 @@
# ---------------------------------------
LUFA_VERSION_NUM := $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"' -f2)
-EXCLUDE_FROM_EXPORT := Documentation DoxygenPages CodeTemplates Build *.conf *.tar *.o *.d *.lss *.lst *.hex *.elf *.hex *.eep *.map *.bin
+EXCLUDE_FROM_EXPORT := Documentation DoxygenPages CodeTemplates Build StudioIntegration *.conf *.tar *.o *.d *.lss *.lst *.hex *.elf *.hex *.eep *.map *.bin
# Default target - no default action when attempting to build the core directly
all:
@@ -29,7 +29,7 @@ version:
# Check if this is being included from a legacy or non LUFA build system makefile
ifneq ($(LUFA_PATH),)
LUFA_ROOT_PATH = $(patsubst %/,%,$(LUFA_PATH))/LUFA/
-
+
include $(patsubst %/,%,$(LUFA_PATH))/LUFA/Build/lufa_sources.mk
else
LUFA_BUILD_MODULES += MASTER
@@ -38,7 +38,7 @@ else
LUFA_PATH = .
ARCH = {AVR8,UC3,XMEGA}
DOXYGEN_OVERRIDE_PARAMS = QUIET=YES PROJECT_NUMBER=$(LUFA_VERSION_NUM)
-
+
# Remove all object and associated files from the LUFA library core
clean:
rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)