Commit 258a6a01 authored by Dean Camera's avatar Dean Camera
Browse files

Fix the tokens which enable and disable the different programming protocols in the AVRISP project.

parent bae00a3d
......@@ -17,8 +17,8 @@
* - Added new RNDIS Ethernet Host ClassDriver demo
* - Added CDC_Host_Flush() function to the CDC Host Class driver to flush sent data to the attached device
* - Added PDI programming support for XMEGA devices to the AVRISP programmer project
* - Added support for the XPLAIN dataflash, with new XPLAIN_REV1 board target for the different dataflash used on the
* first revision boards compared to the ones mounted on later revisions
* - Added support for the XPLAIN board Dataflash, with new XPLAIN_REV1 board target for the different dataflash used
* on the first revision boards compared to the one mounted on later revisions
*
* <b>Changed:</b>
* - Removed code in the Keyboard demos to send zeroed reports between two reports with differing numbers of keycodes
......
......@@ -54,10 +54,10 @@
* drivers. When promted, direct your OS to install Atmel's AVRISP-MKII drivers provided with AVRStudio.
*
* Note that this design currently has several limitations:
* - Minimum target clock speed of 500KHz due to hardware SPI used
* - Minimum ISP target clock speed of 500KHz due to hardware SPI used
* - No reversed/shorted target connector detection and notification
*
* On AVR models with an ADC converter, ACC should be tied to 5V (e.g. VBUS) and the VTARGET_ADC_CHANNEL token should be
* On AVR models with an ADC converter, AVCC should be tied to 5V (e.g. VBUS) and the VTARGET_ADC_CHANNEL token should be
* set to an appropriate ADC channel number in the project makefile for VTARGET detection to operate correctly. On models
* without an ADC converter, VTARGET will report at a fixed 5V level.
*
......@@ -115,7 +115,7 @@
* <tr>
* <td><b>Programmer Pin:</b></td>
* <td><b>Target Device Pin:</b></td>
* <td><b>ISP 6 Pin Layout:</b></td>
* <td><b>PDI 6 Pin Layout:</b></td>
* </tr>
* <tr>
* <td>MISO</td>
......@@ -183,12 +183,12 @@
* <td>ADC channel number (on supported AVRs) to use for VTARGET level detection.</td>
* </tr>
* <tr>
* <td>ENABLE_SPI_PROTOCOL</td>
* <td>ENABLE_ISP_PROTOCOL</td>
* <td>Makefile CDEFS</td>
* <td>Define to enable SPI programming protocol support. <i>Ignored when compiled for the XPLAIN board.</i></td>
* </tr>
* <tr>
* <td>ENABLE_XPROG_PROTOCOL</td>
* <td>ENABLE_PDI_PROTOCOL</td>
* <td>Makefile CDEFS</td>
* <td>Define to enable XMEGA PDI programming protocol support. <i>Ignored when compiled for the XPLAIN board.</i></td>
* </tr>
......
......@@ -1221,7 +1221,7 @@ INCLUDE_FILE_PATTERNS =
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
PREDEFINED = __DOXYGEN__ ENABLE_SPI_PROTOCOL ENABLE_PDI_PROTOCOL
PREDEFINED = __DOXYGEN__ ENABLE_ISP_PROTOCOL ENABLE_PDI_PROTOCOL
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
......
......@@ -28,7 +28,7 @@
this software.
*/
#if defined(ENABLE_SPI_PROTOCOL)
#if defined(ENABLE_ISP_PROTOCOL)
/** \file
*
......
......@@ -43,9 +43,12 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Macros: */
/** Mask for the reading or writing of the high byte in a FLASH word when issuing a low-level programming command */
......
......@@ -28,7 +28,7 @@
this software.
*/
#if defined(ENABLE_SPI_PROTOCOL)
#if defined(ENABLE_ISP_PROTOCOL)
/** \file
*
......
......@@ -49,9 +49,12 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Macros: */
/** Total number of allowable ISP programming speeds supported by the device */
......
......@@ -28,7 +28,7 @@
this software.
*/
#if defined(ENABLE_XPROG_PROTOCOL)
#if defined(ENABLE_PDI_PROTOCOL)
#warning PDI Programming Protocol support is incomplete and not currently suitable for use.
......
......@@ -45,9 +45,12 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Macros: */
#define XPRG_CMD_ENTER_PROGMODE 0x01
......
......@@ -28,7 +28,7 @@
this software.
*/
#if defined(ENABLE_XPROG_PROTOCOL)
#if defined(ENABLE_PDI_PROTOCOL)
/** \file
*
......
......@@ -44,9 +44,12 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Defines: */
#if BOARD == BOARD_XPLAIN
......
......@@ -66,7 +66,7 @@ void V2Protocol_ProcessCommand(void)
case CMD_RESET_PROTECTION:
V2Protocol_ResetProtection();
break;
#if defined(ENABLE_SPI_PROTOCOL)
#if defined(ENABLE_ISP_PROTOCOL)
case CMD_ENTER_PROGMODE_ISP:
ISPProtocol_EnterISPMode();
break;
......@@ -98,7 +98,7 @@ void V2Protocol_ProcessCommand(void)
ISPProtocol_SPIMulti();
break;
#endif
#if defined(ENABLE_XPROG_PROTOCOL)
#if defined(ENABLE_PDI_PROTOCOL)
case CMD_XPROG_SETMODE:
PDIProtocol_XPROG_SetMode();
break;
......
......@@ -48,9 +48,12 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Macros: */
/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
......
......@@ -193,8 +193,8 @@ CDEFS += -DRESET_LINE_PORT=PORTB
CDEFS += -DRESET_LINE_DDR=DDRB
CDEFS += -DRESET_LINE_MASK="(1 << 4)"
CDEFS += -DVTARGET_ADC_CHANNEL=2
CDEFS += -DENABLE_SPI_PROTOCOL
CDEFS += -DENABLE_XPROG_PROTOCOL
CDEFS += -DENABLE_ISP_PROTOCOL
CDEFS += -DENABLE_PDI_PROTOCOL
# Place -D or -U options here for ASM sources
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment