Add notification endpoint to the incomplete TMC demo.

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c
index 08419a9..a564715 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c
+++ b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c
@@ -106,7 +106,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceNumber        = 0x00,
                        .AlternateSetting       = 0x00,
                        
                        .InterfaceNumber        = 0x00,
                        .AlternateSetting       = 0x00,
                        

-                       .TotalEndpoints         = 2,
+                       .TotalEndpoints         = 3,

                                
                        .Class                  = 0xFE,
                        .SubClass               = 0x03,
                                
                        .Class                  = 0xFE,
                        .SubClass               = 0x03,


@@ -133,6 +133,16 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = TMC_IO_EPSIZE,
                        .PollingIntervalMS      = 0x00
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
                        .EndpointSize           = TMC_IO_EPSIZE,
                        .PollingIntervalMS      = 0x00

+               },
+               
+       .NotificationEndpoint = 
+               {
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
+                       
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | TMC_NOTIFICATION_EPNUM),
+                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
+                       .EndpointSize           = TMC_NOTIFICATION_EPSIZE,
+                       .PollingIntervalMS      = 0xFF

                }
 };
 
                }
 };
 

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
index d0f17b1..468a5ea 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
@@ -44,13 +44,19 @@
 \r
        /* Macros: */\r
                /** Endpoint number of the TMC device-to-host data IN endpoint. */\r
 \r
        /* Macros: */\r
                /** Endpoint number of the TMC device-to-host data IN endpoint. */\r

-               #define TMC_IN_EPNUM          3 \r
+               #define TMC_IN_EPNUM            3       \r

 \r
                /** Endpoint number of the TMC host-to-device data OUT endpoint. */\r
 \r
                /** Endpoint number of the TMC host-to-device data OUT endpoint. */\r

-               #define TMC_OUT_EPNUM         4 \r
+               #define TMC_OUT_EPNUM           4       \r
+\r
+               /** Endpoint number of the TMC notification IN endpoint. */\r
+               #define TMC_NOTIFICATION_EPNUM  2       \r

 \r
                /** Size in bytes of the TMC data endpoints. */\r
 \r
                /** Size in bytes of the TMC data endpoints. */\r

-               #define TMC_IO_EPSIZE         64\r
+               #define TMC_IO_EPSIZE           64\r
+\r
+               /** Size in bytes of the TMC notification endpoint. */\r
+               #define TMC_NOTIFICATION_EPSIZE 8\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


@@ -63,6 +69,7 @@
                        USB_Descriptor_Interface_t            Interface;\r
                        USB_Descriptor_Endpoint_t             DataOutEndpoint;\r
                        USB_Descriptor_Endpoint_t             DataInEndpoint;\r
                        USB_Descriptor_Interface_t            Interface;\r
                        USB_Descriptor_Endpoint_t             DataOutEndpoint;\r
                        USB_Descriptor_Endpoint_t             DataInEndpoint;\r

+                       USB_Descriptor_Endpoint_t             NotificationEndpoint;\r

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

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
index 040cb34..e174aa9 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
@@ -120,7 +120,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r

-       /* Setup TMC In and Out Endpoints */\r
+       /* Setup TMC In, Out and Notification Endpoints */\r

        if (!(Endpoint_ConfigureEndpoint(TMC_IN_EPNUM, EP_TYPE_BULK,\r
                                             ENDPOINT_DIR_IN, TMC_IO_EPSIZE,\r
                                         ENDPOINT_BANK_SINGLE)))\r
        if (!(Endpoint_ConfigureEndpoint(TMC_IN_EPNUM, EP_TYPE_BULK,\r
                                             ENDPOINT_DIR_IN, TMC_IO_EPSIZE,\r
                                         ENDPOINT_BANK_SINGLE)))\r


@@ -134,6 +134,13 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        {\r
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        }\r
        {\r
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        }\r

+\r
+       if (!(Endpoint_ConfigureEndpoint(TMC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,\r
+                                            ENDPOINT_DIR_IN, TMC_NOTIFICATION_EPSIZE,\r
+                                        ENDPOINT_BANK_SINGLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }\r

 }\r
 \r
 /** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific\r
 }\r
 \r
 /** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 6ea4dfb..e76b344 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -6,6 +6,9 @@
 
  /** \page Page_ChangeLog Project Changelog
   *
 
  /** \page Page_ChangeLog Project Changelog
   *

+  *  \section Sec_ChangeLogXXXXXX Version XXXXXX
+  *  There is currently no changelog information for this release.
+  *

   *  \section Sec_ChangeLog100807 Version 100807
   *  <b>New:</b>
   *  - Added new ADC_DisableChannel() function (thanks to Mich Davis)
   *  \section Sec_ChangeLog100807 Version 100807
   *  <b>New:</b>
   *  - Added new ADC_DisableChannel() function (thanks to Mich Davis)

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index f620020..8251423 100644 (file)
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -10,6 +10,9 @@
  *  to the next version released. It does not indicate all new additions to the library in each version change, only
  *  areas relevant to making older projects compatible with the API changes of each new release.
  *
  *  to the next version released. It does not indicate all new additions to the library in each version change, only
  *  areas relevant to making older projects compatible with the API changes of each new release.
  *

+ * \section Sec_MigrationXXXXXX Migrating from XXXXXX to XXXXXX
+ * There is currently no migration information for this release.
+ *

  * \section Sec_Migration100807 Migrating from 100513 to 100807
  *
  *  <b>Non-USB Library Components</b>
  * \section Sec_Migration100807 Migrating from 100513 to 100807
  *
  *  <b>Non-USB Library Components</b>

diff --git a/LUFA/Version.h b/LUFA/Version.h
index ed8af11..986ad1e 100644 (file)
--- a/LUFA/Version.h
+++ b/LUFA/Version.h
@@ -43,9 +43,9 @@
        /* Public Interface - May be used in end-application: */
                /* Macros: */
                        /** Indicates the version number of the library, as an integer. */
        /* Public Interface - May be used in end-application: */
                /* Macros: */
                        /** Indicates the version number of the library, as an integer. */

-                       #define LUFA_VERSION_INTEGER     0x100807
+                       #define LUFA_VERSION_INTEGER     0x000000

 
                        /** Indicates the version number of the library, as a string. */
 
                        /** Indicates the version number of the library, as a string. */

-                       #define LUFA_VERSION_STRING      "100807"
+                       #define LUFA_VERSION_STRING      "XXXXXX"

 
 #endif
 
 #endif