No Studio UI to switch boards yet, so make a dummy board that is used by all projects...

diff --git a/LUFA/StudioIntegration/lufa_common.xml b/LUFA/StudioIntegration/lufa_common.xml
index dac1efc..fce4347 100644 (file)
--- a/LUFA/StudioIntegration/lufa_common.xml
+++ b/LUFA/StudioIntegration/lufa_common.xml
@@ -29,6 +29,13 @@
                        <build type="header-file" value="Common/BoardTypes.h"/>\r
                        <build type="header-file" value="Common/CompilerSpecific.h"/>\r
                        <build type="header-file" value="Common/Endianness.h"/>\r
+\r
+                       <require idref="lufa.common.dummyboard"/>\r
+                       <require idref="lufa.drivers.board"/>\r
                </module>\r
+\r
+               <board id="lufa.common.dummyboard" vendor="LUFA" caption="NONE">\r
+                       <device-support value="avr"/>\r
+               </board>\r
        </asf>\r
 </lufa>
\ No newline at end of file

diff --git a/LUFA/StudioIntegration/lufa_drivers_board.xml b/LUFA/StudioIntegration/lufa_drivers_board.xml
index 635635d..035c8c6 100644 (file)
--- a/LUFA/StudioIntegration/lufa_drivers_board.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_board.xml
@@ -75,5 +75,48 @@
                        <build type="include-path" value=".."/>\r
                        <build type="header-file"  subtype="api" value="Drivers/Board/Temperature.h"/>\r
                </module>\r
+\r
+               <select-by-config id="lufa.drivers.board" name="lufa.drivers.board.name" default="none" caption="LUFA Board Support">\r
+                       <module id="lufa.drivers.board#none" name="None">\r
+                               <device-support value="avr"/>\r
+\r
+                               <build type="define" name="BOARD" value="BOARD_NONE"/>\r
+                       </module>\r
+\r
+                       <module id="lufa.drivers.board#usbkey" name="USBKEY">\r
+                               <device-support value="at90usb1287"/>\r
+\r
+                               <require idref="lufa.drivers.misc.at45db642d"/>\r
+\r
+                               <build type="header-file" value="Drivers/Board/AVR8/USBKEY/Buttons.h"/>\r
+                               <build type="header-file" value="Drivers/Board/AVR8/USBKEY/Dataflash.h"/>\r
+                               <build type="header-file" value="Drivers/Board/AVR8/USBKEY/Joystick.h"/>\r
+                               <build type="header-file" value="Drivers/Board/AVR8/USBKEY/LEDs.h"/>\r
+\r
+                               <build type="define" name="BOARD" value="BOARD_USBKEY"/>\r
+                       </module>\r
+\r
+                       <module id="lufa.drivers.board#xplain_rev1" name="XPLAIN (HW Rev 1)">\r
+                               <device-support value="at90usb1287"/>\r
+\r
+                               <require idref="lufa.drivers.misc.at45db642d"/>\r
+\r
+                               <build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Dataflash.h"/>\r
+                               <build type="header-file" value="Drivers/Board/AVR8/XPLAIN/LEDs.h"/>\r
+\r
+                               <build type="define" name="BOARD" value="BOARD_XPLAIN_REV1"/>\r
+                       </module>\r
+\r
+                       <module id="lufa.drivers.board#xplain" name="XPLAIN (HW Rev 2+)">\r
+                               <device-support value="at90usb1287"/>\r
+\r
+                               <require idref="lufa.drivers.misc.at45db642d"/>\r
+\r
+                               <build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Dataflash.h"/>\r
+                               <build type="header-file" value="Drivers/Board/AVR8/XPLAIN/LEDs.h"/>\r
+\r
+                               <build type="define" name="BOARD" value="BOARD_XPLAIN"/>\r
+                       </module>\r
+               </select-by-config>\r
        </asf>\r
 </lufa>
\ 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
deleted file mode 100644 (file)
index babf335..0000000
--- a/LUFA/StudioIntegration/lufa_drivers_board_avr8_usbkey.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2013.\r
-\r
-  dean [at] fourwalledcubicle [dot] com\r
-           www.lufa-lib.org\r
--->\r
-\r
-<!-- Atmel Studio framework integration file -->\r
-\r
-<lufa>\r
-       <asf>\r
-               <board id="lufa.drivers.board.usbkey" vendor="Atmel" caption="USBKEY">\r
-                       <device-support value="at90usb1287"/>\r
-\r
-                       <require idref="lufa.drivers.misc.at45db642d"/>\r
-\r
-                       <build type="header-file" value="Drivers/Board/AVR8/USBKEY/Buttons.h"/>\r
-                       <build type="header-file" value="Drivers/Board/AVR8/USBKEY/Dataflash.h"/>\r
-                       <build type="header-file" value="Drivers/Board/AVR8/USBKEY/Joystick.h"/>\r
-                       <build type="header-file" value="Drivers/Board/AVR8/USBKEY/LEDs.h"/>\r
-\r
-                       <build type="define" name="BOARD" value="BOARD_USBKEY"/>\r
-               </board>\r
-       </asf>\r
-</lufa>
\ No newline at end of file

diff --git a/LUFA/StudioIntegration/lufa_drivers_board_none.xml b/LUFA/StudioIntegration/lufa_drivers_board_none.xml
deleted file mode 100644 (file)
index afac81d..0000000
--- a/LUFA/StudioIntegration/lufa_drivers_board_none.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2013.\r
-\r
-  dean [at] fourwalledcubicle [dot] com\r
-           www.lufa-lib.org\r
--->\r
-\r
-<!-- Atmel Studio framework integration file -->\r
-\r
-<lufa>\r
-       <asf>\r
-               <board id="lufa.drivers.board.none" vendor="N/A" caption="NONE">\r
-                       <device-support value="avr"/>\r
-                       <build type="define" name="BOARD" value="BOARD_NONE"/>\r
-               </board>\r
-       </asf>\r
-</lufa>
\ No newline at end of file