diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-02-26 15:57:06 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-02-26 15:57:06 +0000 |
| commit | 66c38cd940714287e4e11729bf688211902b464d (patch) | |
| tree | 48407fadd460b0717e8715672f83253830d7066e /Projects | |
| parent | 6f01b6afd5a4fbd0a618f790e0afaa5eb2531e12 (diff) | |
| download | lufa-66c38cd940714287e4e11729bf688211902b464d.tar.gz lufa-66c38cd940714287e4e11729bf688211902b464d.tar.bz2 lufa-66c38cd940714287e4e11729bf688211902b464d.zip | |
Added TWI baud rate prescaler and bit length parameters to the TWI_Init() function (thanks to Thomas Herlinghaus).
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/MIDIToneGenerator/makefile | 2 | ||||
| -rw-r--r-- | Projects/TempDataLogger/TempDataLogger.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Projects/MIDIToneGenerator/makefile b/Projects/MIDIToneGenerator/makefile index 6e1a2a32b..4ae786221 100644 --- a/Projects/MIDIToneGenerator/makefile +++ b/Projects/MIDIToneGenerator/makefile @@ -116,7 +116,7 @@ OBJDIR = . # Path to the LUFA library
-LUFA_PATH = ../../
+LUFA_PATH = ../..
# LUFA library compile-time options and predefined tokens
diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c index ecea2fb1a..cd511f4f7 100644 --- a/Projects/TempDataLogger/TempDataLogger.c +++ b/Projects/TempDataLogger/TempDataLogger.c @@ -151,10 +151,6 @@ int main(void) LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); sei(); - /* Discard the first sample from the temperature sensor, as it is generally incorrect */ - volatile uint8_t Dummy = Temperature_GetTemperature(); - (void)Dummy; - for (;;) { MS_Device_USBTask(&Disk_MS_Interface); @@ -204,7 +200,7 @@ void SetupHardware(void) Temperature_Init(); Dataflash_Init(); USB_Init(); - TWI_Init(); + TWI_Init(TWI_BIT_PRESCALE_4, (F_CPU / 4 / 50000) / 2); /* 500ms logging interval timer configuration */ OCR1A = (((F_CPU / 1024) / 2) - 1); |