Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
4cec7ebfab
6 changed files with 233 additions and 0 deletions
95
keyboards/cannonkeys/bakeneko60_iso_hs/info.json
Normal file
95
keyboards/cannonkeys/bakeneko60_iso_hs/info.json
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
{
|
||||
"manufacturer": "CannonKeys",
|
||||
"keyboard_name": "Bakeneko60 ISO",
|
||||
"maintainer": "awkannan",
|
||||
"processor": "STM32F072",
|
||||
"bootloader": "stm32-dfu",
|
||||
"usb": {
|
||||
"vid": "0xCA04",
|
||||
"pid": "0x001E",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"diode_direction": "COL2ROW",
|
||||
"matrix_pins": {
|
||||
"rows": ["B1", "B0", "A7", "A5", "A4"],
|
||||
"cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C15"]
|
||||
},
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
"command": false,
|
||||
"console": false,
|
||||
"extrakey": true,
|
||||
"mousekey": true,
|
||||
"nkro": true
|
||||
},
|
||||
"url": "https://cannonkeys.com",
|
||||
"community_layouts": ["60_iso"],
|
||||
"layouts": {
|
||||
"LAYOUT_60_iso": {
|
||||
"layout": [
|
||||
{ "label": "\u00ac", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
|
||||
{ "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
|
||||
{ "label": "\"", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
|
||||
{ "label": "\u00a3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
|
||||
{ "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
|
||||
{ "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
|
||||
{ "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
|
||||
{ "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
|
||||
{ "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
|
||||
{ "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
|
||||
{ "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
|
||||
{ "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
|
||||
{ "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
|
||||
{ "label": "Backspace", "matrix": [0, 13], "w": 2, "x": 13.0, "y": 0.0 },
|
||||
{ "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
|
||||
{ "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
|
||||
{ "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
|
||||
{ "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
|
||||
{ "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
|
||||
{ "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
|
||||
{ "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
|
||||
{ "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
|
||||
{ "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
|
||||
{ "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
|
||||
{ "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
|
||||
{ "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
|
||||
{ "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
|
||||
{ "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
|
||||
{ "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
|
||||
{ "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
|
||||
{ "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
|
||||
{ "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
|
||||
{ "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
|
||||
{ "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
|
||||
{ "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
|
||||
{ "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
|
||||
{ "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
|
||||
{ "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
|
||||
{ "label": "@", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
|
||||
{ "label": "~", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
|
||||
{ "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 1.0 },
|
||||
{ "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
|
||||
{ "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
|
||||
{ "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
|
||||
{ "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
|
||||
{ "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
|
||||
{ "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
|
||||
{ "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
|
||||
{ "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
|
||||
{ "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
|
||||
{ "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
|
||||
{ "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
|
||||
{ "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
|
||||
{ "label": "Shift", "matrix": [3, 12], "w": 2.75, "x": 12.25, "y": 3.0 },
|
||||
{ "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
|
||||
{ "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
|
||||
{ "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
|
||||
{ "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
|
||||
{ "label": "AltGr", "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
|
||||
{ "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
|
||||
{ "label": "Menu", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
|
||||
{ "label": "Ctrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4.0 }
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
|
||||
// Each layer gets a name for readability, which is then used in the keymap matrix below.
|
||||
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||
// entirely and just use numbers.
|
||||
enum layer_names {
|
||||
_BASE,
|
||||
_FN1
|
||||
};
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_BASE] = LAYOUT_60_iso(
|
||||
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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
|
||||
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
|
||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
|
||||
),
|
||||
|
||||
[_FN1] = LAYOUT_60_iso(
|
||||
QK_GESC, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
KC_GRV, _______, _______, _______, _______, _______, _______, QK_BOOT
|
||||
)
|
||||
};
|
||||
63
keyboards/cannonkeys/bakeneko60_iso_hs/keymaps/via/keymap.c
Normal file
63
keyboards/cannonkeys/bakeneko60_iso_hs/keymaps/via/keymap.c
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
/*
|
||||
Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
|
||||
// Each layer gets a name for readability, which is then used in the keymap matrix below.
|
||||
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
|
||||
// Layer names don't all need to be of the same length, obviously, and you can also skip them
|
||||
// entirely and just use numbers.
|
||||
enum layer_names {
|
||||
_BASE,
|
||||
_FN1,
|
||||
_FN2,
|
||||
_FN3
|
||||
};
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_BASE] = LAYOUT_60_iso(
|
||||
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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
|
||||
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
|
||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
|
||||
),
|
||||
|
||||
[_FN1] = LAYOUT_60_iso(
|
||||
QK_GESC, 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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
KC_GRV, _______, _______, _______, _______, _______, _______, QK_BOOT
|
||||
),
|
||||
|
||||
[_FN2] = LAYOUT_60_iso(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
[_FN3] = LAYOUT_60_iso(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______
|
||||
)
|
||||
};
|
||||
|
|
@ -0,0 +1 @@
|
|||
VIA_ENABLE = yes
|
||||
24
keyboards/cannonkeys/bakeneko60_iso_hs/readme.md
Normal file
24
keyboards/cannonkeys/bakeneko60_iso_hs/readme.md
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
# CannonKeys Bakeneko60 ISO Hotswap
|
||||
|
||||
Bakeneko60 ISO Hotswap PCB
|
||||
|
||||
* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
|
||||
* Hardware Supported: STM32F072CBT6 (or equivalent)
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make cannonkeys/bakeneko60_iso_hs:default
|
||||
|
||||
Flashing example for this keyboard:
|
||||
|
||||
make cannonkeys/bakeneko60_iso_hs: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**: Toggle the switch on the back of the pcb to "0" and briefly press the button on the back of the PCB
|
||||
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
|
||||
5
keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk
Normal file
5
keyboards/cannonkeys/bakeneko60_iso_hs/rules.mk
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
# Wildcard to allow APM32 MCU
|
||||
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
|
||||
|
||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||
Loading…
Reference in a new issue