Fix flip-ee DFU build target accidentally erasing the target FLASH memory space.

[pub/USBasp.git] / Projects / TempDataLogger / TempDataLogger.h

diff --git a/Projects/TempDataLogger/TempDataLogger.h b/Projects/TempDataLogger/TempDataLogger.h
index 7427910..cf21235 100644 (file)
--- a/Projects/TempDataLogger/TempDataLogger.h
+++ b/Projects/TempDataLogger/TempDataLogger.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -49,8 +49,8 @@
                #include "Lib/DataflashManager.h"
                #include "Lib/FATFs/ff.h"
                #include "Lib/DS1307.h"
                #include "Lib/DataflashManager.h"
                #include "Lib/FATFs/ff.h"
                #include "Lib/DS1307.h"

-
-               #include <LUFA/Version.h>
+               #include "Config/AppConfig.h"
+               

                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/Temperature.h>
                #include <LUFA/Drivers/Peripheral/ADC.h>
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/Temperature.h>
                #include <LUFA/Drivers/Peripheral/ADC.h>


@@ -72,11 +72,8 @@
                /** LED mask for the library LED driver, to indicate that the USB interface is busy. */
                #define LEDMASK_USB_BUSY          LEDS_LED2
 
                /** 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. */
                /** 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
 
                /** Indicates if the disk is write protected or not. */
                #define DISK_READ_ONLY           false


@@ -84,15 +81,8 @@
        /* Type Defines: */
                typedef struct
                {
        /* 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: */
                } Device_Report_t;
 
        /* Function Prototypes: */