Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull Request: added 2 new keymaps to DZ60 keyboard #10216

Merged
merged 47 commits into from
Sep 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
83f2285
initial keymap commit
chanp-wsib Aug 24, 2020
1897f71
Keymap for coppertop commit
chanp-wsib Aug 24, 2020
059478f
Merge pull request #1 from spotpuff/spotpuff
spotpuff Aug 24, 2020
cd3a7e8
removed define for layers/kc_no/kc_trns
chanp-wsib Aug 29, 2020
2ef663c
Modified keymap to remove definitions and add layer enum
chanp-wsib Aug 29, 2020
bbc5013
Merge pull request #2 from spotpuff/spotpuff
spotpuff Aug 30, 2020
772479e
initial keymap commit
chanp-wsib Aug 24, 2020
d24121b
Keymap for coppertop commit
chanp-wsib Aug 24, 2020
1e1584f
removed define for layers/kc_no/kc_trns
chanp-wsib Aug 29, 2020
0e5f9eb
Modified keymap to remove definitions and add layer enum
chanp-wsib Aug 29, 2020
fa005e4
Changed KC_NO and KC_TRNS to 7X and 7_
chanp-wsib Sep 1, 2020
9d19c80
Merge remote-tracking branch 'upstream/master' into master
chanp-wsib Sep 1, 2020
23be10f
Fixed spacing on keymaps
chanp-wsib Sep 1, 2020
01530d2
Merge branch 'master' into spotpuff
spotpuff Sep 1, 2020
b6e81d4
Merge pull request #3 from spotpuff/spotpuff
spotpuff Sep 1, 2020
45f964b
TMO50: use layer_state_set_kb at keyboard level (#10150)
Talljoe Sep 1, 2020
c7fa435
[Keymap] update dz60:mrsendyyk (#10160)
mrsendyyk Sep 1, 2020
4b5cde2
[Keyboard] YMDK NP21 refactor (#10181)
fauxpark Sep 1, 2020
7f0f856
[Keyboard] 1upkeyboards/1up60rgb: fix broken Enter (#10188)
Talljoe Sep 1, 2020
5855716
Merge branch 'master' of https://github.com/qmk/qmk_firmware into master
chanp-wsib Sep 1, 2020
dd950f9
no idea what this is
chanp-wsib Sep 1, 2020
2da2f10
Merge remote-tracking branch 'upstream/master' into master
chanp-wsib Sep 3, 2020
7c5d4ba
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 4, 2020
25ba521
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 4, 2020
99684e9
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 5, 2020
8899590
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 6, 2020
e69b2a8
Update keyboards/dz60/keymaps/coppertop/keymap.c
spotpuff Sep 7, 2020
f381e1b
Update keyboards/dz60/keymaps/coppertop/keymap.c
spotpuff Sep 7, 2020
b2c3b6f
Update keyboards/dz60/keymaps/coppertop/keymap.c
spotpuff Sep 7, 2020
3e6207c
Update keyboards/dz60/keymaps/spotpuff/keymap.c
spotpuff Sep 7, 2020
2a10572
Update keyboards/dz60/keymaps/spotpuff/keymap.c
spotpuff Sep 7, 2020
5345f0a
Update keyboards/dz60/keymaps/spotpuff/keymap.c
spotpuff Sep 7, 2020
2640270
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 7, 2020
b9541f5
Added Trns labels to keymap comments.
chanp-wsib Sep 7, 2020
8a79d84
Revert "no idea what this is"
spotpuff Sep 7, 2020
1c13298
Reverted dd950f9eb3bad365961d2aa6c97c9dfbdd6219db
chanp-wsib Sep 7, 2020
1039cdd
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 8, 2020
c9a85db
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 8, 2020
55f5023
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 11, 2020
459e5e5
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 13, 2020
c8566aa
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 14, 2020
36f96d2
fix vusb submodule
spotpuff Sep 15, 2020
f572929
Merge remote-tracking branch 'upstream/master'
spotpuff Sep 15, 2020
5276d14
Update keyboards/dz60/keymaps/coppertop/rules.mk
spotpuff Sep 16, 2020
40ea070
Update keyboards/dz60/keymaps/spotpuff/rules.mk
spotpuff Sep 16, 2020
bdb0e72
Update users/spotpuff/rules.mk
spotpuff Sep 16, 2020
3e2d649
Added GNU copyright license text
chanp-wsib Sep 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 95 additions & 0 deletions keyboards/dz60/keymaps/coppertop/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/* Copyright 2020 Philip Chan
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
spotpuff marked this conversation as resolved.
Show resolved Hide resolved

//Layers
enum layer_names {
_QWERTY,
_FN,
_MEDIA,
};

//Custom Keymap Definitions
#define KC_CAD LALT(LCTL(KC_DEL))

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* Qwerty Base layer
* ,-----------------------------------------------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BSpc| Del |
* |-----------------------------------------------------------------------------------------+
* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ |
* |-----------------------------------------------------------------------------------------+
* | `/_Media| A | S | D | F | G | H | J | K | L | ; | ' | Enter |
* |-----------------------------------------------------------------------------------------+
* | Shift | Z | X | C | V | B | N | M | , | . | / |Home | Up |End |
* |-----------------------------------------------------------------------------------------+
* | LCtrl | LGui | LAlt | Space | Fn | Space | F7 | F10 |Left |Down |Right|
* `----------------------------------------------------------------------------------------'
*/

[_QWERTY] = LAYOUT_directional(
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,
LT(_MEDIA,KC_GRV), 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_HOME, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_SPC, KC_F7, KC_F10, KC_LEFT, KC_DOWN, KC_RGHT
),

/* F-Key/Lighting/whatever layer
* ,-----------------------------------------------------------------------------------------.
* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F0 | F11 | F12 | | Ins |
* |-----------------------------------------------------------------------------------------+
* | |R_Tog|R_HUI|R_SAI|R_VAI| | | | | | | | | KC_CAD |
* |-----------------------------------------------------------------------------------------+
* | Caps | |R_HUD|R_SAD| | | | | | | SLCK|PAUSE| Print Screen|
* |-----------------------------------------------------------------------------------------+
* | |R_M_P|R_M_B|R_M_R|R_M_SW|R_M_S|R_M_K|R_M_X|R_M_G| | |PgUp |BLUP |PgDn |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | |BLTog|BLDN |BLInc|
* `----------------------------------------------------------------------------------------'
*/

[_FN] = LAYOUT_directional(
XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, KC_INS,
XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAD,
KC_CAPS, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 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, XXXXXXX, XXXXXXX, KC_PGUP, BL_INC, KC_PGDN,
_______, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, BL_DEC, BL_STEP
),

/* SFX/Multimedia/Numpad layer
* ,-----------------------------------------------------------------------------------------.
* | | | | | | | | | / | * | - | = | |Trns |Trns |
* |-----------------------------------------------------------------------------------------+
* | | | Prev | Play| Next| | | 7 | 8 | 9 | + | | | RESET |
* |-----------------------------------------------------------------------------------------+
* | | |Mute | VUp | VDn | | | 4 | 5 | 6 | + | | Trns |
* |-----------------------------------------------------------------------------------------+
* | | | | | | | | 1 | 2 | 3 |NumEN| | | |
* |-----------------------------------------------------------------------------------------+
* | Trns | Trns | Trns | Trns | | 0 | . | | | | |
* `----------------------------------------------------------------------------------------'
*/

[_MEDIA] = LAYOUT_directional(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, XXXXXXX, _______, _______,
XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_P7, KC_P8, KC_P9, KC_PPLS, XXXXXXX, XXXXXXX, RESET,
_______, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PPLS, XXXXXXX, _______,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______, _______, KC_P0, KC_PDOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
)
};
1 change: 1 addition & 0 deletions keyboards/dz60/keymaps/coppertop/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BOOTMAGIC_ENABLE = no
95 changes: 95 additions & 0 deletions keyboards/dz60/keymaps/spotpuff/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/* Copyright 2020 Philip Chan
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
spotpuff marked this conversation as resolved.
Show resolved Hide resolved

//Layers
enum layer_names {
_QWERTY,
_FN,
_MEDIA,
};

//Custom Keymap Definitions
#define KC_CAD LALT(LCTL(KC_DEL))

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

/* Qwerty Base layer
* ,-----------------------------------------------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BSpc| Del |
* |-----------------------------------------------------------------------------------------+
* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ |
* |-----------------------------------------------------------------------------------------+
* | `/_Media| A | S | D | F | G | H | J | K | L | ; | ' | Enter |
* |-----------------------------------------------------------------------------------------+
* | Shift | Z | X | C | V | B | N | M | , | . | / |PgUp | Up |PgDn |
* |-----------------------------------------------------------------------------------------+
* | LCtrl | LGui | LAlt | Space | Fn | Space |Home | End |Left |Down |Right|
* `----------------------------------------------------------------------------------------'
*/

[_QWERTY] = LAYOUT_directional(
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,
LT(_MEDIA,KC_GRV), 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, KC_UP, KC_PGDN,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN), KC_SPC, KC_HOME, KC_END, KC_LEFT, KC_DOWN, KC_RGHT
),

/* F-Key/Lighting/whatever layer
* ,-----------------------------------------------------------------------------------------.
* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F0 | F11 | F12 | | Ins |
* |-----------------------------------------------------------------------------------------+
* | |R_Tog|R_HUI|R_SAI|R_VAI| | | | | | | | | KC_CAD |
* |-----------------------------------------------------------------------------------------+
* | Caps | |R_HUD|R_SAD| | | | | | | SLCK|PAUSE| Print Screen|
* |-----------------------------------------------------------------------------------------+
* | Trns |R_M_P|R_M_B|R_M_R|R_M_SW|R_M_S|R_M_K|R_M_X|R_M_G| | | |BLUP | |
* |-----------------------------------------------------------------------------------------+
* | Trns | Trns | Trns | | Trns | | | |BLTog|BLDN |BLInc|
* `----------------------------------------------------------------------------------------'
*/

[_FN] = LAYOUT_directional(
XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, XXXXXXX, KC_INS,
XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CAD,
KC_CAPS, XXXXXXX, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 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, XXXXXXX, XXXXXXX, XXXXXXX, BL_INC, XXXXXXX,
_______, _______, _______, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG, BL_DEC, BL_STEP
),

/* SFX/Multimedia/Numpad layer
* ,-----------------------------------------------------------------------------------------.
* | | | | | | |NumLk| | / | * | - | = | |Trns |Trns |
* |-----------------------------------------------------------------------------------------+
* | | | Prev | Play| Next| | | 7 | 8 | 9 | + | | | RESET |
* |-----------------------------------------------------------------------------------------+
* | Trns | |Mute | VUp | VDn | | | 4 | 5 | 6 | + | | Trns |
* |-----------------------------------------------------------------------------------------+
* | Trns | | | | | | | 1 | 2 | 3 |NumEN| | | |
* |-----------------------------------------------------------------------------------------+
* | Trns | Trns | Trns | Trns | Trns | 0 | . | | | | |
* `----------------------------------------------------------------------------------------'
*/

[_MEDIA] = LAYOUT_directional(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NLCK, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, KC_PEQL, XXXXXXX, _______, _______,
XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, KC_P7, KC_P8, KC_P9, KC_PPLS, XXXXXXX, XXXXXXX, RESET,
_______, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PPLS, XXXXXXX, _______,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PENT, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______, _______, KC_P0, KC_PDOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
)
};
1 change: 1 addition & 0 deletions keyboards/dz60/keymaps/spotpuff/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BOOTMAGIC_ENABLE = no
1 change: 1 addition & 0 deletions users/spotpuff/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BOOTMAGIC_ENABLE = no