Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[pub/USBasp.git] / Projects / TemperatureDataLogger / Descriptors.h

diff --git a/Projects/TemperatureDataLogger/Descriptors.h b/Projects/TemperatureDataLogger/Descriptors.h
index dcaadda..a0f03c3 100644 (file)
--- a/Projects/TemperatureDataLogger/Descriptors.h
+++ b/Projects/TemperatureDataLogger/Descriptors.h
@@ -5,33 +5,6 @@
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r

-\r
-/*\r
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, distribute, and sell this \r
-  software and its documentation for any purpose is hereby granted\r
-  without fee, provided that the above copyright notice appear in \r
-  all copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting \r
-  documentation, and that the name of the author not be used in \r
-  advertising or publicity pertaining to distribution of the \r
-  software without specific, written prior permission.\r
-\r
-  The author disclaim all warranties with regard to this\r
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-/** \file\r
- *\r
- *  Header file for Descriptors.c.\r
- */\r

  \r
 #ifndef _DESCRIPTORS_H_\r
 #define _DESCRIPTORS_H_\r
  \r
 #ifndef _DESCRIPTORS_H_\r
 #define _DESCRIPTORS_H_\r


@@ -41,6 +14,9 @@
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/USB/Class/MassStorage.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <LUFA/Drivers/USB/Class/MassStorage.h>\r

+               #include <LUFA/Drivers/USB/Class/HID.h>\r
+               \r
+               #include "TempDataLogger.h"\r

 \r
        /* Macros: */\r
                /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */\r
 \r
        /* Macros: */\r
                /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */\r


@@ -51,6 +27,15 @@
 \r
                /** Size in bytes of the Mass Storage data endpoints. */\r
                #define MASS_STORAGE_IO_EPSIZE         64\r
 \r
                /** Size in bytes of the Mass Storage data endpoints. */\r
                #define MASS_STORAGE_IO_EPSIZE         64\r

+\r
+               /** Endpoint number of the Generic HID reporting IN endpoint. */\r
+               #define GENERIC_IN_EPNUM               1\r
+\r
+               /** Size in bytes of the Generic HID reporting endpoint. */\r
+               #define GENERIC_EPSIZE                 16\r
+               \r
+               /** Size in bytes of the Generic HID reports (including report ID byte). */\r
+               #define GENERIC_REPORT_SIZE            sizeof(Device_Report_t)\r

                \r
        /* Type Defines: */             \r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r
                \r
        /* Type Defines: */             \r
                /** Type define for the device configuration descriptor structure. This must be defined in the\r


@@ -60,9 +45,12 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t Config;\r

-                       USB_Descriptor_Interface_t            Interface;\r
-                       USB_Descriptor_Endpoint_t             DataInEndpoint;\r
-                       USB_Descriptor_Endpoint_t             DataOutEndpoint;\r
+                       USB_Descriptor_Interface_t            MSInterface;\r
+                       USB_Descriptor_Endpoint_t             MSDataInEndpoint;\r
+                       USB_Descriptor_Endpoint_t             MSDataOutEndpoint;\r
+                       USB_Descriptor_Interface_t            HIDInterface;\r
+                       USB_HID_Descriptor_t                  HIDInfo;\r
+                       USB_Descriptor_Endpoint_t             HIDDataInEndpoint;\r

                } USB_Descriptor_Configuration_t;\r
                \r
        /* Function Prototypes: */\r
                } USB_Descriptor_Configuration_t;\r
                \r
        /* Function Prototypes: */\r