diff --git a/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/.Buttons.h.swp b/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/.Buttons.h.swp new file mode 100644 index 0000000..e47296a Binary files /dev/null and b/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/.Buttons.h.swp differ 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 c7f8578..88d5332 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 @@ -103,7 +103,7 @@ static inline void Buttons_Init_STOP(void) { DDRB &= ~BUTTONS_STOP; - PORTB |= BUTTONS_STOP; + // PORTB |= BUTTONS_STOP; } @@ -112,15 +112,17 @@ static inline void Buttons_Disable_STOP(void) { DDRB &= ~BUTTONS_STOP; - PORTB |= BUTTONS_STOP; + PORTB &= ~BUTTONS_STOP; } + //BUTTON BAS + static inline void Buttons_Init_BAS(void) { DDRF &= ~BUTTONS_BAS; @@ -191,7 +193,7 @@ static inline uint8_t Buttons_GetStatus_STOP(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t Buttons_GetStatus_STOP(void) { - return ((PINB & BUTTONS_STOP) ^ BUTTONS_STOP); + return (PINB & BUTTONS_STOP); } //BAS diff --git a/src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c b/src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c index ed5b728..f302ed1 100644 --- a/src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c +++ b/src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c @@ -179,6 +179,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn uint8_t ButtonStatus_LCL_BAS = Buttons_GetStatus_BAS(); uint8_t ButtonStatus_LCL_DROITE = Buttons_GetStatus_DROITE(); +// uint8_t ButtonStatus_LCL_STOP = Buttons_GetStatus_STOP(); JoystickReport->X = JoyStatus_LCL >> 4; JoystickReport->Y = JoyStatus_LCL & 0x0F; @@ -190,7 +191,8 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn { JoystickReport->Button |= ( 1<<2);} if (ButtonStatus_LCL_DROITE & BUTTONS_DROITE) { JoystickReport->Button |= ( 1<<3);} - +// if (ButtonStatus_LCL_STOP & BUTTONS_STOP) +// { JoystickReport->Button |= ( 1<<4);} // if (JoyStatus_LCL & JOY_LEFT) // JoystickReport->X = -100; -- libgit2 0.21.2