aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2015-08-01 11:52:23 +1000
committerDean Camera <dean@fourwalledcubicle.com>2015-08-01 11:52:23 +1000
commit7c9c3d15e0b772a8bf26c9695236b80cb26c71b5 (patch)
treec0378678154e022f244d846527f6473e1111e2f5
parent617763ae20a9fbd35ed86956450f1555286636af (diff)
downloadlufa-7c9c3d15e0b772a8bf26c9695236b80cb26c71b5.tar.gz
lufa-7c9c3d15e0b772a8bf26c9695236b80cb26c71b5.tar.bz2
lufa-7c9c3d15e0b772a8bf26c9695236b80cb26c71b5.zip
Minor documentation improvements.
-rw-r--r--LUFA/DoxygenPages/ChangeLog.txt5
-rw-r--r--LUFA/DoxygenPages/CompileTimeTokens.txt2
-rw-r--r--LUFA/StudioIntegration/VSIX/extension.vsixmanifest5
-rw-r--r--LUFA/StudioIntegration/lufa.xml2
-rw-r--r--Projects/LEDNotifier/LEDNotifier.c2
-rw-r--r--Projects/LEDNotifier/makefile6
6 files changed, 13 insertions, 9 deletions
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 4935e5f83..f80c1909b 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -8,13 +8,14 @@
*
* \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)
- * - 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)
*
diff --git a/LUFA/DoxygenPages/CompileTimeTokens.txt b/LUFA/DoxygenPages/CompileTimeTokens.txt
index ab075cff7..00b543904 100644
--- 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
- * 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
diff --git a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index ea6edeb25..cfb82ed12 100644
--- a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -15,19 +15,20 @@
<SupportedProducts>
<IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>
<IsolatedShell Version="6.2">AtmelStudio</IsolatedShell>
+ <IsolatedShell Version="7.0">AtmelStudio</IsolatedShell>
</SupportedProducts>
<SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.5"/>
<Locale>1033</Locale>
- <AllUsers>false</AllUsers>
+ <AllUsers>false</AllUsers>
</Identifier>
<References/>
<Content>
<VsPackage>LUFA.pkgdef</VsPackage>
- <CustomExtension Type="MSHelp">helpcontentsetup.msha</CustomExtension>
+ <CustomExtension Type="MSHelp">helpcontentsetup.msha</CustomExtension>
<CustomExtension Type="asf-manifest">asf-manifest.xml</CustomExtension>
</Content>
</Vsix>
diff --git a/LUFA/StudioIntegration/lufa.xml b/LUFA/StudioIntegration/lufa.xml
index 28afdda58..ecbb1d679 100644
--- a/LUFA/StudioIntegration/lufa.xml
+++ b/LUFA/StudioIntegration/lufa.xml
@@ -58,7 +58,7 @@
<device-support value="atxmega128b1"/>
<device-support value="atxmega64c3"/>
<device-support value="atxmega128c3"/>
- <!-- <device-support value="atxmega192c3"/> Wait for ASFP-3339 merge and release before enabling -->
+ <device-support value="atxmega192c3"/>
<device-support value="atxmega256c3"/>
<device-support value="atxmega384c3"/>
<device-support value="atxmega16c4"/>
diff --git a/Projects/LEDNotifier/LEDNotifier.c b/Projects/LEDNotifier/LEDNotifier.c
index 6242774a6..8e70e90d4 100644
--- 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;
+ fputc(&USBSerialStream, ColourUpdate);
+
CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
USB_USBTask();
}
diff --git a/Projects/LEDNotifier/makefile b/Projects/LEDNotifier/makefile
index 05436edec..41f9d1647 100644
--- a/Projects/LEDNotifier/makefile
+++ b/Projects/LEDNotifier/makefile
@@ -11,10 +11,10 @@
# Run "make help" for target help.
-MCU = at90usb1287
+MCU = atmega32u2
ARCH = AVR8
-BOARD = BUI
-F_CPU = 8000000
+BOARD = USB2AX
+F_CPU = 16000000
F_USB = $(F_CPU)
OPTIMIZATION = s
TARGET = LEDNotifier