From a072f3c2d8dcc5da701376797c72bf07689de26d Mon Sep 17 00:00:00 2001 From: gperson Date: Wed, 9 Dec 2020 11:02:47 +0100 Subject: [PATCH] On ajoute les fichiers que j'ai oublié (encore ) de commit --- src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Buttons.h | 2 +- src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Joystick.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Buttons.h b/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Buttons.h index 187560b..44ba9ec 100644 --- a/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Buttons.h +++ b/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Buttons.h @@ -222,7 +222,7 @@ static inline uint8_t Buttons_GetStatus_HAUT(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Buttons_GetStatus_HAUT(void) { - return ((PINF & BUTTONS_HAUT) ^ BUTTONS_HAUT); + return (PINF & BUTTONS_HAUT) ; } diff --git a/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Joystick.h b/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Joystick.h index 6cfff6f..0ba81ab 100644 --- a/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Joystick.h +++ b/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/Joystick.h @@ -145,7 +145,7 @@ uint8_t Yquatrebits = adc_read(); Yquatrebits&=0xF0; 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 - return (uint8_t)(Xquatrebits+Yquatrebits); + return (uint8_t)(Xquatrebits|Yquatrebits); } #endif -- libgit2 0.21.2