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

master
QMK Bot 2023-03-15 16:43:50 +00:00
commit 62943fa93e
6 changed files with 230 additions and 0 deletions

View File

@ -0,0 +1,118 @@
{
"manufacturer": "Hiney LLC",
"keyboard_name": "h87_g2",
"maintainer": "hineybush",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A5", "A4", "A3", "F1", "C15", "C14", "F0", "C13", "B9", "B8", "B5"],
"rows": ["A15", "B3", "B4", "A0", "B6", "B7"]
},
"processor": "STM32F072",
"url": "",
"usb": {
"device_version": "1.0.0",
"pid": "0x0001",
"vid": "0x4048"
},
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
{ "label": "F1", "matrix": [0, 1], "x": 2.0, "y": 0.0 },
{ "label": "F2", "matrix": [0, 2], "x": 3.0, "y": 0.0 },
{ "label": "F3", "matrix": [0, 3], "x": 4.0, "y": 0.0 },
{ "label": "F4", "matrix": [0, 4], "x": 5.0, "y": 0.0 },
{ "label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0.0 },
{ "label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0.0 },
{ "label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0.0 },
{ "label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0.0 },
{ "label": "F9", "matrix": [0, 9], "x": 11.0, "y": 0.0 },
{ "label": "F10", "matrix": [0, 10], "x": 12.0, "y": 0.0 },
{ "label": "F11", "matrix": [0, 11], "x": 13.0, "y": 0.0 },
{ "label": "F12", "matrix": [0, 12], "x": 14.0, "y": 0.0 },
{ "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0.0 },
{ "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0.0 },
{ "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0.0 },
{ "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
{ "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
{ "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
{ "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
{ "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
{ "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
{ "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
{ "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
{ "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
{ "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
{ "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
{ "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
{ "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
{ "label": "Backspace", "matrix": [1, 14], "w": 2.0, "x": 13.0, "y": 1.25 },
{ "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
{ "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
{ "label": "PgUp", "matrix": [2, 16], "x": 17.25, "y": 1.25 },
{ "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
{ "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
{ "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
{ "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
{ "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25 },
{ "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25 },
{ "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25 },
{ "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25 },
{ "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25 },
{ "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25 },
{ "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25 },
{ "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.25 },
{ "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.25 },
{ "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.25 },
{ "label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25 },
{ "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25 },
{ "label": "PgDn", "matrix": [4, 16], "x": 17.25, "y": 2.25 },
{ "label": "Caps", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
{ "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
{ "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
{ "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
{ "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25 },
{ "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25 },
{ "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25 },
{ "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25 },
{ "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25 },
{ "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25 },
{ "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.25 },
{ "label": "Apos", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
{ "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
{ "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0.0, "y": 4.25 },
{ "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
{ "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
{ "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25 },
{ "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25 },
{ "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25 },
{ "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25 },
{ "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25 },
{ "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.25 },
{ "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.25 },
{ "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.25 },
{ "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25 },
{ "label": "\u2191", "matrix": [4, 15], "x": 16.25, "y": 4.25 },
{ "label": "Ctrl", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
{ "label": "Win", "matrix": [5, 1], "x": 1.5, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
{ "matrix": [5, 6], "w": 7.0, "x": 4.0, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 11.0, "y": 5.25 },
{ "label": "Win", "matrix": [5, 11], "x": 12.5, "y": 5.25 },
{ "label": "Ctrl", "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
{ "label": "\u2190", "matrix": [5, 14], "x": 15.25, "y": 5.25 },
{ "label": "\u2193", "matrix": [5, 15], "x": 16.25, "y": 5.25 },
{ "label": "\u2192", "matrix": [5, 16], "x": 17.25, "y": 5.25 }
]
}
}
}

View File

@ -0,0 +1,41 @@
// Copyright 2023 Josh Hinnebusch
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* Esc F1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12 PScScrPse
*
*
* ` 1 2 3 4 5 6 7 8 9 0 - = Backsp InsHomPgU
*
* Tab Q W E R T Y U I O P [ ] \ DelEndPgD
*
* Caps A S D F G H J K L ; ' Enter
*
* Shift Z X C V B N M , . / Shift
*
* CtrlGUI Alt Fn GUICtrl
*
*/
[0] = LAYOUT(
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, 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_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
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, RESET, 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_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};

View File

@ -0,0 +1,42 @@
// Copyright 2023 Josh Hinnebusch
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* Esc F1 F2 F3 F4 F5 F6 F7 F8 F9 F10F11F12 PScScrPse
*
*
* ` 1 2 3 4 5 6 7 8 9 0 - = Backsp InsHomPgU
*
* Tab Q W E R T Y U I O P [ ] \ DelEndPgD
*
* Caps A S D F G H J K L ; ' Enter
*
* Shift Z X C V B N M , . / Shift
*
* CtrlGUI Alt Fn GUICtrl
*
*/
[0] = LAYOUT(
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, 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_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT(
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, RESET, 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_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};

View File

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

View File

@ -0,0 +1,27 @@
# h87_g2
[h87_g2](https://i.imgur.com/t7chDf8h.png)
New generation of the h87 keyboard PCB platform with an STM32 microcontroller.
* Keyboard Maintainer: [Josh Hinnebusch](https://github.com/hineybush)
* Hardware Supported: H87 G2 PCB w/ STM32F072 MCU
* Hardware Availability: [hineybush.com](https://hineybush.com)
Make example for this keyboard (after setting up your build environment):
make hineybush/h87_g2:default
Flashing example for this keyboard:
make hineybush/h87_g2: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

View File

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