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.

Sign up for GitHub

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] Add mkh studio bully #19696

Merged
merged 8 commits into from
Feb 3, 2023
Merged

[Keyboard] Add mkh studio bully #19696

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e7d4126
[Keyboard] Add mkh studio bully
Jan 27, 2023
4cf9e04
Update keyboards/mkh_studio/bully/config.h
zhol0777 Jan 28, 2023
1593f4a
Delete bully.h
zhol0777 Feb 2, 2023
42fed1d
Delete bully.c
zhol0777 Feb 2, 2023
b542c03
Update keyboards/mkh_studio/bully/readme.md
zhol0777 Feb 2, 2023
8e1d1c0
Update keymap.c
zhol0777 Feb 2, 2023
ac3e4f1
Update keymap.c
zhol0777 Feb 2, 2023
c153eb8
Update keyboards/mkh_studio/bully/config.h
zvecr Feb 3, 2023
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
4 changes: 4 additions & 0 deletions keyboards/mkh_studio/bully/bully.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Copyright 2023 zhol
// SPDX-License-Identifier: GPL-2.0-or-later

#include "bully.h"
19 changes: 19 additions & 0 deletions keyboards/mkh_studio/bully/bully.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */

#pragma once

#include "quantum.h"

#define XXX KC_NO

#define LAYOUT( \
K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K, K0L, K3L, \
K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, \
K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, \
K3A, K3B, K3C, K3D, K3F, K3G, K3I, K3J, K3K \
) { \
{ K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K, K0L }, \
{ K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L }, \
{ K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L }, \
{ K3A, K3B, K3C, K3D, XXX, K3F, K3G, XXX, K3I, K3J, K3K, K3L } \
}
zhol0777 marked this conversation as resolved.
Show resolved Hide resolved
11 changes: 11 additions & 0 deletions keyboards/mkh_studio/bully/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
zvecr marked this conversation as resolved.
Show resolved Hide resolved

#pragma once

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

/* Use 1000hz polling */
#define USB_POLLING_INTERVAL_MS 1
zhol0777 marked this conversation as resolved.
Show resolved Hide resolved
75 changes: 75 additions & 0 deletions keyboards/mkh_studio/bully/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"keyboard_name": "bully",
"manufacturer": "mkh studio",
"maintainer": "zhol0777",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["B0", "A7", "A6", "A5", "A4", "A2", "B7", "B6", "B5", "B4", "B3", "A15"],
"rows": ["B10", "B11", "B1", "B2"]
},
"usb": {
"vid": "0x0777",
"pid": "0x0001",
"device_version": "1.0.0"
},
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"layouts": {
"LAYOUT": {
"layout": [
{ "matrix": [0, 0], "w": 1.5, "x": 0.0, "y": 0.0 },
{ "matrix": [0, 1], "x": 1.5, "y": 0.0 },
{ "matrix": [0, 2], "x": 2.5, "y": 0.0 },
{ "matrix": [0, 3], "x": 3.5, "y": 0.0 },
{ "matrix": [0, 4], "x": 4.5, "y": 0.0 },
{ "matrix": [0, 5], "x": 5.5, "y": 0.0 },
{ "matrix": [0, 6], "x": 6.5, "y": 0.0 },
{ "matrix": [0, 7], "x": 7.5, "y": 0.0 },
{ "matrix": [0, 8], "x": 8.5, "y": 0.0 },
{ "matrix": [0, 9], "x": 9.5, "y": 0.0 },
{ "matrix": [0, 10], "x": 10.5, "y": 0.0 },
{ "matrix": [0, 11], "x": 11.5, "y": 0.0 },
{ "matrix": [3, 11], "x": 12.5, "y": 0.0 },
{ "matrix": [1, 0], "w": 1.75, "x": 0.0, "y": 1.0 },
{ "matrix": [1, 1], "x": 1.75, "y": 1.0 },
{ "matrix": [1, 2], "x": 2.75, "y": 1.0 },
{ "matrix": [1, 3], "x": 3.75, "y": 1.0 },
{ "matrix": [1, 4], "x": 4.75, "y": 1.0 },
{ "matrix": [1, 5], "x": 5.75, "y": 1.0 },
{ "matrix": [1, 6], "x": 6.75, "y": 1.0 },
{ "matrix": [1, 7], "x": 7.75, "y": 1.0 },
{ "matrix": [1, 8], "x": 8.75, "y": 1.0 },
{ "matrix": [1, 9], "x": 9.75, "y": 1.0 },
{ "matrix": [1, 10], "x": 10.75, "y": 1.0 },
{ "matrix": [1, 11], "w": 1.75, "x": 11.75, "y": 1.0 },
{ "matrix": [2, 0], "w": 2.25, "x": 0.0, "y": 2.0 },
{ "matrix": [2, 1], "x": 2.25, "y": 2.0 },
{ "matrix": [2, 2], "x": 3.25, "y": 2.0 },
{ "matrix": [2, 3], "x": 4.25, "y": 2.0 },
{ "matrix": [2, 4], "x": 5.25, "y": 2.0 },
{ "matrix": [2, 5], "x": 6.25, "y": 2.0 },
{ "matrix": [2, 6], "x": 7.25, "y": 2.0 },
{ "matrix": [2, 7], "x": 8.25, "y": 2.0 },
{ "matrix": [2, 8], "x": 9.25, "y": 2.0 },
{ "matrix": [2, 9], "x": 10.25, "y": 2.0 },
{ "matrix": [2, 10], "x": 11.25, "y": 2.0 },
{ "matrix": [2, 11], "w": 1.25, "x": 12.25, "y": 2.0 },
{ "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
{ "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3.0 },
{ "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3.0 },
{ "matrix": [3, 3], "w": 3, "x": 3.75, "y": 3.0, "h": 0.5 },
{ "matrix": [3, 5], "w": 6, "x": 3.75, "y": 3.5, "h": 0.5 },
{ "matrix": [3, 6], "w": 3, "x": 6.75, "y": 3.0, "h": 0.5 },
{ "matrix": [3, 8], "w": 1.25, "x": 9.75, "y": 3.0 },
{ "matrix": [3, 9], "w": 1.25, "x": 11, "y": 3.0 },
{ "matrix": [3, 10], "w": 1.25, "x": 12.25, "y": 3.0 }
]
}
}
}
25 changes: 25 additions & 0 deletions keyboards/mkh_studio/bully/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2022 zhol
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC,
LT(1, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),
[1] = LAYOUT(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, QK_BOOT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_HOME, KC_PGDN, KC_END
),
[2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
25 changes: 25 additions & 0 deletions keyboards/mkh_studio/bully/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2022 zhol
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_BSPC,
LT(2, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,
KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),
[1] = LAYOUT(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, QK_BOOT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_HOME, KC_PGDN, KC_END
),
[2] = LAYOUT(
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_PGUP, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
1 change: 1 addition & 0 deletions keyboards/mkh_studio/bully/keymaps/via/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VIA_ENABLE = yes
23 changes: 23 additions & 0 deletions keyboards/mkh_studio/bully/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# mkh bully

* Keyboard Maintainer: [zhol0777](https://github.com/zhol0777)
* Hardware Supported: APM32F072
* Hardware Availability: [Coffee Break Keyboards](https://cbkbd.com/)

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

qmk compile -kb mkh_studio/bully -km default

Flashing example for this keyboard:

qmk flash -kb mkh_studio/bully -km default
zhol0777 marked this conversation as resolved.
Show resolved Hide resolved

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**: Briefly press the button on the back of the PCB
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
2 changes: 2 additions & 0 deletions keyboards/mkh_studio/bully/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
DFU_SUFFIX_ARGS = -p FFFF -v FFFF # allow for APM32 MCU
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE