diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-03-16 12:01:35 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-03-16 12:01:35 -0400 |
| commit | 9307a0a3e415d33d0858283f67fcba4c59a042ff (patch) | |
| tree | 45252e53439dde1122945646f4fa340cf0a8923e /keyboard/infinity/keymap_common.h | |
| parent | be86aefdbda560d6810f9594169fee4385c1422d (diff) | |
| parent | c35c4283b9c2c65d62fe8dc5e4b7ca49a8f5af33 (diff) | |
| download | qmk_firmware-9307a0a3e415d33d0858283f67fcba4c59a042ff.tar.gz qmk_firmware-9307a0a3e415d33d0858283f67fcba4c59a042ff.zip | |
Merge pull request #6 from tmk/master
pulling from tmk
Diffstat (limited to 'keyboard/infinity/keymap_common.h')
| -rw-r--r-- | keyboard/infinity/keymap_common.h | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/keyboard/infinity/keymap_common.h b/keyboard/infinity/keymap_common.h index 7a5f778f2d..b0f765bfeb 100644 --- a/keyboard/infinity/keymap_common.h +++ b/keyboard/infinity/keymap_common.h @@ -33,9 +33,9 @@ extern const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; extern const uint16_t fn_actions[]; -/* GH60 keymap definition macro - * K2C, K31 and K3C are extra keys for ISO - */ +#ifdef INFINITY_PROTOTYPE + +/* Infinity prototype */ #define KEYMAP( \ K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K86, \ K51, K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, \ @@ -54,5 +54,27 @@ extern const uint16_t fn_actions[]; { KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86 } \ } +#else + +/* Infinity production */ +#define KEYMAP( \ + K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K51, \ + K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, K13, \ + K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, K54, \ + K64, K74, K84, K05, K15, K25, K35, K45, K55, K65, K75, K85, K06, \ + K16, K26, K36, K46, K56, K66, K76, K86 \ +) { \ + { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06 }, \ + { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16 }, \ + { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26 }, \ + { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36 }, \ + { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46 }, \ + { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56 }, \ + { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66 }, \ + { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76 }, \ + { KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86 } \ +} + #endif +#endif |