aboutsummaryrefslogtreecommitdiffstats
path: root/Projects
diff options
context:
space:
mode:
Diffstat (limited to 'Projects')
-rw-r--r--Projects/MIDIToneGenerator/makefile2
-rw-r--r--Projects/TempDataLogger/TempDataLogger.c6
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);