From 20c9867a23e5c2ccbe5d8821f0fe25be7608aa77 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 25 Dec 2019 13:15:50 -0800 Subject: [PATCH] use LAYOUT_ergodox instead of KEYMAP --- layouts/community/ergodox/don/keymap.c | 14 +++++++------- .../community/ergodox/don/{Makefile => rules.mk} | 0 2 files changed, 7 insertions(+), 7 deletions(-) rename layouts/community/ergodox/don/{Makefile => rules.mk} (100%) diff --git a/layouts/community/ergodox/don/keymap.c b/layouts/community/ergodox/don/keymap.c index 640b24f84..d7afc437e 100644 --- a/layouts/community/ergodox/don/keymap.c +++ b/layouts/community/ergodox/don/keymap.c @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "ergodox.h" +#include QMK_KEYBOARD_H #include "debug.h" #include "action_layer.h" #include "version.h" @@ -31,7 +31,7 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = KEYMAP( // layer 0 : default + [BASE] = LAYOUT_ergodox( // layer 0 : default // left hand KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL, KC_BSLS,KC_Q, KC_W, KC_E, KC_R, KC_T, TG(MOUS), @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PGDN,KC_ENT, KC_SPC ), - [SYMB] = KEYMAP( // layer 1 : function and symbol keys + [SYMB] = LAYOUT_ergodox( // layer 1 : function and symbol keys // left hand TG(PLVR),KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_TRNS,KC_LBRC,KC_RBRC,KC_LBRC,KC_RBRC,KC_SCLN,KC_TRNS, @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS ), - [MOUS] = KEYMAP( // layer 2 : Mouse + [MOUS] = LAYOUT_ergodox( // layer 2 : Mouse // left hand 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 , @@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_TRNS,KC_TRNS ), - [FNXN] = KEYMAP( // layer 3 : keyboard functions + [FNXN] = LAYOUT_ergodox( // layer 3 : keyboard functions // left hand RESET,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_FN0, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_FN0, @@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS,KC_TRNS,KC_TRNS ), - [NUMP] = KEYMAP( // layer 4: numpad + [NUMP] = LAYOUT_ergodox( // layer 4: numpad // left hand 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, @@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------' `--------------------' */ -[PLVR] = KEYMAP( +[PLVR] = LAYOUT_ergodox( // left hand KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_FN0, KC_NO, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, diff --git a/layouts/community/ergodox/don/Makefile b/layouts/community/ergodox/don/rules.mk similarity index 100% rename from layouts/community/ergodox/don/Makefile rename to layouts/community/ergodox/don/rules.mk -- 2.39.5