From bc9508098ef84b5b4650e58796adf8d7f5ed1512 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 14 Sep 2023 13:40:38 -0400 Subject: [PATCH 1/9] Add is0gr to QMK --- keyboards/cannonkeys/is0gr/info.json | 31 +++++++++++++++++++ .../cannonkeys/is0gr/keymaps/default/keymap.c | 27 ++++++++++++++++ .../cannonkeys/is0gr/keymaps/via/keymap.c | 29 +++++++++++++++++ .../cannonkeys/is0gr/keymaps/via/rules.mk | 1 + keyboards/cannonkeys/is0gr/readme.md | 25 +++++++++++++++ keyboards/cannonkeys/is0gr/rules.mk | 2 ++ 6 files changed, 115 insertions(+) create mode 100644 keyboards/cannonkeys/is0gr/info.json create mode 100644 keyboards/cannonkeys/is0gr/keymaps/default/keymap.c create mode 100644 keyboards/cannonkeys/is0gr/keymaps/via/keymap.c create mode 100644 keyboards/cannonkeys/is0gr/keymaps/via/rules.mk create mode 100644 keyboards/cannonkeys/is0gr/readme.md create mode 100644 keyboards/cannonkeys/is0gr/rules.mk diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json new file mode 100644 index 000000000000..b9e16a8279b1 --- /dev/null +++ b/keyboards/cannonkeys/is0gr/info.json @@ -0,0 +1,31 @@ +{ + "manufacturer": "CannonKeys", + "keyboard_name": "is0GR", + "maintainer": "awkannan", + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "usb": { + "vid": "0x6369", + "pid": "0x6B7B", + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["A15"], + "cols": ["B3"] + }, + "url": "https://cannonkeys.com", + "layouts": { + "LAYOUT": { + "layout": [{"matrix": [0,0], "x":0.25, "y":0, "w":1.25, "h":2}] + } + } +} \ No newline at end of file diff --git a/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c new file mode 100644 index 000000000000..b69fe852189e --- /dev/null +++ b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +/* +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 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ENT + ), +}; diff --git a/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c new file mode 100644 index 000000000000..cc3e410faab4 --- /dev/null +++ b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c @@ -0,0 +1,29 @@ +/* +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 + + +enum custom_keycodes { + QWERTY = SAFE_RANGE, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ENT + ), +}; + diff --git a/keyboards/cannonkeys/is0gr/keymaps/via/rules.mk b/keyboards/cannonkeys/is0gr/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/cannonkeys/is0gr/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cannonkeys/is0gr/readme.md b/keyboards/cannonkeys/is0gr/readme.md new file mode 100644 index 000000000000..7152320bf3b1 --- /dev/null +++ b/keyboards/cannonkeys/is0gr/readme.md @@ -0,0 +1,25 @@ +# Alchemist Keyboards is0GR + +is0GR Keyboard + +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/is0gr:default + + +Flashing example for this keyboard: + + make cannonkeys/is0gr: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 (on this board - it's the only key) and plug in the keyboard +* **Physical reset button**: Bridge the two pads labeled "RESET" on the top of the PCB using some tweezers, and hold the tweezers there until the board enters the bootloader mode +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (it isn't by default) diff --git a/keyboards/cannonkeys/is0gr/rules.mk b/keyboards/cannonkeys/is0gr/rules.mk new file mode 100644 index 000000000000..0ab54aaaf718 --- /dev/null +++ b/keyboards/cannonkeys/is0gr/rules.mk @@ -0,0 +1,2 @@ +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -v FFFF -p FFFF From 2ecfa39d833a747ed50c816dec1b0d28eee81522 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 14 Sep 2023 13:42:20 -0400 Subject: [PATCH 2/9] Reformat JSON --- keyboards/cannonkeys/is0gr/info.json | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json index b9e16a8279b1..fbaf8078acfd 100644 --- a/keyboards/cannonkeys/is0gr/info.json +++ b/keyboards/cannonkeys/is0gr/info.json @@ -2,13 +2,8 @@ "manufacturer": "CannonKeys", "keyboard_name": "is0GR", "maintainer": "awkannan", - "processor": "STM32F072", "bootloader": "stm32-dfu", - "usb": { - "vid": "0x6369", - "pid": "0x6B7B", - "device_version": "0.0.1" - }, + "diode_direction": "COL2ROW", "features": { "bootmagic": true, "command": false, @@ -17,15 +12,22 @@ "mousekey": true, "nkro": true }, - "diode_direction": "COL2ROW", "matrix_pins": { - "rows": ["A15"], - "cols": ["B3"] + "cols": ["B3"], + "rows": ["A15"] }, + "processor": "STM32F072", "url": "https://cannonkeys.com", + "usb": { + "device_version": "0.0.1", + "pid": "0x6B7B", + "vid": "0x6369" + }, "layouts": { "LAYOUT": { - "layout": [{"matrix": [0,0], "x":0.25, "y":0, "w":1.25, "h":2}] + "layout": [ + {"matrix": [0, 0], "x": 0.25, "y": 0, "w": 1.25, "h": 2} + ] } } -} \ No newline at end of file +} From 43143dd1af381276b562f196018362b703c3b2e3 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 14 Sep 2023 13:43:46 -0400 Subject: [PATCH 3/9] Remove safe range as they are unnecessary --- keyboards/cannonkeys/is0gr/keymaps/default/keymap.c | 4 ---- keyboards/cannonkeys/is0gr/keymaps/via/keymap.c | 5 ----- 2 files changed, 9 deletions(-) diff --git a/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c index b69fe852189e..ad20fce3c2c0 100644 --- a/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c @@ -16,10 +16,6 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -enum custom_keycodes { - QWERTY = SAFE_RANGE, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_ENT diff --git a/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c index cc3e410faab4..29a1293890a9 100644 --- a/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c @@ -16,11 +16,6 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H - -enum custom_keycodes { - QWERTY = SAFE_RANGE, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( KC_ENT From 83e51b5c11cd7a00b27284914650e574e0c35b00 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 14 Sep 2023 13:45:35 -0400 Subject: [PATCH 4/9] Bring PID/VID into CannonKeys range --- keyboards/cannonkeys/is0gr/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json index fbaf8078acfd..747bae3c8d2a 100644 --- a/keyboards/cannonkeys/is0gr/info.json +++ b/keyboards/cannonkeys/is0gr/info.json @@ -20,8 +20,8 @@ "url": "https://cannonkeys.com", "usb": { "device_version": "0.0.1", - "pid": "0x6B7B", - "vid": "0x6369" + "pid": "0xCA04", + "vid": "0x0028" }, "layouts": { "LAYOUT": { From b742137570d2e90be62c21755f191aaefbdc7618 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 14 Sep 2023 13:47:13 -0400 Subject: [PATCH 5/9] update copyright headers --- .../cannonkeys/is0gr/keymaps/default/keymap.c | 17 ++--------------- keyboards/cannonkeys/is0gr/keymaps/via/keymap.c | 17 ++--------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c index ad20fce3c2c0..d51b32c0793a 100644 --- a/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c @@ -1,19 +1,6 @@ -/* -Copyright 2012,2013 Jun Wako +// Copyright 2023 Andrew Kannan +// SPDX-License-Identifier: GPL-2.0-or-later -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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c index 29a1293890a9..cf047d147fdf 100644 --- a/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c @@ -1,19 +1,6 @@ -/* -Copyright 2012,2013 Jun Wako +// Copyright 2023 Andrew Kannan +// SPDX-License-Identifier: GPL-2.0-or-later -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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From fee93b0609e86b3070aded80a554746b9efff796 Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Thu, 14 Sep 2023 21:13:09 -0400 Subject: [PATCH 6/9] Apply suggestions from code review Co-authored-by: Duncan Sutherland --- keyboards/cannonkeys/is0gr/info.json | 3 ++- keyboards/cannonkeys/is0gr/keymaps/default/keymap.c | 2 +- keyboards/cannonkeys/is0gr/keymaps/via/keymap.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json index 747bae3c8d2a..1569ad3bc3f7 100644 --- a/keyboards/cannonkeys/is0gr/info.json +++ b/keyboards/cannonkeys/is0gr/info.json @@ -23,8 +23,9 @@ "pid": "0xCA04", "vid": "0x0028" }, + "community_layouts": ["ortho_1x1"], "layouts": { - "LAYOUT": { + "LAYOUT_ortho_1x1": { "layout": [ {"matrix": [0, 0], "x": 0.25, "y": 0, "w": 1.25, "h": 2} ] diff --git a/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c index d51b32c0793a..49f0cdb4916d 100644 --- a/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/is0gr/keymaps/default/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_1x1( KC_ENT ), }; diff --git a/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c index cf047d147fdf..10451984f063 100644 --- a/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/is0gr/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_1x1( KC_ENT ), }; From 55299664bc68f269a0e9f076985c7533aa27149b Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Wed, 20 Sep 2023 15:40:01 -0400 Subject: [PATCH 7/9] Update keyboards/cannonkeys/is0gr/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/cannonkeys/is0gr/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/cannonkeys/is0gr/readme.md b/keyboards/cannonkeys/is0gr/readme.md index 7152320bf3b1..f6fb2b8f61ee 100644 --- a/keyboards/cannonkeys/is0gr/readme.md +++ b/keyboards/cannonkeys/is0gr/readme.md @@ -9,7 +9,6 @@ Make example for this keyboard (after setting up your build environment): make cannonkeys/is0gr:default - Flashing example for this keyboard: make cannonkeys/is0gr:default:flash From b20082d0bfc42ac3fbccad3e5faa7d1aa95223da Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Wed, 20 Sep 2023 15:40:33 -0400 Subject: [PATCH 8/9] is0gr info.json update --- keyboards/cannonkeys/is0gr/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json index 1569ad3bc3f7..3f5e92a99c93 100644 --- a/keyboards/cannonkeys/is0gr/info.json +++ b/keyboards/cannonkeys/is0gr/info.json @@ -6,8 +6,6 @@ "diode_direction": "COL2ROW", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": true From 80c0a836e300ee308ec6c19d7b4c84e98319058b Mon Sep 17 00:00:00 2001 From: Andrew Kannan Date: Wed, 20 Sep 2023 15:40:59 -0400 Subject: [PATCH 9/9] format json --- keyboards/cannonkeys/is0gr/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/cannonkeys/is0gr/info.json b/keyboards/cannonkeys/is0gr/info.json index 3f5e92a99c93..3fd95577d892 100644 --- a/keyboards/cannonkeys/is0gr/info.json +++ b/keyboards/cannonkeys/is0gr/info.json @@ -29,4 +29,4 @@ ] } } -} +} \ No newline at end of file