aboutsummaryrefslogtreecommitdiff
path: root/quantum/quantum.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-25 21:31:10 -0400
committerGitHub <noreply@github.com>2017-06-25 21:31:10 -0400
commitd1fb8d2296889ee1aaa08988c8951eb5f12d930b (patch)
treee19d6fd1cd93c4ee81eb19609c79661160f728bf /quantum/quantum.c
parent42e6ecc36b65ad0f0d29c6c35c93b95078c11a1a (diff)
parent3a2ae6a213acf7b20fab711a311ed5ca44b79b19 (diff)
downloadqmk_firmware-d1fb8d2296889ee1aaa08988c8951eb5f12d930b.tar.gz
qmk_firmware-d1fb8d2296889ee1aaa08988c8951eb5f12d930b.zip
Merge pull request #1431 from rai-suta/master
Bugg fix and add keymap for testing JIS_KEYCODE switch.
Diffstat (limited to 'quantum/quantum.c')
-rw-r--r--quantum/quantum.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 3b5e52ff1..5bb7b04d5 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -530,7 +530,7 @@ void send_string(const char *str) {
530 shift = false; 530 shift = false;
531 } 531 }
532 else { 532 else {
533 int hi = ascii_code>>4 & 0x0f; 533 int hi = ascii_code>>4 & 0x0f,
534 lo = ascii_code & 0x0f; 534 lo = ascii_code & 0x0f;
535 keycode = pgm_read_byte(&ascii_to_keycode_lut[hi][lo]); 535 keycode = pgm_read_byte(&ascii_to_keycode_lut[hi][lo]);
536 shift = !!( pgm_read_word(&ascii_to_shift_lut[hi]) & (0x8000u>>lo) ); 536 shift = !!( pgm_read_word(&ascii_to_shift_lut[hi]) & (0x8000u>>lo) );