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/Config | |
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/Config')
-rw-r--r-- | Projects/AVRISP-MKII/Config/AppConfig.h | 1 | ||||
-rw-r--r-- | Projects/AVRISP-MKII/Config/LUFAConfig.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Projects/AVRISP-MKII/Config/AppConfig.h b/Projects/AVRISP-MKII/Config/AppConfig.h index b7598a51c..26198e3d7 100644 --- a/Projects/AVRISP-MKII/Config/AppConfig.h +++ b/Projects/AVRISP-MKII/Config/AppConfig.h @@ -60,6 +60,7 @@ // #define INVERTED_ISP_MISO // #define LIBUSB_DRIVER_COMPAT +// #define RESET_TOGGLES_LIBUSB_COMPAT // #define FIRMWARE_VERSION_MINOR 0x11 #endif
\ No newline at end of file diff --git a/Projects/AVRISP-MKII/Config/LUFAConfig.h b/Projects/AVRISP-MKII/Config/LUFAConfig.h index 0a7ca2a3c..2071bfdd1 100644 --- a/Projects/AVRISP-MKII/Config/LUFAConfig.h +++ b/Projects/AVRISP-MKII/Config/LUFAConfig.h @@ -67,7 +67,7 @@ /* USB Device Mode Driver Related Tokens: */ // #define USE_RAM_DESCRIPTORS - #define USE_FLASH_DESCRIPTORS +// #define USE_FLASH_DESCRIPTORS // #define USE_EEPROM_DESCRIPTORS #define NO_INTERNAL_SERIAL #define FIXED_CONTROL_ENDPOINT_SIZE 16 |