Jörg Weber
Demo for USBJoystick updated for 32 buttons.
Dependencies: USBDevice USBJoystick_SIM mbed USBJoystick_2
Fork of
USBJoystick_HelloWorld2
by 
Wim Huiskamp
Revision 3:3ddaf1227e1b, committed 2018-09-16
- Comitter:
- Cirrus01
- Date:
- Sun Sep 16 09:57:12 2018 +0000
- Parent:
- 2:967da2faedcd
- Child:
- 4:dc3556a31262
- Commit message:
- Hat switch translation reorganized plus bug fixed
Changed in this revision
| USBJoystick.lib | Show annotated file Show diff for this revision Revisions of this file |
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/USBJoystick.lib Sat Sep 15 07:47:00 2018 +0000 +++ b/USBJoystick.lib Sun Sep 16 09:57:12 2018 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/users/Cirrus01/code/USBJoystick_SIM/#265e03bf82af +https://os.mbed.com/users/Cirrus01/code/USBJoystick_SIM/#550cca870c98
--- a/main.cpp Sat Sep 15 07:47:00 2018 +0000
+++ b/main.cpp Sun Sep 16 09:57:12 2018 +0000
@@ -252,56 +252,56 @@
// translate values read to descriptor values
#if HAT4 && !HAT4_8
- if (hat == 0x01)
- hat = JOY_HAT_UP;
- else if (hat == 0x02)
- hat = JOY_HAT_RIGHT;
- else if (hat == 0x04)
- hat = JOY_HAT_DOWN;
- else if (hat == 0x08)
- hat = JOY_HAT_LEFT;
- else
- hat = JOY_HAT_NEUTRAL;
+ if (hat == 0x01) // 00000001
+ hat = JOY_HAT_UP; // 0
+ else if (hat == 0x02) // 00000010
+ hat = JOY_HAT_RIGHT; // 1
+ else if (hat == 0x04) // 00000100
+ hat = JOY_HAT_DOWN; // 2
+ else if (hat == 0x08) // 00001000
+ hat = JOY_HAT_LEFT; // 3
+ else
+ hat = JOY_HAT_NEUTRAL; // 4
#endif
#if HAT4 && HAT4_8
- if (hat == 0x01)
- hat = JOY_HAT_UP;
- else if (hat == 0x02)
- hat = JOY_HAT_RIGHT;
- else if (hat == 0x03)
- hat = JOY_HAT_UP_RIGHT;
- else if (hat == 0x04)
- hat = JOY_HAT_DOWN;
- else if (hat == 0x05)
- hat = JOY_HAT_DOWN_RIGHT;
- else if (hat == 0x08)
- hat = JOY_HAT_LEFT;
- else if (hat == 0x09)
- hat = JOY_HAT_UP_LEFT;
- else if (hat == 0x0C)
- hat = JOY_HAT_DOWN_LEFT;
+ if (hat == 0x01) // 00000001
+ hat = JOY_HAT_UP; // 0
+ else if (hat == 0x03) // 00000011
+ hat = JOY_HAT_UP_RIGHT; // 1
+ else if (hat == 0x02) // 00000010
+ hat = JOY_HAT_RIGHT; // 2
+ else if (hat == 0x06) // 00000110
+ hat = JOY_HAT_DOWN_RIGHT; // 3
+ else if (hat == 0x04) // 00000100
+ hat = JOY_HAT_DOWN; // 4
+ else if (hat == 0x0C) // 00001100
+ hat = JOY_HAT_DOWN_LEFT; // 5
+ else if (hat == 0x08) // 00001000
+ hat = JOY_HAT_LEFT; // 6
+ else if (hat == 0x09) // 00001001
+ hat = JOY_HAT_UP_LEFT; // 7
else
- hat = JOY_HAT_NEUTRAL;
+ hat = JOY_HAT_NEUTRAL; // 8
#endif
#if HAT8
- if (hat == 0x01)
- hat = JOY_HAT_UP;
- else if (hat == 0x02)
- hat = JOY_HAT_UP_RIGHT;
- else if (hat == 0x04)
- hat = JOY_HAT_RIGHT;
- else if (hat == 0x08)
- hat = JOY_HAT_DOWN_RIGHT;
- else if (hat == 0x10)
- hat = JOY_HAT_DOWN;
- else if (hat == 0x20)
- hat = JOY_HAT_DOWN_LEFT;
- else if (hat == 0x40)
- hat = JOY_HAT_LEFT;
- else if (hat == 0x80)
- hat = JOY_HAT_UP_LEFT;
+ if (hat == 0x01) // 00000001
+ hat = JOY_HAT_UP; // 0
+ else if (hat == 0x02) // 00000010
+ hat = JOY_HAT_UP_RIGHT; // 1
+ else if (hat == 0x04) // 00000100
+ hat = JOY_HAT_RIGHT; // 2
+ else if (hat == 0x08) // 00001000
+ hat = JOY_HAT_DOWN_RIGHT; // 3
+ else if (hat == 0x10) // 00010000
+ hat = JOY_HAT_DOWN; // 4
+ else if (hat == 0x20) // 00100000
+ hat = JOY_HAT_DOWN_LEFT; // 5
+ else if (hat == 0x40) // 01000000
+ hat = JOY_HAT_LEFT; // 6
+ else if (hat == 0x80) // 10000000
+ hat = JOY_HAT_UP_LEFT; // 7
else
- hat = JOY_HAT_NEUTRAL;
+ hat = JOY_HAT_NEUTRAL; // 8
#endif
// return the new button list