Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2024-04-30 01:47:16 +00:00
commit ee178557ed
11 changed files with 313 additions and 0 deletions

View File

@ -0,0 +1,10 @@
// Copyright 2023 Kyle McCreery (@kylemccreery)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define WS2812_PWM_DRIVER PWMD5
#define WS2812_PWM_CHANNEL 2
#define WS2812_PWM_PAL_MODE 2
#define WS2812_DMA_STREAM STM32_DMA1_STREAM6
#define WS2812_DMA_CHANNEL 6

View File

@ -0,0 +1,3 @@
{
"development_board": "blackpill_f401"
}

View File

@ -0,0 +1 @@
# This file intentionally left blank

View File

@ -0,0 +1,3 @@
{
"development_board": "blackpill_f411"
}

View File

@ -0,0 +1 @@
# This file intentionally left blank

View File

@ -0,0 +1,8 @@
// Copyright 2023 Kyle McCreery (@kylemccreery)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_PWM TRUE
#include_next <halconf.h>

View File

@ -0,0 +1,192 @@
{
"manufacturer": "MechWild",
"keyboard_name": "BB65",
"bootloader_instructions": "Hold down the BOOT button, then tap the NRST button on the BlackPill. Avoid touching the A11 and A12 pins.",
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A3", "pin_b": "A2"}
]
},
"features": {
"bootmagic": true,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgblight": true
},
"matrix_pins": {
"cols": ["B14", "B15", "A8", "A15", "B4", "B5", "B8", "B9", "B0"],
"rows": ["B13", "B3", "B10", "A7", "A6", "B12", "B1", "A5"]
},
"rgblight": {
"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
},
"brightness_steps": 8,
"led_count": 10,
"saturation_steps": 8
},
"url": "https://mechwild.com/product/bb65/",
"usb": {
"device_version": "1.0.0",
"pid": "0x1712",
"vid": "0x6D77"
},
"ws2812": {
"driver": "pwm",
"pin": "A1"
},
"layouts": {
"LAYOUT_all": {
"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": [5, 8], "x": 9, "y": 0},
{"matrix": [5, 7], "x": 10, "y": 0},
{"matrix": [5, 6], "x": 11, "y": 0},
{"matrix": [5, 5], "x": 12, "y": 0},
{"matrix": [5, 4], "x": 13, "y": 0, "w": 2},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1},
{"matrix": [1, 4], "x": 4.5, "y": 1},
{"matrix": [1, 5], "x": 5.5, "y": 1},
{"matrix": [1, 6], "x": 6.5, "y": 1},
{"matrix": [1, 7], "x": 7.5, "y": 1},
{"matrix": [1, 8], "x": 8.5, "y": 1},
{"matrix": [6, 8], "x": 9.5, "y": 1},
{"matrix": [6, 7], "x": 10.5, "y": 1},
{"matrix": [6, 6], "x": 11.5, "y": 1},
{"matrix": [6, 5], "x": 12.5, "y": 1},
{"matrix": [6, 4], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [7, 0], "x": 9.75, "y": 2},
{"matrix": [6, 0], "x": 10.75, "y": 2},
{"matrix": [6, 1], "x": 11.75, "y": 2},
{"matrix": [6, 2], "x": 12.75, "y": 2},
{"matrix": [6, 3], "x": 13.75, "y": 2, "w": 1.25},
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 3},
{"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": [7, 8], "x": 9.25, "y": 3},
{"matrix": [7, 7], "x": 10.25, "y": 3},
{"matrix": [7, 6], "x": 11.25, "y": 3},
{"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
{"matrix": [7, 4], "x": 15.5, "y": 3},
{"matrix": [7, 3], "x": 14.25, "y": 3.25},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 3], "x": 10, "y": 4},
{"matrix": [4, 4], "x": 11, "y": 4},
{"matrix": [4, 6], "x": 12, "y": 4},
{"matrix": [4, 7], "x": 13.25, "y": 4.25},
{"matrix": [4, 8], "x": 14.25, "y": 4.25},
{"matrix": [7, 2], "x": 15.25, "y": 4.25}
]
},
"LAYOUT_ansi": {
"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": [5, 8], "x": 9, "y": 0},
{"matrix": [5, 7], "x": 10, "y": 0},
{"matrix": [5, 6], "x": 11, "y": 0},
{"matrix": [5, 5], "x": 12, "y": 0},
{"matrix": [5, 4], "x": 13, "y": 0, "w": 2},
{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"matrix": [1, 1], "x": 1.5, "y": 1},
{"matrix": [1, 2], "x": 2.5, "y": 1},
{"matrix": [1, 3], "x": 3.5, "y": 1},
{"matrix": [1, 4], "x": 4.5, "y": 1},
{"matrix": [1, 5], "x": 5.5, "y": 1},
{"matrix": [1, 6], "x": 6.5, "y": 1},
{"matrix": [1, 7], "x": 7.5, "y": 1},
{"matrix": [1, 8], "x": 8.5, "y": 1},
{"matrix": [6, 8], "x": 9.5, "y": 1},
{"matrix": [6, 7], "x": 10.5, "y": 1},
{"matrix": [6, 6], "x": 11.5, "y": 1},
{"matrix": [6, 5], "x": 12.5, "y": 1},
{"matrix": [6, 4], "x": 13.5, "y": 1, "w": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [7, 0], "x": 9.75, "y": 2},
{"matrix": [6, 0], "x": 10.75, "y": 2},
{"matrix": [6, 1], "x": 11.75, "y": 2},
{"matrix": [6, 3], "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": [7, 8], "x": 9.25, "y": 3},
{"matrix": [7, 7], "x": 10.25, "y": 3},
{"matrix": [7, 6], "x": 11.25, "y": 3},
{"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75},
{"matrix": [7, 4], "x": 15.5, "y": 3},
{"matrix": [7, 3], "x": 14.25, "y": 3.25},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
{"matrix": [4, 3], "x": 10, "y": 4},
{"matrix": [4, 4], "x": 11, "y": 4},
{"matrix": [4, 6], "x": 12, "y": 4},
{"matrix": [4, 7], "x": 13.25, "y": 4.25},
{"matrix": [4, 8], "x": 14.25, "y": 4.25},
{"matrix": [7, 2], "x": 15.25, "y": 4.25}
]
}
}
}

View File

@ -0,0 +1,31 @@
{
"keyboard": "mechwild/bb65/f401",
"keymap": "default",
"version": 1,
"layout": "LAYOUT_all",
"layers": [
[
"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_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",
"MO(1)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_TRNS", "KC_ENT",
"KC_LSFT", "KC_TRNS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "RGB_TOG",
"RGB_RMOD", "KC_LGUI", "RGB_MOD", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"
],
[
"KC_TRNS", "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",
"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", "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_PGUP", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGDN", "KC_END"
]
],
"config": {
"features": {
"encoder_map": true
}
},
"encoders": [
[{"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
[{"ccw": "KC_TRNS", "cw": "KC_TRNS"}]
]
}

View File

@ -0,0 +1,32 @@
{
"keyboard": "mechwild/bb65/f401",
"keymap": "via",
"version": 1,
"layout": "LAYOUT_all",
"layers": [
[
"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_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",
"MO(1)", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_TRNS", "KC_ENT",
"KC_LSFT", "KC_TRNS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "KC_UP", "RGB_TOG",
"RGB_RMOD", "KC_LGUI", "RGB_MOD", "KC_SPC", "KC_RALT", "KC_RGUI", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT"
],
[
"KC_TRNS", "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",
"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", "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_PGUP", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGDN", "KC_END"
]
],
"config": {
"features": {
"encoder_map": true,
"via": true
}
},
"encoders": [
[{"ccw": "KC_VOLD", "cw": "KC_VOLU"}],
[{"ccw": "KC_TRNS", "cw": "KC_TRNS"}]
]
}

View File

@ -0,0 +1,9 @@
// Copyright 2023 Kyle McCreery (@kylemccreery)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
#undef STM32_PWM_USE_TIM5
#define STM32_PWM_USE_TIM5 TRUE

View File

@ -0,0 +1,23 @@
# BB65
![bb65](https://i.imgur.com/0PrDjuS.png)
BB65 is a completely normal BlackPill-powered 65% DIY kit. Its got all the letters, a number row, and arrow keys. Basic as it can be.
The `f401` version is the standard for this kit, using an STM32F401 BlackPill. The `f411` version will not run on an STM32F401 BlackPill; if in doubt, use `f401`.
* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
* Hardware Supported: BB65 v1.0
* Hardware Availability: [BB65 on MechWild](https://mechwild.com/product/bb65/)
Make example for this keyboard (after setting up your build environment):
make mechwild/bb65/f401:default
make mechwild/bb65/f411:default
Flashing example for this keyboard:
make mechwild/bb65/f401:default:flash
make mechwild/bb65/f411: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).