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.

This commit is contained in:
Dean Camera 2010-02-15 13:40:53 +00:00
parent 67cb070810
commit 96a12cd12c
6 changed files with 9 additions and 15 deletions

View file

@ -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)

View file

@ -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);

View file

@ -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);

View file

@ -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)