fusion partie3 vers 328P

rguillom
2 parents 8ae5cde5 752b62a9
Showing 4 changed files with 175 additions and 209 deletions Show diff stats
lufa-master/PolytechLille/PAD/Descriptors.c
lufa-master/PolytechLille/PAD/Descriptors.h
lufa-master/PolytechLille/PAD/PAD.c
lufa-master/PolytechLille/PAD/PAD.h
@@ -29,7 +29,6 @@
   this software.
 */
-
 /** \file
  *
  *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special
@@ -39,13 +38,10 @@
 #include "Descriptors.h"
-//////////////////////////////////////////////////////////////////////////
-
-
-/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
- *  of the device in one of its supported configurations, including information about any device interfaces
- *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
- *  a configuration so that the host may correctly communicate with the USB device.
+/** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall
+ *  device characteristics, including the supported USB version, control endpoint size and the
+ *  number of device configurations. The descriptor is read out by the USB host when the enumeration
+ *  process begins.
  */
 const USB_Descriptor_Device_t PROGMEM RelayBoard_DeviceDescriptor =
 {
@@ -58,8 +54,8 @@ const USB_Descriptor_Device_t PROGMEM RelayBoard_DeviceDescriptor =
 	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,
-	.VendorID               = 0x04B4,
-	.ProductID              = 0xFD11,
+	.VendorID               = 0x04B4,		//A MODIFIER avec VendorID Carte
+	.ProductID              = 0xFD11,		//A MODIFIER
 	.ReleaseNumber          = VERSION_BCD(2,0,0),
 	.ManufacturerStrIndex   = STRING_ID_Manufacturer,
@@ -67,50 +63,60 @@ const USB_Descriptor_Device_t PROGMEM RelayBoard_DeviceDescriptor =
 	.SerialNumStrIndex      = STRING_ID_Serial,
 	.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
-
-
-////////////////////////////////////////////////////////////////////////////
-
-
+};
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
  *  of the device in one of its supported configurations, including information about any device interfaces
  *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
  *  a configuration so that the host may correctly communicate with the USB device.
  */
-const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
+const USB_Descriptor_Configuration_t PROGMEM RelayBoard_ConfigurationDescriptor =
 {
 	.Config =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
 			.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
-			.TotalInterfaces        = 2,// MODIF ICI (1 au début)
+			.TotalInterfaces        = 2,
 			.ConfigurationNumber    = 1,
 			.ConfigurationStrIndex  = NO_DESCRIPTOR,
-			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),
+			.ConfigAttributes       = USB_CONFIG_ATTR_RESERVED,
-			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)
+			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(500)
 		},
-////////////////////////////////////////////////////////////////////////////// AJOUT
-	.InterfaceOUT =
+
+	/* Description Interface SORTIE (LED)*/
+	.InferfaceOUT =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
-			.InterfaceNumber        = INTERFACE_ID_InterfaceOUT, //pas sur mais presque
-			.AlternateSetting       = 0x00,
+			.InterfaceNumber        = INTERFACE_ID_InterfaceOUT,
+			.AlternateSetting       = 0,
 			.TotalEndpoints         = 1,
-			.Class                  = HID_CSCP_HIDClass,
-			.SubClass               = HID_CSCP_BootSubclass,
-			.Protocol               = HID_CSCP_KeyboardBootProtocol,
+			.Class                  = USB_CSCP_VendorSpecificClass,
+			.SubClass               = 0x00,
+			.Protocol               = 0x00,
 			.InterfaceStrIndex      = NO_DESCRIPTOR
 		},
+	
+	/*
+	.HID_KeyboardHID =
+		{
+			.Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},
+			.HIDSpec                = VERSION_BCD(1,1,1),
+			.CountryCode            = 0x00,
+			.TotalReportDescriptors = 1,
+			.HIDReportType          = HID_DTYPE_Report,
+			.HIDReportLength        = sizeof(KeyboardReport)
+		},
+	*/
+	
 	.ReportOUTEndpoint =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
@@ -120,7 +126,9 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.EndpointSize           = KEYBOARD_EPSIZE,
 			.PollingIntervalMS      = 0x05
 		},
-//////////////////////////////////////////////////////////////////////////////        FIN AJOUT
+		
+
+		/* Description interface IN (Boutons)*/
 	.InterfaceIN =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
@@ -137,57 +145,27 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 			.InterfaceStrIndex      = NO_DESCRIPTOR
 		},
-	.ReportINEndpoint1 =
+	.ReportINEndpointBoutons =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-			.EndpointAddress        = KEYBOARD_IN_EPADDR,
+			.EndpointAddress        = KEYBOARD_IN_Bout_EPADDR,
 			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
 			.EndpointSize           = KEYBOARD_EPSIZE,
 			.PollingIntervalMS      = 0x05
 		},
-	.ReportINEndpoint2 =
+	.ReportINEndpointJoystick =
 		{
 			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
-			.EndpointAddress        = KEYBOARD_IN_EPADDR,
+			.EndpointAddress        = KEYBOARD_IN_Joy_EPADDR,
 			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
 			.EndpointSize           = KEYBOARD_EPSIZE,
 			.PollingIntervalMS      = 0x05
 		}
 };
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
- *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
- *  via the language ID table available at USB.org what languages the device supports for its string descriptors.
- */
-const USB_Descriptor_String_t PROGMEM LanguageString = USB_STRING_DESCRIPTOR_ARRAY(LANGUAGE_ID_ENG);
-
-/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
- *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
- *  Descriptor.
- */
-const USB_Descriptor_String_t PROGMEM ManufacturerString = USB_STRING_DESCRIPTOR(L"LUFA Library");
-
-/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
- *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
- *  Descriptor.
- */
-const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LUFA Keyboard Demo");
-
-/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
- *  documentation) by the application code so that the address and size of a requested descriptor can be given
- *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
- *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
- *  USB host.
- */
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 /** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
  *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
  *  via the language ID table available at USB.org what languages the device supports for its string descriptors.
@@ -222,12 +200,6 @@ const USB_Descriptor_String_t PROGMEM RelayBoard_SerialString = USB_STRING_DESCR
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
  *  USB host.
  */
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                                     const uint16_t wIndex,
                                     const void** const DescriptorAddress)
@@ -241,67 +213,6 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 	switch (DescriptorType)
 	{
 		case DTYPE_Device:
-			Address = &DeviceDescriptor;
-			Size    = sizeof(USB_Descriptor_Device_t);
-			break;
-		case DTYPE_Configuration:
-			Address = &ConfigurationDescriptor;
-			Size    = sizeof(USB_Descriptor_Configuration_t);
-			break;
-		case DTYPE_String:
-			switch (DescriptorNumber)
-			{
-				case STRING_ID_Language:
-					Address = &LanguageString;
-					Size    = pgm_read_byte(&LanguageString.Header.Size);
-					break;
-				case STRING_ID_Manufacturer:
-					Address = &ManufacturerString;
-					Size    = pgm_read_byte(&ManufacturerString.Header.Size);
-					break;
-				case STRING_ID_Product:
-					Address = &ProductString;
-					Size    = pgm_read_byte(&ProductString.Header.Size);
-					break;
-			}
-
-			break;
-		case HID_DTYPE_HID:
-			Address = &ConfigurationDescriptor.HID_KeyboardHID;
-			Size    = sizeof(USB_HID_Descriptor_HID_t);
-			break;
-		case HID_DTYPE_Report:
-			Address = &KeyboardReport;
-			Size    = sizeof(KeyboardReport);
-			break;
-	}
-
-	*DescriptorAddress = Address;
-	return Size;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////
-
-
-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint16_t wIndex,
-                                    const void** const DescriptorAddress)
-{
-	cons
-/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
- *  of the device in one of its supported configurations, including information about any device interfaces
- *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
- *  a configuration so that the host may correctly communicate with the USB device.
- */t uint8_t  DescriptorType   = (wValue >> 8);
-	const uint8_t  DescriptorNumber = (wValue & 0xFF);
-
-	const void* Address = NULL;
-	uint16_t    Size    = NO_DESCRIPTOR;
-
-	switch (DescriptorType)
-	{
-		case DTYPE_Device:
 			Address = &RelayBoard_DeviceDescriptor;
 			Size    = sizeof(USB_Descriptor_Device_t);
 			break;
@@ -336,3 +247,4 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 	*DescriptorAddress = Address;
 	return Size;
 }
+
@@ -51,7 +51,13 @@
 			USB_Descriptor_Configuration_Header_t Config;
 			// Relay Board Interface
-			USB_Descriptor_Interface_t            RelayBoardInterface;
+			USB_Descriptor_Interface_t            InterfaceOUT;
+			//USB_HID_Descriptor_HID_t              HID_KeyboardHID;				//UTILE ?
+			USB_Descriptor_Endpoint_t             HID_ReportOUTEndpoint;
+			
+			USB_Descriptor_Interface_t            InterfaceIN;
+			USB_Descriptor_Endpoint_t             HID_ReportINEndpointBoutons;
+			USB_Descriptor_Endpoint_t             HID_ReportOUTEndpointJoystick;
 		} USB_Descriptor_Configuration_t;
 		/** Enum for the device interface descriptor IDs within the device. Each interface descriptor
@@ -60,8 +66,8 @@
 		 */
 		enum InterfaceDescriptors_t
 		{
-			INTERFACE_ID_InterfaceOUT = 0,
-            INTERFACE_ID_InterfaceIN = 1,/**< Relay board interface descriptor ID */
+			INTERFACE_ID_InterfaceOUT = 0, /**< Relay board interface descriptor ID */
+			INTERFACE_ID_InterfaceIN = 1,
 		};
 		/** Enum for the device string descriptor IDs within the device. Each string descriptor should
@@ -76,9 +82,24 @@
 			STRING_ID_Serial       = 3, /**< Serial number string ID */
 		};
+	/* Macros: */
+	
+	
+		/** Endpoint address of the Keyboard HID reporting IN endpoint. */
+		#define KEYBOARD_IN_Bout_EPADDR        (ENDPOINT_DIR_IN  | 1)		//Adr. EP Boutons
+		#define KEYBOARD_IN_Joy_EPADDR        (ENDPOINT_DIR_IN  | 1)		//Adr. EP Joystick
+
+		/** Endpoint address of the Keyboard HID reporting OUT endpoint. */
+		#define KEYBOARD_OUT_EPADDR       (ENDPOINT_DIR_OUT | 2)
+		
+		/** Size in bytes of the Keyboard HID reporting IN and OUT endpoints. */
+		#define KEYBOARD_EPSIZE           8
+
+
 	/* Function Prototypes: */
 		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
 		                                    const uint16_t wIndex,
 		                                    const void** const DescriptorAddress)
 		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
 #endif
+
@@ -53,7 +53,7 @@ int main(void)
 	  USB_USBTask();
       //HID_Task();
     }
-    }
+}
 /** Configures the board hardware and chip peripherals for the project's functionality. */
 void SetupHardware(void)
@@ -65,87 +65,121 @@ void SetupHardware(void)
 	/* Disable clock division */
 	clock_prescale_set(clock_div_1);
-#endif
-//TODO INITIALISATIONS
+/**INITIALISATIONS*/
 	/* Hardware Initialization */
 	USB_Init();
+	Serial_init(9600,0); 	//9600 Bauds, configuration
 	/* Initialize Relays */
-	DDRC  |=  ALL_RELAYS;
-	PORTC &= ~ALL_RELAYS;
+	DDRD  |=  ALL_RELAYS;		// Port pour la liaison série
+	PORTD &= ~ALL_RELAYS;		
 }
-/** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
+
+/** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration
+ *  of the USB device after enumeration, and configures the keyboard device endpoints.
+ */
+void EVENT_USB_Device_ConfigurationChanged(void)
 {
-    const uint8_t SerialNumber[5] = { 0, 0, 0, 0, 1 };
-	uint8_t ControlData[2]        = { 0, 0 };
+	bool ConfigSuccess = true;
+
+	/* Setup HID Report Endpoints */		//MODIFS ICI
+	ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_IN_Bout_EPADDR, EP_TYPE_INTERRUPT, KEYBOARD_EPSIZE, 1);
+	ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_IN_Joy_EPADDR, EP_TYPE_INTERRUPT, KEYBOARD_EPSIZE, 1);
+	ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_OUT_EPADDR, EP_TYPE_INTERRUPT, KEYBOARD_EPSIZE, 1);
+
+	/* Turn on Start-of-Frame events for tracking HID report period expiry */
+	USB_Device_EnableSOFEvents();
+
+	/* Indicate endpoint configuration success or failure */
+	//LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
+}
+
+
+/** Sends the next HID report to the host, via the keyboard data endpoint. */
+void SendNextReport(void)		//Envoi liaison Série
+{
+	static USB_KeyboardReport_Data_t PrevKeyboardReportData;
+	USB_KeyboardReport_Data_t        KeyboardReportData;
+	bool                             SendReport = false;
+
+	/* Create the next keyboard report for transmission to the host */
+	CreateKeyboardReport(&KeyboardReportData);
+
+	/* Check if the idle period is set and has elapsed */
+	if (IdleCount && (!(IdleMSRemaining)))
+	{
+		/* Reset the idle time remaining counter */
+		IdleMSRemaining = IdleCount;
+
+		/* Idle period is set and has elapsed, must send a report to the host */
+		SendReport = true;
+	}
+	else
+	{
+		/* Check to see if the report data has changed - if so a report MUST be sent */
+		SendReport = (memcmp(&PrevKeyboardReportData, &KeyboardReportData, sizeof(USB_KeyboardReport_Data_t)) != 0);
+	}
+	
+	
+	/** Envoi sur INTERFACE BOUTONS**/
+	/* Select the Keyboard Report Endpoint */
+	Endpoint_SelectEndpoint(KEYBOARD_IN_Bout_EPADDR);
+
+	/* Check if Keyboard Endpoint Ready for Read/Write and if we should send a new report */
+	if (Endpoint_IsReadWriteAllowed() && SendReport)
+	{
+		/* Save the current report data for later comparison to check for changes */
+		PrevKeyboardReportData = KeyboardReportData;
-    switch (USB_ControlRequest.bRequest)
+		/* Write Keyboard Report Data */
+		Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData), NULL);
+
+		/* Finalize the stream transfer to send the last packet */
+		Endpoint_ClearIN();
+	}
+	
+		/** Envoi sur INTERFACE Joystick**/
+	/* Select the Keyboard Report Endpoint */
+	Endpoint_SelectEndpoint(KEYBOARD_IN_Joy_EPADDR);
+
+	/* Check if Keyboard Endpoint Ready for Read/Write and if we should send a new report */
+	if (Endpoint_IsReadWriteAllowed() && SendReport)
 	{
-		case 0x09:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				LEDs_ToggleLEDs(LEDS_LED1);
-
-				Endpoint_ClearSETUP();
-
-				Endpoint_Read_Control_Stream_LE(ControlData, sizeof(ControlData));
-				Endpoint_ClearIN();
-
-				switch (USB_ControlRequest.wValue)
-				{
-					case 0x303:
-						if (ControlData[1]) PORTC &= ~RELAY1; else PORTC |= RELAY1;
-						break;
-					case 0x306:
-						if (ControlData[1]) PORTC &= ~RELAY2; else PORTC |= RELAY2;
-						break;
-					case 0x309:
-						if (ControlData[1]) PORTC &= ~RELAY3; else PORTC |= RELAY3;
-						break;
-					case 0x30c:
-						if (ControlData[1]) PORTC &= ~RELAY4; else PORTC |= RELAY4;
-						break;
-				}
-			}
-
-			break;
-		case 0x01:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				LEDs_ToggleLEDs(LEDS_LED1);
-
-				Endpoint_ClearSETUP();
-
-				switch (USB_ControlRequest.wValue)
-				{
-					case 0x301:
-						Endpoint_Write_Control_Stream_LE(SerialNumber, sizeof(SerialNumber));
-						break;
-					case 0x303:
-						ControlData[1] = (PORTC & RELAY1) ? 2 : 3;
-						break;
-					case 0x306:
-						ControlData[1] = (PORTC & RELAY2) ? 2 : 3;
-						break;
-					case 0x309:
-						ControlData[1] = (PORTC & RELAY3) ? 2 : 3;
-						break;
-					case 0x30c:
-						ControlData[1] = (PORTC & RELAY4) ? 2 : 3;
-						break;
-				}
-
-				if (ControlData[1])
-				  Endpoint_Write_Control_Stream_LE(ControlData, sizeof(ControlData));
-
-				Endpoint_ClearOUT();
-			}
-
-			break;
+		/* Save the current report data for later comparison to check for changes */
+		PrevKeyboardReportData = KeyboardReportData;
+
+		/* Write Keyboard Report Data */
+		Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData), NULL);
+
+		/* Finalize the stream transfer to send the last packet */
+		Endpoint_ClearIN();
 	}
 }
+
+/** Reads the next LED status report from the host from the LED data endpoint, if one has been sent. */
+void ReceiveNextReport(void)	//Réception Liaison Série
+{
+	/* Select the Keyboard LED Report Endpoint */
+	Endpoint_SelectEndpoint(KEYBOARD_OUT_EPADDR);
+
+	/* Check if Keyboard LED Endpoint contains a packet */
+	if (Endpoint_IsOUTReceived())
+	{
+		/* Check to see if the packet contains data */
+		if (Endpoint_IsReadWriteAllowed())
+		{
+			/* Read in the LED report from the host */
+			uint8_t LEDReport = Endpoint_Read_8();
+
+			/* Process the read LED report from the host */
+			ProcessLEDReport(LEDReport);
+		}
+
+		/* Handshake the OUT Endpoint - clear endpoint and ready for next report */
+		Endpoint_ClearOUT();
+	}
+}
@@ -45,20 +45,19 @@
 		#include "Descriptors.h"
-		#include <LUFA/Drivers/Board/LEDs.h>
+		//#include <LUFA/Drivers/Board/LEDs.h>
+		#include "LUFA/Drivers/PeripheralSerial.h"
 		#include <LUFA/Drivers/USB/USB.h>
 		#include <LUFA/Platform/Platform.h>
 	/* Macros: */
-		#define RELAY1      (1 << 7)
-		#define RELAY2      (1 << 6)
-		#define RELAY3      (1 << 5)
-		#define RELAY4      (1 << 4)
-		#define ALL_RELAYS  (RELAY1 | RELAY2 | RELAY3 | RELAY4)
+		
 	/* Function Prototypes: */
 		void SetupHardware(void);
-
+		void EVENT_USB_Device_ConfigurationChanged(void);
+		void SendNextReport(void);
+		void ReceiveNextReport(void);
 		void EVENT_USB_Device_ControlRequest(void);
 #endif