From cf4575b94a3c65e6535a159fc71fc885aebc2620 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 2 Aug 2019 14:02:40 -0700 Subject: Fix the LUFA lib to use a submodule instead of just files (#6245) * Remove LUFA files * Update descriptions for newer version of LUFA * Create PR6245.md * Fix CDC(Serial) type errors * Fix missed merge conflict for AUDIO_DTYPE_CSInterface --- .../StudioIntegration/Docbook/mshelp/README.txt | 13 - .../StudioIntegration/Docbook/mshelp/docbook.xsl | 58 -- .../Docbook/mshelp/hv1-common.xsl | 664 ---------------- .../LUFA/StudioIntegration/Docbook/placeholder.txt | 1 - .../StudioIntegration/HV1/helpcontentsetup.msha | 27 - .../HV1/lufa_docbook_transform.xslt | 806 ------------------- .../HV1/lufa_helpcontentsetup_transform.xslt | 47 -- .../StudioIntegration/HV1/lufa_hv1_transform.xslt | 45 -- .../HV1/lufa_studio_help_styling.css | 53 -- lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll | Bin 785920 -> 0 bytes lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef | Bin 2242 -> 0 bytes .../StudioIntegration/VSIX/[Content_Types].xml | 13 - .../LUFA/StudioIntegration/VSIX/asf-manifest.xml | 18 - .../StudioIntegration/VSIX/extension.vsixmanifest | 32 - .../LUFA/StudioIntegration/VSIX/generate_caches.py | 38 - .../VSIX/lufa_asfmanifest_transform.xslt | 36 - .../VSIX/lufa_vsmanifest_transform.xslt | 33 - .../XDK/lufa_extension_transform.xslt | 68 -- .../XDK/lufa_filelist_transform.xslt | 35 - .../XDK/lufa_indent_transform.xslt | 23 - .../XDK/lufa_module_transform.xslt | 66 -- lib/lufa/LUFA/StudioIntegration/lufa.xml | 96 --- lib/lufa/LUFA/StudioIntegration/lufa_common.xml | 34 - .../LUFA/StudioIntegration/lufa_drivers_board.xml | 114 --- .../StudioIntegration/lufa_drivers_board_names.xml | 853 --------------------- .../LUFA/StudioIntegration/lufa_drivers_misc.xml | 57 -- .../StudioIntegration/lufa_drivers_peripheral.xml | 198 ----- .../LUFA/StudioIntegration/lufa_drivers_usb.xml | 32 - .../StudioIntegration/lufa_drivers_usb_class.xml | 32 - .../lufa_drivers_usb_class_android.xml | 54 -- .../lufa_drivers_usb_class_audio.xml | 109 --- .../lufa_drivers_usb_class_cdc.xml | 99 --- .../lufa_drivers_usb_class_hid.xml | 99 --- .../lufa_drivers_usb_class_midi.xml | 99 --- .../lufa_drivers_usb_class_ms.xml | 99 --- .../lufa_drivers_usb_class_printer.xml | 99 --- .../lufa_drivers_usb_class_rndis.xml | 99 --- .../lufa_drivers_usb_class_si.xml | 56 -- .../StudioIntegration/lufa_drivers_usb_core.xml | 85 -- .../lufa_drivers_usb_core_avr8.xml | 43 -- .../lufa_drivers_usb_core_uc3.xml | 42 - .../lufa_drivers_usb_core_xmega.xml | 36 - lib/lufa/LUFA/StudioIntegration/lufa_platform.xml | 60 -- .../LUFA/StudioIntegration/lufa_platform_uc3.xml | 26 - .../LUFA/StudioIntegration/lufa_platform_xmega.xml | 23 - lib/lufa/LUFA/StudioIntegration/lufa_toolchain.xml | 45 -- lib/lufa/LUFA/StudioIntegration/makefile | 142 ---- 47 files changed, 4807 deletions(-) delete mode 100644 lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/README.txt delete mode 100644 lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/docbook.xsl delete mode 100644 lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/hv1-common.xsl delete mode 100644 lib/lufa/LUFA/StudioIntegration/Docbook/placeholder.txt delete mode 100644 lib/lufa/LUFA/StudioIntegration/HV1/helpcontentsetup.msha delete mode 100644 lib/lufa/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt delete mode 100644 lib/lufa/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt delete mode 100644 lib/lufa/LUFA/StudioIntegration/HV1/lufa_hv1_transform.xslt delete mode 100644 lib/lufa/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/asf-manifest.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/extension.vsixmanifest delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/generate_caches.py delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt delete mode 100644 lib/lufa/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt delete mode 100644 lib/lufa/LUFA/StudioIntegration/XDK/lufa_extension_transform.xslt delete mode 100644 lib/lufa/LUFA/StudioIntegration/XDK/lufa_filelist_transform.xslt delete mode 100644 lib/lufa/LUFA/StudioIntegration/XDK/lufa_indent_transform.xslt delete mode 100644 lib/lufa/LUFA/StudioIntegration/XDK/lufa_module_transform.xslt delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_common.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_board.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_board_names.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_misc.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_peripheral.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class_android.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class_audio.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class_cdc.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class_hid.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class_midi.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class_ms.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class_printer.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class_rndis.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_class_si.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_core.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_drivers_usb_core_xmega.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_platform.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_platform_uc3.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_platform_xmega.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/lufa_toolchain.xml delete mode 100644 lib/lufa/LUFA/StudioIntegration/makefile (limited to 'lib/lufa/LUFA/StudioIntegration') diff --git a/lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/README.txt b/lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/README.txt deleted file mode 100644 index 4f251cc0b8..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/README.txt +++ /dev/null @@ -1,13 +0,0 @@ -This is a modified/updated version of the Microsoft HV1 Docbook transform, written by Morten Engelhardt Olsen, - -Originally posted at http://sourceforge.net/p/docbook/feature-requests/461/, this has been further updated by Morten to make it compatible with more recent DocBook versions. - - --------------------------- -/ This documentation system \ -\ is udderly ridiculous! / - --------------------------- - \ ^__^ - \ (oo)\_______ - (__)\ )\/\ - ||----w | - || || diff --git a/lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/docbook.xsl b/lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/docbook.xsl deleted file mode 100644 index 03b81feafc..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/docbook.xsl +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/hv1-common.xsl b/lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/hv1-common.xsl deleted file mode 100644 index b6f2610680..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/Docbook/mshelp/hv1-common.xsl +++ /dev/null @@ -1,664 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - en-US - - - - - - - - - - - - - - - - - en-US - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - - - -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bk - - - - - - - - - - - - ar - - - - - - - - - - - - pr - - - - - - - - - - - - ch - - - - - - - - - - - - ap - - - - - - - - - - - - - - - - pt - - - - - - - - - - - - - - - - rn - - - - - - - - - - - - - - - re - - - - - - - - - - - - - - - - co - - - - - - - - s - - - - - - - - - - - - - - - - bi - - - - - - - - - - - - - - - - go - - - - - - - - - - - - - - - - ix - - - - - si - - - - - chunk-filename-error- - - - - - - - - - - - - - - - - - - - - - - - - - $product.name needs to be set to generate ms.help style links - - - - - $product.version needs to be set to generate ms.help style links - - - - - $product.locale needs to be set to generate ms.help style links - - - - ms.help?method=page&id= - - &product= - - &productVersion= - - &locale= - - - - # - - - - - - ms-xhelp:///?Id= - - - - - - - - - - - - - - preserve - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - : - - , - - - - - - - , - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/lib/lufa/LUFA/StudioIntegration/Docbook/placeholder.txt b/lib/lufa/LUFA/StudioIntegration/Docbook/placeholder.txt deleted file mode 100644 index dd69b7e0bd..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/Docbook/placeholder.txt +++ /dev/null @@ -1 +0,0 @@ -Copy the Docbook XSLT docbook-xsl-1.78.1 release contents into this directory (i.e. with the root Docbook files in the current folder). The Docbook releases can be found at http://sourceforge.net/projects/docbook/files/docbook-xsl/ . diff --git a/lib/lufa/LUFA/StudioIntegration/HV1/helpcontentsetup.msha b/lib/lufa/LUFA/StudioIntegration/HV1/helpcontentsetup.msha deleted file mode 100644 index bd1d7ee219..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/HV1/helpcontentsetup.msha +++ /dev/null @@ -1,27 +0,0 @@ - - - - - LUFA Help - - -
- FourWalledCubicle - LUFA - LUFA Help - en-us -
-
-
- lufa_studio_help.mshc - lufa_studio_help.mshc -
-
- - diff --git a/lib/lufa/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt b/lib/lufa/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt deleted file mode 100644 index 26c1d378e2..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/HV1/lufa_docbook_transform.xslt +++ /dev/null @@ -1,806 +0,0 @@ - - - - - - - - LUFA Library - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="$book.title"/> - - - - - - - - - - - - - - - - Modules - - - - - - - - - - - - - - - - LUFA. - - - - - - - - - <xsl:value-of select="$page.title"/> - - - - - - - Subsections: - - - - - - - - - - - - - - - - - - - -
- - <xsl:value-of select="title"/> - - - - LUFA. - - - - - - - - - - - - Subgroups: - - - - - - - - - - - - - - - - - - - - - -
-
- - - - -
- - <xsl:choose> - <xsl:when test="@kind = 'struct'"> - <xsl:text>Struct </xsl:text> - </xsl:when> - - <xsl:when test="@kind = 'union'"> - <xsl:text>Union </xsl:text> - </xsl:when> - </xsl:choose> - - <xsl:value-of select="$name"/> - - - - - - - - - - - - <xsl:value-of select="$name"/> - - - - - - Type - Name - Description - - - - - - - - - - - - - [] - - - - - . - - - - - - - - - - - - - - -
-
-
-
- - -
- - <xsl:text>Function </xsl:text> - <xsl:value-of select="name"/> - <xsl:text>()</xsl:text> - - - - - - - - - - - - - - - - - - - ( - - - - void - - - - - - , - - - - - - - - - - - - ) - - - -
-
- - -
- - <xsl:text>Enum </xsl:text> - <xsl:value-of select="name"/> - - - - - - - - - - Members - - - - Enum Value - Description - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
- - <xsl:text>Macro </xsl:text> - <xsl:value-of select="name"/> - - - - - - - - - #define - - - ( - - - , - - - - ) - - - - - - \ - - - - - - - - -
-
- - -
- - <xsl:text>Type </xsl:text> - <xsl:value-of select="name"/> - - - - - - - - - typedef - - - - - - - - - -
-
- - - -
- - <xsl:text>Variable </xsl:text> - <xsl:value-of select="name"/> - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="title"/> - - - - - - - - Returns - - - - - - - Warning - - - - - - - Precondition - - - - - - - See also - - - - - - - Note - - - - - - - - - - Parameters - - - - Data Direction - Parameter Name - Description - - - - - - - - - - -
-
- - - - Return Values - - - - Return Value - Description - - - - - - - - - - -
-
- - - - - - - - ? - - - - - [] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <xsl:value-of select="caption"/> - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - images/ - - - - - - - - - - - - -
- - - - - - - - <xsl:value-of select="title"/> - - - -
-
- - - - - - - - - - - - - NO XSL TEMPLATE MATCH: - - -
diff --git a/lib/lufa/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt b/lib/lufa/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt deleted file mode 100644 index c9ff58f597..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/HV1/lufa_helpcontentsetup_transform.xslt +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/lufa/LUFA/StudioIntegration/HV1/lufa_hv1_transform.xslt b/lib/lufa/LUFA/StudioIntegration/HV1/lufa_hv1_transform.xslt deleted file mode 100644 index e7b57ab641..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/HV1/lufa_hv1_transform.xslt +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/lufa/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css b/lib/lufa/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css deleted file mode 100644 index b1b9cafd19..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/HV1/lufa_studio_help_styling.css +++ /dev/null @@ -1,53 +0,0 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2017. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -.programlisting { - display: block; - margin-left: 15px; - padding: 10px; - background-color: #f4f4f4; - border: 1px solid #aaaaaa; - font-family: "Consolas", "Courier New", sans-serif; - } - - code { - background-color: #f4f4f4; - font-family: "Consolas", "Courier New", sans-serif; - } - -.note, .warning, .tip { - display: block; - margin-left: 15px; - padding-left: 10px; - padding-bottom: 5px; - background-color: #f4f4f4; - border: 1px solid #aaaaaa; -} - -table { - border: 1px solid #aaaaaa; - border-collapse: collapse; - margin-left: 15px; - font-size: 10pt; -} - -table thead { - background-color: #f4f4f4; -} - -table thead th { - padding: 5px; -} - -table tbody td { - padding: 5px; -} - -ul { - padding-left: 20px; -} diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll b/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll deleted file mode 100644 index 369c78178b..0000000000 Binary files a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.dll and /dev/null differ diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef b/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef deleted file mode 100644 index b1b2f943b8..0000000000 Binary files a/lib/lufa/LUFA/StudioIntegration/VSIX/LUFA.pkgdef and /dev/null differ diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml b/lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml deleted file mode 100644 index 112d169942..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/VSIX/[Content_Types].xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/asf-manifest.xml b/lib/lufa/LUFA/StudioIntegration/VSIX/asf-manifest.xml deleted file mode 100644 index bd969518a1..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/VSIX/asf-manifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - FourWalledCubicle - LUFA - Dean Camera - - True - - - - 0 - - - content.xml.cache - - - - diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/lib/lufa/LUFA/StudioIntegration/VSIX/extension.vsixmanifest deleted file mode 100644 index a1901cb567..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/VSIX/extension.vsixmanifest +++ /dev/null @@ -1,32 +0,0 @@ - - - - - LUFA Library - Dean Camera - 0 - http://www.lufa-lib.org - LUFA, the Lightweight USB Framework for AVRs. - - License.txt - LUFA_thumb.png - LUFA.png - - - AtmelStudio - - - - 1033 - - false - - - - - - LUFA.pkgdef - helpcontentsetup.msha - asf-manifest.xml - - diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/generate_caches.py b/lib/lufa/LUFA/StudioIntegration/VSIX/generate_caches.py deleted file mode 100644 index 671bed9d56..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/VSIX/generate_caches.py +++ /dev/null @@ -1,38 +0,0 @@ -""" - LUFA Library - Copyright (C) Dean Camera, 2017. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -""" - -import sys -sys.path.append("ProjectGenerator") - - -def show_message(message): - print("[Project Generator] %s" % message) - sys.stdout.flush() - - -def main(lufa_root_path): - try: - from asf_avrstudio5_interface import PythonFacade - except ImportError: - print("Fatal Error: The ASF project generator is missing.") - return 1 - - p = PythonFacade(lufa_root_path) - - show_message("Checking database sanity...") - p.check_extension_database_sanity(lufa_root_path) - - show_message("Building cache files...") - p.generate_extension_cache_files(lufa_root_path) - - show_message("Cache files created.") - return 0 - - -if __name__ == "__main__": - sys.exit(main(sys.argv[1])) diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt b/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt deleted file mode 100644 index 00f552c9c9..0000000000 --- a/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_asfmanifest_transform.xslt +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - . - - . - - - - diff --git a/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt b/lib/lufa/LUFA/StudioIntegration/VSIX/lufa_vsmanifest_transform.xslt del