Ca marche git status

root
1 parent bfb1101b
Showing 7 changed files with 208 additions and 31 deletions Show diff stats
PartiePC/PCReveive.c
PartiePC/PC.c -> PartiePC/PCSend.c
PartiePC/a.out
PartiePC/makefile
atmega16u2/base/makefile
atmega16u2/custom/lufa-LUFA-170418/PolytechLille/PAD/PAD.c
atmega16u2/custom/lufa-LUFA-170418/PolytechLille/PAD/PAD.h
@@ -0,0 +1,170 @@
+#include <libusb-1.0/libusb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+
+// arduino ID vendor and product
+#define ID_VENDOR 0x2341
+#define ID_PRODUCT 0x01
+#define ENDPOINTS_NUMBER 4
+#define TIMEOUT 100
+#define MAX_DATA 50
+
+void init(libusb_context **context, libusb_device ***devices, ssize_t *devices_count){
+	int status = libusb_init(context);
+	if(status != 0){perror("libusb_init"); exit(-1);}
+
+	*devices_count = libusb_get_device_list(*context, devices);
+	if(*devices_count < 0){perror("libusb_get_device_list"); exit(-1);}
+}
+
+libusb_device* searchArduino(libusb_device **devices, ssize_t devices_count){
+	for(int i=0; i<devices_count; i++){
+		libusb_device *device = devices[i];
+
+		// device description
+		struct libusb_device_descriptor desc;
+		int status = libusb_get_device_descriptor(device, &desc);
+		if(status != 0) continue;
+		
+		// search for device
+		if(desc.idVendor == ID_VENDOR
+				&& desc.idProduct == ID_PRODUCT)
+			return device;
+	}
+	return NULL;
+}
+
+void openConnection(libusb_device *arduino, libusb_device_handle **handle, struct libusb_config_descriptor **config_desc){
+	// open connection
+	int status = libusb_open(arduino, handle);
+	if(status != 0){ perror("libusb_open"); exit(-1); }
+	
+	// prepare config
+	status = libusb_get_config_descriptor(arduino, 0, config_desc);
+	if(status != 0){ perror("libusb_get_config_descriptor"); exit(-1); }
+	int configuration = (*config_desc)->bConfigurationValue;
+
+	// detach kernel
+	for(int j=0; j<(*config_desc)->bNumInterfaces; j++){
+		int interface = (*config_desc)->interface[j].altsetting[0].bInterfaceNumber;
+		if(libusb_kernel_driver_active(*handle, interface)){
+			status = libusb_detach_kernel_driver(*handle, interface);
+			if(status != 0){ perror("libusb_detach_kernel_driver"); exit(-1); }
+		}
+	}
+	
+	// use config
+	status = libusb_set_configuration(*handle, configuration);
+	if(status != 0){ perror("libusb_set_configuration"); exit(-1); }
+	
+	// claim interfaces
+	for(int j=0; j<(*config_desc)->bNumInterfaces; j++){
+		struct libusb_interface_descriptor interface_desc = (*config_desc)->interface[j].altsetting[0];
+		int interface = interface_desc.bInterfaceNumber;
+
+		status = libusb_claim_interface(*handle, interface);
+		if(status != 0){ perror("libusb_claim_interface"); exit(-1); }
+	}
+}
+
+void getEndpoints(struct libusb_config_descriptor *config_desc, struct libusb_endpoint_descriptor *endpoint_desc_list){
+	int count = 0;
+	// in interfaces
+	for(int j=0; j<config_desc->bNumInterfaces; j++){
+		// find endpoints
+		for(int k=0; k<config_desc->interface[j].altsetting[0].bNumEndpoints; k++){
+			if(count > ENDPOINTS_NUMBER){ printf("getEndpoints: Array out of bound :%d:", count); exit(-1); }
+			*(endpoint_desc_list + count) = config_desc->interface[j].altsetting[0].endpoint[k];
+			count++;
+		}
+	}
+	//if(count != ENDPOINTS_NUMBER){ printf("Wrong number of endpoints.\nIs this the good device ?\n"); exit(-1); }
+}
+
+void start(libusb_context **context, libusb_device ***devices, libusb_device_handle **handle, struct libusb_config_descriptor **config_desc, struct libusb_endpoint_descriptor *endpoint_desc_list){
+	// init
+	ssize_t devices_count;
+	init(context, devices, &devices_count);
+
+	// get arduino device
+	libusb_device *arduino = searchArduino(*devices, devices_count);
+	if(arduino == NULL){ printf("Arduino device not found\n"); exit(-1); }
+
+	// open connection, use config, detach kernel and claim interfaces
+	openConnection(arduino, handle, config_desc);
+
+	// get enpoints
+	getEndpoints(*config_desc, endpoint_desc_list);
+}
+
+void stop(struct libusb_config_descriptor *config_desc, libusb_device_handle *handle, libusb_device **devices, libusb_context *context){
+	// release interfaces
+	for(int j=0; j<config_desc->bNumInterfaces; j++){
+		struct libusb_interface_descriptor interface_desc = config_desc->interface[j].altsetting[0];
+		int interface = interface_desc.bInterfaceNumber;
+
+		int status = libusb_release_interface(handle, interface);
+		if(status != 0){ perror("libusb_release_interface"); exit(-1); }
+	}
+	
+	// free config
+	libusb_free_config_descriptor(config_desc);
+
+	// close connection
+	libusb_close(handle);
+
+	// free device list
+	libusb_free_device_list(devices, 1);
+
+	// libusb exit
+	libusb_exit(context);
+}
+
+void sendData(int endpoint_id, uint8_t data, libusb_device_handle *handle, struct libusb_endpoint_descriptor *endpoint_desc_list){
+	if(endpoint_id < 0 || endpoint_id > 1){ printf("(sendData) Wrong endpoint !\nMust be 0 or 1\n"); return; }
+	int status = libusb_interrupt_transfer(handle, endpoint_desc_list[endpoint_id].bEndpointAddress, (unsigned char *) &data, 1, NULL, TIMEOUT);
+	if(status!=0){ perror("libusb_interrupt_transfer"); exit(-1); }
+}
+
+void receiveData(int endpoint_id, uint8_t *data, libusb_device_handle *handle, struct libusb_endpoint_descriptor *endpoint_desc_list){
+	if(endpoint_id < 2 || endpoint_id > 3){ printf("(sendData) Wrong endpoint !\nMust be 2 or 3\n"); return; }
+	int status = libusb_interrupt_transfer(handle, endpoint_desc_list[endpoint_id].bEndpointAddress, (unsigned char *) data, 1, NULL, 0);
+	if(status!=0){ perror("libusb_interrupt_transfer"); exit(-1); }
+}
+
+int go = 1;
+void signalINT(int sig){
+	if(sig == SIGINT){
+		printf("\nSignal SIGINT reçu...\n");
+		go = 0;
+	}
+}
+int main(){
+	libusb_context *context;
+	libusb_device **devices;
+	libusb_device_handle *handle;
+	struct libusb_config_descriptor *config_desc;
+	struct libusb_endpoint_descriptor endpoint_desc_list[ENDPOINTS_NUMBER];
+
+	// start
+	printf("Starting...\n");
+	start(&context, &devices, &handle, &config_desc, endpoint_desc_list);
+	printf("Start complete\n");
+
+	struct sigaction action;
+	action.sa_handler = signalINT;
+	sigaction(SIGINT, &action, NULL);
+
+	while(go){
+		int data;
+		receiveData(3, &data, handle, endpoint_desc_list);
+		printf("0x%x\n", data);
+	}
+	
+	// stop
+	printf("Stoping...\n");
+	stop(config_desc, handle, devices, context);
+	printf("Stop complete...\n");
+}
@@ -122,15 +122,15 @@ void stop(struct libusb_config_descriptor *config_desc, libusb_device_handle *ha
 	libusb_exit(context);
 }
-void sendData(int endpoint_id, uint8_t data){
+void sendData(int endpoint_id, uint8_t data, libusb_device_handle *handle, struct libusb_endpoint_descriptor *endpoint_desc_list){
 	if(endpoint_id < 0 || endpoint_id > 1){ printf("(sendData) Wrong endpoint !\nMust be 0 or 1\n"); return; }
 	int status = libusb_interrupt_transfer(handle, endpoint_desc_list[endpoint_id].bEndpointAddress, (unsigned char *) &data, 1, NULL, TIMEOUT);
 	if(status!=0){ perror("libusb_interrupt_transfer"); exit(-1); }
 }
-void receiveData(int endpoint_id, uint8_t *data){
+void receiveData(int endpoint_id, uint8_t *data, libusb_device_handle *handle, struct libusb_endpoint_descriptor *endpoint_desc_list){
 	if(endpoint_id < 2 || endpoint_id > 3){ printf("(sendData) Wrong endpoint !\nMust be 2 or 3\n"); return; }
-	status = libusb_interrupt_transfer(handle, endpoint_desc_list[endpoint_id].bEndpointAddress, (unsigned char *) data, 1, NULL, TIMEOUT);
+	int status = libusb_interrupt_transfer(handle, endpoint_desc_list[endpoint_id].bEndpointAddress, (unsigned char *) data, 1, NULL, TIMEOUT);
 	if(status!=0){ perror("libusb_interrupt_transfer"); exit(-1); }
 }
@@ -158,12 +158,14 @@ int main(){
 	sigaction(SIGINT, &action, NULL);
 	while(go){
-		sendData(0, 0x16); //0b00010110
+		sendData(1, 0x01, handle, endpoint_desc_list);
 		sleep(1);
-		sendData(1, 0x01); //0b00000001
+		sendData(0, 0x1F, handle, endpoint_desc_list);
 		sleep(1);
-		sendData(1, 0x00);
-		sendData(1, 0x00);
+		sendData(0, 0x16, handle, endpoint_desc_list);
+		sleep(1);
+		sendData(0, 0x00, handle, endpoint_desc_list);
+		sendData(1, 0x00, handle, endpoint_desc_list);
 		sleep(1);
 	}
 all:
-	gcc *.c -l usb-1.0 -Wall -Wextra
+	gcc PCSend.c -l usb-1.0 -Wall -Wextra
 clean:
 	rm -f *.o a.out
@@ -0,0 +1,4 @@
+all:
+	dfu-programmer atmega16u2 erase
+	dfu-programmer atmega16u2 flash *.hex
+	dfu-programmer atmega16u2 reset
@@ -15,6 +15,7 @@ int main(void){
 	}
 }
+uint8_t led = 0;
 void PAD_Task(void){
 	if (USB_DeviceState != DEVICE_STATE_Configured)
 		return;
@@ -33,37 +34,34 @@ void PAD_Task(void){
 	 * Z : état d'un bouton
 	 * Cas 0b1YZZZZZZ : (joystick)
-	 *  12u2 -> PC (endpoint button 2) : 0bXXXXYYYY
-	 * X != 0000 -> valeur en X du joystick (codé sur 4 bits) Y est mis à 0000
-	 * Y != 0000 -> valeur en Y du joystick (codé sur 4 bits) X est mis à 0000
+	 *  12u2 -> PC (endpoint button 2) : 0bX0YYYYYY
+	 * X = 0 -> valeur en X du joystick
+	 * X = 1 -> valeur en Y du joystick
 	 */
 	if(Serial_IsCharReceived()){
 		uint8_t byte = Serial_ReceiveByte();
 		if((byte & 0x80) == 0){ // bouttons
 			Endpoint_SelectEndpoint(PAD_IN_EP_BUTTON1);
 			if (Endpoint_IsINReady() && Endpoint_IsReadWriteAllowed()){
-				LEDs_SetAllLEDs(LEDS_LED1);
+				LEDs_SetAllLEDs(LEDS_LED1); //LED Tx
 				Endpoint_Write_8(byte);
 				Endpoint_ClearIN();
-				LEDs_SetAllLEDs(0);
 			}
 		}else if((byte & 0x40) == 0){ // joystick X
-			uint8_t toSend = (byte << 2) && 0xF0;
+			uint8_t toSend = (byte) & 0x3F;
 			Endpoint_SelectEndpoint(PAD_IN_EP_BUTTON2);
 			if (Endpoint_IsINReady() && Endpoint_IsReadWriteAllowed()){
-				LEDs_SetAllLEDs(LEDS_LED1);
-				Endpoint_Write_8(byte);
+				LEDs_SetAllLEDs(LEDS_LED1); //LED Tx
+				Endpoint_Write_8(toSend);
 				Endpoint_ClearIN();
-				LEDs_SetAllLEDs(0);
 			}
 		}else{ // joystick Y
-			uint8_t toSend = (byte >> 2) && 0x0F;
+			uint8_t toSend = ((byte) & 0x3F) | 0x80;
 			Endpoint_SelectEndpoint(PAD_IN_EP_BUTTON2);
 			if (Endpoint_IsINReady() && Endpoint_IsReadWriteAllowed()){
-				LEDs_SetAllLEDs(LEDS_LED1);
-				Endpoint_Write_8(byte);
+				LEDs_SetAllLEDs(LEDS_LED1); //LED Tx
+				Endpoint_Write_8(toSend);
 				Endpoint_ClearIN();
-				LEDs_SetAllLEDs(0);
 			}
 		}
 	}
@@ -78,22 +76,27 @@ void PAD_Task(void){
 	 * X = état d'une LED (LED 13)
 	 * 
 	 *  16u2 -> 328p : 0bXYYYYYYY
-	 * X = 0 -> pour les LEDs 8 9 10 11 12 (Y : les données)
-	 * X = 1 -> pour la LED 13 (Y : la donnée)
+	 * X = 0 -> pour les LEDs 8 9 10 11 12 13 (Y : les données)
 	 */
 	Endpoint_SelectEndpoint(PAD_OUT_EP_LED1);
 	if (Endpoint_IsOUTReceived() && Endpoint_IsReadWriteAllowed()){
+		LEDs_SetAllLEDs(LEDS_LED2); //LED Rx
 		uint8_t byte = Endpoint_Read_8();
-		Serial_SendByte(byte);
+		led = (led & 0x20) | byte;
+		Serial_SendByte(led);
 		Endpoint_ClearOUT();
 	}
-	Endpoint_SelectEndpoint(PAD_OUT_EP_LED1);
+	Endpoint_SelectEndpoint(PAD_OUT_EP_LED2);
 	if (Endpoint_IsOUTReceived() && Endpoint_IsReadWriteAllowed()){
+		LEDs_SetAllLEDs(LEDS_LED2); //LED Rx
 		uint8_t byte = Endpoint_Read_8();
-		uint8_t toSend = byte | 0x80;
-		Serial_SendByte(byte);
+		led = (led & 0x1F) | byte << 5;
+		Serial_SendByte(led);
 		Endpoint_ClearOUT();
 	}
+
+	//LED Reset
+	LEDs_SetAllLEDs(0);
 }
 /** Configures the board hardware and chip peripherals for the project's functionality. */
@@ -117,7 +120,7 @@ void SetupHardware(void){
 void EVENT_USB_Device_ConfigurationChanged(void){
 	/* Setup HID Report Endpoints */
 	Endpoint_ConfigureEndpoint(PAD_OUT_EP_LED1  , EP_TYPE_INTERRUPT, PAD_EPSIZE, 1);
-	Endpoint_ConfigureEndpoint(PAD_OUT_EP_LED2  , EP_TYPE_INTERRif(Serial_IsCharReceived())UPT, PAD_EPSIZE, 1);
+	Endpoint_ConfigureEndpoint(PAD_OUT_EP_LED2  , EP_TYPE_INTERRUPT, PAD_EPSIZE, 1);
 	Endpoint_ConfigureEndpoint(PAD_IN_EP_BUTTON1, EP_TYPE_INTERRUPT, PAD_EPSIZE, 1);
 	Endpoint_ConfigureEndpoint(PAD_IN_EP_BUTTON2, EP_TYPE_INTERRUPT, PAD_EPSIZE, 1);
 }
@@ -29,9 +29,7 @@
 	/* Function Prototypes: */
 		void SetupHardware(void);
-		void HID_Task(void);
-		void Send_Task(void);
-		void EVENT_USB_Device_configure(void);
+		void PAD_Task(void);
 		void EVENT_USB_Device_ControlRequest(void);
 #endif