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

This commit is contained in:
QMK Bot 2024-08-07 20:29:11 +00:00
commit 142128740d
5 changed files with 293 additions and 0 deletions

View file

@ -0,0 +1,169 @@
{
"manufacturer": "auaera",
"keyboard_name": "Bunnygirl65",
"maintainer": "MaiTheSan",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"cols": ["A10", "A0", "A9", "C13", "A1", "A2", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "C14"],
"rows": ["B4", "A15", "A3", "A8", "B14"]
},
"processor": "STM32F072",
"url": "",
"usb": {
"device_version": "1.0.0",
"force_nkro": true,
"pid": "0x00A2",
"vid": "0x5350"
},
"community_layouts": ["65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
"layouts": {
"LAYOUT_65_ansi_blocker_tsangan": {
"layout": [
{"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
{"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0, "w": 2},
{"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
{"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
{"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
{"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
{"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
{"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
{"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
{"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
{"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
{"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
{"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
{"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
{"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
{"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
{"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
{"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
{"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
{"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
{"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
{"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
{"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
{"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
{"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
{"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
{"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
{"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
{"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
{"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
{"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
{"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
{"label": "K46", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
{"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
{"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
{"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
{"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker_tsangan_split_bs": {
"layout": [
{"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0},
{"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0},
{"label": "K2D", "matrix": [2, 13], "x": 14, "y": 0},
{"label": "K0E", "matrix": [0, 14], "x": 15, "y": 0},
{"label": "K10", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1},
{"label": "K12", "matrix": [1, 2], "x": 2.5, "y": 1},
{"label": "K13", "matrix": [1, 3], "x": 3.5, "y": 1},
{"label": "K14", "matrix": [1, 4], "x": 4.5, "y": 1},
{"label": "K15", "matrix": [1, 5], "x": 5.5, "y": 1},
{"label": "K16", "matrix": [1, 6], "x": 6.5, "y": 1},
{"label": "K17", "matrix": [1, 7], "x": 7.5, "y": 1},
{"label": "K18", "matrix": [1, 8], "x": 8.5, "y": 1},
{"label": "K19", "matrix": [1, 9], "x": 9.5, "y": 1},
{"label": "K1A", "matrix": [1, 10], "x": 10.5, "y": 1},
{"label": "K1B", "matrix": [1, 11], "x": 11.5, "y": 1},
{"label": "K1C", "matrix": [1, 12], "x": 12.5, "y": 1},
{"label": "K1D", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
{"label": "K1E", "matrix": [1, 14], "x": 15, "y": 1},
{"label": "K20", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
{"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
{"label": "K2C", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
{"label": "K2E", "matrix": [2, 14], "x": 15, "y": 2},
{"label": "K30", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "K32", "matrix": [3, 2], "x": 2.25, "y": 3},
{"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3},
{"label": "K34", "matrix": [3, 4], "x": 4.25, "y": 3},
{"label": "K35", "matrix": [3, 5], "x": 5.25, "y": 3},
{"label": "K36", "matrix": [3, 6], "x": 6.25, "y": 3},
{"label": "K37", "matrix": [3, 7], "x": 7.25, "y": 3},
{"label": "K38", "matrix": [3, 8], "x": 8.25, "y": 3},
{"label": "K39", "matrix": [3, 9], "x": 9.25, "y": 3},
{"label": "K3A", "matrix": [3, 10], "x": 10.25, "y": 3},
{"label": "K3B", "matrix": [3, 11], "x": 11.25, "y": 3},
{"label": "K3C", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
{"label": "K3D", "matrix": [3, 13], "x": 14, "y": 3},
{"label": "K3E", "matrix": [3, 14], "x": 15, "y": 3},
{"label": "K40", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
{"label": "K41", "matrix": [4, 1], "x": 1.5, "y": 4},
{"label": "K42", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
{"label": "K46", "matrix": [4, 7], "x": 4, "y": 4, "w": 7},
{"label": "K4B", "matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
{"label": "K4C", "matrix": [4, 12], "x": 13, "y": 4},
{"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4},
{"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}
]
}
}
}

View file

@ -0,0 +1,48 @@
// Copyright 2023 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* Esc 1 2 3 4 5 6 7 8 9 0 - = BspBspHom
*
* Tab Q W E R T Y U I O P [ ] \ PgU
*
* Caps A S D F G H J K L ; ' Enter PgD
*
* Shift Z X C V B N M , . / Shift End
*
* Ctrl GUIAlt Fn
*
*/
[0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
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_BSPC, KC_HOME,
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_PGUP,
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_PGDN,
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_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
/*
*
* ` F1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12DelDel
*
* Ins PScScrPause
*
*
*
* MutVl-Vl+
*
*
*
*/
[1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
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, KC_DEL, _______,
_______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};

View file

@ -0,0 +1,48 @@
// Copyright 2023 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* Esc 1 2 3 4 5 6 7 8 9 0 - = BspBspHom
*
* Tab Q W E R T Y U I O P [ ] \ PgU
*
* Caps A S D F G H J K L ; ' Enter PgD
*
* Shift Z X C V B N M , . / Shift End
*
* Ctrl GUIAlt Fn
*
*/
[0] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
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_BSPC, KC_HOME,
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_PGUP,
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_PGDN,
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_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
/*
*
* ` F1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12DelDel
*
* Ins PScScrPause
*
*
*
* MutVl-Vl+
*
*
*
*/
[1] = LAYOUT_65_ansi_blocker_tsangan_split_bs(
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, KC_DEL, _______,
_______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};

View file

@ -0,0 +1 @@
VIA_ENABLE = yes

View file

@ -0,0 +1,27 @@
# BunnyGirl65
![BunnyGirl65](https://i.imgur.com/APqNMhc.jpeg)
A Wibu 60% keyboard PCB Design by inspire of Nekomata Okayu and can fit many keyboard case
* Keyboard Maintainer: [Mai The San](https://github.com/maithesan)
* Hardware Supported: BunnyGirl65
* Hardware Availability: [Waifu.Works](https://discord.gg/waifuworks)
Make example for this keyboard (after setting up your build environment):
make sawnsprojects/bunnygirl65:default
Flashing example for this keyboard:
make sawnsprojects/bunnygirl65: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**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available