Skip to content

Commit 79252a5

Browse files
hathachhathach
authored
Merge pull request #283 from adafruit/develop
fix #279 conflict between ble hid and usb hid
2 parents 2fdd5c5 + 4f66d41 commit 79252a5

File tree

6 files changed

+279
-411
lines changed

6 files changed

+279
-411
lines changed

‎cores/nRF5/Adafruit_TinyUSB_Core/tinyusb/src/class/hid/hid.h‎

Lines changed: 266 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,272 @@ enum
598598
HID_USAGE_CONSUMER_AC_PAN = 0x0238,
599599
};
600600

601+
/*--------------------------------------------------------------------
602+
* ASCII to KEYCODE Conversion
603+
* Expand to array of [128][2] (shift, keycode)
604+
*
605+
* Usage: example to convert input chr into keyboard report (modifier + keycode)
606+
*
607+
* uint8_t const conv_table[128][2] = { HID_ASCII_TO_KEYCODE };
608+
*
609+
* uint8_t keycode[6] = { 0 };
610+
* uint8_t modifier = 0;
611+
*
612+
* if ( conv_table[chr][0] ) modifier = KEYBOARD_MODIFIER_LEFTSHIFT;
613+
* keycode[0] = conv_table[chr][1];
614+
* tud_hid_keyboard_report(report_id, modifier, keycode);
615+
*
616+
*--------------------------------------------------------------------*/
617+
#define HID_ASCII_TO_KEYCODE \
618+
{0, 0 }, /* 0x00 Null */ \
619+
{0, 0 }, /* 0x01 */ \
620+
{0, 0 }, /* 0x02 */ \
621+
{0, 0 }, /* 0x03 */ \
622+
{0, 0 }, /* 0x04 */ \
623+
{0, 0 }, /* 0x05 */ \
624+
{0, 0 }, /* 0x06 */ \
625+
{0, 0 }, /* 0x07 */ \
626+
{0, HID_KEY_BACKSPACE }, /* 0x08 Backspace */ \
627+
{0, HID_KEY_TAB }, /* 0x09 Tab */ \
628+
{0, HID_KEY_RETURN }, /* 0x0A Line Feed */ \
629+
{0, 0 }, /* 0x0B */ \
630+
{0, 0 }, /* 0x0C */ \
631+
{0, HID_KEY_RETURN }, /* 0x0D CR */ \
632+
{0, 0 }, /* 0x0E */ \
633+
{0, 0 }, /* 0x0F */ \
634+
{0, 0 }, /* 0x10 */ \
635+
{0, 0 }, /* 0x11 */ \
636+
{0, 0 }, /* 0x12 */ \
637+
{0, 0 }, /* 0x13 */ \
638+
{0, 0 }, /* 0x14 */ \
639+
{0, 0 }, /* 0x15 */ \
640+
{0, 0 }, /* 0x16 */ \
641+
{0, 0 }, /* 0x17 */ \
642+
{0, 0 }, /* 0x18 */ \
643+
{0, 0 }, /* 0x19 */ \
644+
{0, 0 }, /* 0x1A */ \
645+
{0, HID_KEY_ESCAPE }, /* 0x1B Escape */ \
646+
{0, 0 }, /* 0x1C */ \
647+
{0, 0 }, /* 0x1D */ \
648+
{0, 0 }, /* 0x1E */ \
649+
{0, 0 }, /* 0x1F */ \
650+
\
651+
{0, HID_KEY_SPACE }, /* 0x20 */ \
652+
{1, HID_KEY_1 }, /* 0x21 ! */ \
653+
{1, HID_KEY_APOSTROPHE }, /* 0x22 " */ \
654+
{1, HID_KEY_3 }, /* 0x23 # */ \
655+
{1, HID_KEY_4 }, /* 0x24 $ */ \
656+
{1, HID_KEY_5 }, /* 0x25 % */ \
657+
{1, HID_KEY_7 }, /* 0x26 & */ \
658+
{0, HID_KEY_APOSTROPHE }, /* 0x27 ' */ \
659+
{1, HID_KEY_9 }, /* 0x28 ( */ \
660+
{1, HID_KEY_0 }, /* 0x29 ) */ \
661+
{1, HID_KEY_8 }, /* 0x2A * */ \
662+
{1, HID_KEY_EQUAL }, /* 0x2B + */ \
663+
{0, HID_KEY_COMMA }, /* 0x2C , */ \
664+
{0, HID_KEY_MINUS }, /* 0x2D - */ \
665+
{0, HID_KEY_PERIOD }, /* 0x2E . */ \
666+
{0, HID_KEY_SLASH }, /* 0x2F / */ \
667+
{0, HID_KEY_0 }, /* 0x30 0 */ \
668+
{0, HID_KEY_1 }, /* 0x31 1 */ \
669+
{0, HID_KEY_2 }, /* 0x32 2 */ \
670+
{0, HID_KEY_3 }, /* 0x33 3 */ \
671+
{0, HID_KEY_4 }, /* 0x34 4 */ \
672+
{0, HID_KEY_5 }, /* 0x35 5 */ \
673+
{0, HID_KEY_6 }, /* 0x36 6 */ \
674+
{0, HID_KEY_7 }, /* 0x37 7 */ \
675+
{0, HID_KEY_8 }, /* 0x38 8 */ \
676+
{0, HID_KEY_9 }, /* 0x39 9 */ \
677+
{1, HID_KEY_SEMICOLON }, /* 0x3A : */ \
678+
{0, HID_KEY_SEMICOLON }, /* 0x3B ; */ \
679+
{1, HID_KEY_COMMA }, /* 0x3C < */ \
680+
{0, HID_KEY_EQUAL }, /* 0x3D = */ \
681+
{1, HID_KEY_PERIOD }, /* 0x3E > */ \
682+
{1, HID_KEY_SLASH }, /* 0x3F ? */ \
683+
\
684+
{1, HID_KEY_2 }, /* 0x40 @ */ \
685+
{1, HID_KEY_A }, /* 0x41 A */ \
686+
{1, HID_KEY_B }, /* 0x42 B */ \
687+
{1, HID_KEY_C }, /* 0x43 C */ \
688+
{1, HID_KEY_D }, /* 0x44 D */ \
689+
{1, HID_KEY_E }, /* 0x45 E */ \
690+
{1, HID_KEY_F }, /* 0x46 F */ \
691+
{1, HID_KEY_G }, /* 0x47 G */ \
692+
{1, HID_KEY_H }, /* 0x48 H */ \
693+
{1, HID_KEY_I }, /* 0x49 I */ \
694+
{1, HID_KEY_J }, /* 0x4A J */ \
695+
{1, HID_KEY_K }, /* 0x4B K */ \
696+
{1, HID_KEY_L }, /* 0x4C L */ \
697+
{1, HID_KEY_M }, /* 0x4D M */ \
698+
{1, HID_KEY_N }, /* 0x4E N */ \
699+
{1, HID_KEY_O }, /* 0x4F O */ \
700+
{1, HID_KEY_P }, /* 0x50 P */ \
701+
{1, HID_KEY_Q }, /* 0x51 Q */ \
702+
{1, HID_KEY_R }, /* 0x52 R */ \
703+
{1, HID_KEY_S }, /* 0x53 S */ \
704+
{1, HID_KEY_T }, /* 0x55 T */ \
705+
{1, HID_KEY_U }, /* 0x55 U */ \
706+
{1, HID_KEY_V }, /* 0x56 V */ \
707+
{1, HID_KEY_W }, /* 0x57 W */ \
708+
{1, HID_KEY_X }, /* 0x58 X */ \
709+
{1, HID_KEY_Y }, /* 0x59 Y */ \
710+
{1, HID_KEY_Z }, /* 0x5A Z */ \
711+
{0, HID_KEY_BRACKET_LEFT }, /* 0x5B [ */ \
712+
{0, HID_KEY_BACKSLASH }, /* 0x5C '\' */ \
713+
{0, HID_KEY_BRACKET_RIGHT }, /* 0x5D ] */ \
714+
{1, HID_KEY_6 }, /* 0x5E ^ */ \
715+
{1, HID_KEY_MINUS }, /* 0x5F _ */ \
716+
\
717+
{0, HID_KEY_GRAVE }, /* 0x60 ` */ \
718+
{0, HID_KEY_A }, /* 0x61 a */ \
719+
{0, HID_KEY_B }, /* 0x62 b */ \
720+
{0, HID_KEY_C }, /* 0x63 c */ \
721+
{0, HID_KEY_D }, /* 0x66 d */ \
722+
{0, HID_KEY_E }, /* 0x65 e */ \
723+
{0, HID_KEY_F }, /* 0x66 f */ \
724+
{0, HID_KEY_G }, /* 0x67 g */ \
725+
{0, HID_KEY_H }, /* 0x68 h */ \
726+
{0, HID_KEY_I }, /* 0x69 i */ \
727+
{0, HID_KEY_J }, /* 0x6A j */ \
728+
{0, HID_KEY_K }, /* 0x6B k */ \
729+
{0, HID_KEY_L }, /* 0x6C l */ \
730+
{0, HID_KEY_M }, /* 0x6D m */ \
731+
{0, HID_KEY_N }, /* 0x6E n */ \
732+
{0, HID_KEY_O }, /* 0x6F o */ \
733+
{0, HID_KEY_P }, /* 0x70 p */ \
734+
{0, HID_KEY_Q }, /* 0x71 q */ \
735+
{0, HID_KEY_R }, /* 0x72 r */ \
736+
{0, HID_KEY_S }, /* 0x73 s */ \
737+
{0, HID_KEY_T }, /* 0x75 t */ \
738+
{0, HID_KEY_U }, /* 0x75 u */ \
739+
{0, HID_KEY_V }, /* 0x76 v */ \
740+
{0, HID_KEY_W }, /* 0x77 w */ \
741+
{0, HID_KEY_X }, /* 0x78 x */ \
742+
{0, HID_KEY_Y }, /* 0x79 y */ \
743+
{0, HID_KEY_Z }, /* 0x7A z */ \
744+
{1, HID_KEY_BRACKET_LEFT }, /* 0x7B { */ \
745+
{1, HID_KEY_BACKSLASH }, /* 0x7C | */ \
746+
{1, HID_KEY_BRACKET_RIGHT }, /* 0x7D } */ \
747+
{1, HID_KEY_GRAVE }, /* 0x7E ~ */ \
748+
{0, HID_KEY_DELETE } /* 0x7F Delete */ \
749+
750+
/*--------------------------------------------------------------------
751+
* KEYCODE to Ascii Conversion
752+
* Expand to array of [128][2] (ascii without shift, ascii with shift)
753+
*
754+
* Usage: example to convert ascii from keycode (key) and shift modifier (shift).
755+
* Here we assume key < 128 ( printable )
756+
*
757+
* uint8_t const conv_table[128][2] = { HID_KEYCODE_TO_ASCII };
758+
* char ch = shift ? conv_table[chr][1] : conv_table[chr][0];
759+
*
760+
*--------------------------------------------------------------------*/
761+
#define HID_KEYCODE_TO_ASCII \
762+
{0 , 0 }, /* 0x00 */ \
763+
{0 , 0 }, /* 0x01 */ \
764+
{0 , 0 }, /* 0x02 */ \
765+
{0 , 0 }, /* 0x03 */ \
766+
{'a' , 'A' }, /* 0x04 */ \
767+
{'b' , 'B' }, /* 0x05 */ \
768+
{'c' , 'C' }, /* 0x06 */ \
769+
{'d' , 'D' }, /* 0x07 */ \
770+
{'e' , 'E' }, /* 0x08 */ \
771+
{'f' , 'F' }, /* 0x09 */ \
772+
{'g' , 'G' }, /* 0x0a */ \
773+
{'h' , 'H' }, /* 0x0b */ \
774+
{'i' , 'I' }, /* 0x0c */ \
775+
{'j' , 'J' }, /* 0x0d */ \
776+
{'k' , 'K' }, /* 0x0e */ \
777+
{'l' , 'L' }, /* 0x0f */ \
778+
{'m' , 'M' }, /* 0x10 */ \
779+
{'n' , 'N' }, /* 0x11 */ \
780+
{'o' , 'O' }, /* 0x12 */ \
781+
{'p' , 'P' }, /* 0x13 */ \
782+
{'q' , 'Q' }, /* 0x14 */ \
783+
{'r' , 'R' }, /* 0x15 */ \
784+
{'s' , 'S' }, /* 0x16 */ \
785+
{'t' , 'T' }, /* 0x17 */ \
786+
{'u' , 'U' }, /* 0x18 */ \
787+
{'v' , 'V' }, /* 0x19 */ \
788+
{'w' , 'W' }, /* 0x1a */ \
789+
{'x' , 'X' }, /* 0x1b */ \
790+
{'y' , 'Y' }, /* 0x1c */ \
791+
{'z' , 'Z' }, /* 0x1d */ \
792+
{'1' , '!' }, /* 0x1e */ \
793+
{'2' , '@' }, /* 0x1f */ \
794+
{'3' , '#' }, /* 0x20 */ \
795+
{'4' , '$' }, /* 0x21 */ \
796+
{'5' , '%' }, /* 0x22 */ \
797+
{'6' , '^' }, /* 0x23 */ \
798+
{'7' , '&' }, /* 0x24 */ \
799+
{'8' , '*' }, /* 0x25 */ \
800+
{'9' , '(' }, /* 0x26 */ \
801+
{'0' , ')' }, /* 0x27 */ \
802+
{'\r' , '\r' }, /* 0x28 */ \
803+
{'\x1b', '\x1b' }, /* 0x29 */ \
804+
{'\b' , '\b' }, /* 0x2a */ \
805+
{'\t' , '\t' }, /* 0x2b */ \
806+
{' ' , ' ' }, /* 0x2c */ \
807+
{'-' , '_' }, /* 0x2d */ \
808+
{'=' , '+' }, /* 0x2e */ \
809+
{'[' , '{' }, /* 0x2f */ \
810+
{']' , '}' }, /* 0x30 */ \
811+
{'\\' , '|' }, /* 0x31 */ \
812+
{'#' , '~' }, /* 0x32 */ \
813+
{';' , ':' }, /* 0x33 */ \
814+
{'\'' , '\"' }, /* 0x34 */ \
815+
{0 , 0 }, /* 0x35 */ \
816+
{',' , '<' }, /* 0x36 */ \
817+
{'.' , '>' }, /* 0x37 */ \
818+
{'/' , '?' }, /* 0x38 */ \
819+
\
820+
{0 , 0 }, /* 0x39 */ \
821+
{0 , 0 }, /* 0x3a */ \
822+
{0 , 0 }, /* 0x3b */ \
823+
{0 , 0 }, /* 0x3c */ \
824+
{0 , 0 }, /* 0x3d */ \
825+
{0 , 0 }, /* 0x3e */ \
826+
{0 , 0 }, /* 0x3f */ \
827+
{0 , 0 }, /* 0x40 */ \
828+
{0 , 0 }, /* 0x41 */ \
829+
{0 , 0 }, /* 0x42 */ \
830+
{0 , 0 }, /* 0x43 */ \
831+
{0 , 0 }, /* 0x44 */ \
832+
{0 , 0 }, /* 0x45 */ \
833+
{0 , 0 }, /* 0x46 */ \
834+
{0 , 0 }, /* 0x47 */ \
835+
{0 , 0 }, /* 0x48 */ \
836+
{0 , 0 }, /* 0x49 */ \
837+
{0 , 0 }, /* 0x4a */ \
838+
{0 , 0 }, /* 0x4b */ \
839+
{0 , 0 }, /* 0x4c */ \
840+
{0 , 0 }, /* 0x4d */ \
841+
{0 , 0 }, /* 0x4e */ \
842+
{0 , 0 }, /* 0x4f */ \
843+
{0 , 0 }, /* 0x50 */ \
844+
{0 , 0 }, /* 0x51 */ \
845+
{0 , 0 }, /* 0x52 */ \
846+
{0 , 0 }, /* 0x53 */ \
847+
\
848+
{'/' , '/' }, /* 0x54 */ \
849+
{'*' , '*' }, /* 0x55 */ \
850+
{'-' , '-' }, /* 0x56 */ \
851+
{'+' , '+' }, /* 0x57 */ \
852+
{'\r' , '\r' }, /* 0x58 */ \
853+
{'1' , 0 }, /* 0x59 */ \
854+
{'2' , 0 }, /* 0x5a */ \
855+
{'3' , 0 }, /* 0x5b */ \
856+
{'4' , 0 }, /* 0x5c */ \
857+
{'5' , '5' }, /* 0x5d */ \
858+
{'6' , 0 }, /* 0x5e */ \
859+
{'7' , 0 }, /* 0x5f */ \
860+
{'8' , 0 }, /* 0x60 */ \
861+
{'9' , 0 }, /* 0x61 */ \
862+
{'0' , 0 }, /* 0x62 */ \
863+
{'0' , 0 }, /* 0x63 */ \
864+
{'=' , '=' }, /* 0x67 */ \
865+
866+
601867
#ifdef __cplusplus
602868
}
603869
#endif

0 commit comments

Comments
 (0)