diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-20 15:43:51 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2012-05-20 15:43:51 +0000 |
commit | 063474561de084fbdd8c1ddc02fcce5b8abebe3e (patch) | |
tree | 831ba5778a2b6adf6f05be487f91d87ab1c18f2c /Projects/AVRISP-MKII/AVRISP-MKII.txt | |
parent | 666088a38818e371cc8ad89360c960d86b311a49 (diff) | |
parent | b181cf4fb87c289b2aed93e44d03b20b6b9ba623 (diff) | |
download | lufa-063474561de084fbdd8c1ddc02fcce5b8abebe3e.tar.gz lufa-063474561de084fbdd8c1ddc02fcce5b8abebe3e.tar.bz2 lufa-063474561de084fbdd8c1ddc02fcce5b8abebe3e.zip |
Merge in latest trunk.
Diffstat (limited to 'Projects/AVRISP-MKII/AVRISP-MKII.txt')
-rw-r--r-- | Projects/AVRISP-MKII/AVRISP-MKII.txt | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.txt b/Projects/AVRISP-MKII/AVRISP-MKII.txt index a933f386a..cd1faf094 100644 --- a/Projects/AVRISP-MKII/AVRISP-MKII.txt +++ b/Projects/AVRISP-MKII/AVRISP-MKII.txt @@ -10,10 +10,10 @@ * * The following list indicates what microcontrollers are compatible with this project. * - * - Series 7 USB AVRs (AT90USBxxx7) - * - Series 6 USB AVRs (AT90USBxxx6) - * - Series 4 USB AVRs (ATMEGAxxU4) - * - Series 2 USB AVRs (AT90USBxx2, ATMEGAxxU2) - <i>8KB versions with reduced features only</i> + * \li Series 7 USB AVRs (AT90USBxxx7) + * \li Series 6 USB AVRs (AT90USBxxx6) + * \li Series 4 USB AVRs (ATMEGAxxU4) + * \li Series 2 USB AVRs (AT90USBxx2, ATMEGAxxU2) - <i>8KB versions with reduced features only</i> * * \section Sec_Info USB Information: * @@ -37,7 +37,7 @@ * <td>Atmel AVRISP MKII Protocol Specification</td> * </tr> * <tr> - * <td><b>Usable Speeds:</b></td> + * <td><b>Supported USB Speeds:</b></td> * <td>Full Speed Mode</td> * </tr> * </table> @@ -293,7 +293,18 @@ * <td>LIBUSB_DRIVER_COMPAT</td> * <td>AppConfig.h</td> * <td>Define to switch to a non-standard endpoint scheme, breaking compatibility with AVRStudio under Windows but making - * the code compatible with software such as avrdude (all platforms) that use the libUSB driver.</td> + * the code compatible with software such as avrdude (all platforms) that use the libUSB driver. + * + * \note This option is incompatible with \c RESET_TOGGLES_LIBUSB_COMPAT.</td> + * </tr> + * <tr> + * <td>RESET_TOGGLES_LIBUSB_COMPAT</td> + * <td>AppConfig.h</td> + * <td>Define to make the /RESET line of the AVR toggle between Jungo and libUSB driver compatibility modes. Each time the AVR is + * reset externally via the reset pin, the compatibility mode will be toggled. The compatibility mode is preserved between + * power cycles and is not toggled via other forms of reset such as Watchdog or Brown Out. + * + * \note This option is incompatible with \c LIBUSB_DRIVER_COMPAT.</td> * </tr> * <tr> * <td>XCK_RESCUE_CLOCK_ENABLE</td> |