diff options
author | GlenPickle <wilson.r.william@gmail.com> | 2018-02-16 11:03:53 -0600 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-02-16 12:03:53 -0500 |
commit | d1ea398fb9c4848b74fc3eca40d6078bb529bf0a (patch) | |
tree | faa306d723222b8fdb22d52ee284c3b48ddb9441 /keyboards/chimera_ortho/keymaps | |
parent | bfc2b1205a724c4562d893a17200fffcef8b7fcf (diff) | |
download | qmk_firmware-d1ea398fb9c4848b74fc3eca40d6078bb529bf0a.tar.gz |
Added Chimera LS and Chimera Ergo (#2335)
* Added Chimera Ortho keymap
* added readme
* fixed hardware link
* Added KC_KEYMAP
* resolving conflict
* Added Chimera LS and Chimera Ergo
* Added rules file
* fixed rule files
* Added Chimera Ortho keymap
* Added KC_KEYMAP
* Added Chimera LS and Chimera Ergo
* fixed rule files
* fixed rule files
* fixed image links
* Added KC_KEYMAP
* Added Chimera LS and Chimera Ergo
* Added Chimera Ortho keymap
* fixed rule files
* fixed rule files
* fixed image links
* Fixed KEYMAP vs KC_KEYMAP
Diffstat (limited to 'keyboards/chimera_ortho/keymaps')
-rw-r--r-- | keyboards/chimera_ortho/keymaps/default/keymap.c | 12 | ||||
-rw-r--r-- | keyboards/chimera_ortho/keymaps/gordon/keymap.c | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/keyboards/chimera_ortho/keymaps/default/keymap.c b/keyboards/chimera_ortho/keymaps/default/keymap.c index ef477e652..6201eebac 100644 --- a/keyboards/chimera_ortho/keymaps/default/keymap.c +++ b/keyboards/chimera_ortho/keymaps/default/keymap.c @@ -44,7 +44,7 @@ enum chimera_ortho_layers const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = KEYMAP( + [_QWERTY] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. MESC, Q , W , E , R , T ,SCTL, SCTR, Y , U , I , O , P ,QUOT, //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_CAPS] = KEYMAP( + [_CAPS] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. , , , , , , , , , , , , , , //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_NUMPAD] = KEYMAP( + [_NUMPAD] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. , ,COLN , , , , , , , 7 , 8 , 9 ,ASTR,MINS, //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_SYMBOLS] = KEYMAP( + [_SYMBOLS] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. ,EXLM, AT ,HASH,DLR ,PERC, , ,CIRC,AMPR,ASTR,LPRN,RPRN,BSLS, //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_NAV] = KEYMAP( + [_NAV] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. , , , , , , , , , , UP , ,PSCR, , //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -104,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_MACROS] = KEYMAP( + [_MACROS] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. , , , , , , , , , ,INCL, , , , //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| diff --git a/keyboards/chimera_ortho/keymaps/gordon/keymap.c b/keyboards/chimera_ortho/keymaps/gordon/keymap.c index 721f8207a..c6d668f8f 100644 --- a/keyboards/chimera_ortho/keymaps/gordon/keymap.c +++ b/keyboards/chimera_ortho/keymaps/gordon/keymap.c @@ -206,7 +206,7 @@ qk_tap_dance_action_t tap_dance_actions[] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = KEYMAP( + [_QWERTY] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. MESC, Q ,CSHW,ENAV, R , T ,SPC , CLPS, Y , U ,INAV, O , P ,TTT, //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -218,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_NUMPAD] = KEYMAP( + [_NUMPAD] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. , , , ,ASTR, , , , , 7 , 8 , 9 ,ASTR,/**/, //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -230,7 +230,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_SYMBOLS] = KEYMAP( + [_SYMBOLS] = KC_KEYMAP( //,----+----+-----+----+----+----+----. ,----+----+----+----+----+----+----. ,EXLM, AT ,LCBR,RCBR,HASH, , ,CIRC,AMPR,ASTR,LPRN,RPRN,/**/, //|----+----+-----+----+----+----+----| |----+----+----+----+----+----+----| @@ -242,7 +242,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \-------------------+----+----+---/ \---+----+----+-------------------/ ), - [_FUNCTION] = KEYMAP( + [_FUNCTION] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. F6F7 ,F1 ,F2 ,F3 ,ALF4,F5 ,F6 , F7 ,F8 ,F9 ,F10 ,F11 ,F12 ,/**/, //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -254,7 +254,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_NAV] = KEYMAP( + [_NAV] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. , ,SNAPLEFT,/**/,SNAPRIGHT,, , , , , UP , , , , //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -266,7 +266,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_TEXTNAV] = KEYMAP( + [_TEXTNAV] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. , , , , , , , , , ,/**/, , , , //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -278,7 +278,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // \------------------+----+----+---/ \---+----+----+-------------------/ ), - [_MOUSE] = KEYMAP( + [_MOUSE] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. , , ,MS_UP, , , , , , , UP , , , ,/**/ //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| @@ -291,7 +291,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), - [_MACROS] = KEYMAP( + [_MACROS] = KC_KEYMAP( //,----+----+----+----+----+----+----. ,----+----+----+----+----+----+----. /**/,RESET,SECRET_2,SECRET_3, , , ,SYSTEM_SLEEP, , ,INCL, , , , //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| |