diff --git a/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/LEDs.h b/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/LEDs.h index bb070db..ff9a78f 100644 --- a/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/LEDs.h +++ b/src/lufa-LUFA-170418/LUFA/Drivers/Board/AVR8/PINGUI/LEDs.h @@ -86,7 +86,7 @@ #define LEDS_LED4 (1 << 7) /** LED mask for all the LEDs on the board. */ - #define LEDS_ALL_LEDS (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4) + #define LEDS_ALL_LEDS 0b00011111 /** LED mask for none of the board LEDs. */ #define LEDS_NO_LEDS 0 @@ -95,29 +95,36 @@ #if !defined(__DOXYGEN__) static inline void LEDs_Init(void) { - DDRB |= LEDS_ALL_LEDS; - PORTB &= ~LEDS_ALL_LEDS; + //DDRB |= 0b01010000; + //DDRC |= 0b10000000; + DDRD |= 0b10011111; + //DDRE |= ; + + PORTD &= ~LEDS_ALL_LEDS; } static inline void LEDs_Disable(void) { - DDRB &= ~LEDS_ALL_LEDS; - PORTB &= ~LEDS_ALL_LEDS; + //axel : unused + DDRD &= ~LEDS_ALL_LEDS; + PORTD &= ~LEDS_ALL_LEDS; } static inline void LEDs_TurnOnLEDs(const uint8_t LedMask) { - PORTB |= LedMask; + PORTD |= LedMask; } static inline void LEDs_TurnOffLEDs(const uint8_t LedMask) { - PORTB &= ~LedMask; + PORTD &= ~LedMask; } static inline void LEDs_SetAllLEDs(const uint8_t LedMask) { - PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LedMask); + //unused + //PORTB etc + PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LedMask & LEDS_ALL_LEDS); } static inline void LEDs_ChangeLEDs(const uint8_t LedMask, diff --git a/src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c b/src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c index f302ed1..048477e 100644 --- a/src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c +++ b/src/lufa-LUFA-170418/PolytechLille/Manette/Manette.c @@ -65,19 +65,35 @@ USB_ClassInfo_HID_Device_t Joystick_HID_Interface = */ - - +//Only DBG +void POC_LEDS(){ + for(;;){ + LEDs_SetAllLEDs(0b00000001); + _delay_ms(250); + LEDs_SetAllLEDs(0b00000010); + _delay_ms(250); + LEDs_SetAllLEDs(0b00000100); + _delay_ms(250); + LEDs_SetAllLEDs(0b00001000); + _delay_ms(250); + LEDs_SetAllLEDs(0b00000000); + _delay_ms(250); + } +} int main(void) { SetupHardware(); - LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); + LEDs_SetAllLEDs(0); + //uncomment to see LEDS Proof of working + //POC_LEDS(); GlobalInterruptEnable(); for (;;) { + LEDs_SetAllLEDs(0xFF); HID_Device_USBTask(&Joystick_HID_Interface); USB_USBTask(); } @@ -190,7 +206,13 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn if (ButtonStatus_LCL_BAS & BUTTONS_BAS) { JoystickReport->Button |= ( 1<<2);} if (ButtonStatus_LCL_DROITE & BUTTONS_DROITE) - { JoystickReport->Button |= ( 1<<3);} + { JoystickReport->Button |= ( 1<<3); + LEDs_SetAllLEDs(0b00011111); + + }else{ + LEDs_SetAllLEDs(0b00000000); + +} // if (ButtonStatus_LCL_STOP & BUTTONS_STOP) // { JoystickReport->Button |= ( 1<<4);} -- libgit2 0.21.2