From 359fbfe14d00ab378f85a36664820ea9ba538c3f Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 10 May 2012 19:24:58 +0000 Subject: Add branch for the conversion of demos to use standard C header files for configuration, rather than makefile defined macros. --- Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h') diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h index 523fc15bd..605653588 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h +++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h @@ -51,7 +51,7 @@ #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)) /* On the XPLAIN board, we only need PDI programming for the ATXMEGA128A1 - disable ISP to prevent hardware - damage. + damage and force-enable XPROG. */ #undef ENABLE_ISP_PROTOCOL -- cgit v1.2.3 From 926a83bbc12cc09e026a51b173007dc7cda16117 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 10 May 2012 20:11:47 +0000 Subject: AppConfigHeaders: Update several user projects to use configuration header files, rather than makefile defines. --- Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h') diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h index 605653588..2d99d5656 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h +++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h @@ -46,7 +46,8 @@ #include "../V2Protocol.h" #include "XMEGANVM.h" #include "TINYNVM.h" - + #include "Config/AppConfig.h" + /* Preprocessor Checks: */ #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)) /* On the XPLAIN board, we only need PDI programming -- cgit v1.2.3