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

[keyboard]Graystudio BD60 Support #22210

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
6fd02f2
bd60 commit
edwardslau Oct 5, 2023
0fe98f0
Update keyboards/gray_studio/bd60/rules.mk
edwardslau Oct 5, 2023
baecf7f
Update keyboards/gray_studio/bd60/config.h
edwardslau Oct 5, 2023
b9f0cee
Update keyboards/gray_studio/bd60/info.json
edwardslau Oct 5, 2023
12fe1a7
Update keyboards/gray_studio/bd60/readme.md
edwardslau Oct 5, 2023
a74d22d
Update keyboards/gray_studio/bd60/readme.md
edwardslau Oct 5, 2023
d464491
Update keyboards/gray_studio/bd60/readme.md
edwardslau Oct 5, 2023
caa6da1
Update keyboards/gray_studio/bd60/info.json
edwardslau Oct 5, 2023
3cecb06
Update keyboards/gray_studio/bd60/bd60.c
edwardslau Oct 5, 2023
e0df197
Update keyboards/gray_studio/bd60/info.json
edwardslau Oct 6, 2023
d045048
Update keyboards/gray_studio/bd60/info.json
edwardslau Oct 6, 2023
41bb579
Update keyboards/gray_studio/bd60/info.json
edwardslau Oct 6, 2023
b7cc70c
Update keyboards/gray_studio/bd60/info.json
edwardslau Oct 6, 2023
47066c3
Update keyboards/gray_studio/bd60/keymaps/via/keymap.c
edwardslau Oct 6, 2023
f0f37d8
Update keyboards/gray_studio/bd60/rules.mk
edwardslau Oct 6, 2023
3ff78c8
Update keyboards/gray_studio/bd60/keymaps/default/keymap.c
edwardslau Oct 6, 2023
aacb540
Update info.json
edwardslau Oct 6, 2023
c6fd8cb
Update info.json
edwardslau Oct 6, 2023
7f259c0
Update keyboards/gray_studio/bd60/readme.md
edwardslau Oct 7, 2023
688c203
Update keyboards/gray_studio/bd60/info.json
edwardslau Oct 7, 2023
448c115
Update keyboards/gray_studio/bd60/keymaps/default/keymap.c
edwardslau Oct 7, 2023
5046f70
Update keyboards/gray_studio/bd60/keymaps/via/keymap.c
edwardslau Oct 7, 2023
03f97c4
adding communities layout
edwardslau Oct 7, 2023
973da8d
Update keyboards/gray_studio/bd60/info.json
edwardslau Oct 7, 2023
0e6bb33
Update keyboards/gray_studio/bd60/info.json
edwardslau Nov 11, 2023
6b372bf
Update keyboards/gray_studio/bd60/info.json
edwardslau Nov 11, 2023
4870e94
Update keyboards/gray_studio/bd60/config.h
edwardslau Nov 14, 2023
618eed7
Update keyboards/gray_studio/bd60/info.json
edwardslau Nov 14, 2023
9764ab2
Update keyboards/gray_studio/bd60/readme.md
edwardslau Nov 17, 2023
e96cb1c
Update keyboards/gray_studio/bd60/readme.md
edwardslau Nov 25, 2023
f8ee8d4
Update keyboards/gray_studio/bd60/readme.md
edwardslau Nov 25, 2023
faa7932
Merge branch 'master' into graystudio-bd60
edwardslau Nov 30, 2023
3049b5e
Merge branch 'master' into graystudio-bd60
edwardslau Dec 12, 2023
1fd6db4
update 12/30
edwardslau Dec 31, 2023
e5017eb
Merge branch 'master' into graystudio-bd60
edwardslau Dec 31, 2023
05294bd
Update keyboards/gray_studio/bd60/info.json
edwardslau Dec 31, 2023
b83af1a
Update keyboards/gray_studio/bd60/info.json
edwardslau Jan 1, 2024
6ff5b16
Update keyboards/gray_studio/bd60/info.json
edwardslau Jan 1, 2024
2477185
Update info.json
edwardslau Jan 2, 2024
1b816a1
Merge branch 'graystudio-bd60' of https://github.com/edwardslau/qmk_f…
edwardslau Jan 2, 2024
9f5e770
Merge branch 'master' into graystudio-bd60
edwardslau Jan 2, 2024
35e44d3
Merge branch 'master' into graystudio-bd60
edwardslau Jan 6, 2024
936caa6
Merge branch 'master' into graystudio-bd60
edwardslau Jan 9, 2024
d3b3b2e
Merge branch 'master' into graystudio-bd60
edwardslau Jan 17, 2024
e831426
Update keyboards/gray_studio/bd60/info.json
edwardslau Jan 17, 2024
5db90d7
Update keyboards/gray_studio/bd60/info.json
edwardslau Jan 17, 2024
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
18 changes: 18 additions & 0 deletions keyboards/gray_studio/bd60/bd60.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2023 Yizhen Liu (@edwardslau)
// SPDX-License-Identifier: GPL-2.0
#include "quantum.h"
const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
{0,1, HSV_WHITE}
);
const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
my_capslock_layer
);

void keyboard_post_init_user(void) {
// Enable the LED layers
rgblight_layers = my_rgb_layers;
}
bool led_update_user(led_t led_state) {
rgblight_set_layer_state(0, led_state.caps_lock);
return true;
}
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
13 changes: 13 additions & 0 deletions keyboards/gray_studio/bd60/config.h
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file can be removed, and the config migrated to info.json. qmk migrate or qmk info -kb (name) -f json can assist with this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should still be removed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file still needs to be removed

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright 2023 Yizhen Liu (@edwardslau)
// SPDX-License-Identifier: GPL-2.0
#pragma once
#define RGBLIGHT_LAYERS
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
120 changes: 120 additions & 0 deletions keyboards/gray_studio/bd60/info.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4th/Shift row has an extra key (typically ISO Backslash); please remove and correct matrix co-ordinates for remaining keys in said row.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please run qmk format-json -i on this file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still outstanding, and just to note, there is no need to continually merge master.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still outstanding, and this file should also be renamed to keyboard.json.

Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"keyboard_name": "BD60",
"url": "",
"maintainer": "edwardslau",
"manufacturer":"GrayStudio",
"processor": "STM32F072",
"diode_direction": "COL2ROW",
"bootloader": "stm32-dfu",
"usb": {
"vid":"0x4753",
"pid":"0x4060",
"device_version": "0.0.1",
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
},
"features": {
"backlight": false,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"backlight": false,

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs removing

"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgblight": true
},
"ws2812": {
"pin": "B10",
}
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
"matrix_pins": {
"cols": ["A3", "C14", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "B0", "A8", "B15", "B14"],
"rows": ["B13", "B12", "A2", "A0", "A1"]
},
"rgblight": {
"led_count": 1,
"sleep": true,
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
},
},
"layouts": {
"LAYOUT": {
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
"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,13],"x": 12.75, "y": 2, "w": 2.25},

{"matrix": [3,0], "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.25},
{"matrix": [4,1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4,3], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4,7], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4,10],"x": 10, "y": 4, "w": 1.25},
{"matrix": [4,11],"x": 11.25, "y": 4, "w": 1.25},
{"matrix": [4,13],"x": 12.5, "y": 4, "w": 1.25},
{"matrix": [4,14],"x": 13.75, "y": 4, "w": 1.25}
]
}
}
}
20 changes: 20 additions & 0 deletions keyboards/gray_studio/bd60/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2023 Yizhen Liu (@edwardslau)
// SPDX-License-Identifier: GPL-2.0
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
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_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, KC_DEL,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL
),
[1] = LAYOUT(
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
_______, 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, _______, _______, _______, _______, _______,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
_______, UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, UG_VALU, UG_VALD, _______, _______, _______, _______, _______,

_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
QK_BOOT, _______, _______, _______, _______, _______, _______, _______
),
};
20 changes: 20 additions & 0 deletions keyboards/gray_studio/bd60/keymaps/via/keymap.c
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VIA keymap needs to be removed.

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2023 Yizhen Liu (@edwardslau)
// SPDX-License-Identifier: GPL-2.0
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
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_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, KC_DEL,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL
),
[1] = LAYOUT(
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
_______, 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, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
QK_BOOT, _______, _______, _______, _______, _______, _______, _______
),
};
1 change: 1 addition & 0 deletions keyboards/gray_studio/bd60/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
21 changes: 21 additions & 0 deletions keyboards/gray_studio/bd60/readme.md
drashna marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Gray Studio bd60
edwardslau marked this conversation as resolved.
Show resolved Hide resolved

edwardslau marked this conversation as resolved.
Show resolved Hide resolved
A 60% keyboard by Graystudio. PCB designed and manufactured by DEMO Studio.

* Keyboard Maintainer: [edwardslau](https://github.com/edwardslau)
* Hardware Support: bd60
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
* Hardware Availability:
edwardslau marked this conversation as resolved.
Show resolved Hide resolved

Make example for this keyboard (after setting up your build environment):

make gray_studio bd60:default

Flashing example for this keyboard:

make gray_studio bd60:default:flash
edwardslau marked this conversation as resolved.
Show resolved Hide resolved

## Bootloader

* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead

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 infromation. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
edwardslau marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions keyboards/gray_studio/bd60/rules.mk
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file can be deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
edwardslau marked this conversation as resolved.
Show resolved Hide resolved