diff options
author | QMK Bot <hello@qmk.fm> | 2021-09-25 16:49:53 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-09-25 16:49:53 +0000 |
commit | ea451cbe8e95eb601972fb3a7b0a7e618062658a (patch) | |
tree | 5cc66f274ebcc2aa76350adec026cfa72766b243 | |
parent | 2c415a8b61741471b50cc2bceceb3154dd0a4642 (diff) | |
parent | 29079e54f140c5e1e9ef215cb16881e378bae2be (diff) | |
download | qmk_firmware-ea451cbe8e95eb601972fb3a7b0a7e618062658a.tar.gz qmk_firmware-ea451cbe8e95eb601972fb3a7b0a7e618062658a.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | keyboards/dyz/dyz40/config.h | 42 | ||||
-rw-r--r-- | keyboards/dyz/dyz40/dyz40.c | 16 | ||||
-rw-r--r-- | keyboards/dyz/dyz40/dyz40.h | 31 | ||||
-rw-r--r-- | keyboards/dyz/dyz40/info.json | 30 | ||||
-rw-r--r-- | keyboards/dyz/dyz40/keymaps/default/keymap.c | 43 | ||||
-rw-r--r-- | keyboards/dyz/dyz40/keymaps/via/keymap.c | 43 | ||||
-rw-r--r-- | keyboards/dyz/dyz40/keymaps/via/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/dyz/dyz40/readme.md | 27 | ||||
-rw-r--r-- | keyboards/dyz/dyz40/rules.mk | 22 |
9 files changed, 255 insertions, 0 deletions
diff --git a/keyboards/dyz/dyz40/config.h b/keyboards/dyz/dyz40/config.h new file mode 100644 index 000000000..581f92516 --- /dev/null +++ b/keyboards/dyz/dyz40/config.h | |||
@@ -0,0 +1,42 @@ | |||
1 | /* | ||
2 | Copyright 2021 dayatz | ||
3 | |||
4 | This program is free software: you can redistribute it and/or modify | ||
5 | it under the terms of the GNU General Public License as published by | ||
6 | the Free Software Foundation, either version 2 of the License, or | ||
7 | (at your option) any later version. | ||
8 | |||
9 | This program is distributed in the hope that it will be useful, | ||
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | GNU General Public License for more details. | ||
13 | |||
14 | You should have received a copy of the GNU General Public License | ||
15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
16 | */ | ||
17 | |||
18 | #pragma once | ||
19 | |||
20 | #include "config_common.h" | ||
21 | |||
22 | /* USB Device descriptor parameter */ | ||
23 | #define MANUFACTURER dyz | ||
24 | #define PRODUCT dyz40 | ||
25 | |||
26 | /* key matrix size */ | ||
27 | #define MATRIX_ROWS 4 | ||
28 | #define MATRIX_COLS 13 | ||
29 | |||
30 | |||
31 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | ||
32 | #define DEBOUNCE 5 | ||
33 | |||
34 | /* Bootmagic Lite key configuration */ | ||
35 | #define BOOTMAGIC_LITE_ROW 0 | ||
36 | #define BOOTMAGIC_LITE_COLUMN 0 | ||
37 | |||
38 | #define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work | ||
39 | #define ENCODERS_PAD_A { D1 } | ||
40 | #define ENCODERS_PAD_B { D0 } | ||
41 | |||
42 | #define DYNAMIC_KEYMAP_LAYER_COUNT 3 | ||
diff --git a/keyboards/dyz/dyz40/dyz40.c b/keyboards/dyz/dyz40/dyz40.c new file mode 100644 index 000000000..1ca2cf108 --- /dev/null +++ b/keyboards/dyz/dyz40/dyz40.c | |||
@@ -0,0 +1,16 @@ | |||
1 | /* Copyright 2021 dayatz | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #include "dyz40.h" | ||
diff --git a/keyboards/dyz/dyz40/dyz40.h b/keyboards/dyz/dyz40/dyz40.h new file mode 100644 index 000000000..8fc7c7d6b --- /dev/null +++ b/keyboards/dyz/dyz40/dyz40.h | |||
@@ -0,0 +1,31 @@ | |||
1 | /* Copyright 2021 dayatz | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #pragma once | ||
17 | |||
18 | #include "quantum.h" | ||
19 | #define _X_ KC_NO | ||
20 | |||
21 | #define LAYOUT_all( \ | ||
22 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ | ||
23 | K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ | ||
24 | K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ | ||
25 | K30, K31, K32, K33, K36, K37, K3A, K3B, K3C \ | ||
26 | ) { \ | ||
27 | { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ | ||
28 | { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, _X_ }, \ | ||
29 | { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _X_ }, \ | ||
30 | { K30, K31, K32, K33, _X_, _X_, K36, K37, _X_, _X_, K3A, K3B, K3C } \ | ||
31 | } | ||
diff --git a/keyboards/dyz/dyz40/info.json b/keyboards/dyz/dyz40/info.json new file mode 100644 index 000000000..4d17bbeb2 --- /dev/null +++ b/keyboards/dyz/dyz40/info.json | |||
@@ -0,0 +1,30 @@ | |||
1 | { | ||
2 | "keyboard_name": "dyz40", | ||
3 | "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/dyz40", | ||
4 | "maintainer": "dayatz", | ||
5 | "diode_direction": "COL2ROW", | ||
6 | "matrix_pins": { | ||
7 | "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7"], | ||
8 | "rows": ["B0", "B1", "B3", "B2"] | ||
9 | }, | ||
10 | "rgblight": { | ||
11 | "led_count": 13, | ||
12 | "pin": "B7", | ||
13 | "hue_steps": 10, | ||
14 | "saturation_steps": 10, | ||
15 | "brightness_steps": 10, | ||
16 | "animations": { | ||
17 | "all": true | ||
18 | } | ||
19 | }, | ||
20 | "usb": { | ||
21 | "vid": "0xD772", | ||
22 | "pid": "0x000B", | ||
23 | "device_ver": "0x0001" | ||
24 | }, | ||
25 | "layouts": { | ||
26 | "LAYOUT": { | ||
27 | "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"{", "x":11, "y":0}, {"label":"}", "x":12, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"", "x":8.75, "y":2}, {"label":"", "x":9.75, "y":2}, {"label":"", "x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.5}, {"label":"Win", "x":1.5, "y":3}, {"label":"Alt", "x":2.5, "y":3, "w":1.5}, {"label":"Space", "x":4, "y":3, "w":2.75}, {"label":"Fn", "x":6.75, "y":3, "w":2.25}, {"label":"Alt", "x":9, "y":3, "w":1.5}, {"label":"Win", "x":10.5, "y":3}, {"label":"Ctrl", "x":11.5, "y":3, "w":1.5}] | ||
28 | } | ||
29 | } | ||
30 | } | ||
diff --git a/keyboards/dyz/dyz40/keymaps/default/keymap.c b/keyboards/dyz/dyz40/keymaps/default/keymap.c new file mode 100644 index 000000000..0c0c98470 --- /dev/null +++ b/keyboards/dyz/dyz40/keymaps/default/keymap.c | |||
@@ -0,0 +1,43 @@ | |||
1 | /* Copyright 2021 dayatz | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #include QMK_KEYBOARD_H | ||
17 | |||
18 | enum layer_names { | ||
19 | _BASE, | ||
20 | _FN, | ||
21 | _FN2 | ||
22 | }; | ||
23 | |||
24 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
25 | [_BASE] = LAYOUT_all( /* Base */ | ||
26 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, | ||
27 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, | ||
28 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, | ||
29 | KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(_FN), MO(_FN2), KC_RALT, KC_RWIN, KC_SCLN | ||
30 | ), | ||
31 | [_FN] = LAYOUT_all( | ||
32 | KC_CAPS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, | ||
33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
34 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
35 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
36 | ), | ||
37 | [_FN2] = LAYOUT_all( | ||
38 | 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, | ||
39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
41 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
42 | ) | ||
43 | }; | ||
diff --git a/keyboards/dyz/dyz40/keymaps/via/keymap.c b/keyboards/dyz/dyz40/keymaps/via/keymap.c new file mode 100644 index 000000000..0c0c98470 --- /dev/null +++ b/keyboards/dyz/dyz40/keymaps/via/keymap.c | |||
@@ -0,0 +1,43 @@ | |||
1 | /* Copyright 2021 dayatz | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #include QMK_KEYBOARD_H | ||
17 | |||
18 | enum layer_names { | ||
19 | _BASE, | ||
20 | _FN, | ||
21 | _FN2 | ||
22 | }; | ||
23 | |||
24 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
25 | [_BASE] = LAYOUT_all( /* Base */ | ||
26 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, | ||
27 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, | ||
28 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, | ||
29 | KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(_FN), MO(_FN2), KC_RALT, KC_RWIN, KC_SCLN | ||
30 | ), | ||
31 | [_FN] = LAYOUT_all( | ||
32 | KC_CAPS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, | ||
33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
34 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
35 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
36 | ), | ||
37 | [_FN2] = LAYOUT_all( | ||
38 | 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, | ||
39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
41 | _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
42 | ) | ||
43 | }; | ||
diff --git a/keyboards/dyz/dyz40/keymaps/via/rules.mk b/keyboards/dyz/dyz40/keymaps/via/rules.mk new file mode 100644 index 000000000..1e5b99807 --- /dev/null +++ b/keyboards/dyz/dyz40/keymaps/via/rules.mk | |||
@@ -0,0 +1 @@ | |||
VIA_ENABLE = yes | |||
diff --git a/keyboards/dyz/dyz40/readme.md b/keyboards/dyz/dyz40/readme.md new file mode 100644 index 000000000..f73c4ef46 --- /dev/null +++ b/keyboards/dyz/dyz40/readme.md | |||
@@ -0,0 +1,27 @@ | |||
1 | # dyz40 | ||
2 | |||
3 |  | ||
4 | |||
5 | 40% 13u hotswap with multiple layouts for bottom row | ||
6 | |||
7 | - Keyboard Maintainer: [dayatz](https://github.com/dayatz) | ||
8 | - Hardware Supported: ATMega32u4 | ||
9 | - Hardware Availability: Local Indonesia GB. | ||
10 | |||
11 | Make example for this keyboard (after setting up your build environment): | ||
12 | |||
13 | make dyz/dyz40:default | ||
14 | |||
15 | Flashing example for this keyboard: | ||
16 | |||
17 | make dyz/dyz40:default:flash | ||
18 | |||
19 | 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). | ||
20 | |||
21 | ## Bootloader | ||
22 | |||
23 | Enter the bootloader in 3 ways: | ||
24 | |||
25 | - **Bootmagic reset**: Hold the `Esc` key while plugging in the USB cable | ||
26 | - **Physical reset button**: Briefly short the pins under the Enter key | ||
27 | - **Keycode in layout**: Press the key mapped to `RESET` if it is available | ||
diff --git a/keyboards/dyz/dyz40/rules.mk b/keyboards/dyz/dyz40/rules.mk new file mode 100644 index 000000000..209bdae2e --- /dev/null +++ b/keyboards/dyz/dyz40/rules.mk | |||
@@ -0,0 +1,22 @@ | |||
1 | # MCU name | ||
2 | MCU = atmega32u4 | ||
3 | |||
4 | # Bootloader selection | ||
5 | BOOTLOADER = atmel-dfu | ||
6 | |||
7 | # Build Options | ||
8 | # change yes to no to disable | ||
9 | # | ||
10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite | ||
11 | MOUSEKEY_ENABLE = no # Mouse keys | ||
12 | EXTRAKEY_ENABLE = yes # Audio control and System control | ||
13 | CONSOLE_ENABLE = no # Console for debug | ||
14 | COMMAND_ENABLE = no # Commands for debug and configuration | ||
15 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | ||
16 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | ||
17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
18 | NKRO_ENABLE = yes # USB Nkey Rollover | ||
19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | ||
20 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow | ||
21 | AUDIO_ENABLE = no # Audio output | ||
22 | ENCODER_ENABLE = yes | ||