From 8ab5707143bf736b8848d2728ff0abe270c7adfe Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 11:54:52 +0200 Subject: [PATCH 01/17] Addition of KBDFans D60B, aka Sun60 --- keyboards/kbdfans/d60b/README.md | 18 ++ keyboards/kbdfans/d60b/keyboard.json | 230 ++++++++++++++++++ .../kbdfans/d60b/keymaps/default/keymap.c | 37 +++ keyboards/kbdfans/d60b/rules.mk | 1 + 4 files changed, 286 insertions(+) create mode 100644 keyboards/kbdfans/d60b/README.md create mode 100644 keyboards/kbdfans/d60b/keyboard.json create mode 100644 keyboards/kbdfans/d60b/keymaps/default/keymap.c create mode 100644 keyboards/kbdfans/d60b/rules.mk diff --git a/keyboards/kbdfans/d60b/README.md b/keyboards/kbdfans/d60b/README.md new file mode 100644 index 00000000000..3fb1d85f691 --- /dev/null +++ b/keyboards/kbdfans/d60b/README.md @@ -0,0 +1,18 @@ +# KBDfans D60B + +Customizable 60% Tsangan Hotswap by PCB by [KBDfans](https://kbdfans.com). +This board has also, at times, been refer to as the Sun60, but the name on the PCB is D60 B. + +- Keyboard Maintainer: [chrisgve](https://github.com/chrisgve) +- Hardware Supported: KBDfans D60B +- Hardware Availability: non longer available for sale + +Make example for this keyboard (after setting up your build environment): + + make kbdfans/d60b:default + +The keyboard uses a DFU bootloader. To make a keymap and use dfu to flash it: + + make kbdfans/d60b:default:flash + +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). diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json new file mode 100644 index 00000000000..c6299e66f3c --- /dev/null +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -0,0 +1,230 @@ +{ + "manufacturer": "KBDfans", + "keyboard_name": "D60B", + "maintainer": "chrisgve", + "bootloader": "atmel-dfu", + "community_layout": ["LAYOUT_60_ansi_tsangan_split_bs_rshift"], + "debounce": 5, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakeys": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["F0", "F1", "F5", "F4", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["C7", "C6", "B6", "B5", "F6"] + }, + "processor": "atmega32u4", + "qmk": { + "locking": { + "enabled": true + } + }, + "rgb_matrix": { + "animations": { + "rgb_matrix_alphas_mods": true, + "rgb_matrix_band_pinwheel_sat": true, + "rgb_matrix_band_pinwheel_val": true, + "rgb_matrix_band_sat": true, + "rgb_matrix_band_spiral_sat": true, + "rgb_matrix_band_spiral_val": true, + "rgb_matrix_band_val": true, + "rgb_matrix_breathing": true, + "rgb_matrix_cycle_all": true, + "rgb_matrix_cycle_left_right": true, + "rgb_matrix_cycle_out_in": true, + "rgb_matrix_cycle_out_in_dual": true, + "rgb_matrix_cycle_pinwheel": true, + "rgb_matrix_cycle_spiral": true, + "rgb_matrix_cycle_up_down": true, + "rgb_matrix_digital_rain": true, + "rgb_matrix_dual_beacon": true, + "rgb_matrix_effect_max": true, + "rgb_matrix_flower_blooming": true, + "rgb_matrix_gradient_left_right": true, + "rgb_matrix_gradient_up_down": true, + "rgb_matrix_hue_breathing": true, + "rgb_matrix_hue_pendulum": true, + "rgb_matrix_hue_wave": true, + "rgb_matrix_jellybean_raindrops": true, + "rgb_matrix_multisplash": true, + "rgb_matrix_pixel_flow": true, + "rgb_matrix_pixel_fractal": true, + "rgb_matrix_pixel_rain": true, + "rgb_matrix_rainbow_beacon": true, + "rgb_matrix_rainbow_moving_chevron": true, + "rgb_matrix_rainbow_pinwheels": true, + "rgb_matrix_raindrops": true, + "rgb_matrix_riverflow": true, + "rgb_matrix_solid_color": true, + "rgb_matrix_solid_multisplash": true, + "rgb_matrix_solid_reactive": true, + "rgb_matrix_solid_reactive_cross": true, + "rgb_matrix_solid_reactive_multicross": true, + "rgb_matrix_solid_reactive_multinexus": true, + "rgb_matrix_solid_reactive_multiwide": true, + "rgb_matrix_solid_reactive_nexus": true, + "rgb_matrix_solid_reactive_simple": true, + "rgb_matrix_solid_reactive_wide": true, + "rgb_matrix_solid_splash": true, + "rgb_matrix_splash": true, + "rgb_matrix_starlight": true, + "rgb_matrix_starlight_dual_hue": true, + "rgb_matrix_starlight_dual_sat": true, + "rgb_matrix_typing_heatmap": true + }, + "driver": "ws2812", + "hue_steps": 8, + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, + {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4}, + {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, + {"matrix": [2, 12], "x": 192, "y": 32, "flags": 4}, + {"matrix": [2, 14], "x": 224, "y": 32, "flags": 4}, + {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4}, + {"matrix": [3, 10], "x": 160, "y": 48, "flags": 4}, + {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4}, + {"matrix": [3, 13], "x": 208, "y": 48, "flags": 4}, + {"matrix": [3, 14], "x": 224, "y": 48, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4}, + {"matrix": [4, 3], "x": 48, "y": 64, "flags": 4}, + {"matrix": [4, 7], "x": 112, "y": 64, "flags": 4}, + {"matrix": [4, 11], "x": 176, "y": 64, "flags": 4}, + {"matrix": [4, 13], "x": 208, "y": 64, "flags": 4}, + {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4} + ], + "max_brightness": 200, + "sat_steps": 8, + "sleep": true, + "spleep": false, + "val_steps": 8 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x1600", + "vid": "0xCA04" + }, + "ws2812": { + "pin": "F7" + }, + "layout_aliases": { + "LAYOUT_60_tansang_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift" + }, + "layouts": { + "LAYOUT_60_ansi_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4}, + {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/kbdfans/d60b/keymaps/default/keymap.c b/keyboards/kbdfans/d60b/keymaps/default/keymap.c new file mode 100644 index 00000000000..2ed6df14501 --- /dev/null +++ b/keyboards/kbdfans/d60b/keymaps/default/keymap.c @@ -0,0 +1,37 @@ +/* Copyright 2025 chrisgve + * + * 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 + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0]=LAYOUT_60_ansi_tsangan_split_bs_rshift( + 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_GRAVE, KC_BSPC, + 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL + ), + + [1]=LAYOUT_60_ansi_tsangan_split_bs_rshift( + 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, _______, KC_DEL, + RM_TOG, RM_NEXT, RM_PREV, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, RM_SPDU, RM_SPDD, _______, QK_BOOT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ) +}; +//clang-format on diff --git a/keyboards/kbdfans/d60b/rules.mk b/keyboards/kbdfans/d60b/rules.mk new file mode 100644 index 00000000000..21c90351871 --- /dev/null +++ b/keyboards/kbdfans/d60b/rules.mk @@ -0,0 +1 @@ +SLEEP_LED_ENABLE = no From 61bfee2a595302b968e8967aae7a4b61cf9007fa Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 12:03:29 +0200 Subject: [PATCH 02/17] D60B: corrected a typo on the default keymap --- keyboards/kbdfans/d60b/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/d60b/keymaps/default/keymap.c b/keyboards/kbdfans/d60b/keymaps/default/keymap.c index 2ed6df14501..79ad6238ced 100644 --- a/keyboards/kbdfans/d60b/keymaps/default/keymap.c +++ b/keyboards/kbdfans/d60b/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1]=LAYOUT_60_ansi_tsangan_split_bs_rshift( 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, _______, KC_DEL, - RM_TOG, RM_NEXT, RM_PREV, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, RM_SPDU, RM_SPDD, _______, QK_BOOT, + RM_TOGG, RM_NEXT, RM_PREV, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, RM_SPDU, RM_SPDD, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ From 0bb21fa4183b5d6e187c556b1ee61bd56f6cc282 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 12:14:11 +0200 Subject: [PATCH 03/17] Corrected typo for the name of the alias --- keyboards/kbdfans/d60b/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json index c6299e66f3c..7c9894208fe 100644 --- a/keyboards/kbdfans/d60b/keyboard.json +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -157,7 +157,7 @@ "pin": "F7" }, "layout_aliases": { - "LAYOUT_60_tansang_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift" + "LAYOUT_60_tsangn_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift" }, "layouts": { "LAYOUT_60_ansi_tsangan_split_bs_rshift": { From 997fa19ec319b80e1a62873a88a9866653124e65 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 12:19:18 +0200 Subject: [PATCH 04/17] Corrected typos in the README.md --- keyboards/kbdfans/d60b/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kbdfans/d60b/README.md b/keyboards/kbdfans/d60b/README.md index 3fb1d85f691..7f05cbce4dc 100644 --- a/keyboards/kbdfans/d60b/README.md +++ b/keyboards/kbdfans/d60b/README.md @@ -1,11 +1,11 @@ # KBDfans D60B Customizable 60% Tsangan Hotswap by PCB by [KBDfans](https://kbdfans.com). -This board has also, at times, been refer to as the Sun60, but the name on the PCB is D60 B. +This board has also, at times, been referred to as the Sun60, but the name on the PCB is D60 B. - Keyboard Maintainer: [chrisgve](https://github.com/chrisgve) - Hardware Supported: KBDfans D60B -- Hardware Availability: non longer available for sale +- Hardware Availability: no longer available for sale Make example for this keyboard (after setting up your build environment): From 0fcb7ed07c58488a46bbea736dec9442088aedc0 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 20:34:27 +0200 Subject: [PATCH 05/17] Rules.mk removed --- keyboards/kbdfans/d60b/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/kbdfans/d60b/rules.mk diff --git a/keyboards/kbdfans/d60b/rules.mk b/keyboards/kbdfans/d60b/rules.mk deleted file mode 100644 index 21c90351871..00000000000 --- a/keyboards/kbdfans/d60b/rules.mk +++ /dev/null @@ -1 +0,0 @@ -SLEEP_LED_ENABLE = no From 8e7f41bbb96c6dacee77958ae846c0f10936f210 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 20:35:06 +0200 Subject: [PATCH 06/17] Update keyboards/kbdfans/d60b/keyboard.json Co-authored-by: Joel Challis --- keyboards/kbdfans/d60b/keyboard.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json index 7c9894208fe..9446c00f9d9 100644 --- a/keyboards/kbdfans/d60b/keyboard.json +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -143,10 +143,7 @@ {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4} ], "max_brightness": 200, - "sat_steps": 8, - "sleep": true, - "spleep": false, - "val_steps": 8 + "sleep": true }, "usb": { "device_version": "0.0.1", From 5314b1dc8e720aa93939e6fc4e2d25056aaa34d7 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 20:35:16 +0200 Subject: [PATCH 07/17] Update keyboards/kbdfans/d60b/keyboard.json Co-authored-by: Joel Challis --- keyboards/kbdfans/d60b/keyboard.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json index 9446c00f9d9..479d0e72cd7 100644 --- a/keyboards/kbdfans/d60b/keyboard.json +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -77,7 +77,6 @@ "rgb_matrix_typing_heatmap": true }, "driver": "ws2812", - "hue_steps": 8, "layout": [ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, From 2806cfc3d1c75133ba03115c6a8b6ef2b00d44d4 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 20:35:27 +0200 Subject: [PATCH 08/17] Update keyboards/kbdfans/d60b/keyboard.json Co-authored-by: Joel Challis --- keyboards/kbdfans/d60b/keyboard.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json index 479d0e72cd7..e72632dd573 100644 --- a/keyboards/kbdfans/d60b/keyboard.json +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -4,7 +4,6 @@ "maintainer": "chrisgve", "bootloader": "atmel-dfu", "community_layout": ["LAYOUT_60_ansi_tsangan_split_bs_rshift"], - "debounce": 5, "diode_direction": "COL2ROW", "features": { "bootmagic": true, From 7174863d2385e4ab83565c807f8788082255825c Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 20:35:37 +0200 Subject: [PATCH 09/17] Update keyboards/kbdfans/d60b/keyboard.json Co-authored-by: Joel Challis --- keyboards/kbdfans/d60b/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json index e72632dd573..190d0cafd9f 100644 --- a/keyboards/kbdfans/d60b/keyboard.json +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -3,7 +3,7 @@ "keyboard_name": "D60B", "maintainer": "chrisgve", "bootloader": "atmel-dfu", - "community_layout": ["LAYOUT_60_ansi_tsangan_split_bs_rshift"], + "community_layouts": ["60_ansi_tsangan_split_bs_rshift"], "diode_direction": "COL2ROW", "features": { "bootmagic": true, From 3fdd58691afbf557249ca9ad8915bd6555ea797b Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 20:35:49 +0200 Subject: [PATCH 10/17] Update keyboards/kbdfans/d60b/keyboard.json Co-authored-by: Joel Challis --- keyboards/kbdfans/d60b/keyboard.json | 99 ++++++++++++++-------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json index 190d0cafd9f..e87adf43d24 100644 --- a/keyboards/kbdfans/d60b/keyboard.json +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -24,56 +24,55 @@ }, "rgb_matrix": { "animations": { - "rgb_matrix_alphas_mods": true, - "rgb_matrix_band_pinwheel_sat": true, - "rgb_matrix_band_pinwheel_val": true, - "rgb_matrix_band_sat": true, - "rgb_matrix_band_spiral_sat": true, - "rgb_matrix_band_spiral_val": true, - "rgb_matrix_band_val": true, - "rgb_matrix_breathing": true, - "rgb_matrix_cycle_all": true, - "rgb_matrix_cycle_left_right": true, - "rgb_matrix_cycle_out_in": true, - "rgb_matrix_cycle_out_in_dual": true, - "rgb_matrix_cycle_pinwheel": true, - "rgb_matrix_cycle_spiral": true, - "rgb_matrix_cycle_up_down": true, - "rgb_matrix_digital_rain": true, - "rgb_matrix_dual_beacon": true, - "rgb_matrix_effect_max": true, - "rgb_matrix_flower_blooming": true, - "rgb_matrix_gradient_left_right": true, - "rgb_matrix_gradient_up_down": true, - "rgb_matrix_hue_breathing": true, - "rgb_matrix_hue_pendulum": true, - "rgb_matrix_hue_wave": true, - "rgb_matrix_jellybean_raindrops": true, - "rgb_matrix_multisplash": true, - "rgb_matrix_pixel_flow": true, - "rgb_matrix_pixel_fractal": true, - "rgb_matrix_pixel_rain": true, - "rgb_matrix_rainbow_beacon": true, - "rgb_matrix_rainbow_moving_chevron": true, - "rgb_matrix_rainbow_pinwheels": true, - "rgb_matrix_raindrops": true, - "rgb_matrix_riverflow": true, - "rgb_matrix_solid_color": true, - "rgb_matrix_solid_multisplash": true, - "rgb_matrix_solid_reactive": true, - "rgb_matrix_solid_reactive_cross": true, - "rgb_matrix_solid_reactive_multicross": true, - "rgb_matrix_solid_reactive_multinexus": true, - "rgb_matrix_solid_reactive_multiwide": true, - "rgb_matrix_solid_reactive_nexus": true, - "rgb_matrix_solid_reactive_simple": true, - "rgb_matrix_solid_reactive_wide": true, - "rgb_matrix_solid_splash": true, - "rgb_matrix_splash": true, - "rgb_matrix_starlight": true, - "rgb_matrix_starlight_dual_hue": true, - "rgb_matrix_starlight_dual_sat": true, - "rgb_matrix_typing_heatmap": true + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "effect_max": true, + "flower_blooming": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "riverflow": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "starlight": true, + "starlight_dual_hue": true, + "starlight_dual_sat": true, + "typing_heatmap": true }, "driver": "ws2812", "layout": [ From c84f9146597aceec51da3b7c618a9a5c35651595 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 20:39:31 +0200 Subject: [PATCH 11/17] Fixed a typo in the layout alias name --- keyboards/kbdfans/d60b/keyboard.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json index e87adf43d24..fefa2a1ebb4 100644 --- a/keyboards/kbdfans/d60b/keyboard.json +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -151,7 +151,7 @@ "pin": "F7" }, "layout_aliases": { - "LAYOUT_60_tsangn_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift" + "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift" }, "layouts": { "LAYOUT_60_ansi_tsangan_split_bs_rshift": { From 40414b4b6063feb2c1773f9ea5f9367e47431cef Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 7 May 2025 20:46:19 +0200 Subject: [PATCH 12/17] Reduced the number of animations to reduce memory footprint --- keyboards/kbdfans/d60b/keyboard.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json index fefa2a1ebb4..61d07084cc7 100644 --- a/keyboards/kbdfans/d60b/keyboard.json +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -67,12 +67,7 @@ "solid_reactive_nexus": true, "solid_reactive_simple": true, "solid_reactive_wide": true, - "solid_splash": true, - "splash": true, - "starlight": true, - "starlight_dual_hue": true, - "starlight_dual_sat": true, - "typing_heatmap": true + "solid_splash": true }, "driver": "ws2812", "layout": [ From 52ee79bb7e2b1883c3206bddb017f0ecffb7d581 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 8 May 2025 08:17:26 +0200 Subject: [PATCH 13/17] Removed layout_aliases, corrected typo for extrakey, removed effect_max --- keyboards/kbdfans/d60b/keyboard.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/kbdfans/d60b/keyboard.json b/keyboards/kbdfans/d60b/keyboard.json index 61d07084cc7..817cc6f504c 100644 --- a/keyboards/kbdfans/d60b/keyboard.json +++ b/keyboards/kbdfans/d60b/keyboard.json @@ -7,7 +7,7 @@ "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "extrakeys": true, + "extrakey": true, "mousekey": true, "nkro": true, "rgb_matrix": true @@ -41,7 +41,6 @@ "cycle_up_down": true, "digital_rain": true, "dual_beacon": true, - "effect_max": true, "flower_blooming": true, "gradient_left_right": true, "gradient_up_down": true, @@ -145,9 +144,6 @@ "ws2812": { "pin": "F7" }, - "layout_aliases": { - "LAYOUT_60_tsangan_hhkb": "LAYOUT_60_ansi_tsangan_split_bs_rshift" - }, "layouts": { "LAYOUT_60_ansi_tsangan_split_bs_rshift": { "layout": [ From bedbc98385deac9074c117459cf64660c8111ee2 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Thu, 8 May 2025 08:18:37 +0200 Subject: [PATCH 14/17] Renamed readme.md to lower cases --- keyboards/kbdfans/d60b/{README.md => readme.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/kbdfans/d60b/{README.md => readme.md} (100%) diff --git a/keyboards/kbdfans/d60b/README.md b/keyboards/kbdfans/d60b/readme.md similarity index 100% rename from keyboards/kbdfans/d60b/README.md rename to keyboards/kbdfans/d60b/readme.md From 902c2120e7987802fdd295a2483215a7e9bd5416 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sun, 11 May 2025 10:03:07 +0200 Subject: [PATCH 15/17] Update keyboards/kbdfans/d60b/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/kbdfans/d60b/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/d60b/keymaps/default/keymap.c b/keyboards/kbdfans/d60b/keymaps/default/keymap.c index 79ad6238ced..069e3713ad3 100644 --- a/keyboards/kbdfans/d60b/keymaps/default/keymap.c +++ b/keyboards/kbdfans/d60b/keymaps/default/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_GRAVE, KC_BSPC, 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL ), From 0b7f800174869386b1af04bd6de427d6b85c7909 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Sun, 11 May 2025 10:03:15 +0200 Subject: [PATCH 16/17] Update keyboards/kbdfans/d60b/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/kbdfans/d60b/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kbdfans/d60b/keymaps/default/keymap.c b/keyboards/kbdfans/d60b/keymaps/default/keymap.c index 069e3713ad3..d0a47b0d2fa 100644 --- a/keyboards/kbdfans/d60b/keymaps/default/keymap.c +++ b/keyboards/kbdfans/d60b/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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, _______, KC_DEL, RM_TOGG, RM_NEXT, RM_PREV, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, RM_SPDU, RM_SPDD, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; From 67fbd27885b85cee24dd4b94b3371f39f0813b62 Mon Sep 17 00:00:00 2001 From: "Christian C. Berclaz" Date: Wed, 23 Jul 2025 09:21:35 +0200 Subject: [PATCH 17/17] docs(d60b): Bootloader version added to README.md --- keyboards/kbdfans/d60b/readme.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/keyboards/kbdfans/d60b/readme.md b/keyboards/kbdfans/d60b/readme.md index 7f05cbce4dc..903a52019f0 100644 --- a/keyboards/kbdfans/d60b/readme.md +++ b/keyboards/kbdfans/d60b/readme.md @@ -16,3 +16,11 @@ The keyboard uses a DFU bootloader. To make a keymap and use dfu to flash it: make kbdfans/d60b:default:flash 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). + +## Bootloader + +Enter the bootloader in 3 ways: + +- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +- **Physical reset button**: Short the two pads close to the position of the caps lock key +- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available