aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/XPLAINBridge/Config
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-05-20 17:16:21 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-05-20 17:16:21 +0000
commit5f709e281eec223c5de9766a99bdd54339e149cb (patch)
treeaac4b2e9f666d28d37ca6078afc08926021867f8 /Projects/XPLAINBridge/Config
parent28967ef2e8f32e77031eb645970d2fa1a843e255 (diff)
parent5833b27f80f4b6b10f5765468f5863e57b97a65a (diff)
downloadlufa-5f709e281eec223c5de9766a99bdd54339e149cb.tar.gz
lufa-5f709e281eec223c5de9766a99bdd54339e149cb.tar.bz2
lufa-5f709e281eec223c5de9766a99bdd54339e149cb.zip
Merge in latest trunk.
Diffstat (limited to 'Projects/XPLAINBridge/Config')
-rw-r--r--Projects/XPLAINBridge/Config/AppConfig.h2
-rw-r--r--Projects/XPLAINBridge/Config/LUFAConfig.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/Projects/XPLAINBridge/Config/AppConfig.h b/Projects/XPLAINBridge/Config/AppConfig.h
index 3fe80171d..260880c22 100644
--- a/Projects/XPLAINBridge/Config/AppConfig.h
+++ b/Projects/XPLAINBridge/Config/AppConfig.h
@@ -48,6 +48,7 @@
#define AUX_LINE_DDR DDRB
#define AUX_LINE_MASK (1 << 4)
+// #define ENABLE_ISP_PROTOCOL
#define ENABLE_XPROG_PROTOCOL
#define VTARGET_ADC_CHANNEL 2
@@ -59,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/XPLAINBridge/Config/LUFAConfig.h b/Projects/XPLAINBridge/Config/LUFAConfig.h
index 4cd8b39f1..5c16ffb2b 100644
--- a/Projects/XPLAINBridge/Config/LUFAConfig.h
+++ b/Projects/XPLAINBridge/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