gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-13 20:34:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tighten up the code in the delta movement detection code in the MouseHostWithParser and JoystickHostWithParser demos. Make the ClassDriver JoystickHostWithParser demo use the HID_ALIGN_DATA() macro instead of manual shifting and casting.

Browse Source
This commit is contained in:
Dean Camera 2010-08-09 12:04:52 +00:00
parent 508e905d8d
commit eb060db71b
4 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c
View File

@ -148,16 +148,13 @@ int main(void)
(ReportItem->Attributes.Usage.Usage == USAGE_Y)) && (ReportItem->Attributes.Usage.Usage == USAGE_Y)) &&
(ReportItem->ItemType == REPORT_ITEM_TYPE_In)) (ReportItem->ItemType == REPORT_ITEM_TYPE_In))
{ {
int16_t DeltaMovement = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize)); int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t);
if (DeltaMovement)
{
if (ReportItem->Attributes.Usage.Usage == USAGE_X) if (ReportItem->Attributes.Usage.Usage == USAGE_X)
{
if (DeltaMovement)
LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2); LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2);
}
else else
{
if (DeltaMovement)
LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4); LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4);
} }
} }

7
Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
View File

@ -159,14 +159,11 @@ int main(void)
{ {
int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t); int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t);
if (DeltaMovement)
{
if (ReportItem->Attributes.Usage.Usage == USAGE_X) if (ReportItem->Attributes.Usage.Usage == USAGE_X)
{
if (DeltaMovement)
LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2); LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2);
}
else else
{
if (DeltaMovement)
LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4); LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4);
} }
} }

12
Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.c
View File

@ -285,17 +285,13 @@ void ProcessJoystickReport(uint8_t* JoystickReport)
int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t); int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t);
/* Determine if the report is for the X or Y delta movement */ /* Check to see if a (non-zero) delta movement has been indicated */
if (DeltaMovement)
{
/* Determine if the report is for the X or Y delta movement, light LEDs as appropriate */
if (ReportItem->Attributes.Usage.Usage == USAGE_X) if (ReportItem->Attributes.Usage.Usage == USAGE_X)
{
/* Turn on the appropriate LED according to direction if the delta is non-zero */
if (DeltaMovement)
LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2); LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2);
}
else else
{
/* Turn on the appropriate LED according to direction if the delta is non-zero */
if (DeltaMovement)
LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4); LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4);
} }
} }

14
Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c
View File

@ -299,19 +299,15 @@ void ProcessMouseReport(uint8_t* MouseReport)
if (!(FoundData)) if (!(FoundData))
continue; continue;
int16_t DeltaMovement = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize)); int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t);
/* Determine if the report is for the X or Y delta movement */ /* Check to see if a (non-zero) delta movement has been indicated */
if (DeltaMovement)
{
/* Determine if the report is for the X or Y delta movement, light LEDs as appropriate */
if (ReportItem->Attributes.Usage.Usage == USAGE_X) if (ReportItem->Attributes.Usage.Usage == USAGE_X)
{
/* Turn on the appropriate LED according to direction if the delta is non-zero */
if (DeltaMovement)
LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2); LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2);
}
else else
{
/* Turn on the appropriate LED according to direction if the delta is non-zero */
if (DeltaMovement)
LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4); LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4);
} }
} }