X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7776aa4e2e7430da6fab1712816b887d21032dd9..6e7fc21a94f29e09b4bdce7c17cade5b1322bc7d:/Projects/TempDataLogger/TempDataLogger.c diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c index ec3902908..cd511f4f7 100644 --- a/Projects/TempDataLogger/TempDataLogger.c +++ b/Projects/TempDataLogger/TempDataLogger.c @@ -59,7 +59,7 @@ USB_ClassInfo_MS_Device_t Disk_MS_Interface = }; /** Buffer to hold the previously generated HID report, for comparison purposes inside the HID class driver. */ -uint8_t PrevHIDReportBuffer[GENERIC_REPORT_SIZE]; +static uint8_t PrevHIDReportBuffer[GENERIC_REPORT_SIZE]; /** LUFA HID Class driver interface configuration and state information. This structure is * passed to all HID Class driver functions, so that multiple instances of the same class @@ -81,19 +81,19 @@ USB_ClassInfo_HID_Device_t Generic_HID_Interface = }; /** Non-volatile Logging Interval value in EEPROM, stored as a number of 500ms ticks */ -uint8_t EEMEM LoggingInterval500MS_EEPROM = DEFAULT_LOG_INTERVAL; +static uint8_t EEMEM LoggingInterval500MS_EEPROM = DEFAULT_LOG_INTERVAL; /** SRAM Logging Interval value fetched from EEPROM, stored as a number of 500ms ticks */ -uint8_t LoggingInterval500MS_SRAM; +static uint8_t LoggingInterval500MS_SRAM; /** Total number of 500ms logging ticks elapsed since the last log value was recorded */ -uint16_t CurrentLoggingTicks; +static uint16_t CurrentLoggingTicks; /** FAT Fs structure to hold the internal state of the FAT driver for the Dataflash contents. */ -FATFS DiskFATState; +static FATFS DiskFATState; /** FAT Fs structure to hold a FAT file handle for the log data write destination. */ -FIL TempLogFile; +static FIL TempLogFile; /** ISR to handle the 500ms ticks for sampling and data logging */ @@ -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);