From c833b77646af8e51aee5546746d7183728e2cff8 Mon Sep 17 00:00:00 2001 From: kb-elmo Date: Thu, 18 Mar 2021 14:17:21 +0100 Subject: [PATCH] Fixed keymap names of Noah AVR (#12265) Co-authored-by: Ryan Co-authored-by: Drashna Jaelre --- keyboards/kb_elmo/noah_avr/info.json | 6 +++--- keyboards/kb_elmo/noah_avr/keymaps/default/keymap.c | 4 ++-- keyboards/kb_elmo/noah_avr/noah_avr.h | 6 +++--- keyboards/kb_elmo/noah_avr/rules.mk | 2 -- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json index c90b32b0d..8560d4b86 100644 --- a/keyboards/kb_elmo/noah_avr/info.json +++ b/keyboards/kb_elmo/noah_avr/info.json @@ -78,7 +78,7 @@ {"x":15, "y":4} ] }, - "LAYOUT_65_ansi": { + "LAYOUT_ansi": { "layout": [ {"x":0, "y":0}, {"x":1, "y":0}, @@ -149,7 +149,7 @@ {"x":15, "y":4} ] }, - "LAYOUT_65_ansi_splitbs": { + "LAYOUT_ansi_splitbs": { "layout": [ {"x":0, "y":0}, {"x":1, "y":0}, @@ -221,7 +221,7 @@ {"x":15, "y":4} ] }, - "LAYOUT_65_iso": { + "LAYOUT_iso": { "layout": [ {"x":0, "y":0}, {"x":1, "y":0}, diff --git a/keyboards/kb_elmo/noah_avr/keymaps/default/keymap.c b/keyboards/kb_elmo/noah_avr/keymaps/default/keymap.c index aa7f99a5c..6dae99e2b 100644 --- a/keyboards/kb_elmo/noah_avr/keymaps/default/keymap.c +++ b/keyboards/kb_elmo/noah_avr/keymaps/default/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_65_ansi( + [0] = LAYOUT_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_65_ansi( + [1] = LAYOUT_ansi( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/kb_elmo/noah_avr/noah_avr.h b/keyboards/kb_elmo/noah_avr/noah_avr.h index eb16cf4f4..a816a30d0 100644 --- a/keyboards/kb_elmo/noah_avr/noah_avr.h +++ b/keyboards/kb_elmo/noah_avr/noah_avr.h @@ -42,7 +42,7 @@ { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 } \ } -#define LAYOUT_64_ansi( \ +#define LAYOUT_ansi( \ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k015, \ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \ @@ -56,7 +56,7 @@ { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 } \ } -#define LAYOUT_64_ansi_splitbs( \ +#define LAYOUT_ansi_splitbs( \ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \ @@ -70,7 +70,7 @@ { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 } \ } -#define LAYOUT_64_iso( \ +#define LAYOUT_iso( \ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k015, \ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k115, \ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k113, k213, k215, \ diff --git a/keyboards/kb_elmo/noah_avr/rules.mk b/keyboards/kb_elmo/noah_avr/rules.mk index a547ba86b..38ce53e30 100644 --- a/keyboards/kb_elmo/noah_avr/rules.mk +++ b/keyboards/kb_elmo/noah_avr/rules.mk @@ -20,5 +20,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output - -LAYOUTS = 65_ansi 65_iso