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

This commit is contained in:
QMK Bot 2022-09-14 18:15:10 +00:00
commit 237d47ae2c
6 changed files with 153 additions and 0 deletions

View File

@ -0,0 +1,35 @@
{
"manufacturer": "CannonKeys",
"keyboard_name": "Vector",
"maintainer": "awkannan",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
},
"matrix_pins": {
"cols": ["C13", "C15", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
"rows": ["C14", "A1", "B14", "B15", "A8"]
},
"indicators": {
"caps_lock": "B3",
"on_state": 0
},
"processor": "STM32F072",
"url": "",
"usb": {
"device_version": "1.0.0",
"vid": "0xCA04",
"pid": "0x000C"
},
"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": [0,9], "x":9, "y":0}, {"matrix": [0,10], "x":10, "y":0}, {"matrix": [0,11], "x":11, "y":0}, {"matrix": [0,12], "x":12, "y":0}, {"matrix": [0,13], "x":13, "y":0}, {"matrix": [2,12], "x":14, "y":0}, {"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": [1,9], "x":9.5, "y":1}, {"matrix": [1,10], "x":10.5, "y":1}, {"matrix": [1,11], "x":11.5, "y":1}, {"matrix": [1,12], "x":12.5, "y":1}, {"matrix": [1,13], "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": [2,9], "x":9.75, "y":2}, {"matrix": [2,10], "x":10.75, "y":2}, {"matrix": [2,11], "x":11.75, "y":2}, {"matrix": [2,13], "x":12.75, "y":2, "w":2.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": [3,9], "x":9.25, "y":3}, {"matrix": [3,10], "x":10.25, "y":3}, {"matrix": [3,11], "x":11.25, "y":3}, {"matrix": [3,12], "x":12.25, "y":3, "w":1.75}, {"matrix": [3,13], "x":14, "y":3}, {"matrix": [4,0], "x":0, "y":4, "w":1.5}, {"matrix": [4,1], "x":1.5, "y":4}, {"matrix": [4,2], "x":2.5, "y":4, "w":1.5}, {"matrix": [4,5], "x":4, "y":4, "w":3}, {"matrix": [4,7], "x":7, "y":4}, {"matrix": [4,9], "x":8, "y":4, "w":3}, {"matrix": [4,11], "x":11, "y":4, "w":1.5}, {"matrix": [4,12], "x":12.5, "y":4}, {"matrix": [4,13], "x":13.5, "y":4, "w":1.5}]
}
}
}

View File

@ -0,0 +1,45 @@
// Copyright 2022 Andrew Kannan (@awkannan)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
enum layer_names {
_BASE,
_FN1,
_FN2,
_FN3
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_all(
KC_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_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,
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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),
[_FN1] = LAYOUT_all(
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,
RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, RESET
),
[_FN2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_FN3] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

@ -0,0 +1,45 @@
// Copyright 2022 Andrew Kannan (@awkannan)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
enum layer_names {
_BASE,
_FN1,
_FN2,
_FN3
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT_all(
KC_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_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,
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_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN1),
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL
),
[_FN1] = LAYOUT_all(
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_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, RESET
),
[_FN2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_FN3] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
};

View File

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

View File

@ -0,0 +1,25 @@
# Vector
*A PCB mount 60% designed by ai03*
* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
* Hardware Supported: STM32F072CBT6
* Hardware Availability: [CannonKeys](https://cannonkeys.com)
Make example for this keyboard (after setting up your build environment):
make cannonkeys/vector:default
Flashing example for this keyboard:
make cannonkeys/vector: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**: Swap the boot switch on the back of the PCB to "1" and hit the reset button
* **Keycode in layout**: Press the key mapped to `RESET` if it is available

View File

@ -0,0 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF