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

keyboards/cannonkeys/leviatan/info.json

@@ -0,0 +1,311 @@
+{
+ "manufacturer": "CannonKeys",
+ "url": "https://cannonkeys.com",
+ "maintainer": "awkannan",
+ "keyboard_name": "Leviatan",
+ "usb": {
+ "vid": "0xCA04",
+ "pid": "0x0024",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+ "rows": ["B1", "B0", "A7", "A5", "A4"]
+ },
+ "diode_direction": "COL2ROW",
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "community_layouts": ["60_ansi", "60_tsangan_hhkb", "60_iso"],
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0, "matrix": [0, 3]},
+ {"x": 4, "y": 0, "matrix": [0, 4]},
+ {"x": 5, "y": 0, "matrix": [0, 5]},
+ {"x": 6, "y": 0, "matrix": [0, 6]},
+ {"x": 7, "y": 0, "matrix": [0, 7]},
+ {"x": 8, "y": 0, "matrix": [0, 8]},
+ {"x": 9, "y": 0, "matrix": [0, 9]},
+ {"x": 10, "y": 0, "matrix": [0, 10]},
+ {"x": 11, "y": 0, "matrix": [0, 11]},
+ {"x": 12, "y": 0, "matrix": [0, 12]},
+ {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
+
+ {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+ {"x": 1.5, "y": 1, "matrix": [1, 1]},
+ {"x": 2.5, "y": 1, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1, "matrix": [1, 5]},
+ {"x": 6.5, "y": 1, "matrix": [1, 6]},
+ {"x": 7.5, "y": 1, "matrix": [1, 7]},
+ {"x": 8.5, "y": 1, "matrix": [1, 8]},
+ {"x": 9.5, "y": 1, "matrix": [1, 9]},
+ {"x": 10.5, "y": 1, "matrix": [1, 10]},
+ {"x": 11.5, "y": 1, "matrix": [1, 11]},
+ {"x": 12.5, "y": 1, "matrix": [1, 12]},
+ {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
+
+ {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+ {"x": 1.75, "y": 2, "matrix": [2, 1]},
+ {"x": 2.75, "y": 2, "matrix": [2, 2]},
+ {"x": 3.75, "y": 2, "matrix": [2, 3]},
+ {"x": 4.75, "y": 2, "matrix": [2, 4]},
+ {"x": 5.75, "y": 2, "matrix": [2, 5]},
+ {"x": 6.75, "y": 2, "matrix": [2, 6]},
+ {"x": 7.75, "y": 2, "matrix": [2, 7]},
+ {"x": 8.75, "y": 2, "matrix": [2, 8]},
+ {"x": 9.75, "y": 2, "matrix": [2, 9]},
+ {"x": 10.75, "y": 2, "matrix": [2, 10]},
+ {"x": 11.75, "y": 2, "matrix": [2, 11]},
+ {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
+
+ {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+ {"x": 2.25, "y": 3, "matrix": [3, 2]},
+ {"x": 3.25, "y": 3, "matrix": [3, 3]},
+ {"x": 4.25, "y": 3, "matrix": [3, 4]},
+ {"x": 5.25, "y": 3, "matrix": [3, 5]},
+ {"x": 6.25, "y": 3, "matrix": [3, 6]},
+ {"x": 7.25, "y": 3, "matrix": [3, 7]},
+ {"x": 8.25, "y": 3, "matrix": [3, 8]},
+ {"x": 9.25, "y": 3, "matrix": [3, 9]},
+ {"x": 10.25, "y": 3, "matrix": [3, 10]},
+ {"x": 11.25, "y": 3, "matrix": [3, 11]},
+ {"x": 12.25, "y": 3, "w": 2.75, "matrix": [3, 12]},
+
+ {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+ {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+ {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+ {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+ {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+ {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+ {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+ {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
+ ]
+ },
+ "LAYOUT_60_tsangan_hhkb": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0, "matrix": [0, 3]},
+ {"x": 4, "y": 0, "matrix": [0, 4]},
+ {"x": 5, "y": 0, "matrix": [0, 5]},
+ {"x": 6, "y": 0, "matrix": [0, 6]},
+ {"x": 7, "y": 0, "matrix": [0, 7]},
+ {"x": 8, "y": 0, "matrix": [0, 8]},
+ {"x": 9, "y": 0, "matrix": [0, 9]},
+ {"x": 10, "y": 0, "matrix": [0, 10]},
+ {"x": 11, "y": 0, "matrix": [0, 11]},
+ {"x": 12, "y": 0, "matrix": [0, 12]},
+ {"x": 13, "y": 0, "matrix": [0, 13]},
+ {"x": 14, "y": 0, "matrix": [0, 14]},
+
+ {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+ {"x": 1.5, "y": 1, "matrix": [1, 1]},
+ {"x": 2.5, "y": 1, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1, "matrix": [1, 5]},
+ {"x": 6.5, "y": 1, "matrix": [1, 6]},
+ {"x": 7.5, "y": 1, "matrix": [1, 7]},
+ {"x": 8.5, "y": 1, "matrix": [1, 8]},
+ {"x": 9.5, "y": 1, "matrix": [1, 9]},
+ {"x": 10.5, "y": 1, "matrix": [1, 10]},
+ {"x": 11.5, "y": 1, "matrix": [1, 11]},
+ {"x": 12.5, "y": 1, "matrix": [1, 12]},
+ {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
+
+ {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+ {"x": 1.75, "y": 2, "matrix": [2, 1]},
+ {"x": 2.75, "y": 2, "matrix": [2, 2]},
+ {"x": 3.75, "y": 2, "matrix": [2, 3]},
+ {"x": 4.75, "y": 2, "matrix": [2, 4]},
+ {"x": 5.75, "y": 2, "matrix": [2, 5]},
+ {"x": 6.75, "y": 2, "matrix": [2, 6]},
+ {"x": 7.75, "y": 2, "matrix": [2, 7]},
+ {"x": 8.75, "y": 2, "matrix": [2, 8]},
+ {"x": 9.75, "y": 2, "matrix": [2, 9]},
+ {"x": 10.75, "y": 2, "matrix": [2, 10]},
+ {"x": 11.75, "y": 2, "matrix": [2, 11]},
+ {"x": 12.75, "y": 2, "w": 2.25, "matrix": [2, 14]},
+
+ {"x": 0, "y": 3, "w": 2.25, "matrix": [3, 0]},
+ {"x": 2.25, "y": 3, "matrix": [3, 2]},
+ {"x": 3.25, "y": 3, "matrix": [3, 3]},
+ {"x": 4.25, "y": 3, "matrix": [3, 4]},
+ {"x": 5.25, "y": 3, "matrix": [3, 5]},
+ {"x": 6.25, "y": 3, "matrix": [3, 6]},
+ {"x": 7.25, "y": 3, "matrix": [3, 7]},
+ {"x": 8.25, "y": 3, "matrix": [3, 8]},
+ {"x": 9.25, "y": 3, "matrix": [3, 9]},
+ {"x": 10.25, "y": 3, "matrix": [3, 10]},
+ {"x": 11.25, "y": 3, "matrix": [3, 11]},
+ {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+ {"x": 14, "y": 3, "matrix": [3, 14]},
+
+ {"x": 0, "y": 4, "w": 1.5, "matrix": [4, 0]},
+ {"x": 1.5, "y": 4, "matrix": [4, 1]},
+ {"x": 2.5, "y": 4, "w": 1.5, "matrix": [4, 2]},
+ {"x": 4, "y": 4, "w": 7, "matrix": [4, 6]},
+ {"x": 11, "y": 4, "w": 1.5, "matrix": [4, 11]},
+ {"x": 12.5, "y": 4, "matrix": [4, 12]},
+ {"x": 13.5, "y": 4, "w": 1.5, "matrix": [4, 14]}
+ ]
+ },
+ "LAYOUT_60_iso": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0, "matrix": [0, 3]},
+ {"x": 4, "y": 0, "matrix": [0, 4]},
+ {"x": 5, "y": 0, "matrix": [0, 5]},
+ {"x": 6, "y": 0, "matrix": [0, 6]},
+ {"x": 7, "y": 0, "matrix": [0, 7]},
+ {"x": 8, "y": 0, "matrix": [0, 8]},
+ {"x": 9, "y": 0, "matrix": [0, 9]},
+ {"x": 10, "y": 0, "matrix": [0, 10]},
+ {"x": 11, "y": 0, "matrix": [0, 11]},
+ {"x": 12, "y": 0, "matrix": [0, 12]},
+ {"x": 13, "y": 0, "w": 2, "matrix": [0, 13]},
+
+ {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+ {"x": 1.5, "y": 1, "matrix": [1, 1]},
+ {"x": 2.5, "y": 1, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1, "matrix": [1, 5]},
+ {"x": 6.5, "y": 1, "matrix": [1, 6]},
+ {"x": 7.5, "y": 1, "matrix": [1, 7]},
+ {"x": 8.5, "y": 1, "matrix": [1, 8]},
+ {"x": 9.5, "y": 1, "matrix": [1, 9]},
+ {"x": 10.5, "y": 1, "matrix": [1, 10]},
+ {"x": 11.5, "y": 1, "matrix": [1, 11]},
+ {"x": 12.5, "y": 1, "matrix": [1, 12]},
+
+ {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+ {"x": 1.75, "y": 2, "matrix": [2, 1]},
+ {"x": 2.75, "y": 2, "matrix": [2, 2]},
+ {"x": 3.75, "y": 2, "matrix": [2, 3]},
+ {"x": 4.75, "y": 2, "matrix": [2, 4]},
+ {"x": 5.75, "y": 2, "matrix": [2, 5]},
+ {"x": 6.75, "y": 2, "matrix": [2, 6]},
+ {"x": 7.75, "y": 2, "matrix": [2, 7]},
+ {"x": 8.75, "y": 2, "matrix": [2, 8]},
+ {"x": 9.75, "y": 2, "matrix": [2, 9]},
+ {"x": 10.75, "y": 2, "matrix": [2, 10]},
+ {"x": 11.75, "y": 2, "matrix": [2, 11]},
+ {"x": 12.75, "y": 2, "matrix": [2, 12]},
+ {"x": 13.75, "y": 1, "w": 1.25, "h": 2, "matrix": [2, 14]},
+
+ {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+ {"x": 1.25, "y": 3, "matrix": [3, 1]},
+ {"x": 2.25, "y": 3, "matrix": [3, 2]},
+ {"x": 3.25, "y": 3, "matrix": [3, 3]},
+ {"x": 4.25, "y": 3, "matrix": [3, 4]},
+ {"x": 5.25, "y": 3, "matrix": [3, 5]},
+ {"x": 6.25, "y": 3, "matrix": [3, 6]},
+ {"x": 7.25, "y": 3, "matrix": [3, 7]},
+ {"x": 8.25, "y": 3, "matrix": [3, 8]},
+ {"x": 9.25, "y": 3, "matrix": [3, 9]},
+ {"x": 10.25, "y": 3, "matrix": [3, 10]},
+ {"x": 11.25, "y": 3, "matrix": [3, 11]},
+ {"x": 12.25, "y": 3, "w": 2.75, "matrix": [3, 12]},
+
+ {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+ {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+ {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+ {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+ {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+ {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+ {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+ {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"x": 0, "y": 0, "matrix": [0, 0]},
+ {"x": 1, "y": 0, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0, "matrix": [0, 3]},
+ {"x": 4, "y": 0, "matrix": [0, 4]},
+ {"x": 5, "y": 0, "matrix": [0, 5]},
+ {"x": 6, "y": 0, "matrix": [0, 6]},
+ {"x": 7, "y": 0, "matrix": [0, 7]},
+ {"x": 8, "y": 0, "matrix": [0, 8]},
+ {"x": 9, "y": 0, "matrix": [0, 9]},
+ {"x": 10, "y": 0, "matrix": [0, 10]},
+ {"x": 11, "y": 0, "matrix": [0, 11]},
+ {"x": 12, "y": 0, "matrix": [0, 12]},
+ {"x": 13, "y": 0, "matrix": [0, 13]},
+ {"x": 14, "y": 0, "matrix": [0, 14]},
+
+ {"x": 0, "y": 1, "w": 1.5, "matrix": [1, 0]},
+ {"x": 1.5, "y": 1, "matrix": [1, 1]},
+ {"x": 2.5, "y": 1, "matrix": [1, 2]},
+ {"x": 3.5, "y": 1, "matrix": [1, 3]},
+ {"x": 4.5, "y": 1, "matrix": [1, 4]},
+ {"x": 5.5, "y": 1, "matrix": [1, 5]},
+ {"x": 6.5, "y": 1, "matrix": [1, 6]},
+ {"x": 7.5, "y": 1, "matrix": [1, 7]},
+ {"x": 8.5, "y": 1, "matrix": [1, 8]},
+ {"x": 9.5, "y": 1, "matrix": [1, 9]},
+ {"x": 10.5, "y": 1, "matrix": [1, 10]},
+ {"x": 11.5, "y": 1, "matrix": [1, 11]},
+ {"x": 12.5, "y": 1, "matrix": [1, 12]},
+ {"x": 13.5, "y": 1, "w": 1.5, "matrix": [1, 14]},
+
+ {"x": 0, "y": 2, "w": 1.75, "matrix": [2, 0]},
+ {"x": 1.75, "y": 2, "matrix": [2, 1]},
+ {"x": 2.75, "y": 2, "matrix": [2, 2]},
+ {"x": 3.75, "y": 2, "matrix": [2, 3]},
+ {"x": 4.75, "y": 2, "matrix": [2, 4]},
+ {"x": 5.75, "y": 2, "matrix": [2, 5]},
+ {"x": 6.75, "y": 2, "matrix": [2, 6]},
+ {"x": 7.75, "y": 2, "matrix": [2, 7]},
+ {"x": 8.75, "y": 2, "matrix": [2, 8]},
+ {"x": 9.75, "y": 2, "matrix": [2, 9]},
+ {"x": 10.75, "y": 2, "matrix": [2, 10]},
+ {"x": 11.75, "y": 2, "matrix": [2, 11]},
+ {"x": 12.75, "y": 2, "matrix": [2, 12]},
+ {"x": 13.75, "y": 2, "w": 1.25, "matrix": [2, 14]},
+
+ {"x": 0, "y": 3, "w": 1.25, "matrix": [3, 0]},
+ {"x": 1.25, "y": 3, "matrix": [3, 1]},
+ {"x": 2.25, "y": 3, "matrix": [3, 2]},
+ {"x": 3.25, "y": 3, "matrix": [3, 3]},
+ {"x": 4.25, "y": 3, "matrix": [3, 4]},
+ {"x": 5.25, "y": 3, "matrix": [3, 5]},
+ {"x": 6.25, "y": 3, "matrix": [3, 6]},
+ {"x": 7.25, "y": 3, "matrix": [3, 7]},
+ {"x": 8.25, "y": 3, "matrix": [3, 8]},
+ {"x": 9.25, "y": 3, "matrix": [3, 9]},
+ {"x": 10.25, "y": 3, "matrix": [3, 10]},
+ {"x": 11.25, "y": 3, "matrix": [3, 11]},
+ {"x": 12.25, "y": 3, "w": 1.75, "matrix": [3, 12]},
+ {"x": 14, "y": 3, "matrix": [3, 14]},
+
+ {"x": 0, "y": 4, "w": 1.25, "matrix": [4, 0]},
+ {"x": 1.25, "y": 4, "w": 1.25, "matrix": [4, 1]},
+ {"x": 2.5, "y": 4, "w": 1.25, "matrix": [4, 2]},
+ {"x": 3.75, "y": 4, "w": 6.25, "matrix": [4, 6]},
+ {"x": 10, "y": 4, "w": 1.25, "matrix": [4, 10]},
+ {"x": 11.25, "y": 4, "w": 1.25, "matrix": [4, 11]},
+ {"x": 12.5, "y": 4, "w": 1.25, "matrix": [4, 12]},
+ {"x": 13.75, "y": 4, "w": 1.25, "matrix": [4, 14]}
+ ]
+ }
+ }
+}

keyboards/cannonkeys/leviatan/keymaps/default/keymap.c

@@ -0,0 +1,45 @@
+/*
+Copyright 2012,2013 Jun Wako <[email protected]>
+
+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:https://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_ansi(
+ 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,
+ 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
+ ),
+
+ [_FN1] = LAYOUT_60_ansi(
+ 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,
+ RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_GRV, _______, _______, _______, _______, _______, _______, QK_BOOT
+ )
+};