X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/9f7883fa2b78fd7907162987fc65b71d3c6b19fa..5cae54154506176d64a581c5b3d9550c901b570c:/Projects/TempDataLogger/TempDataLogger.h diff --git a/Projects/TempDataLogger/TempDataLogger.h b/Projects/TempDataLogger/TempDataLogger.h index 39aa43c69..4fcc1bc86 100644 --- a/Projects/TempDataLogger/TempDataLogger.h +++ b/Projects/TempDataLogger/TempDataLogger.h @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2010. + Copyright (C) Dean Camera, 2013. dean [at] fourwalledcubicle [dot] com www.lufa-lib.org */ /* - Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2013 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -18,7 +18,7 @@ advertising or publicity pertaining to distribution of the software without specific, written prior permission. - The author disclaim all warranties with regard to this + The author disclaims all warranties with regard to this software, including all implied warranties of merchantability and fitness. In no event shall the author be liable for any special, indirect or consequential damages or any damages @@ -48,13 +48,14 @@ #include "Lib/SCSI.h" #include "Lib/DataflashManager.h" #include "Lib/FATFs/ff.h" - #include "Lib/DS1307.h" + #include "Lib/RTC.h" + #include "Config/AppConfig.h" - #include #include #include #include #include + #include /* Macros: */ /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */ @@ -72,11 +73,8 @@ /** LED mask for the library LED driver, to indicate that the USB interface is busy. */ #define LEDMASK_USB_BUSY LEDS_LED2 - /** Filename for the log data when written to the dataflash FAT filesystem. */ - #define LOG_FILENAME "TEMPLOG.txt" - /** Default log interval when the EEPROM is blank, in 500ms ticks. */ - #define DEFAULT_LOG_INTERVAL 20 + #define DEFAULT_LOG_INTERVAL 10 /** Indicates if the disk is write protected or not. */ #define DISK_READ_ONLY false @@ -84,15 +82,8 @@ /* Type Defines: */ typedef struct { - uint8_t Day; - uint8_t Month; - uint8_t Year; - - uint8_t Hour; - uint8_t Minute; - uint8_t Second; - - uint8_t LogInterval500MS; + TimeDate_t TimeDate; + uint8_t LogInterval500MS; } Device_Report_t; /* Function Prototypes: */