diff options
| author | tmk <nobody@nowhere> | 2010-10-19 01:03:27 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2010-10-19 01:03:27 +0900 |
| commit | 9d7979931e0037fc5ddc77a2cb895eb055501f34 (patch) | |
| tree | bed7080ff4375c04beb0526d423a71c88a5e3873 /hhkb | |
| parent | 54b5bafaacf0d7863b7bdb84dd69cbc80db77956 (diff) | |
| download | qmk_firmware-9d7979931e0037fc5ddc77a2cb895eb055501f34.tar.gz qmk_firmware-9d7979931e0037fc5ddc77a2cb895eb055501f34.zip | |
FIX: clear keyboard_keys.
NOT change layer when one more Fn keys pressed/other than Fn key pressed
Diffstat (limited to 'hhkb')
| -rw-r--r-- | hhkb/keymap.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/hhkb/keymap.c b/hhkb/keymap.c index d7e6bbe3b..572f530b9 100644 --- a/hhkb/keymap.c +++ b/hhkb/keymap.c | |||
| @@ -152,12 +152,17 @@ int get_layer(void) { | |||
| 152 | for (int col = 0; col < MATRIX_ROWS; col++) { | 152 | for (int col = 0; col < MATRIX_ROWS; col++) { |
| 153 | if (matrix[row] & 1<<col) continue; // NOT pressed | 153 | if (matrix[row] & 1<<col) continue; // NOT pressed |
| 154 | uint8_t code = get_keycode(0, row, col); | 154 | uint8_t code = get_keycode(0, row, col); |
| 155 | if (code == FN_1) layer = 1; | 155 | |
| 156 | else if (code == FN_2) layer = 2; | 156 | // NOT change current_layer when one more Fn keys pressed |
| 157 | else if (code == FN_3) layer = 3; | 157 | // when other than Fn key pressed |
| 158 | else if (code == FN_4) layer = 4; | 158 | if (code == FN_1) layer = layer ? current_layer : 1; |
| 159 | else if (code == FN_2) layer = layer ? current_layer : 2; | ||
| 160 | else if (code == FN_3) layer = layer ? current_layer : 3; | ||
| 161 | else if (code == FN_4) layer = layer ? current_layer : 4; | ||
| 159 | else if (KB_LCTRL <= code && code <= KB_RGUI) | 162 | else if (KB_LCTRL <= code && code <= KB_RGUI) |
| 160 | modifiers |= 1<<(code & 0x07); | 163 | modifiers |= 1<<(code & 0x07); |
| 164 | else // other_key_pressed | ||
| 165 | layer = current_layer; | ||
| 161 | } | 166 | } |
| 162 | } | 167 | } |
| 163 | 168 | ||