diff -r -c2 tmk_keyboard-master/converter/adb_usb/keymap.c tmk_keyboard-master-mod/converter/adb_usb/keymap.c *** tmk_keyboard-master/converter/adb_usb/keymap.c 2012-12-05 02:45:48.000000000 -0600 --- tmk_keyboard-master-mod/converter/adb_usb/keymap.c 2012-12-11 00:23:50.000000000 -0600 *************** *** 41,45 **** K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K45, \ K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K7B, K3E, K53,K54,K55, \ ! K36,K3A,K37, K31, K3B,K3D,K3C, K52, K41,K4C \ ) { \ { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \ --- 41,45 ---- K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K45, \ K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K7B, K3E, K53,K54,K55, \ ! K36,K3A,K37, K31, K7C,K7D, K3B,K3D,K3C, K52, K41,K4C \ ) { \ { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \ *************** *** 58,62 **** { KC_NO, KC_##K69, KC_NO, KC_##K6B, KC_NO, KC_##K6D, KC_NO, KC_##K6F }, \ { KC_NO, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \ ! { KC_##K78, KC_##K79, KC_##K7A, KC_##K7B, KC_NO, KC_NO, KC_NO, KC_##K7F } \ } --- 58,62 ---- { KC_NO, KC_##K69, KC_NO, KC_##K6B, KC_NO, KC_##K6D, KC_NO, KC_##K6F }, \ { KC_NO, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \ ! { KC_##K78, KC_##K79, KC_##K7A, KC_##K7B, KC_##K7C, KC_##K7D, KC_NO, KC_##K7F } \ } *************** *** 110,114 **** CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS, LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3, ! LCTL,LGUI,LALT, SPC, LEFT,DOWN,RGHT, P0, PDOT,PENT ), }; --- 110,114 ---- CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS, LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3, ! LCTL,LGUI,LALT, SPC, RGUI,RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT ), }; diff -r -c2 tmk_keyboard-master/converter/adb_usb/matrix.c tmk_keyboard-master-mod/converter/adb_usb/matrix.c *** tmk_keyboard-master/converter/adb_usb/matrix.c 2012-12-05 02:45:48.000000000 -0600 --- tmk_keyboard-master-mod/converter/adb_usb/matrix.c 2012-12-11 00:30:14.000000000 -0600 *************** *** 73,76 **** --- 73,82 ---- adb_host_init(); + // Enable keyboard left/right modifier distinction + // Addr:Keyboard(0010), Cmd:Listen(10), Register3(11) + // upper byte: reserved bits 0000, device address 0010 + // lower byte: device handler 00000011 + adb_host_listen(0x2B,0x02,0x03); + // initialize matrix state: all keys off for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00; diff -r -c2 tmk_keyboard-master/protocol/adb.c tmk_keyboard-master-mod/protocol/adb.c *** tmk_keyboard-master/protocol/adb.c 2012-12-05 02:45:48.000000000 -0600 --- tmk_keyboard-master-mod/protocol/adb.c 2012-12-11 00:29:30.000000000 -0600 *************** *** 99,115 **** } ! // send state of LEDs ! void adb_host_kbd_led(uint8_t led) { attention(); ! send_byte(0x2A); // Addr:Keyboard(0010), Cmd:Listen(10), Register2(10) place_bit0(); // Stopbit(0) _delay_us(200); // Tlt/Stop to Start place_bit1(); // Startbit(1) ! send_byte(0); // send upper byte (not used) ! send_byte(led&0x07); // send lower byte (bit2: ScrollLock, bit1: CapsLock, bit0: NumLock) place_bit0(); // Stopbit(0); } static inline void data_lo() --- 99,123 ---- } ! void adb_host_listen(uint8_t cmd, uint8_t data_h, uint8_t data_l) { attention(); ! send_byte(cmd); place_bit0(); // Stopbit(0) _delay_us(200); // Tlt/Stop to Start place_bit1(); // Startbit(1) ! send_byte(data_h); ! send_byte(data_l); place_bit0(); // Stopbit(0); } + // send state of LEDs + void adb_host_kbd_led(uint8_t led) + { + // Addr:Keyboard(0010), Cmd:Listen(10), Register2(10) + // send upper byte (not used) + // send lower byte (bit2: ScrollLock, bit1: CapsLock, bit0: + adb_host_listen(0x2A,0,led&0x07); + } + static inline void data_lo() diff -r -c2 tmk_keyboard-master/protocol/adb.h tmk_keyboard-master-mod/protocol/adb.h *** tmk_keyboard-master/protocol/adb.h 2012-12-05 02:45:48.000000000 -0600 --- tmk_keyboard-master-mod/protocol/adb.h 2012-12-11 00:27:48.000000000 -0600 *************** *** 57,60 **** --- 57,61 ---- bool adb_host_psw(void); uint16_t adb_host_kbd_recv(void); + void adb_host_listen(uint8_t cmd, uint8_t data_h, uint8_t data_l); void adb_host_kbd_led(uint8_t led);