terminé !

root
1 parent 0d065eeb
Showing 34 changed files with 63 additions and 34 deletions Show diff stats
games/ninvaders/ninvaders-0.1.1/ChangeLog -> games/ninvaders/ChangeLog
games/ninvaders/ninvaders-0.1.1/README -> games/ninvaders/README
games/ninvaders/ninvaders-0.1.1/aliens.c -> games/ninvaders/aliens.c
games/ninvaders/ninvaders-0.1.1/aliens.h -> games/ninvaders/aliens.h
games/ninvaders/ninvaders-0.1.1/arduino.c -> games/ninvaders/arduino.c
games/ninvaders/ninvaders-0.1.1/arduino.h -> games/ninvaders/arduino.h
games/ninvaders/ninvaders-0.1.1/debian/changelog -> games/ninvaders/debian/changelog
games/ninvaders/ninvaders-0.1.1/debian/compat -> games/ninvaders/debian/compat
games/ninvaders/ninvaders-0.1.1/debian/control -> games/ninvaders/debian/control
games/ninvaders/ninvaders-0.1.1/debian/copyright -> games/ninvaders/debian/copyright
games/ninvaders/ninvaders-0.1.1/debian/dirs -> games/ninvaders/debian/dirs
games/ninvaders/ninvaders-0.1.1/debian/docs -> games/ninvaders/debian/docs
games/ninvaders/ninvaders-0.1.1/debian/links -> games/ninvaders/debian/links
games/ninvaders/ninvaders-0.1.1/debian/menu -> games/ninvaders/debian/menu
games/ninvaders/ninvaders-0.1.1/debian/ninvaders.1 -> games/ninvaders/debian/ninvaders.1
games/ninvaders/ninvaders-0.1.1/debian/rules -> games/ninvaders/debian/rules
games/ninvaders/ninvaders-0.1.1/globals.c -> games/ninvaders/globals.c
games/ninvaders/ninvaders-0.1.1/globals.h -> games/ninvaders/globals.h
games/ninvaders/ninvaders-0.1.1/gpl.txt -> games/ninvaders/gpl.txt
games/ninvaders/ninvaders-0.1.1/ind.html -> games/ninvaders/ind.html
@@ -118,13 +118,11 @@ void stop(struct libusb_config_descriptor *config_desc, libusb_device_handle *ha
 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 && status!=LIBUSB_ERROR_TIMEOUT){ perror("libusb_interrupt_transfer"); exit(-1); }
+	libusb_interrupt_transfer(handle, endpoint_desc_list[endpoint_id].bEndpointAddress, (unsigned char *) &data, 1, NULL, TIMEOUT);
+	
 }
-int 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 -1; }
-	int status = libusb_interrupt_transfer(handle, endpoint_desc_list[endpoint_id].bEndpointAddress, (unsigned char *) data, 1, NULL, TIMEOUT);
-	if(status!=0 && status!=LIBUSB_ERROR_TIMEOUT){ perror("libusb_interrupt_transfer"); exit(-1); }
-	return status;
+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; }
+	libusb_interrupt_transfer(handle, endpoint_desc_list[endpoint_id].bEndpointAddress, (unsigned char *) data, 1, NULL, TIMEOUT);
 }
 #ifndef ARDUINO 
 #define ARDUINO
+#include <libusb-1.0/libusb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+
 #define ID_VENDOR 0x2341
 #define ID_PRODUCT 0x01
 #define ENDPOINTS_NUMBER 4
-#define TIMEOUT 50
+#define TIMEOUT 10
 #define MAX_DATA 50
 void init(libusb_context **context, libusb_device ***devices, ssize_t *devices_count);
@@ -14,6 +20,6 @@ void getEndpoints(struct libusb_config_descriptor *config_desc, struct libusb_en
 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);
 void stop(struct libusb_config_descriptor *config_desc, libusb_device_handle *handle, libusb_device **devices, libusb_context *context);
 void sendData(int endpoint_id, uint8_t data, libusb_device_handle *handle, struct libusb_endpoint_descriptor *endpoint_desc_list);
-int receiveData(int endpoint_id, uint8_t *data, libusb_device_handle *handle, struct libusb_endpoint_descriptor *endpoint_desc_list);
+void receiveData(int endpoint_id, uint8_t *data, libusb_device_handle *handle, struct libusb_endpoint_descriptor *endpoint_desc_list);
 #endif
 CC=gcc
 CFLAGS=-O3 -Wall
-LIBS=-l ncurses usb-1.0
+LIBS=-l ncurses -l usb-1.0
-CFILES=globals.c view.c aliens.c ufo.c player.c ardunio.c nInvaders.c
-HFILES=globals.h view.h aliens.h ufo.h player.h ardunio.h nInvaders.h
-OFILES=globals.o view.o aliens.o ufo.o player.o ardunio.o nInvaders.o
+CFILES=arduino.c globals.c view.c aliens.c ufo.c player.c nInvaders.c
+HFILES=arduino.h globals.h view.h aliens.h ufo.h player.h nInvaders.h
+OFILES=arduino.o globals.o view.o aliens.o ufo.o player.o nInvaders.o
 all:		nInvaders
 		rm -f $(OFILES)
@@ -48,8 +48,25 @@ int status; // status handled in timer
 #define GAME_EXIT 5
 #define GAME_HIGHSCORE 6
-
-
+libusb_device_handle *handle;
+struct libusb_endpoint_descriptor endpoint_desc_list[ENDPOINTS_NUMBER];
+int waitUSB = 0;
+
+void sendLives(){
+	uint8_t toSend = 0x00;
+	if(lives == 5) toSend = 0x1F;
+	else if(lives == 4) toSend = 0x0F;
+	else if(lives == 3) toSend = 0x07;
+	else if(lives == 2) toSend = 0x03;
+	else if(lives == 1) toSend = 0x01;
+	else if(lives == 0) toSend = 0x00;
+	if(handle != NULL && endpoint_desc_list != NULL && waitUSB == 0){
+		waitUSB = 1;
+		usleep(100000); // wait for endpoints to be free (100 ms)
+		sendData(0, toSend, handle, endpoint_desc_list);
+		waitUSB = 0;
+	}
+}
 /**
  * initialize level: reset attributes of most units
@@ -64,7 +81,6 @@ static void initLevel()
 	drawscore();
 }
-
 /**
  * evaluate command line parameters 
  */
@@ -136,21 +152,26 @@ void drawscore()
 /**
  * reads input from keyboard and do action
  */
-void readInput(libusb_device_handle *handle, struct libusb_endpoint_descriptor *endpoint_desc_list)
+void readInput()
 {
 	int ch;
 	static int lastmove;
 	timeout(100);
 	ch = getch();		// get key pressed
-	if(ch == -1){
-		uint8_t data;
-		int status = receiveData(2, &data, handle, endpoint_desc_list);
-		if(status == 0){
-			if(data & 0x10 == 0x10) ch = KEY_LEFT;
-			else if(data & 0x08 == 0x08) ch = ' ';
-			else if(data & 0x04 == 0x04) ch = KEY_RIGHT;
+
+	static uint8_t data = 0;
+	if(ch == -1){ // keyboard first
+		usleep(1000000); // slow down inputs (100 ms)
+		if(handle != NULL && endpoint_desc_list != NULL && waitUSB == 0)
+			receiveData(2, &data, handle, endpoint_desc_list);
+		if(data != 0){
+			if((data & 0x10) == 0x10) ch = KEY_LEFT;
+			else if((data & 0x04) == 0x04) ch = KEY_RIGHT;
+			else if((data & 0x08) == 0x08) ch = ' ';
+			else return;
 		}
+		else return;
 	}
 	switch (status) {
@@ -169,6 +190,7 @@ void readInput(libusb_device_handle *handle, struct libusb_endpoint_descriptor *
 			level = 0;      // reset level
 			score = 0;      // reset score
 			lives = 3;      // restore lives
+			sendLives();
 			status = GAME_NEXTLEVEL;
 		} else if (ch == 'q') {	// quit game
 			status = GAME_EXIT;
@@ -205,6 +227,7 @@ void readInput(libusb_device_handle *handle, struct libusb_endpoint_descriptor *
 			status = GAME_NEXTLEVEL;
 		} else if (ch == 'L') {			// cheat: one more live
 			lives++;
+			sendLives();
 			drawscore();
 		} else if (ch == 'q') {	// quit game
 			status = GAME_EXIT;
@@ -258,6 +281,7 @@ void handleTimer()
 		if (aliens_move_counter == 0 && aliensMove() == 1) {
 			// aliens reached player
 			lives = 0;
+			sendLives();
 			status = GAME_OVER;
 		}
@@ -271,6 +295,7 @@ void handleTimer()
 		if (aliens_shot_counter == 0 && aliensMissileMove() == 1) {
 			// player was hit
 			lives--;			// player looses one life
+			sendLives();
 			drawscore();	                // draw score
 			playerExplode();		// display some explosion graphics
 			if (lives == 0) {		// if no lives left ...
@@ -342,31 +367,30 @@ void setUpTimer()
 int go = 1;
-void signalINT(int sig){
+/*void signalINT(int sig){
 	if(sig == SIGINT){
 		go = 0;
 	}
-}
+}*/
 int main(int argc, char **argv)
 {
 	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
 	start(&context, &devices, &handle, &config_desc, endpoint_desc_list);
 	// singals
-	struct sigaction action;
+	/*struct sigaction action;
 	action.sa_handler = signalINT;
-	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGINT, &action, NULL);*/
-    // nInvaders
-    weite = 0;
-    score = 0;
+	// nInvaders
+	weite = 0;
+	score = 0;
 	lives = 3;
+	sendLives();
 	level = 0;
 	skill_level = 1;
@@ -380,7 +404,7 @@ int main(int argc, char **argv)
 	// read keyboard input
 	do {
 		// do movements and key-checking
-		readInput(handler, endpoint_desc_list);
+		readInput(handle, endpoint_desc_list);
 	} while (go);
 	// stop
@@ -399,6 +423,7 @@ void doScoring(int alienType)
 	// every 6000 pts player gets a new live
 	if (score % 6000 == 0){
 		lives++;
+		sendLives();
 	}
 	drawscore();	// display score