diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-07-07 13:57:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 13:57:39 -0400 |
| commit | e8719e10c4395102f8e252c8377e2f19a18ee74d (patch) | |
| tree | d802534a5cd71b046543fe8eaf31c94e5155b7b8 /keyboards | |
| parent | c1dfb636ef61159456bdb24f4fee3f27e5babbeb (diff) | |
| parent | a2eae81927ab0e817857d5b6ba2c7ce4a4b751b6 (diff) | |
| download | qmk_firmware-e8719e10c4395102f8e252c8377e2f19a18ee74d.tar.gz qmk_firmware-e8719e10c4395102f8e252c8377e2f19a18ee74d.zip | |
Merge pull request #491 from fredizzimo/keycode_fixes
Some fixes for keycode processing
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/chibios_test/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/infinity_ergodox/keymaps/default/keymap.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/keyboards/chibios_test/keymaps/default/keymap.c b/keyboards/chibios_test/keymaps/default/keymap.c index 239d70007a..a362e2ccf6 100644 --- a/keyboards/chibios_test/keymaps/default/keymap.c +++ b/keyboards/chibios_test/keymaps/default/keymap.c @@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "chibios_test.h" const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - {{KC_CAPS}}, // test with KC_CAPS, KC_A, KC_BTLD + {{KC_CAPS}}, // test with KC_CAPS, KC_A, RESET }; const uint16_t fn_actions[] = { diff --git a/keyboards/infinity_ergodox/keymaps/default/keymap.c b/keyboards/infinity_ergodox/keymaps/default/keymap.c index c33fb7b926..f1e6b1c8ae 100644 --- a/keyboards/infinity_ergodox/keymaps/default/keymap.c +++ b/keyboards/infinity_ergodox/keymaps/default/keymap.c @@ -18,6 +18,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "infinity_ergodox.h" +// Workaround for old keymap format +#define KC_RESET RESET + const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KEYMAP( // layer 0 : default // left hand @@ -63,7 +66,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KEYMAP( // layer 2 : keyboard functions // left hand - BTLD,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, + RESET,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, FN3, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, |