Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
258a6a01
Commit
258a6a01
authored
Dec 03, 2009
by
Dean Camera
Browse files
Fix the tokens which enable and disable the different programming protocols in the AVRISP project.
parent
bae00a3d
Changes
14
Hide whitespace changes
Inline
Side-by-side
LUFA/ManPages/ChangeLog.txt
View file @
258a6a01
...
...
@@ -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
d
ataflash, with new XPLAIN_REV1 board target for the different dataflash used
on the
* first revision boards compared to the one
s
mounted on later revisions
* - Added support for the XPLAIN
board D
ataflash, 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
...
...
Projects/AVRISP/AVRISP.txt
View file @
258a6a01
...
...
@@ -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, A
V
CC 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_SP
I
_PROTOCOL</td>
* <td>ENABLE_
I
SP_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>
...
...
Projects/AVRISP/Doxygen.conf
View file @
258a6a01
...
...
@@ -1221,7 +1221,7 @@ INCLUDE_FILE_PATTERNS =
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
PREDEFINED
=
__
DOXYGEN__
ENABLE_SP
I
_PROTOCOL
ENABLE_PDI_PROTOCOL
PREDEFINED
=
__
DOXYGEN__
ENABLE_
I
SP_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.
...
...
Projects/AVRISP/Lib/ISPProtocol.c
View file @
258a6a01
...
...
@@ -28,7 +28,7 @@
this software.
*/
#if defined(ENABLE_SP
I
_PROTOCOL)
#if defined(ENABLE_
I
SP_PROTOCOL)
/** \file
*
...
...
Projects/AVRISP/Lib/ISPProtocol.h
View file @
258a6a01
...
...
@@ -43,8 +43,11 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#define ENABLE_PDI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Macros: */
...
...
Projects/AVRISP/Lib/ISPTarget.c
View file @
258a6a01
...
...
@@ -28,7 +28,7 @@
this software.
*/
#if defined(ENABLE_SP
I
_PROTOCOL)
#if defined(ENABLE_
I
SP_PROTOCOL)
/** \file
*
...
...
Projects/AVRISP/Lib/ISPTarget.h
View file @
258a6a01
...
...
@@ -49,8 +49,11 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#define ENABLE_PDI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Macros: */
...
...
Projects/AVRISP/Lib/PDIProtocol.c
View file @
258a6a01
...
...
@@ -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.
...
...
Projects/AVRISP/Lib/PDIProtocol.h
View file @
258a6a01
...
...
@@ -45,8 +45,11 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#define ENABLE_PDI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Macros: */
...
...
Projects/AVRISP/Lib/PDITarget.c
View file @
258a6a01
...
...
@@ -28,7 +28,7 @@
this software.
*/
#if defined(ENABLE_
XPROG
_PROTOCOL)
#if defined(ENABLE_
PDI
_PROTOCOL)
/** \file
*
...
...
Projects/AVRISP/Lib/PDITarget.h
View file @
258a6a01
...
...
@@ -44,8 +44,11 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#define ENABLE_PDI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Defines: */
...
...
Projects/AVRISP/Lib/V2Protocol.c
View file @
258a6a01
...
...
@@ -66,7 +66,7 @@ void V2Protocol_ProcessCommand(void)
case
CMD_RESET_PROTECTION
:
V2Protocol_ResetProtection
();
break
;
#if defined(ENABLE_SP
I
_PROTOCOL)
#if defined(ENABLE_
I
SP_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
;
...
...
Projects/AVRISP/Lib/V2Protocol.h
View file @
258a6a01
...
...
@@ -48,8 +48,11 @@
/* Preprocessor Checks: */
#if BOARD == BOARD_XPLAIN
#undef ENABLE_SPI_PROTOCOL
#define ENABLE_PDI_PROTOCOL
#undef ENABLE_ISP_PROTOCOL
#if !defined(ENABLE_PDI_PROTOCOL)
#define ENABLE_PDI_PROTOCOL
#endif
#endif
/* Macros: */
...
...
Projects/AVRISP/makefile
View file @
258a6a01
...
...
@@ -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_SP
I
_PROTOCOL
CDEFS
+=
-DENABLE_
XPROG
_PROTOCOL
CDEFS
+=
-DENABLE_
I
SP_PROTOCOL
CDEFS
+=
-DENABLE_
PDI
_PROTOCOL
# Place -D or -U options here for ASM sources
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment