Minor documentation improvements.

diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 4935e5f..f80c190 100644 (file)
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -8,13 +8,14 @@
   *
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX
   *  <b>New:</b>
   *
   *  \section Sec_ChangeLogXXXXXX Version XXXXXX
   *  <b>New:</b>

-  *   - Added support for the Atmel Xplained-MINI series of development kits.
+  *   - Added support for the Atmel Xplained-MINI series of development kits
+  *   - Added new PROGMEM variant send functions to the CDC class driver (thanks to Stefan Hellermann)

   *
   *  <b>Changed:</b>
   *  - Library Applications:
   *   - The CDC, DFU, Mass Storage and Printer class bootloaders will no longer run the user application if the application reset
   *     vector is blank (thanks to Alex Kazik)
   *
   *  <b>Changed:</b>
   *  - Library Applications:
   *   - The CDC, DFU, Mass Storage and Printer class bootloaders will no longer run the user application if the application reset
   *     vector is blank (thanks to Alex Kazik)

-  *   - The CDC, DFU and Printer class bootloaders are now compatible with the original Atmel XPLAIN and Arduino Leonardo boards.
+  *   - The CDC, DFU and Printer class bootloaders are now compatible with the original Atmel XPLAIN and Arduino Leonardo boards

   *   - The CDC, DFU, Mass Storage and Printer class bootloaders are not compatible with devices with the BOOTRST fuse set and will
   *     exit automatically unless an external reset was the last reset cause (thanks to Alex Kazik)
   *
   *   - The CDC, DFU, Mass Storage and Printer class bootloaders are not compatible with devices with the BOOTRST fuse set and will
   *     exit automatically unless an external reset was the last reset cause (thanks to Alex Kazik)
   *

diff --git a/LUFA/DoxygenPages/CompileTimeTokens.txt b/LUFA/DoxygenPages/CompileTimeTokens.txt
index ab075cf..00b5439 100644 (file)
--- a/LUFA/DoxygenPages/CompileTimeTokens.txt
+++ b/LUFA/DoxygenPages/CompileTimeTokens.txt
@@ -114,7 +114,7 @@
  *      VBUS events, the library attempts to determine the connection state via the bus suspension and wake up events instead. This however may be
  *      slightly inaccurate due to the possibility of the host suspending the bus while the device is still connected. If accurate connection status is
  *      required, the VBUS line of the USB connector should be routed to an AVR pin to detect its level, so that the USB_DeviceState global
  *      VBUS events, the library attempts to determine the connection state via the bus suspension and wake up events instead. This however may be
  *      slightly inaccurate due to the possibility of the host suspending the bus while the device is still connected. If accurate connection status is
  *      required, the VBUS line of the USB connector should be routed to an AVR pin to detect its level, so that the USB_DeviceState global

- *      can be accurately set and the \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events manually raised by the RAISE_EVENT macro.
+ *      can be accurately set and the \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events manually raised by the user application.

  *      When defined, this token disables the library's auto-detection of the connection state by the aforementioned suspension and wake up events.
  *
  *  \li <b>NO_SOF_EVENTS</b> - (\ref Group_Events) - <i>All Architectures</i> \n
  *      When defined, this token disables the library's auto-detection of the connection state by the aforementioned suspension and wake up events.
  *
  *  \li <b>NO_SOF_EVENTS</b> - (\ref Group_Events) - <i>All Architectures</i> \n

diff --git a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index ea6edeb..cfb82ed 100644 (file)
--- a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -15,19 +15,20 @@
                <SupportedProducts>\r
                        <IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>\r
                        <IsolatedShell Version="6.2">AtmelStudio</IsolatedShell>\r
                <SupportedProducts>\r
                        <IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>\r
                        <IsolatedShell Version="6.2">AtmelStudio</IsolatedShell>\r

+                       <IsolatedShell Version="7.0">AtmelStudio</IsolatedShell>\r

                </SupportedProducts>\r
 \r
                <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.5"/>\r
                <Locale>1033</Locale>\r
 \r
                </SupportedProducts>\r
 \r
                <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.5"/>\r
                <Locale>1033</Locale>\r
 \r

-           <AllUsers>false</AllUsers>\r
+               <AllUsers>false</AllUsers>\r

        </Identifier>\r
 \r
        <References/>\r
 \r
        <Content>\r
                <VsPackage>LUFA.pkgdef</VsPackage>\r
        </Identifier>\r
 \r
        <References/>\r
 \r
        <Content>\r
                <VsPackage>LUFA.pkgdef</VsPackage>\r

-           <CustomExtension Type="MSHelp">helpcontentsetup.msha</CustomExtension>\r
+               <CustomExtension Type="MSHelp">helpcontentsetup.msha</CustomExtension>\r

                <CustomExtension Type="asf-manifest">asf-manifest.xml</CustomExtension>\r
        </Content>\r
 </Vsix>\r
                <CustomExtension Type="asf-manifest">asf-manifest.xml</CustomExtension>\r
        </Content>\r
 </Vsix>\r

diff --git a/LUFA/StudioIntegration/lufa.xml b/LUFA/StudioIntegration/lufa.xml
index 28afdda..ecbb1d6 100644 (file)
--- a/LUFA/StudioIntegration/lufa.xml
+++ b/LUFA/StudioIntegration/lufa.xml
@@ -58,7 +58,7 @@
                        <device-support value="atxmega128b1"/>\r
                        <device-support value="atxmega64c3"/>\r
                        <device-support value="atxmega128c3"/>\r
                        <device-support value="atxmega128b1"/>\r
                        <device-support value="atxmega64c3"/>\r
                        <device-support value="atxmega128c3"/>\r

-                       <!-- <device-support value="atxmega192c3"/> Wait for ASFP-3339 merge and release before enabling -->\r
+                       <device-support value="atxmega192c3"/>\r

                        <device-support value="atxmega256c3"/>\r
                        <device-support value="atxmega384c3"/>\r
                        <device-support value="atxmega16c4"/>\r
                        <device-support value="atxmega256c3"/>\r
                        <device-support value="atxmega384c3"/>\r
                        <device-support value="atxmega16c4"/>\r

diff --git a/Projects/LEDNotifier/LEDNotifier.c b/Projects/LEDNotifier/LEDNotifier.c
index 6242774..8e70e90 100644 (file)
--- a/Projects/LEDNotifier/LEDNotifier.c
+++ b/Projects/LEDNotifier/LEDNotifier.c
@@ -134,6 +134,8 @@ int main(void)
                if (Channel & (1 << 7))
                  SoftPWM_Channel3_Duty = Duty;
 
                if (Channel & (1 << 7))
                  SoftPWM_Channel3_Duty = Duty;
 

+               fputc(&USBSerialStream, ColourUpdate);
+

                CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
                USB_USBTask();
        }
                CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
                USB_USBTask();
        }

diff --git a/Projects/LEDNotifier/makefile b/Projects/LEDNotifier/makefile
index 05436ed..41f9d16 100644 (file)
--- a/Projects/LEDNotifier/makefile
+++ b/Projects/LEDNotifier/makefile
@@ -11,10 +11,10 @@
 
 # Run "make help" for target help.
 
 
 # Run "make help" for target help.
 

-MCU          = at90usb1287
+MCU          = atmega32u2

 ARCH         = AVR8
 ARCH         = AVR8

-BOARD        = BUI
-F_CPU        = 8000000
+BOARD        = USB2AX
+F_CPU        = 16000000

 F_USB        = $(F_CPU)
 OPTIMIZATION = s
 TARGET       = LEDNotifier
 F_USB        = $(F_CPU)
 OPTIMIZATION = s
 TARGET       = LEDNotifier