From 5f4c2dfd84467dc7f04e8e07c294ebfa5b4ca459 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Sat, 7 Apr 2018 12:14:53 -0700 Subject: Fix some Configurator Warnings regarding LAYOUT vs KEYMAP (#2708) * change diverge 3 KC_KEYMAP to LAYOUT * Change KEYMAP to LAYOUT for handwired arrow pad * change M10A to LAYOUT for m10-a * Change KC_KEYMAP to LAYOUT_kc and KEYMAP to LAYOUT for mf68 * change KC_KEYMAP to LAYOUT for nano * Refactor to LAYOUT * refactor to LAYOUT-ansi and LAYOUT_iso for s65 * LAYOUT conversions for lfkkeyboards * missed a few renames * mini1800 for lfkeyobards support of LAYOUT --- keyboards/handwired/arrow_pad/keymaps/default/keymap.c | 10 +++++----- keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c | 10 +++++----- keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'keyboards/handwired/arrow_pad') diff --git a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c index 03adf746d..b5d304708 100644 --- a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c +++ b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c @@ -3,7 +3,7 @@ #include "led.h" // This is the 21-key keypad to 2x11 element matrix mapping -#define KEYMAP( \ +#define LAYOUT( \ KM_ESC, KM_TAB, KM_BSL, KM_ARR, \ KM_NUM, KM_FSL, KM_AST, KM_MIN, \ KM___7, KM___8, KM___9, KM_EQU, \ @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[LAYER_BASE] = KEYMAP( \ +[LAYER_BASE] = LAYOUT( \ KC_ESC, KC_TAB, KC_BSLS, KC_FN0, \ KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ KC_P7, KC_P8, KC_P9, KC_PEQL, \ @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, XXXXXXX, \ KC_P0, KC_PCMM, KC_PDOT, KC_PENT ), -[LAYER_EDIT] = KEYMAP( \ +[LAYER_EDIT] = LAYOUT( \ KC_ESC, KC_TAB, KC_SPC, _______, \ KC_FN1, SC_PSTE, SC_REDO, SC_UNDO, \ KC_HOME, KC_UP, KC_PGUP, KC_LALT, \ @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_END, KC_DOWN, KC_PGDN, XXXXXXX, \ KC_BSPC, KC_PENT, KC_DEL, M_SHFCT), -[LAYER_FUNCTION] = KEYMAP( \ +[LAYER_FUNCTION] = LAYOUT( \ KC_FN2, KC_FN3, KC_FN4, _______, \ KC_FN1, _______, _______, _______, \ _______, _______, _______, _______, \ @@ -158,4 +158,4 @@ void led_set_user(uint8_t usb_led) DDRC &= ~(1<<7); PORTC &= ~(1<<7); } -} \ No newline at end of file +} diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c index d93ccb1ae..a29f9e101 100644 --- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c +++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c @@ -3,7 +3,7 @@ #include "led.h" // This is the 21-key keypad to 2x11 element matrix mapping -#define KEYMAP( \ +#define LAYOUT( \ KM_ESC, KM_TAB, KM_BSL, KM_ARR, \ KM_NUM, KM_FSL, KM_AST, KM_MIN, \ KM___7, KM___8, KM___9, ___PLS, \ @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[LAYER_BASE] = KEYMAP( \ +[LAYER_BASE] = LAYOUT( \ KC_ESC, KC_TAB, KC_BSLS, KC_FN0, \ KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ KC_P7, KC_P8, KC_P9, XXXXXXX, \ @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, XXXXXXX, \ KC_P0, XXXXXXX, KC_PDOT, KC_PENT ), -[LAYER_EDIT] = KEYMAP( \ +[LAYER_EDIT] = LAYOUT( \ KC_ESC, KC_TAB, KC_SPC, _______, \ KC_FN1, SC_PSTE, SC_REDO, SC_UNDO, \ KC_HOME, KC_UP, KC_PGUP, XXXXXXX, \ @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_END, KC_DOWN, KC_PGDN, XXXXXXX, \ KC_BSPC, XXXXXXX, KC_DEL, M_SHFCT), -[LAYER_FUNCTION] = KEYMAP( \ +[LAYER_FUNCTION] = LAYOUT( \ KC_FN2, KC_FN3, KC_FN4, _______, \ KC_FN1, _______, _______, _______, \ _______, _______, _______, XXXXXXX, \ @@ -155,4 +155,4 @@ void led_set_user(uint8_t usb_led) DDRC &= ~(1<<7); PORTC &= ~(1<<7); } -} \ No newline at end of file +} diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c index 03adf746d..b5d304708 100644 --- a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c +++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c @@ -3,7 +3,7 @@ #include "led.h" // This is the 21-key keypad to 2x11 element matrix mapping -#define KEYMAP( \ +#define LAYOUT( \ KM_ESC, KM_TAB, KM_BSL, KM_ARR, \ KM_NUM, KM_FSL, KM_AST, KM_MIN, \ KM___7, KM___8, KM___9, KM_EQU, \ @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[LAYER_BASE] = KEYMAP( \ +[LAYER_BASE] = LAYOUT( \ KC_ESC, KC_TAB, KC_BSLS, KC_FN0, \ KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ KC_P7, KC_P8, KC_P9, KC_PEQL, \ @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, XXXXXXX, \ KC_P0, KC_PCMM, KC_PDOT, KC_PENT ), -[LAYER_EDIT] = KEYMAP( \ +[LAYER_EDIT] = LAYOUT( \ KC_ESC, KC_TAB, KC_SPC, _______, \ KC_FN1, SC_PSTE, SC_REDO, SC_UNDO, \ KC_HOME, KC_UP, KC_PGUP, KC_LALT, \ @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_END, KC_DOWN, KC_PGDN, XXXXXXX, \ KC_BSPC, KC_PENT, KC_DEL, M_SHFCT), -[LAYER_FUNCTION] = KEYMAP( \ +[LAYER_FUNCTION] = LAYOUT( \ KC_FN2, KC_FN3, KC_FN4, _______, \ KC_FN1, _______, _______, _______, \ _______, _______, _______, _______, \ @@ -158,4 +158,4 @@ void led_set_user(uint8_t usb_led) DDRC &= ~(1<<7); PORTC &= ~(1<<7); } -} \ No newline at end of file +} -- cgit v1.2.3-24-g4f1b