gperson / TutoratPersonChemin

Commit 7b3420c17cd472e5293271b3ca3ec03bd9f6e1df

Authored by gperson
1 parent c84ba5c0

a supprimer, ou sinon tu as oublie de le commit @Guillaume

Showing 3 changed files with 9 additions and 3 deletions   Show diff stats
Inline Side-by-side
Makefile
  Show/Hide comments   View file @7b3420c
... ... @@ -40,6 +40,9 @@ STEP4.2 : ${SRC}/FourPointTwo.c bin
40 40 STEP4.3 : ${SRC}/FourPointThree.c bin
41 41 gcc -o ${BIN}/STEP4.3.out ${SRC}/FourPointThree.c ${CLIBS} ${CFLAGS}
42 42  
  43 +STEP5.2 : src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c bin
  44 + gcc -o ${BIN}/STEP5.2.out src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c ${CLIBS} ${FLAGS}
  45 +
43 46 obj :
44 47 @-mkdir ${OBJ}
45 48  
... ...
src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Buttons.h
  Show/Hide comments   View file @7b3420c
... ... @@ -67,6 +67,7 @@
67 67 #if !defined(__INCLUDE_FROM_BUTTONS_H)
68 68 #error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
69 69 #endif
  70 + // HID_Interface;HID_ReportOUTEndpoint;
70 71  
71 72 /* Public Interface - May be used in end-application: */
72 73 /* Macros: */
... ... @@ -93,6 +94,7 @@
93 94 static inline void Buttons_Disable_SEL(void)
94 95 {
95 96 DDRB &= ~BUTTONS_SEL;
  97 + //HID_Interface1;HID_ReportOUTEndpoint;
96 98 PORTB &= ~BUTTONS_SEL;
97 99 }
98 100  
... ... @@ -223,6 +225,7 @@
223 225 static inline uint8_t Buttons_GetStatus_HAUT(void)
224 226 {
225 227 return ((PINF & BUTTONS_HAUT) ^ BUTTONS_HAUT);
  228 +
226 229 }
227 230  
228 231  
... ...
src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Joystick.h
  Show/Hide comments   View file @7b3420c
... ... @@ -139,12 +139,12 @@
139 139 static inline uint8_t Joystick_GetStatus(void)
140 140 {
141 141 adc_init(joy_X_ADC);
142   - uinit8_t Xquatrebits = adc_read();
  142 + uint8_t Xquatrebits = adc_read()/2;
143 143 Xquatrebits&=0xF0; //pour les quatres bits de poids fort pour axe X
144 144 adc_init(joy_Y_ADC);
145   - uinit8_t Yquatrebits = adc_read();
  145 + uint8_t Yquatrebits = adc_read();
146 146 Yquatrebits&=0xF0;
147   - Yquatrebits=Yquatrebits>>4 //pour les quatres bits de poids faible pour axe Y, on place en fort et on decale de 4 bits into le poids faible
  147 + Yquatrebits=Yquatrebits>>4; //pour les quatres bits de poids faible pour axe Y, on place en fort et on decale de 4 bits into le poids faible
148 148 return (uint8_t)(Xquatrebits+Yquatrebits);
149 149 }
150 150 #endif
... ...