From 8816437c94781de60413febda9377d9e0f1d9252 Mon Sep 17 00:00:00 2001 From: dayatz Date: Tue, 3 Aug 2021 11:38:31 +0800 Subject: [PATCH 1/9] add keyboard dyz60 --- keyboards/dyz/dyz60/config.h | 76 +++++++ keyboards/dyz/dyz60/dyz60.c | 16 ++ keyboards/dyz/dyz60/dyz60.h | 33 +++ keyboards/dyz/dyz60/keymaps/default/keymap.c | 47 +++++ keyboards/dyz/dyz60/keymaps/vial/keymap.c | 47 +++++ keyboards/dyz/dyz60/keymaps/vial/rules.mk | 8 + keyboards/dyz/dyz60/keymaps/vial/vial.json | 211 +++++++++++++++++++ keyboards/dyz/dyz60/rules.mk | 27 +++ 8 files changed, 465 insertions(+) create mode 100644 keyboards/dyz/dyz60/config.h create mode 100644 keyboards/dyz/dyz60/dyz60.c create mode 100644 keyboards/dyz/dyz60/dyz60.h create mode 100644 keyboards/dyz/dyz60/keymaps/default/keymap.c create mode 100644 keyboards/dyz/dyz60/keymaps/vial/keymap.c create mode 100644 keyboards/dyz/dyz60/keymaps/vial/rules.mk create mode 100644 keyboards/dyz/dyz60/keymaps/vial/vial.json create mode 100644 keyboards/dyz/dyz60/rules.mk diff --git a/keyboards/dyz/dyz60/config.h b/keyboards/dyz/dyz60/config.h new file mode 100644 index 000000000000..4cea8c094e4b --- /dev/null +++ b/keyboards/dyz/dyz60/config.h @@ -0,0 +1,76 @@ +/* +Copyright 2021 dayatz + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xD772 +#define PRODUCT_ID 0x0017 +#define DEVICE_VER 0x0001 +#define MANUFACTURER dyz +#define PRODUCT dyz60 +#define DESCRIPTION 60% with flexcut and multiple mounts support + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * +*/ +#define MATRIX_ROW_PINS { B0, E6, F0, F5, F4 } +#define MATRIX_COL_PINS { F6, F7, B3, B2, B1, D2, C7, C6, B6, B5, B4, D7, D6, D4 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +#define RGB_DI_PIN B7 +#define RGBLIGHT_ANIMATIONS +// #define RGBLED_NUM 19 +// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +#define RGBLED_NUM 16 + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 + +#define LED_CAPS_LOCK_PIN F1 + +#define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work +#define ENCODERS_PAD_A { D0 } +#define ENCODERS_PAD_B { D1 } + +// python3 util/vial_generate_keyboard_uid.py +#define VIAL_KEYBOARD_UID {0xBF, 0x0D, 0x8D, 0xDF, 0xDB, 0x11, 0x0C, 0xA5} +// encoder per layers +#define VIAL_ENCODER_DEFAULT { KC_VOLD, KC_VOLU, KC_LEFT, KC_RIGHT, KC_TRNS, KC_TRNS } +#define VIAL_ENCODER_KEYCODE_DELAY 10 + +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/dyz/dyz60/dyz60.c b/keyboards/dyz/dyz60/dyz60.c new file mode 100644 index 000000000000..9d0fd70b908f --- /dev/null +++ b/keyboards/dyz/dyz60/dyz60.c @@ -0,0 +1,16 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#include "dyz60.h" diff --git a/keyboards/dyz/dyz60/dyz60.h b/keyboards/dyz/dyz60/dyz60.h new file mode 100644 index 000000000000..485f7df4e2aa --- /dev/null +++ b/keyboards/dyz/dyz60/dyz60.h @@ -0,0 +1,33 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#pragma once + +#include "quantum.h" +#define KNO KC_NO + +#define LAYOUT_all( \ + K00, K01, K02, K03, K04, K05, K45, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ + K40, K41, K42, K46, K4A, K4B, K4C, K4D \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ + { K40, K41, K42, KNO, KNO, K45, K46, KNO, KNO, KNO, K4A, K4B, K4C, K4D } \ +} diff --git a/keyboards/dyz/dyz60/keymaps/default/keymap.c b/keyboards/dyz/dyz60/keymaps/default/keymap.c new file mode 100644 index 000000000000..4cc6185140fd --- /dev/null +++ b/keyboards/dyz/dyz60/keymaps/default/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#include QMK_KEYBOARD_H +#define _______ KC_TRNS + +enum layer_names { + _BASE, + _FN, + _FN2 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_all( /* Base */ + 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_GRV, + 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_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, MO(_FN), + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, KC_MENU, KC_RCTL + ), + [_FN] = LAYOUT_all( + _______, 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_HOME, KC_UP, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [_FN2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/dyz/dyz60/keymaps/vial/keymap.c b/keyboards/dyz/dyz60/keymaps/vial/keymap.c new file mode 100644 index 000000000000..4cc6185140fd --- /dev/null +++ b/keyboards/dyz/dyz60/keymaps/vial/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2019 Ryota Goto + * + * 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 . + */ +#include QMK_KEYBOARD_H +#define _______ KC_TRNS + +enum layer_names { + _BASE, + _FN, + _FN2 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_all( /* Base */ + 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_GRV, + 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_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, MO(_FN), + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, KC_MENU, KC_RCTL + ), + [_FN] = LAYOUT_all( + _______, 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_HOME, KC_UP, KC_END, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RIGHT, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [_FN2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/dyz/dyz60/keymaps/vial/rules.mk b/keyboards/dyz/dyz60/keymaps/vial/rules.mk new file mode 100644 index 000000000000..2a9e1a14ca2f --- /dev/null +++ b/keyboards/dyz/dyz60/keymaps/vial/rules.mk @@ -0,0 +1,8 @@ +VIA_ENABLE = yes +ENCODER_ENABLE = yes +VIAL_ENABLE = yes +VIAL_INSECURE = yes +VIAL_ENCODERS_ENABLE = yes +QMK_SETTINGS = no +TAP_DANCE_ENABLE = no +COMBO_ENABLE = no diff --git a/keyboards/dyz/dyz60/keymaps/vial/vial.json b/keyboards/dyz/dyz60/keymaps/vial/vial.json new file mode 100644 index 000000000000..c5bba4984b67 --- /dev/null +++ b/keyboards/dyz/dyz60/keymaps/vial/vial.json @@ -0,0 +1,211 @@ +{ + "name": "dyz60", + "vendorId": "0xD772", + "productId": "0x0017", + "lighting": "qmk_rgblight", + "matrix": { + "rows": 5, + "cols": 14 + }, + "layouts": { + "keymap": [ + { + "name": "dyz60" + }, + [ + { + "x": 15.75 + }, + "0,12\n\n\n0,1", + "0,13\n\n\n0,1" + ], + [ + { + "y": 0.25, + "x": 2.75 + }, + "0,0", + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "4,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + { + "w": 2 + }, + "0,12\n\n\n0,0" + ], + [ + { + "x": 2.75, + "w": 1.5 + }, + "1,0", + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 1.5 + }, + "1,13\n\n\n1,0", + { + "x": 1.25, + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13\n\n\n1,1" + ], + [ + { + "x": 2.75, + "w": 1.75 + }, + "2,0", + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "w": 2.25 + }, + "2,12\n\n\n1,0", + { + "x": 0.25 + }, + "2,12\n\n\n1,1" + ], + [ + { + "x": 0.25, + "w": 1.25 + }, + "3,0\n\n\n2,1", + "3,1\n\n\n2,1", + { + "x": 0.25, + "w": 2.25 + }, + "3,0\n\n\n2,0", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "w": 1.75 + }, + "3,12\n\n\n3,0", + "3,13\n\n\n3,0", + { + "x": 0.25, + "w": 2.75 + }, + "3,12\n\n\n3,1", + { + "x": 0.25 + }, + "0,0\n\n\n\n\n\n\n\n\ne", + "0,1\n\n\n\n\n\n\n\n\ne" + ], + [ + { + "x": 2.75, + "w": 1.5 + }, + "4,0\n\n\n4,0", + "4,1\n\n\n4,0", + { + "w": 1.5 + }, + "4,2\n\n\n4,0", + { + "w": 7 + }, + "4,6\n\n\n4,0", + { + "w": 1.5 + }, + "4,11\n\n\n4,0", + "4,12\n\n\n4,0", + { + "w": 1.5 + }, + "4,13\n\n\n4,0" + ], + [ + { + "y": 0.5, + "x": 2.75, + "w": 1.25 + }, + "4,0\n\n\n4,1", + { + "w": 1.25 + }, + "4,1\n\n\n4,1", + { + "w": 1.25 + }, + "4,2\n\n\n4,1", + { + "w": 6.25 + }, + "4,6\n\n\n4,1", + { + "w": 1.25 + }, + "4,10\n\n\n4,1", + { + "w": 1.25 + }, + "4,11\n\n\n4,1", + { + "w": 1.25 + }, + "4,12\n\n\n4,1", + { + "w": 1.25 + }, + "4,13\n\n\n4,1" + ] + ], + "labels": [ + "Split Backspace", + "ISO Enter", + "Split Left Shift", + "Split Right Shift", + ["Bottom Row", "Tsangan", "ANSI"] + ] + } + } diff --git a/keyboards/dyz/dyz60/rules.mk b/keyboards/dyz/dyz60/rules.mk new file mode 100644 index 000000000000..2a017ce6b9e4 --- /dev/null +++ b/keyboards/dyz/dyz60/rules.mk @@ -0,0 +1,27 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +ENCODER_ENABLE = yes From 8b9f6c5914a0ded229d64510256b8899880d9b19 Mon Sep 17 00:00:00 2001 From: dayatz Date: Tue, 3 Aug 2021 11:44:31 +0800 Subject: [PATCH 2/9] update copyright name --- keyboards/dyz/dyz60/dyz60.c | 2 +- keyboards/dyz/dyz60/dyz60.h | 2 +- keyboards/dyz/dyz60/keymaps/default/keymap.c | 2 +- keyboards/dyz/dyz60/keymaps/vial/keymap.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/dyz/dyz60/dyz60.c b/keyboards/dyz/dyz60/dyz60.c index 9d0fd70b908f..b5a260621055 100644 --- a/keyboards/dyz/dyz60/dyz60.c +++ b/keyboards/dyz/dyz60/dyz60.c @@ -1,4 +1,4 @@ -/* Copyright 2019 Ryota Goto +/* Copyright 2021 dayatz * * 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 diff --git a/keyboards/dyz/dyz60/dyz60.h b/keyboards/dyz/dyz60/dyz60.h index 485f7df4e2aa..bc3aae7afb29 100644 --- a/keyboards/dyz/dyz60/dyz60.h +++ b/keyboards/dyz/dyz60/dyz60.h @@ -1,4 +1,4 @@ -/* Copyright 2019 Ryota Goto +/* Copyright 2021 dayatz * * 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 diff --git a/keyboards/dyz/dyz60/keymaps/default/keymap.c b/keyboards/dyz/dyz60/keymaps/default/keymap.c index 4cc6185140fd..4892abf47e05 100644 --- a/keyboards/dyz/dyz60/keymaps/default/keymap.c +++ b/keyboards/dyz/dyz60/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 Ryota Goto +/* Copyright 2021 dayatz * * 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 diff --git a/keyboards/dyz/dyz60/keymaps/vial/keymap.c b/keyboards/dyz/dyz60/keymaps/vial/keymap.c index 4cc6185140fd..4892abf47e05 100644 --- a/keyboards/dyz/dyz60/keymaps/vial/keymap.c +++ b/keyboards/dyz/dyz60/keymaps/vial/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2019 Ryota Goto +/* Copyright 2021 dayatz * * 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 From 680c6453e3b262bb910996ba83f64579d83fea39 Mon Sep 17 00:00:00 2001 From: dayatz Date: Tue, 3 Aug 2021 16:45:11 +0800 Subject: [PATCH 3/9] update product id --- keyboards/dyz/dyz60/config.h | 2 +- keyboards/dyz/dyz60/keymaps/vial/vial.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/dyz/dyz60/config.h b/keyboards/dyz/dyz60/config.h index 4cea8c094e4b..ef2e10e9ef74 100644 --- a/keyboards/dyz/dyz60/config.h +++ b/keyboards/dyz/dyz60/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0xD772 -#define PRODUCT_ID 0x0017 +#define PRODUCT_ID 0x000A #define DEVICE_VER 0x0001 #define MANUFACTURER dyz #define PRODUCT dyz60 diff --git a/keyboards/dyz/dyz60/keymaps/vial/vial.json b/keyboards/dyz/dyz60/keymaps/vial/vial.json index c5bba4984b67..e7cc251c413c 100644 --- a/keyboards/dyz/dyz60/keymaps/vial/vial.json +++ b/keyboards/dyz/dyz60/keymaps/vial/vial.json @@ -1,7 +1,7 @@ { "name": "dyz60", "vendorId": "0xD772", - "productId": "0x0017", + "productId": "0x000A", "lighting": "qmk_rgblight", "matrix": { "rows": 5, From 929330e652078f2ea7978a24715fc2470daf3421 Mon Sep 17 00:00:00 2001 From: dayatz Date: Sun, 8 Aug 2021 08:11:53 +0800 Subject: [PATCH 4/9] remove unnecessary codes, update based on review --- keyboards/dyz/dyz60/config.h | 18 +- keyboards/dyz/dyz60/keymaps/default/keymap.c | 1 - .../dyz/dyz60/keymaps/{vial => via}/keymap.c | 1 - keyboards/dyz/dyz60/keymaps/via/rules.mk | 1 + keyboards/dyz/dyz60/keymaps/vial/rules.mk | 8 - keyboards/dyz/dyz60/keymaps/vial/vial.json | 211 ------------------ keyboards/dyz/dyz60/rules.mk | 7 - 7 files changed, 7 insertions(+), 240 deletions(-) rename keyboards/dyz/dyz60/keymaps/{vial => via}/keymap.c (99%) create mode 100644 keyboards/dyz/dyz60/keymaps/via/rules.mk delete mode 100644 keyboards/dyz/dyz60/keymaps/vial/rules.mk delete mode 100644 keyboards/dyz/dyz60/keymaps/vial/vial.json diff --git a/keyboards/dyz/dyz60/config.h b/keyboards/dyz/dyz60/config.h index ef2e10e9ef74..3eb3cd2f614c 100644 --- a/keyboards/dyz/dyz60/config.h +++ b/keyboards/dyz/dyz60/config.h @@ -25,7 +25,6 @@ along with this program. If not, see . #define DEVICE_VER 0x0001 #define MANUFACTURER dyz #define PRODUCT dyz60 -#define DESCRIPTION 60% with flexcut and multiple mounts support /* key matrix size */ #define MATRIX_ROWS 5 @@ -49,10 +48,13 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN B7 -#define RGBLIGHT_ANIMATIONS -// #define RGBLED_NUM 19 -// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ #define RGBLED_NUM 16 +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_RGB_TEST /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 @@ -66,11 +68,3 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work #define ENCODERS_PAD_A { D0 } #define ENCODERS_PAD_B { D1 } - -// python3 util/vial_generate_keyboard_uid.py -#define VIAL_KEYBOARD_UID {0xBF, 0x0D, 0x8D, 0xDF, 0xDB, 0x11, 0x0C, 0xA5} -// encoder per layers -#define VIAL_ENCODER_DEFAULT { KC_VOLD, KC_VOLU, KC_LEFT, KC_RIGHT, KC_TRNS, KC_TRNS } -#define VIAL_ENCODER_KEYCODE_DELAY 10 - -#define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/dyz/dyz60/keymaps/default/keymap.c b/keyboards/dyz/dyz60/keymaps/default/keymap.c index 4892abf47e05..62bb1a407536 100644 --- a/keyboards/dyz/dyz60/keymaps/default/keymap.c +++ b/keyboards/dyz/dyz60/keymaps/default/keymap.c @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#define _______ KC_TRNS enum layer_names { _BASE, diff --git a/keyboards/dyz/dyz60/keymaps/vial/keymap.c b/keyboards/dyz/dyz60/keymaps/via/keymap.c similarity index 99% rename from keyboards/dyz/dyz60/keymaps/vial/keymap.c rename to keyboards/dyz/dyz60/keymaps/via/keymap.c index 4892abf47e05..62bb1a407536 100644 --- a/keyboards/dyz/dyz60/keymaps/vial/keymap.c +++ b/keyboards/dyz/dyz60/keymaps/via/keymap.c @@ -14,7 +14,6 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#define _______ KC_TRNS enum layer_names { _BASE, diff --git a/keyboards/dyz/dyz60/keymaps/via/rules.mk b/keyboards/dyz/dyz60/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/dyz/dyz60/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/dyz/dyz60/keymaps/vial/rules.mk b/keyboards/dyz/dyz60/keymaps/vial/rules.mk deleted file mode 100644 index 2a9e1a14ca2f..000000000000 --- a/keyboards/dyz/dyz60/keymaps/vial/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -VIA_ENABLE = yes -ENCODER_ENABLE = yes -VIAL_ENABLE = yes -VIAL_INSECURE = yes -VIAL_ENCODERS_ENABLE = yes -QMK_SETTINGS = no -TAP_DANCE_ENABLE = no -COMBO_ENABLE = no diff --git a/keyboards/dyz/dyz60/keymaps/vial/vial.json b/keyboards/dyz/dyz60/keymaps/vial/vial.json deleted file mode 100644 index e7cc251c413c..000000000000 --- a/keyboards/dyz/dyz60/keymaps/vial/vial.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "name": "dyz60", - "vendorId": "0xD772", - "productId": "0x000A", - "lighting": "qmk_rgblight", - "matrix": { - "rows": 5, - "cols": 14 - }, - "layouts": { - "keymap": [ - { - "name": "dyz60" - }, - [ - { - "x": 15.75 - }, - "0,12\n\n\n0,1", - "0,13\n\n\n0,1" - ], - [ - { - "y": 0.25, - "x": 2.75 - }, - "0,0", - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "4,5", - "0,6", - "0,7", - "0,8", - "0,9", - "0,10", - "0,11", - { - "w": 2 - }, - "0,12\n\n\n0,0" - ], - [ - { - "x": 2.75, - "w": 1.5 - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "w": 1.5 - }, - "1,13\n\n\n1,0", - { - "x": 1.25, - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,13\n\n\n1,1" - ], - [ - { - "x": 2.75, - "w": 1.75 - }, - "2,0", - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - { - "w": 2.25 - }, - "2,12\n\n\n1,0", - { - "x": 0.25 - }, - "2,12\n\n\n1,1" - ], - [ - { - "x": 0.25, - "w": 1.25 - }, - "3,0\n\n\n2,1", - "3,1\n\n\n2,1", - { - "x": 0.25, - "w": 2.25 - }, - "3,0\n\n\n2,0", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "w": 1.75 - }, - "3,12\n\n\n3,0", - "3,13\n\n\n3,0", - { - "x": 0.25, - "w": 2.75 - }, - "3,12\n\n\n3,1", - { - "x": 0.25 - }, - "0,0\n\n\n\n\n\n\n\n\ne", - "0,1\n\n\n\n\n\n\n\n\ne" - ], - [ - { - "x": 2.75, - "w": 1.5 - }, - "4,0\n\n\n4,0", - "4,1\n\n\n4,0", - { - "w": 1.5 - }, - "4,2\n\n\n4,0", - { - "w": 7 - }, - "4,6\n\n\n4,0", - { - "w": 1.5 - }, - "4,11\n\n\n4,0", - "4,12\n\n\n4,0", - { - "w": 1.5 - }, - "4,13\n\n\n4,0" - ], - [ - { - "y": 0.5, - "x": 2.75, - "w": 1.25 - }, - "4,0\n\n\n4,1", - { - "w": 1.25 - }, - "4,1\n\n\n4,1", - { - "w": 1.25 - }, - "4,2\n\n\n4,1", - { - "w": 6.25 - }, - "4,6\n\n\n4,1", - { - "w": 1.25 - }, - "4,10\n\n\n4,1", - { - "w": 1.25 - }, - "4,11\n\n\n4,1", - { - "w": 1.25 - }, - "4,12\n\n\n4,1", - { - "w": 1.25 - }, - "4,13\n\n\n4,1" - ] - ], - "labels": [ - "Split Backspace", - "ISO Enter", - "Split Left Shift", - "Split Right Shift", - ["Bottom Row", "Tsangan", "ANSI"] - ] - } - } diff --git a/keyboards/dyz/dyz60/rules.mk b/keyboards/dyz/dyz60/rules.mk index 2a017ce6b9e4..49b674fd7048 100644 --- a/keyboards/dyz/dyz60/rules.mk +++ b/keyboards/dyz/dyz60/rules.mk @@ -2,13 +2,6 @@ MCU = atmega32u4 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options From 4ffbf1f07408f5420d554351e76b8558b6ce230e Mon Sep 17 00:00:00 2001 From: dayatz Date: Mon, 9 Aug 2021 11:53:09 +0800 Subject: [PATCH 5/9] limit layers to 3 --- keyboards/dyz/dyz60/config.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/dyz/dyz60/config.h b/keyboards/dyz/dyz60/config.h index 3eb3cd2f614c..160c8a02b0a3 100644 --- a/keyboards/dyz/dyz60/config.h +++ b/keyboards/dyz/dyz60/config.h @@ -68,3 +68,5 @@ along with this program. If not, see . #define TAP_CODE_DELAY 10 // Need this delay for some keys like VOLD/VOLU to work #define ENCODERS_PAD_A { D0 } #define ENCODERS_PAD_B { D1 } + +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 From 76e22e39efe558bc07e2439e5c211fcd69a3b211 Mon Sep 17 00:00:00 2001 From: Bahrul Hidayat Date: Wed, 25 Aug 2021 08:09:11 +0800 Subject: [PATCH 6/9] Update keyboards/dyz/dyz60/rules.mk Co-authored-by: Ryan --- keyboards/dyz/dyz60/rules.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/keyboards/dyz/dyz60/rules.mk b/keyboards/dyz/dyz60/rules.mk index 49b674fd7048..e8eb38c6cf6f 100644 --- a/keyboards/dyz/dyz60/rules.mk +++ b/keyboards/dyz/dyz60/rules.mk @@ -7,14 +7,17 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys +BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration +COMMAND_ENABLE = no # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes From 3d0bcdbad4c8030b668b5e554661e299d48e0fc3 Mon Sep 17 00:00:00 2001 From: dayatz Date: Sun, 29 Aug 2021 08:54:43 +0800 Subject: [PATCH 7/9] add info.json --- keyboards/dyz/dyz60/info.json | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 keyboards/dyz/dyz60/info.json diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/info.json new file mode 100644 index 000000000000..4ba1e501a1c1 --- /dev/null +++ b/keyboards/dyz/dyz60/info.json @@ -0,0 +1,32 @@ +{ + "keyboard_name": "dyz60", + "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/dyz60", + "maintainer": "dayatz", + "width": 15, + "height": 5, + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["F6", "F7", "B3", "B2", "B1", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B0", "E6", "F0", "F5", "F4"] + }, + "rgblight": { + "led_count": 16, + "pin": "B7", + "hue_steps": 10, + "saturation_steps": 10, + "brightness_steps": 10, + "animations": { + "all": true + } + }, + "usb": { + "vid": "0xD772", + "pid": "0x000A", + "device_ver": "0x0001" + }, + "layouts": { + "LAYOUT": { + "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Win", "x":11, "y":4, "w":1.5}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] + } + } +} From 495d6c25a4ed8624098f0fa134b8e41892bf7c0e Mon Sep 17 00:00:00 2001 From: Bahrul Hidayat Date: Mon, 6 Sep 2021 15:15:18 +0800 Subject: [PATCH 8/9] Update keyboards/dyz/dyz60/info.json Co-authored-by: Ryan --- keyboards/dyz/dyz60/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/info.json index 4ba1e501a1c1..9e8ea860c441 100644 --- a/keyboards/dyz/dyz60/info.json +++ b/keyboards/dyz/dyz60/info.json @@ -2,8 +2,6 @@ "keyboard_name": "dyz60", "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/dyz60", "maintainer": "dayatz", - "width": 15, - "height": 5, "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["F6", "F7", "B3", "B2", "B1", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], From 6e343e290a05702dac7f0c577ccda96f9e5ccd30 Mon Sep 17 00:00:00 2001 From: Bahrul Hidayat Date: Thu, 16 Sep 2021 10:30:23 +0800 Subject: [PATCH 9/9] remove BLUETOOTH_ENABLE rules.mk Co-authored-by: Ryan --- keyboards/dyz/dyz60/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dyz/dyz60/rules.mk b/keyboards/dyz/dyz60/rules.mk index e8eb38c6cf6f..02bed4240e73 100644 --- a/keyboards/dyz/dyz60/rules.mk +++ b/keyboards/dyz/dyz60/rules.mk @@ -18,6 +18,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes