From 1e1584fa90583c098f9b108ed1fc2154fc4d4781 Mon Sep 17 00:00:00 2001 From: Philip Chan Date: Sat, 29 Aug 2020 08:02:05 -0400 Subject: [PATCH] removed define for layers/kc_no/kc_trns --- keyboards/dz60/keymaps/coppertop/keymap.c | 33 ++++++++++++----------- keyboards/dz60/keymaps/spotpuff/keymap.c | 32 +++++++++++----------- users/spotpuff/rules.mk | 1 + 3 files changed, 34 insertions(+), 32 deletions(-) create mode 100644 users/spotpuff/rules.mk diff --git a/keyboards/dz60/keymaps/coppertop/keymap.c b/keyboards/dz60/keymaps/coppertop/keymap.c index d1b8ff8c179..4ec1a4c9738 100644 --- a/keyboards/dz60/keymaps/coppertop/keymap.c +++ b/keyboards/dz60/keymaps/coppertop/keymap.c @@ -1,13 +1,14 @@ #include QMK_KEYBOARD_H //Layers -#define _QWERTY 0 -#define _FN 1 -#define _MEDIA 2 +enum layer_names { + _QWERTY, + _FN, + _MEDIA, +}; -//Filler for KC_TRNS/KC_NO just so the key maps are a bit more readable -#define ______ KC_TRNS -#define XXXXXX KC_NO +//Custom Keymap Definitions +#define KC_CAD LALT(LCTL(KC_DEL)) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -46,11 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------------------------------------------------------------' */ [_FN] = LAYOUT_directional( - XXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXX, KC_INS, - XXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, - KC_CAPS, XXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_SLCK, KC_PAUS, KC_PSCR, - ______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXX, XXXXXX, KC_PGUP, BL_INC, KC_PGDN, - ______, ______, ______, XXXXXX, ______, XXXXXX, XXXXXX, XXXXXX, BL_TOGG, BL_DEC, BL_STEP + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_INS, + KC_NO, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_CAPS, KC_NO, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLCK, KC_PAUS, KC_PSCR, + KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, KC_PGUP, BL_INC, KC_PGDN, + KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, BL_TOGG, BL_DEC, BL_STEP ), /* SFX/Multimedia/Numpad layer @@ -67,10 +68,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------------------------------------------------------------' */ [_MEDIA] = LAYOUT_directional( - XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, XXXXXX, ______, ______, - XXXXXX, XXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXX, XXXXXX, KC_P7, KC_P8, KC_P9, KC_PPLS, XXXXXX, XXXXXX, RESET, - ______, XXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXX, XXXXXX, KC_P4, KC_P5, KC_P6, KC_PPLS, XXXXXX, ______, - ______, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_P1, KC_P2, KC_P3, KC_PENT, XXXXXX, XXXXXX, XXXXXX, - ______, ______, ______, ______, ______, KC_P0, KC_PDOT, XXXXXX, XXXXXX, XXXXXX, XXXXXX + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, KC_NO, KC_TRNS, KC_TRNS, + KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_NO, KC_NO, RESET, + KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_TRNS, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO ) }; \ No newline at end of file diff --git a/keyboards/dz60/keymaps/spotpuff/keymap.c b/keyboards/dz60/keymaps/spotpuff/keymap.c index de055d4636b..ee70b1a40f1 100644 --- a/keyboards/dz60/keymaps/spotpuff/keymap.c +++ b/keyboards/dz60/keymaps/spotpuff/keymap.c @@ -1,13 +1,13 @@ #include QMK_KEYBOARD_H //Layers -#define _QWERTY 0 -#define _FN 1 -#define _MEDIA 2 +enum layer_names { + _QWERTY, + _FN, + _MEDIA, +}; -//Filler for KC_TRNS/KC_NO just so the key maps are a bit more readable -#define ______ KC_TRNS -#define XXXXXX KC_NO +//Custom Keymap Definitions #define KC_CAD LALT(LCTL(KC_DEL)) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -49,11 +49,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FN] = LAYOUT_directional( - XXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXX, KC_INS, - XXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_CAD, - KC_CAPS, XXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_SLCK, KC_PAUS, KC_PSCR, - ______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, XXXXXX, XXXXXX, XXXXXX, BL_INC, XXXXXX, - ______, ______, ______, XXXXXX, ______, XXXXXX, XXXXXX, XXXXXX, BL_TOGG, BL_DEC, BL_STEP + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_INS, + KC_NO, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_CAD, + KC_CAPS, KC_NO, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLCK, KC_PAUS, KC_PSCR, + KC_TRNS, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_NO, KC_NO, KC_NO, BL_INC, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, BL_TOGG, BL_DEC, BL_STEP ), /* SFX/Multimedia/Numpad layer @@ -70,10 +70,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `----------------------------------------------------------------------------------------' */ [_MEDIA] = LAYOUT_directional( - XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_NLCK, XXXXXX, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, XXXXXX, ______, ______, - XXXXXX, XXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXX, XXXXXX, KC_P7, KC_P8, KC_P9, KC_PPLS, XXXXXX, XXXXXX, RESET, - ______, XXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXX, XXXXXX, KC_P4, KC_P5, KC_P6, KC_PPLS, XXXXXX, ______, - ______, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, XXXXXX, KC_P1, KC_P2, KC_P3, KC_PENT, XXXXXX, XXXXXX, XXXXXX, - ______, ______, ______, ______, ______, KC_P0, KC_PDOT, XXXXXX, XXXXXX, XXXXXX, XXXXXX + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NLCK, KC_NO, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, KC_NO, KC_TRNS, KC_TRNS, + KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_NO, KC_NO, RESET, + KC_TRNS, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_NO, KC_TRNS, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_NO, KC_NO, KC_NO, KC_NO ) }; \ No newline at end of file diff --git a/users/spotpuff/rules.mk b/users/spotpuff/rules.mk new file mode 100644 index 00000000000..9f9a3302df1 --- /dev/null +++ b/users/spotpuff/rules.mk @@ -0,0 +1 @@ +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) \ No newline at end of file