diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-25 13:26:34 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-25 13:26:34 +0000 |
| commit | 244bba2097574fd9c4905eadac069c57796cbc28 (patch) | |
| tree | 349d0aa62c469713ad4aa251d66efbd57d47301d /Projects/AVRISP | |
| parent | cfe054474ffafddcbba0f6d3f46d3f02473fac96 (diff) | |
| download | lufa-244bba2097574fd9c4905eadac069c57796cbc28.tar.gz lufa-244bba2097574fd9c4905eadac069c57796cbc28.tar.bz2 lufa-244bba2097574fd9c4905eadac069c57796cbc28.zip | |
Make AVRISP project build again - fix incorrect preprocessor directive in V2Protocol.c, fix makefile LUFA_PATH.
Diffstat (limited to 'Projects/AVRISP')
| -rw-r--r-- | Projects/AVRISP/Lib/V2ProtocolTarget.c | 2 | ||||
| -rw-r--r-- | Projects/AVRISP/makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Projects/AVRISP/Lib/V2ProtocolTarget.c b/Projects/AVRISP/Lib/V2ProtocolTarget.c index a39c5e96d..c36295ea0 100644 --- a/Projects/AVRISP/Lib/V2ProtocolTarget.c +++ b/Projects/AVRISP/Lib/V2ProtocolTarget.c @@ -55,7 +55,7 @@ uint8_t V2Protocol_GetSPIPrescalerMask(void) SPI_SPEED_FCPU_DIV_16, // AVRStudio = 500KHz SPI, Actual = 500KHz SPI
SPI_SPEED_FCPU_DIV_32, // AVRStudio = 250KHz SPI, Actual = 250KHz SPI
SPI_SPEED_FCPU_DIV_64 // AVRStudio = 125KHz SPI, Actual = 125KHz SPI
- #if (F_CPU == 16000000)
+ #elif (F_CPU == 16000000)
SPI_SPEED_FCPU_DIV_2, // AVRStudio = 8MHz SPI, Actual = 8MHz SPI
SPI_SPEED_FCPU_DIV_4, // AVRStudio = 4MHz SPI, Actual = 4MHz SPI
SPI_SPEED_FCPU_DIV_8, // AVRStudio = 2MHz SPI, Actual = 2MHz SPI
diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile index 72b1fd76c..84ca93ab6 100644 --- a/Projects/AVRISP/makefile +++ b/Projects/AVRISP/makefile @@ -119,7 +119,7 @@ OBJDIR = . # Path to the LUFA library
-LUFA_PATH = ../../../
+LUFA_PATH = ../../
# LUFA library compile-time options
|