From 8fd534805f56a461b8f4be91bf5ef3713ad90be6 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sun, 20 Aug 2017 23:28:43 -0400 Subject: [PATCH] touch-up default layouts --- keyboards/nyquist/keymaps/default/config.h | 4 ++-- keyboards/nyquist/rev1/config.h | 3 +++ .../60_ansi_split_bs/default_ansi_split_bs/keymap.c | 2 +- layouts/default/ortho_4x12/default_ortho_4x12/keymap.c | 8 ++++---- layouts/default/ortho_4x4/default_ortho_4x12/keymap.c | 10 ---------- layouts/default/ortho_4x4/default_ortho_4x4/keymap.c | 10 ++++++++++ 6 files changed, 20 insertions(+), 17 deletions(-) delete mode 100644 layouts/default/ortho_4x4/default_ortho_4x12/keymap.c create mode 100644 layouts/default/ortho_4x4/default_ortho_4x4/keymap.c diff --git a/keyboards/nyquist/keymaps/default/config.h b/keyboards/nyquist/keymaps/default/config.h index 072d4a7ce211..cc6009730e33 100644 --- a/keyboards/nyquist/keymaps/default/config.h +++ b/keyboards/nyquist/keymaps/default/config.h @@ -22,12 +22,12 @@ along with this program. If not, see . /* Use I2C or Serial, not both */ -#define USE_SERIAL +// #define USE_SERIAL // #define USE_I2C /* Select hand configuration */ -#define MASTER_LEFT +// #define MASTER_LEFT // #define _MASTER_RIGHT // #define EE_HANDS diff --git a/keyboards/nyquist/rev1/config.h b/keyboards/nyquist/rev1/config.h index 361576887138..e286e94665a7 100644 --- a/keyboards/nyquist/rev1/config.h +++ b/keyboards/nyquist/rev1/config.h @@ -68,6 +68,9 @@ along with this program. If not, see . #define ws2812_PORTREG PORTD #define ws2812_DDRREG DDRD +#define MASTER_LEFT +#define USE_SERIAL + /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/layouts/default/60_ansi_split_bs/default_ansi_split_bs/keymap.c b/layouts/default/60_ansi_split_bs/default_ansi_split_bs/keymap.c index 840d28515731..d81390f451bc 100644 --- a/layouts/default/60_ansi_split_bs/default_ansi_split_bs/keymap.c +++ b/layouts/default/60_ansi_split_bs/default_ansi_split_bs/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi( + [0] = LAYOUT_60_ansi_split_bs( KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, diff --git a/layouts/default/ortho_4x12/default_ortho_4x12/keymap.c b/layouts/default/ortho_4x12/default_ortho_4x12/keymap.c index 79581fa618bc..da7484f73cfe 100644 --- a/layouts/default/ortho_4x12/default_ortho_4x12/keymap.c +++ b/layouts/default/ortho_4x12/default_ortho_4x12/keymap.c @@ -2,9 +2,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ortho_4x4( - KC_A, KC_B, KC_C, KC_D, - KC_A, KC_B, KC_C, KC_D, - KC_A, KC_B, KC_C, KC_D, - KC_A, KC_B, KC_C, KC_D + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L ) }; \ No newline at end of file diff --git a/layouts/default/ortho_4x4/default_ortho_4x12/keymap.c b/layouts/default/ortho_4x4/default_ortho_4x12/keymap.c deleted file mode 100644 index 4a2f8fd955ec..000000000000 --- a/layouts/default/ortho_4x4/default_ortho_4x12/keymap.c +++ /dev/null @@ -1,10 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x12( - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L, - KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, KC_K, KC_L - ) -}; \ No newline at end of file diff --git a/layouts/default/ortho_4x4/default_ortho_4x4/keymap.c b/layouts/default/ortho_4x4/default_ortho_4x4/keymap.c new file mode 100644 index 000000000000..79581fa618bc --- /dev/null +++ b/layouts/default/ortho_4x4/default_ortho_4x4/keymap.c @@ -0,0 +1,10 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x4( + KC_A, KC_B, KC_C, KC_D, + KC_A, KC_B, KC_C, KC_D, + KC_A, KC_B, KC_C, KC_D, + KC_A, KC_B, KC_C, KC_D + ) +}; \ No newline at end of file