diff options
Diffstat (limited to 'Projects/AVRISP-MKII')
| -rw-r--r-- | Projects/AVRISP-MKII/AVRISPDescriptors.c | 4 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/Doxygen.conf | 39 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/V2ProtocolConstants.h | 5 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c | 4 |
4 files changed, 38 insertions, 14 deletions
diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.c b/Projects/AVRISP-MKII/AVRISPDescriptors.c index c185cb9f4..3b2230168 100644 --- a/Projects/AVRISP-MKII/AVRISPDescriptors.c +++ b/Projects/AVRISP-MKII/AVRISPDescriptors.c @@ -57,7 +57,7 @@ const USB_Descriptor_Device_t PROGMEM AVRISP_DeviceDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, - .USBSpecification = VERSION_BCD(01.10), + .USBSpecification = VERSION_BCD(1,1,0), .Class = USB_CSCP_VendorSpecificClass, .SubClass = USB_CSCP_NoDeviceSubclass, .Protocol = USB_CSCP_NoDeviceProtocol, @@ -66,7 +66,7 @@ const USB_Descriptor_Device_t PROGMEM AVRISP_DeviceDescriptor = .VendorID = 0x03EB, .ProductID = 0x2104, - .ReleaseNumber = VERSION_BCD(02.00), + .ReleaseNumber = VERSION_BCD(2,0,0), .ManufacturerStrIndex = AVRISP_STRING_ID_Manufacturer, .ProductStrIndex = AVRISP_STRING_ID_Product, diff --git a/Projects/AVRISP-MKII/Doxygen.conf b/Projects/AVRISP-MKII/Doxygen.conf index ec6786295..6fcfe7885 100644 --- a/Projects/AVRISP-MKII/Doxygen.conf +++ b/Projects/AVRISP-MKII/Doxygen.conf @@ -1,4 +1,4 @@ -# Doxyfile 1.8.5 +# Doxyfile 1.8.6 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. @@ -73,12 +73,14 @@ CREATE_SUBDIRS = NO # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese- -# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi, -# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en, -# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, -# Turkish, Ukrainian and Vietnamese. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. # The default value is: English. OUTPUT_LANGUAGE = English @@ -510,6 +512,13 @@ HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = YES +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + # If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include # files with double quotes in the documentation rather than with sharp brackets. # The default value is: NO. @@ -531,7 +540,8 @@ SORT_MEMBER_DOCS = YES # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief # descriptions of file, namespace and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. +# name. If set to NO the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. # The default value is: NO. SORT_BRIEF_DOCS = NO @@ -2052,6 +2062,13 @@ CLASS_DIAGRAMS = NO MSCGEN_PATH = +# You can include diagrams made with dia in doxygen documentation. Doxygen will +# then run dia to produce the diagram and insert it in the documentation. The +# DIA_PATH tag allows you to specify the directory where the dia binary resides. +# If left empty dia is assumed to be found in the default search path. + +DIA_PATH = + # If set to YES, the inheritance and collaboration graphs will hide inheritance # and usage relations if the target is undocumented or is not a class. # The default value is: YES. @@ -2252,6 +2269,12 @@ DOTFILE_DIRS = MSCFILE_DIRS = +# The DIAFILE_DIRS tag can be used to specify one or more directories that +# contain dia files that are included in the documentation (see the \diafile +# command). + +DIAFILE_DIRS = + # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes # that will be shown in the graph. If the number of nodes in a graph becomes # larger than this value, doxygen will truncate the graph, which is visualized diff --git a/Projects/AVRISP-MKII/Lib/V2ProtocolConstants.h b/Projects/AVRISP-MKII/Lib/V2ProtocolConstants.h index 4c68ffdc4..927c5565b 100644 --- a/Projects/AVRISP-MKII/Lib/V2ProtocolConstants.h +++ b/Projects/AVRISP-MKII/Lib/V2ProtocolConstants.h @@ -67,11 +67,12 @@ #define STATUS_SET_PARAM_MISSING 0x82 #define STATUS_CMD_FAILED 0xC0 #define STATUS_CMD_UNKNOWN 0xC9 - #define STATUS_ISP_READY 0x00 + #define STATUS_CMD_ILLEGAL_PARAM 0xCA + #define STATUS_ISP_READY 0x10 #define STATUS_CONN_FAIL_MOSI 0x01 #define STATUS_CONN_FAIL_RST 0x02 #define STATUS_CONN_FAIL_SCK 0x04 - #define STATUS_TGT_NOT_DETECTED 0x10 + #define STATUS_TGT_NOT_DETECTED 0x00 #define STATUS_TGT_REVERSE_INSERTED 0x20 #define PARAM_BUILD_NUMBER_LOW 0x80 diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c index 165c76903..180fed6ab 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c +++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c @@ -52,7 +52,7 @@ void XPROGTarget_EnableTargetPDI(void) /* Set DATA line high for at least 90ns to disable /RESET functionality */ PORTD |= (1 << 3); - _delay_ms(1); + _delay_us(100); /* Set up the synchronous USART for XMEGA communications - 8 data bits, even parity, 2 stop bits */ UBRR1 = ((F_CPU / 2 / XPROG_HARDWARE_SPEED) - 1); @@ -72,7 +72,7 @@ void XPROGTarget_EnableTargetTPI(void) /* Set /RESET line low for at least 400ns to enable TPI functionality */ AUX_LINE_DDR |= AUX_LINE_MASK; AUX_LINE_PORT &= ~AUX_LINE_MASK; - _delay_ms(1); + _delay_us(100); /* Set Tx and XCK as outputs, Rx as input */ DDRD |= (1 << 5) | (1 << 3); |