diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-15 13:40:53 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-15 13:40:53 +0000 |
| commit | 96a12cd12cb9294ba9a7ec5547af81b9c6575748 (patch) | |
| tree | 5f1481fd05f27013eec55cf4169d01dccb0408e3 /Projects/TemperatureDataLogger | |
| parent | 67cb070810bd3122491fb6c1c1bf921bf89bde31 (diff) | |
| download | lufa-96a12cd12cb9294ba9a7ec5547af81b9c6575748.tar.gz lufa-96a12cd12cb9294ba9a7ec5547af81b9c6575748.tar.bz2 lufa-96a12cd12cb9294ba9a7ec5547af81b9c6575748.zip | |
Add missing TWI_Init() call to the TemperatureDataLogger project. Make DUMMY_RTC compile time option the default, so that it works correctly on the USBKEY and other Atmel boards out of the box.
Diffstat (limited to 'Projects/TemperatureDataLogger')
| -rw-r--r-- | Projects/TemperatureDataLogger/Lib/DS1307.c | 5 | ||||
| -rw-r--r-- | Projects/TemperatureDataLogger/Lib/DS1307.h | 2 | ||||
| -rw-r--r-- | Projects/TemperatureDataLogger/TempDataLogger.c | 1 | ||||
| -rw-r--r-- | Projects/TemperatureDataLogger/makefile | 8 |
4 files changed, 3 insertions, 13 deletions
diff --git a/Projects/TemperatureDataLogger/Lib/DS1307.c b/Projects/TemperatureDataLogger/Lib/DS1307.c index 37817e97f..64e03df0d 100644 --- a/Projects/TemperatureDataLogger/Lib/DS1307.c +++ b/Projects/TemperatureDataLogger/Lib/DS1307.c @@ -7,11 +7,6 @@ #include "DS1307.h"
-void DS1307_Init(void)
-{
- // Nothing to initialize
-}
-
void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)
{
#if defined(DUMMY_RTC)
diff --git a/Projects/TemperatureDataLogger/Lib/DS1307.h b/Projects/TemperatureDataLogger/Lib/DS1307.h index 491836079..90b91e3e8 100644 --- a/Projects/TemperatureDataLogger/Lib/DS1307.h +++ b/Projects/TemperatureDataLogger/Lib/DS1307.h @@ -100,8 +100,6 @@ #define DS1307_ADDRESS_WRITE 0b11010000
/* Function Prototypes: */
- void DS1307_Init(void);
-
void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year);
void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second);
diff --git a/Projects/TemperatureDataLogger/TempDataLogger.c b/Projects/TemperatureDataLogger/TempDataLogger.c index 2f2e8daf7..7d26ee25d 100644 --- a/Projects/TemperatureDataLogger/TempDataLogger.c +++ b/Projects/TemperatureDataLogger/TempDataLogger.c @@ -199,6 +199,7 @@ void SetupHardware(void) Temperature_Init();
Dataflash_Init();
USB_Init();
+ TWI_Init();
/* 500ms logging interval timer configuration */
OCR1A = ((F_CPU / 1024) / 2);
diff --git a/Projects/TemperatureDataLogger/makefile b/Projects/TemperatureDataLogger/makefile index 622bb1c84..8fd2c2941 100644 --- a/Projects/TemperatureDataLogger/makefile +++ b/Projects/TemperatureDataLogger/makefile @@ -193,12 +193,8 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources
CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
-CDEFS += -DAVR_RESET_LINE_PORT="PORTD"
-CDEFS += -DAVR_RESET_LINE_DDR="DDRD"
-CDEFS += -DAVR_RESET_LINE_MASK="(1 << 4)"
-CDEFS += -DAVR_RESET_PULSE_MS=10
-CDEFS += -DTX_RX_LED_PULSE_MS=30
-CDEFS += -DPING_PONG_LED_PULSE_MS=100
+CDEFS += -DDUMMY_RTC
+
# Place -D or -U options here for ASM sources
ADEFS = -DF_CPU=$(F_CPU)
|