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/lfkeyboards/lfkpad/keymaps/default/keymap.c | 4 ++-- keyboards/lfkeyboards/lfkpad/lfkpad.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/lfkeyboards/lfkpad') diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c index 33ecfd56b..e73b8a99e 100644 --- a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c @@ -4,7 +4,7 @@ #include "action_layer.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = KEYMAP( /* Base */ +[0] = LAYOUT( /* Base */ KC_ESC, KC_TAB, KC_PEQL, MO(1), \ KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS, \ KC_P7, KC_P8, KC_P9, KC_PPLS, \ @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P1, KC_P2, KC_P3, KC_PENT, \ KC_P0, KC_PDOT), -[1] = KEYMAP( /* RGB */ +[1] = LAYOUT( /* RGB */ RGB_SAI, RGB_VAI, RGB_HUI, KC_TRNS, \ RGB_SAD, RGB_VAD, RGB_HUD, KC_TRNS, \ RGB_M_X, RGB_M_G, RGB_MOD, RGB_RMOD, \ diff --git a/keyboards/lfkeyboards/lfkpad/lfkpad.h b/keyboards/lfkeyboards/lfkpad/lfkpad.h index d7d66ea7a..b82581b93 100644 --- a/keyboards/lfkeyboards/lfkpad/lfkpad.h +++ b/keyboards/lfkeyboards/lfkpad/lfkpad.h @@ -54,7 +54,7 @@ enum action_functions { void reset_keyboard_kb(void); void click(uint16_t freq, uint16_t duration); -#define KEYMAP( \ +#define LAYOUT( \ k00, k01, k02, k03,\ k10, k11, k12, k13,\ k20, k21, k22, k23,\ @@ -70,4 +70,4 @@ void click(uint16_t freq, uint16_t duration); { k50, KC_NO, k52, KC_NO } \ } -#endif //LFKPAD_H \ No newline at end of file +#endif //LFKPAD_H -- cgit v1.2.3-24-g4f1b