Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...

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

diff --git a/Projects/TempDataLogger/TempDataLogger.h b/Projects/TempDataLogger/TempDataLogger.h
index 48a051f..4fcc1bc 100644 (file)
--- a/Projects/TempDataLogger/TempDataLogger.h
+++ b/Projects/TempDataLogger/TempDataLogger.h
@@ -1,24 +1,24 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2013.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.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 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   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
   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


@@ -42,21 +42,20 @@
                #include <avr/power.h>
                #include <avr/interrupt.h>
                #include <stdio.h>
                #include <avr/power.h>
                #include <avr/interrupt.h>
                #include <stdio.h>

-               
+

                #include "Descriptors.h"
 
                #include "Lib/SCSI.h"
                #include "Lib/DataflashManager.h"
                #include "Lib/FATFs/ff.h"
                #include "Descriptors.h"
 
                #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 <LUFA/Version.h>

                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Board/Temperature.h>
                #include <LUFA/Drivers/Peripheral/ADC.h>
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Board/LEDs.h>
                #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>
+               #include <LUFA/Platform/Platform.h>

 
        /* Macros: */
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
 
        /* Macros: */
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */


@@ -73,25 +72,18 @@
 
                /** 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
+

        /* 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: */


@@ -102,12 +94,19 @@
                void EVENT_USB_Device_Connect(void);
                void EVENT_USB_Device_Disconnect(void);
                void EVENT_USB_Device_ConfigurationChanged(void);
                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_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);

-               bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,
-                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize);
-               void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, 
-                                                         const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize);
+               bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
+                                                        uint8_t* const ReportID,
+                                                 const uint8_t ReportType,
+                                                        void* ReportData,
+                                                        uint16_t* const ReportSize);
+               void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
+                                                         const uint8_t ReportID,
+                                                         const uint8_t ReportType,
+                                                         const void* ReportData,
+                                                         const uint16_t ReportSize);

 
 #endif
 
 #endif

+