From d1ea398fb9c4848b74fc3eca40d6078bb529bf0a Mon Sep 17 00:00:00 2001 From: GlenPickle Date: Fri, 16 Feb 2018 11:03:53 -0600 Subject: 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 --- keyboards/chimera_ortho/chimera_ortho.h | 15 ++++++++++++++- keyboards/chimera_ortho/keymaps/default/keymap.c | 12 ++++++------ keyboards/chimera_ortho/keymaps/gordon/keymap.c | 16 ++++++++-------- 3 files changed, 28 insertions(+), 15 deletions(-) (limited to 'keyboards/chimera_ortho') diff --git a/keyboards/chimera_ortho/chimera_ortho.h b/keyboards/chimera_ortho/chimera_ortho.h index c21b37ff80..3b7690d43a 100644 --- a/keyboards/chimera_ortho/chimera_ortho.h +++ b/keyboards/chimera_ortho/chimera_ortho.h @@ -49,7 +49,7 @@ // This a shortcut to help you visually see your layout. // The first section contains all of the arguements // The second converts the arguments into a two-dimensional array -#define KEYMAP( \ +#define KC_KEYMAP( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \ k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \ k28, k29, k31, k32, k33, k34, k35, k36, k37, k38, k41, k42, k43, k44,\ @@ -63,4 +63,17 @@ { KC_NO, KC_##k28, KC_##k14, KC_##k00, KC_##k45, KC_##k48, KC_##k13, KC_##k27, KC_##k44, KC_NO }, \ } +#define KEYMAP( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \ + k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \ + k28, k29, k31, k32, k33, k34, k35, k36, k37, k38, k41, k42, k43, k44,\ + k45, k46, k47, k48 \ +) \ +{ \ + { k01, k02, k03, k04, k05, k08, k09, k10, k11, k12 }, \ + { k15, k16, k17, k18, k19, k22, k23, k24, k25, k26 }, \ + { k29, k31, k32, k33, k34, k37, k38, k41, k42, k43 }, \ + { KC_NO, k06, k20, k35, k46, k47, k36, k21, k07, KC_NO }, \ + { KC_NO, k28, k14, k00, k45, k48, k13, k27, k44, KC_NO }, \ +} #endif diff --git a/keyboards/chimera_ortho/keymaps/default/keymap.c b/keyboards/chimera_ortho/keymaps/default/keymap.c index ef477e6527..6201eebac8 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 721f8207ae..c6d668f8f8 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, , , , //|----+----+----+----+----+----+----| |----+----+----+----+----+----+----| -- cgit v1.2.3