From c7d6296396afec375425a97192984ee10f4ec75a Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 27 Oct 2022 16:48:02 -0400 Subject: [PATCH 1/6] Add Brutal v2 1800 Keyboard to QMK --- keyboards/cannonkeys/brutalv2_1800/config.h | 25 ++++ keyboards/cannonkeys/brutalv2_1800/halconf.h | 5 + keyboards/cannonkeys/brutalv2_1800/info.json | 139 ++++++++++++++++++ .../brutalv2_1800/keymaps/default/keymap.c | 48 ++++++ .../brutalv2_1800/keymaps/via/keymap.c | 58 ++++++++ .../brutalv2_1800/keymaps/via/rules.mk | 1 + keyboards/cannonkeys/brutalv2_1800/mcuconf.h | 6 + keyboards/cannonkeys/brutalv2_1800/readme.md | 22 +++ keyboards/cannonkeys/brutalv2_1800/rules.mk | 2 + 9 files changed, 306 insertions(+) create mode 100644 keyboards/cannonkeys/brutalv2_1800/config.h create mode 100644 keyboards/cannonkeys/brutalv2_1800/halconf.h create mode 100644 keyboards/cannonkeys/brutalv2_1800/info.json create mode 100644 keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c create mode 100644 keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c create mode 100644 keyboards/cannonkeys/brutalv2_1800/keymaps/via/rules.mk create mode 100644 keyboards/cannonkeys/brutalv2_1800/mcuconf.h create mode 100644 keyboards/cannonkeys/brutalv2_1800/readme.md create mode 100644 keyboards/cannonkeys/brutalv2_1800/rules.mk diff --git a/keyboards/cannonkeys/brutalv2_1800/config.h b/keyboards/cannonkeys/brutalv2_1800/config.h new file mode 100644 index 000000000000..9ac66b56248a --- /dev/null +++ b/keyboards/cannonkeys/brutalv2_1800/config.h @@ -0,0 +1,25 @@ +/* +Copyright 2015 Jun Wako + +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 . +*/ + +#pragma once + +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U + +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 +#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 + diff --git a/keyboards/cannonkeys/brutalv2_1800/halconf.h b/keyboards/cannonkeys/brutalv2_1800/halconf.h new file mode 100644 index 000000000000..c4a7101379f8 --- /dev/null +++ b/keyboards/cannonkeys/brutalv2_1800/halconf.h @@ -0,0 +1,5 @@ +#pragma once + +#define HAL_USE_I2C TRUE + +#include_next diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/info.json new file mode 100644 index 000000000000..a7f5d9fdb802 --- /dev/null +++ b/keyboards/cannonkeys/brutalv2_1800/info.json @@ -0,0 +1,139 @@ +{ + "keyboard_name": "Brutal v2 1800", + "maintainer": "awkannan", + "manufacturer": "CannonKeys", + "processor": "RP2040", + "bootloader": "rp2040", + "usb": { + "vid": "0xCA04", + "pid": "0x000D", + "device_version": "0.0.1" + }, + "url": "https://cannonkeys.com", + "diode_direction": "COL2ROW", + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP9", "GP6", "GP5", "GP4", "GP3"], + "rows": ["GP13", "GP12", "GP11", "GP10", "GP8", "GP7"] + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + }, + "indicators": { + "caps_lock": "GP29", + "num_lock": "GP2", + "on_state": 0 + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, + { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 }, + { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 }, + { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 }, + { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 }, + { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 }, + { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 }, + { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 }, + { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 }, + { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 }, + { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 }, + { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 }, + { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 }, + { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 }, + { "matrix": [0, 14], "x": 15.5, "y": 0.0 }, + { "matrix": [0, 15], "x": 16.5, "y": 0.0 }, + { "matrix": [0, 16], "x": 17.5, "y": 0.0 }, + { "matrix": [0, 17], "x": 18.5, "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 }, + { "matrix": [1, 13], "x": 13.0, "y": 1.25 }, + { "matrix": [3, 12], "x": 14.0, "y": 1.25 }, + { "label": "Insert", "matrix": [1, 14], "x": 15.5, "y": 1.25 }, + { "label": "Home", "matrix": [1, 15], "x": 16.5, "y": 1.25 }, + { "label": "PgUp", "matrix": [1, 16], "x": 17.5, "y": 1.25 }, + { "matrix": [1, 17], "x": 18.5, "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": "Delete", "matrix": [2, 14], "x": 15.5, "y": 2.25 }, + { "label": "End", "matrix": [2, 15], "x": 16.5, "y": 2.25 }, + { "label": "PgDn", "matrix": [2, 16], "x": 17.5, "y": 2.25 }, + { "matrix": [2, 17], "x": 18.5, "y": 2.25 }, + { "label": "Caps Lock", "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": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, + { "label": "Enter", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 }, + { "matrix": [3, 14], "x": 15.5, "y": 3.25 }, + { "matrix": [3, 15], "x": 16.5, "y": 3.25 }, + { "matrix": [3, 16], "x": 17.5, "y": 3.25 }, + { "matrix": [3, 17], "x": 18.5, "y": 3.25 }, + { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 }, + { "matrix": [4, 1], "x": 1.25, "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": 1.75, "x": 12.25, "y": 4.25 }, + { "label": "\u2191", "matrix": [4, 13], "x": 14.25, "y": 4.25 }, + { "matrix": [4, 14], "x": 15.5, "y": 4.25 }, + { "matrix": [4, 15], "x": 16.5, "y": 4.25 }, + { "matrix": [4, 16], "x": 17.5, "y": 4.25 }, + { "matrix": [4, 17], "x": 18.5, "y": 4.25 }, + { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 }, + { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10.0, "y": 5.25 }, + { "label": "Ctrl", "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.25 }, + { "label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.25 }, + { "label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.25 }, + { "label": "\u2192", "matrix": [5, 14], "x": 15.25, "y": 5.25 }, + { "matrix": [5, 15], "x": 16.5, "y": 5.25 }, + { "matrix": [5, 16], "x": 17.5, "y": 5.25 }, + { "matrix": [5, 17], "x": 18.5, "y": 5.25 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c b/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c new file mode 100644 index 000000000000..0bf985cb6773 --- /dev/null +++ b/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c @@ -0,0 +1,48 @@ +/* +Copyright 2012,2013 Jun Wako + +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 . +*/ +#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_all( + 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_DEL, KC_INS, KC_PGUP, KC_PGDN, + 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_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUHS, 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ), + + [_FN1] = LAYOUT_all( + QK_BOOT, 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_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, + BL_BRTG, 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, + BL_INC, BL_DEC, BL_TOGG, 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 + ) +}; diff --git a/keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c new file mode 100644 index 000000000000..0e1f6d5c3ea6 --- /dev/null +++ b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c @@ -0,0 +1,58 @@ +/* +Copyright 2012,2013 Jun Wako + +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 . +*/ +#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, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_BASE] = LAYOUT_all( + 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_DEL, KC_INS, KC_PGUP, KC_PGDN, + 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_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, KC_PPLS, + KC_LSFT, KC_NUHS, 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT + ), + + [_FN1] = LAYOUT_all( + QK_BOOT, 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_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, + BL_BRTG, 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, + BL_INC, BL_DEC, BL_TOGG, 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 + ), + + [_FN2] = LAYOUT_all( + 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_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_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 + ) +}; diff --git a/keyboards/cannonkeys/brutalv2_1800/keymaps/via/rules.mk b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cannonkeys/brutalv2_1800/mcuconf.h b/keyboards/cannonkeys/brutalv2_1800/mcuconf.h new file mode 100644 index 000000000000..d3ca0baab50e --- /dev/null +++ b/keyboards/cannonkeys/brutalv2_1800/mcuconf.h @@ -0,0 +1,6 @@ +#pragma once + +#include_next + +#undef RP_I2C_USE_I2C0 +#define RP_I2C_USE_I2C0 TRUE diff --git a/keyboards/cannonkeys/brutalv2_1800/readme.md b/keyboards/cannonkeys/brutalv2_1800/readme.md new file mode 100644 index 000000000000..29c8c0c46004 --- /dev/null +++ b/keyboards/cannonkeys/brutalv2_1800/readme.md @@ -0,0 +1,22 @@ +# Brutal v2 1800 + +Brutal v2 1800 Keyboard + +* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan) +* Hardware Supported: RP2040 +* Hardware Availability: [CannonKeys](https://cannonkeys.com) + + +Make example for this keyboard (after setting up your build environment): + + make cannonkeys/brutalv2_1800:default + +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 diff --git a/keyboards/cannonkeys/brutalv2_1800/rules.mk b/keyboards/cannonkeys/brutalv2_1800/rules.mk new file mode 100644 index 000000000000..59f8593f1849 --- /dev/null +++ b/keyboards/cannonkeys/brutalv2_1800/rules.mk @@ -0,0 +1,2 @@ +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = rp2040_flash From 4904a8b34a500af7bea5142c7ba9d5a3304919da Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 27 Oct 2022 16:52:25 -0400 Subject: [PATCH 2/6] Update readme --- keyboards/cannonkeys/brutalv2_1800/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cannonkeys/brutalv2_1800/readme.md b/keyboards/cannonkeys/brutalv2_1800/readme.md index 29c8c0c46004..dd4dd9e42b6c 100644 --- a/keyboards/cannonkeys/brutalv2_1800/readme.md +++ b/keyboards/cannonkeys/brutalv2_1800/readme.md @@ -18,5 +18,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to 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 +* **Physical reset button**: Toggle the switch on the back of the pcb to "Bootloader" 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 From 2b59fb74f169de14e0b3f2a74ccd03709563d966 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 27 Oct 2022 16:54:00 -0400 Subject: [PATCH 3/6] Remove halconf and mcuconf since we are relying on flash emulated eeprom --- keyboards/cannonkeys/brutalv2_1800/halconf.h | 5 ----- keyboards/cannonkeys/brutalv2_1800/mcuconf.h | 6 ------ 2 files changed, 11 deletions(-) delete mode 100644 keyboards/cannonkeys/brutalv2_1800/halconf.h delete mode 100644 keyboards/cannonkeys/brutalv2_1800/mcuconf.h diff --git a/keyboards/cannonkeys/brutalv2_1800/halconf.h b/keyboards/cannonkeys/brutalv2_1800/halconf.h deleted file mode 100644 index c4a7101379f8..000000000000 --- a/keyboards/cannonkeys/brutalv2_1800/halconf.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define HAL_USE_I2C TRUE - -#include_next diff --git a/keyboards/cannonkeys/brutalv2_1800/mcuconf.h b/keyboards/cannonkeys/brutalv2_1800/mcuconf.h deleted file mode 100644 index d3ca0baab50e..000000000000 --- a/keyboards/cannonkeys/brutalv2_1800/mcuconf.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include_next - -#undef RP_I2C_USE_I2C0 -#define RP_I2C_USE_I2C0 TRUE From 01474dd6b5f5540a713617b7b60c33cd7635ea00 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 27 Oct 2022 20:01:27 -0400 Subject: [PATCH 4/6] Update readme --- keyboards/cannonkeys/brutalv2_1800/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cannonkeys/brutalv2_1800/readme.md b/keyboards/cannonkeys/brutalv2_1800/readme.md index dd4dd9e42b6c..3e82c0328541 100644 --- a/keyboards/cannonkeys/brutalv2_1800/readme.md +++ b/keyboards/cannonkeys/brutalv2_1800/readme.md @@ -18,5 +18,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to 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 "Bootloader" and briefly press the button on the back of the PCB +* **Physical reset button**: Toggle the switch on the back of the pcb to "Rcovery" 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 From f6969f17ee6b10b81c517cb8bcdcafa0e6b0b967 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 27 Oct 2022 20:26:59 -0400 Subject: [PATCH 5/6] Change debouncing type --- keyboards/cannonkeys/brutalv2_1800/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/info.json index a7f5d9fdb802..cbb19b3b3fc0 100644 --- a/keyboards/cannonkeys/brutalv2_1800/info.json +++ b/keyboards/cannonkeys/brutalv2_1800/info.json @@ -28,6 +28,9 @@ "num_lock": "GP2", "on_state": 0 }, + "build": { + "debounce_type": "asym_eager_defer_pk", + }, "layouts": { "LAYOUT_all": { "layout": [ From 6cf4508fff364d35a252b5deb634921ff8f44ee6 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Tue, 1 Nov 2022 14:33:11 -0400 Subject: [PATCH 6/6] Apply suggestions from code review Co-authored-by: Ryan --- keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c | 2 +- keyboards/cannonkeys/brutalv2_1800/readme.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c b/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c index 0bf985cb6773..78607d6a6097 100644 --- a/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/brutalv2_1800/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_all( 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_DEL, KC_INS, KC_PGUP, KC_PGDN, - 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_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + 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_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_P7, KC_P8, KC_P9, KC_PPLS, 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_P4, KC_P5, KC_P6, KC_PPLS, KC_LSFT, KC_NUHS, 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_P1, KC_P2, KC_P3, KC_PENT, diff --git a/keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c index 0e1f6d5c3ea6..7b3aecc4e047 100644 --- a/keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/brutalv2_1800/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_all( 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_DEL, KC_INS, KC_PGUP, KC_PGDN, - 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_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + 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_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_P7, KC_P8, KC_P9, KC_PPLS, 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_P4, KC_P5, KC_P6, KC_PPLS, KC_LSFT, KC_NUHS, 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_P1, KC_P2, KC_P3, KC_PENT, diff --git a/keyboards/cannonkeys/brutalv2_1800/readme.md b/keyboards/cannonkeys/brutalv2_1800/readme.md index 3e82c0328541..971454e9ca52 100644 --- a/keyboards/cannonkeys/brutalv2_1800/readme.md +++ b/keyboards/cannonkeys/brutalv2_1800/readme.md @@ -2,8 +2,8 @@ Brutal v2 1800 Keyboard -* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan) -* Hardware Supported: RP2040 +* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan) +* Hardware Supported: RP2040 * Hardware Availability: [CannonKeys](https://cannonkeys.com)