Add LUFA-111009-BETA tag.

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

diff --git a/Projects/TempDataLogger/TempDataLogger.h b/Projects/TempDataLogger/TempDataLogger.h
index ce79670..10597da 100644 (file)
--- 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, 2011.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  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
@@ -55,8 +55,6 @@
                #include <LUFA/Drivers/Board/Temperature.h>
                #include <LUFA/Drivers/Peripheral/ADC.h>
                #include <LUFA/Drivers/USB/USB.h>
-               #include <LUFA/Drivers/USB/Class/MassStorage.h>
-               #include <LUFA/Drivers/USB/Class/HID.h>
 
        /* Macros: */
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
@@ -74,24 +72,17 @@
                /** 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
 
        /* 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: */
@@ -102,7 +93,7 @@
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
-               void EVENT_USB_Device_UnhandledControlRequest(void);
+               void EVENT_USB_Device_ControlRequest(void);
 
                bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);
                bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,