Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2023-09-21 06:02:13 +00:00
commit ad7a405fa5
7 changed files with 2627 additions and 0 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,34 @@
/* Copyright 2023 dztech
*
* 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
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT_all(
QK_GESC, 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,
KC_CAPS, 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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

@ -0,0 +1,34 @@
/* Copyright 2023 dztech
*
* 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
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT_all(
QK_GESC, 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,
KC_CAPS, 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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, QK_BOOT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

@ -0,0 +1,2 @@
LTO_ENABLE = yes
VIA_ENABLE = yes

View File

@ -0,0 +1,26 @@
# DZ60 60% Mechanical Keyboard PCB
## A Customizable 60% Mechanical Keyboard PCB
* Keyboard Maintainer: QMK Community
* Hardware Supported: DZ60 60% Mechanical Keyboard PCB
* Hardware Availability: [KBDfans](https://kbdfans.com/collections/60/products/dz60-60-pcb)
There are two versions of the DZ60 PCB. Please use the appropriate firmware for your board.
* V1: 1.6mm thickness PCB;
* V2: 1.2mm thickness PCB
## Bootloader
Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix
* **Physical reset button**: Briefly press the button on the back of the PCB
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
Make example for this keyboard (after setting up your build environment):
make dztech/dz60v2:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

View File

@ -0,0 +1 @@
# This file intentionally left blank

View File

@ -54,6 +54,95 @@
"vid": "0x4B42"
},
"layouts": {
"LAYOUT_all": {
"layout": [
{"label": "~", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "!", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "@", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "#", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "$", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "%", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "^", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "&", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "*", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "(", "matrix": [0, 9], "x": 9, "y": 0},
{"label": ")", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "Backspace", "matrix": [2, 13], "x": 13, "y": 0},
{"label": "Del", "matrix": [2, 17], "x": 14, "y": 0},
{"label": "Insert", "matrix": [0, 13], "x": 15.25, "y": 0},
{"label": "Num Lock", "matrix": [0, 14], "x": 16.5, "y": 0},
{"label": "/", "matrix": [0, 15], "x": 17.5, "y": 0},
{"label": "*", "matrix": [0, 16], "x": 18.5, "y": 0},
{"label": "-", "matrix": [0, 17], "x": 19.5, "y": 0},
{"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
{"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
{"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
{"label": "|", "matrix": [3, 13], "w": 1.5, "x": 13.5, "y": 1},
{"label": "Delete", "matrix": [1, 13], "x": 15.25, "y": 1},
{"label": "7", "matrix": [1, 14], "x": 16.5, "y": 1},
{"label": "8", "matrix": [1, 15], "x": 17.5, "y": 1},
{"label": "9", "matrix": [1, 16], "x": 18.5, "y": 1},
{"h": 2, "label": "+", "matrix": [1, 17], "x": 19.5, "y": 1},
{"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "Enter", "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2},
{"label": "4", "matrix": [2, 14], "x": 16.5, "y": 2},
{"label": "5", "matrix": [2, 15], "x": 17.5, "y": 2},
{"label": "6", "matrix": [2, 16], "x": 18.5, "y": 2},
{"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
{"matrix": [4, 3], "w": 2.25, "x": 1.25, "y": 3},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
{"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
{"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
{"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
{"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
{"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
{"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
{"label": "<", "matrix": [3, 8], "x": 9.25, "y": 3},
{"label": ">", "matrix": [3, 9], "x": 10.25, "y": 3},
{"label": "?", "matrix": [3, 10], "x": 11.25, "y": 3},
{"label": "Shift", "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3},
{"label": "Fn", "matrix": [4, 4], "x": 14, "y": 3},
{"label": "1", "matrix": [3, 12], "x": 16.5, "y": 3},
{"label": "2", "matrix": [3, 14], "x": 17.5, "y": 3},
{"label": "3", "matrix": [3, 15], "x": 18.5, "y": 3},
{"h": 2, "label": "Enter", "matrix": [3, 16], "x": 19.5, "y": 3},
{"label": "\u2191", "matrix": [3, 17], "x": 15.25, "y": 3.25},
{"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
{"label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
{"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
{"label": "k45", "matrix": [4, 5], "w": 7, "x": 3.75, "y": 4},
{"label": "Alt", "matrix": [4, 8], "w": 1.5, "x": 10.75, "y": 4},
{"label": "Menu", "matrix": [4, 9], "w": 1.5, "x": 12.25, "y": 4},
{"label": "0", "matrix": [4, 10], "x": 17.5, "y": 4},
{"label": ".", "matrix": [4, 11], "x": 18.5, "y": 4},
{"label": "\u2190", "matrix": [4, 12], "x": 14.25, "y": 4.25},
{"label": "\u2193", "matrix": [4, 14], "x": 15.25, "y": 4.25},
{"label": "\u2192", "matrix": [4, 15], "x": 16.25, "y": 4.25}
]
},
"LAYOUT": {
"layout": [
{"label": "~", "matrix": [0, 0], "x": 0, "y": 0},