forked from mfulz_github/qmk_firmware
Change device demos to cache the board button values in the same manner as the board joystick to maintain consistency.
This commit is contained in:
parent
63a8f66d92
commit
a908773a13
@ -155,6 +155,7 @@ bool GetNextReport(USB_JoystickReport_Data_t* ReportData)
|
|||||||
{
|
{
|
||||||
static uint8_t PrevJoyStatus = 0;
|
static uint8_t PrevJoyStatus = 0;
|
||||||
uint8_t JoyStatus_LCL = Joystick_GetStatus();
|
uint8_t JoyStatus_LCL = Joystick_GetStatus();
|
||||||
|
uint8_t ButtonStatus_LCL = Buttons_GetStatus();
|
||||||
bool InputChanged = false;
|
bool InputChanged = false;
|
||||||
|
|
||||||
/* Clear the report contents */
|
/* Clear the report contents */
|
||||||
@ -173,14 +174,15 @@ bool GetNextReport(USB_JoystickReport_Data_t* ReportData)
|
|||||||
if (JoyStatus_LCL & JOY_PRESS)
|
if (JoyStatus_LCL & JOY_PRESS)
|
||||||
ReportData->Button = (1 << 1);
|
ReportData->Button = (1 << 1);
|
||||||
|
|
||||||
if (Buttons_GetStatus() & BUTTONS_BUTTON1)
|
if (ButtonStatus_LCL & BUTTONS_BUTTON1)
|
||||||
ReportData->Button |= (1 << 0);
|
ReportData->Button |= (1 << 0);
|
||||||
|
|
||||||
/* Check if the new report is different to the previous report */
|
/* Check if the new report is different to the previous report */
|
||||||
InputChanged = (uint8_t)(PrevJoyStatus ^ JoyStatus_LCL);
|
InputChanged = (uint8_t)(PrevJoyStatus ^ JoyStatus_LCL) | (uint8_t)(PrevButtonStatus ^ ButtonStatus_LCL);
|
||||||
|
|
||||||
/* Save the current joystick status for later comparison */
|
/* Save the current joystick status for later comparison */
|
||||||
PrevJoyStatus = JoyStatus_LCL;
|
PrevJoyStatus = JoyStatus_LCL;
|
||||||
|
PrevButtonStatus = ButtonStatus_LCL;
|
||||||
|
|
||||||
/* Return whether the new report is different to the previous report or not */
|
/* Return whether the new report is different to the previous report or not */
|
||||||
return InputChanged;
|
return InputChanged;
|
||||||
|
@ -288,6 +288,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
|
|||||||
void CreateMouseReport(USB_MouseReport_Data_t* ReportData)
|
void CreateMouseReport(USB_MouseReport_Data_t* ReportData)
|
||||||
{
|
{
|
||||||
uint8_t JoyStatus_LCL = Joystick_GetStatus();
|
uint8_t JoyStatus_LCL = Joystick_GetStatus();
|
||||||
|
uint8_t ButtonStatus_LCL = Buttons_GetStatus();
|
||||||
|
|
||||||
/* Clear the report contents */
|
/* Clear the report contents */
|
||||||
memset(ReportData, 0, sizeof(USB_MouseReport_Data_t));
|
memset(ReportData, 0, sizeof(USB_MouseReport_Data_t));
|
||||||
@ -305,7 +306,7 @@ void CreateMouseReport(USB_MouseReport_Data_t* ReportData)
|
|||||||
if (JoyStatus_LCL & JOY_PRESS)
|
if (JoyStatus_LCL & JOY_PRESS)
|
||||||
ReportData->Button = (1 << 0);
|
ReportData->Button = (1 << 0);
|
||||||
|
|
||||||
if (Buttons_GetStatus() & BUTTONS_BUTTON1)
|
if (ButtonStatus_LCL & BUTTONS_BUTTON1)
|
||||||
ReportData->Button |= (1 << 1);
|
ReportData->Button |= (1 << 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user