Merge in latest trunk.
This commit is contained in:
commit
5f709e281e
18 changed files with 115 additions and 361 deletions
|
@ -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
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue