From ef934355f9e88c4ab2ab238ee1c632719890ce0e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 29 May 2024 02:54:47 +0100 Subject: [PATCH 1/7] Workaround for broken ChibiOS startup (#23822) From 78fbd40c9c78fd1fcf37c67767066608d33b76be Mon Sep 17 00:00:00 2001 From: NoPunIn10Did Date: Wed, 29 May 2024 12:21:15 -0400 Subject: [PATCH 2/7] Add personal keymap JSON --- viktus_styrka_nopunin10did_20240529.json | 175 +++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100644 viktus_styrka_nopunin10did_20240529.json diff --git a/viktus_styrka_nopunin10did_20240529.json b/viktus_styrka_nopunin10did_20240529.json new file mode 100644 index 000000000000..d6b71eda744d --- /dev/null +++ b/viktus_styrka_nopunin10did_20240529.json @@ -0,0 +1,175 @@ +{ + "version": 1, + "notes": "", + "documentation": "\"This file is a QMK Configurator export. You can import this at . It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: \n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n", + "keyboard": "viktus/styrka", + "keymap": "viktus_styrka_nopunin10did_20240529", + "layout": "LAYOUT_all", + "layers": [ + [ + "LSFT(KC_F5)", + "KC_F5", + "KC_ESC", + "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_DEL", + "KC_F11", + "LCTL(KC_F5)", + "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_ENT", + "KC_PGUP", + "LSFT(KC_F11)", + "LCTL(KC_INS)", + "KC_LCTL", + "KC_A", + "KC_S", + "KC_D", + "KC_F", + "KC_G", + "KC_H", + "KC_J", + "KC_K", + "KC_L", + "KC_SCLN", + "KC_QUOT", + "KC_BSLS", + "KC_ENT", + "KC_PGDN", + "KC_F10", + "LSFT(KC_INS)", + "KC_LSFT", + "KC_Z", + "KC_X", + "KC_C", + "KC_V", + "KC_B", + "ANY(LSA_T(KC_DEL))", + "KC_N", + "KC_M", + "KC_COMM", + "KC_DOT", + "KC_SLSH", + "KC_RSFT", + "KC_UP", + "LT(1,KC_F16)", + "KC_INS", + "SGUI(KC_S)", + "KC_RCTL", + "KC_LGUI", + "LALT_T(KC_GRV)", + "KC_SPC", + "RALT_T(KC_HOME)", + "RGUI_T(KC_END)", + "KC_LEFT", + "KC_DOWN", + "KC_RGHT" + ], + [ + "KC_NO", + "KC_NO", + "QK_BOOT", + "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_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_INS", + "KC_TRNS", + "KC_PSCR", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_CAPS", + "KC_TRNS", + "KC_SCRL", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_SCRL", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_CALC", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_NUBS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_PAUS", + "KC_TRNS", + "KC_TRNS", + "KC_APP", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_NO", + "KC_NO", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS", + "KC_TRNS" + ] + ], + "author": "" +} \ No newline at end of file From 182037eb8c6088db32fc10926281205956cd16ab Mon Sep 17 00:00:00 2001 From: NoPunIn10Did Date: Wed, 4 Sep 2024 13:42:22 -0400 Subject: [PATCH 3/7] Delete viktus_styrka_nopunin10did_20240529.json --- viktus_styrka_nopunin10did_20240529.json | 175 ----------------------- 1 file changed, 175 deletions(-) delete mode 100644 viktus_styrka_nopunin10did_20240529.json diff --git a/viktus_styrka_nopunin10did_20240529.json b/viktus_styrka_nopunin10did_20240529.json deleted file mode 100644 index d6b71eda744d..000000000000 --- a/viktus_styrka_nopunin10did_20240529.json +++ /dev/null @@ -1,175 +0,0 @@ -{ - "version": 1, - "notes": "", - "documentation": "\"This file is a QMK Configurator export. You can import this at . It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: \n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n", - "keyboard": "viktus/styrka", - "keymap": "viktus_styrka_nopunin10did_20240529", - "layout": "LAYOUT_all", - "layers": [ - [ - "LSFT(KC_F5)", - "KC_F5", - "KC_ESC", - "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_DEL", - "KC_F11", - "LCTL(KC_F5)", - "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_ENT", - "KC_PGUP", - "LSFT(KC_F11)", - "LCTL(KC_INS)", - "KC_LCTL", - "KC_A", - "KC_S", - "KC_D", - "KC_F", - "KC_G", - "KC_H", - "KC_J", - "KC_K", - "KC_L", - "KC_SCLN", - "KC_QUOT", - "KC_BSLS", - "KC_ENT", - "KC_PGDN", - "KC_F10", - "LSFT(KC_INS)", - "KC_LSFT", - "KC_Z", - "KC_X", - "KC_C", - "KC_V", - "KC_B", - "ANY(LSA_T(KC_DEL))", - "KC_N", - "KC_M", - "KC_COMM", - "KC_DOT", - "KC_SLSH", - "KC_RSFT", - "KC_UP", - "LT(1,KC_F16)", - "KC_INS", - "SGUI(KC_S)", - "KC_RCTL", - "KC_LGUI", - "LALT_T(KC_GRV)", - "KC_SPC", - "RALT_T(KC_HOME)", - "RGUI_T(KC_END)", - "KC_LEFT", - "KC_DOWN", - "KC_RGHT" - ], - [ - "KC_NO", - "KC_NO", - "QK_BOOT", - "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_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_NO", - "KC_NO", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_INS", - "KC_TRNS", - "KC_PSCR", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_NO", - "KC_NO", - "KC_CAPS", - "KC_TRNS", - "KC_SCRL", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_SCRL", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_CALC", - "KC_NO", - "KC_NO", - "KC_TRNS", - "KC_NUBS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_PAUS", - "KC_TRNS", - "KC_TRNS", - "KC_APP", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_NO", - "KC_NO", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS" - ] - ], - "author": "" -} \ No newline at end of file From f0a12a4c31f9e59a408ebce4f7b5ae68d3a3897b Mon Sep 17 00:00:00 2001 From: NoPunIn10Did Date: Wed, 4 Sep 2024 15:19:25 -0400 Subject: [PATCH 4/7] Add custom Styrka Atmel firmware --- .../nopunin10did/styrkatmel/keyboard.json | 127 ++++++++++++++++++ .../styrkatmel/keymaps/default/keymap.c | 48 +++++++ .../styrkatmel/keymaps/nopunin10did/keymap.c | 52 +++++++ .../styrkatmel/keymaps/via/keymap.c | 56 ++++++++ .../styrkatmel/keymaps/via/rules.mk | 2 + keyboards/nopunin10did/styrkatmel/readme.md | 35 +++++ 6 files changed, 320 insertions(+) create mode 100644 keyboards/nopunin10did/styrkatmel/keyboard.json create mode 100644 keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c create mode 100644 keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c create mode 100644 keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c create mode 100644 keyboards/nopunin10did/styrkatmel/keymaps/via/rules.mk create mode 100644 keyboards/nopunin10did/styrkatmel/readme.md diff --git a/keyboards/nopunin10did/styrkatmel/keyboard.json b/keyboards/nopunin10did/styrkatmel/keyboard.json new file mode 100644 index 000000000000..98a9597b34dd --- /dev/null +++ b/keyboards/nopunin10did/styrkatmel/keyboard.json @@ -0,0 +1,127 @@ +{ + "keyboard_name": "Styrka Atmel", + "manufacturer": "NoPunIn10Did", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/styrkatmel", + "maintainer": "NoPunIn10Did", + "usb": { + "vid": "0x4E50", + "pid": "0x5341", + "device_version": "0.0.1" + }, + "features": { + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "D7", "B4", "B5", "B6"], + "rows": ["B3", "B0", "B1", "B2", "E6", "B7", "C6", "C7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 3 + }, + "indicators": { + "caps_lock": "F0" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [1, 1], "x": 3.25, "y": 0}, + {"matrix": [0, 2], "x": 4.25, "y": 0}, + {"matrix": [1, 2], "x": 5.25, "y": 0}, + {"matrix": [0, 3], "x": 6.25, "y": 0}, + {"matrix": [1, 3], "x": 7.25, "y": 0}, + {"matrix": [0, 4], "x": 8.25, "y": 0}, + {"matrix": [1, 4], "x": 9.25, "y": 0}, + {"matrix": [0, 5], "x": 10.25, "y": 0}, + {"matrix": [1, 5], "x": 11.25, "y": 0}, + {"matrix": [0, 6], "x": 12.25, "y": 0}, + {"matrix": [1, 6], "x": 13.25, "y": 0}, + {"matrix": [0, 7], "x": 14.25, "y": 0}, + {"matrix": [0, 8], "x": 15.25, "y": 0, "w": 2}, + {"matrix": [1, 8], "x": 17.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2.25, "y": 1, "w":1.5}, + {"matrix": [3, 1], "x": 3.75, "y": 1}, + {"matrix": [2, 2], "x": 4.75, "y": 1}, + {"matrix": [3, 2], "x": 5.75, "y": 1}, + {"matrix": [2, 3], "x": 6.75, "y": 1}, + {"matrix": [3, 3], "x": 7.75, "y": 1}, + {"matrix": [2, 4], "x": 8.75, "y": 1}, + {"matrix": [3, 4], "x": 9.75, "y": 1}, + {"matrix": [2, 5], "x": 10.75, "y": 1}, + {"matrix": [3, 5], "x": 11.75, "y": 1}, + {"matrix": [2, 6], "x": 12.75, "y": 1}, + {"matrix": [3, 6], "x": 13.75, "y": 1}, + {"matrix": [2, 7], "x": 14.75, "y": 1}, + {"matrix": [3, 8], "x": 17.25, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2.25, "y": 2, "w":1.25}, + {"matrix": [5, 1], "x": 4, "y": 2}, + {"matrix": [4, 2], "x": 5, "y": 2}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [5, 5], "x": 12, "y": 2}, + {"matrix": [4, 6], "x": 13, "y": 2}, + {"matrix": [5, 6], "x": 14, "y": 2}, + {"matrix": [4, 7], "x": 15, "y": 2}, + {"matrix": [4, 8], "x": 16, "y": 1, "w":1.25, "h":2}, + {"matrix": [5, 8], "x": 17.25, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3, "w":1.25}, + {"matrix": [7, 1], "x": 3.5, "y": 3}, + {"matrix": [6, 2], "x": 4.5, "y": 3}, + {"matrix": [7, 2], "x": 5.5, "y": 3}, + {"matrix": [6, 3], "x": 6.5, "y": 3}, + {"matrix": [7, 3], "x": 7.5, "y": 3}, + {"matrix": [6, 4], "x": 8.5, "y": 3}, + {"matrix": [7, 4], "x": 9.5, "y": 3}, + {"matrix": [6, 5], "x": 10.5, "y": 3}, + {"matrix": [7, 5], "x": 11.5, "y": 3}, + {"matrix": [6, 6], "x": 12.5, "y": 3}, + {"matrix": [7, 6], "x": 13.5, "y": 3}, + {"matrix": [6, 7], "x": 14.5, "y": 3, "w":1.75}, + {"matrix": [6, 8], "x": 16.25, "y": 3}, + {"matrix": [7, 8], "x": 17.25, "y": 3}, + + {"matrix": [8, 0], "x": 0, "y": 4}, + {"matrix": [9, 0], "x": 1, "y": 4}, + {"matrix": [8, 1], "x": 2.25, "y": 4, "w":1.25}, + {"matrix": [9, 1], "x": 3.5, "y": 4, "w":1.25}, + {"matrix": [8, 2], "x": 4.75, "y": 4, "w":1.25}, + {"matrix": [8, 4], "x": 6, "y": 4, "w":7}, + {"matrix": [8, 6], "x": 12.25, "y": 4, "w":1.25}, + {"matrix": [9, 6], "x": 13.5, "y": 4, "w":1.25}, + {"matrix": [8, 7], "x": 15.25, "y": 4}, + {"matrix": [8, 8], "x": 16.25, "y": 4}, + {"matrix": [9, 8], "x": 17.25, "y": 4} + ] + } + } +} diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c b/keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c new file mode 100644 index 000000000000..31f80a4f3150 --- /dev/null +++ b/keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2024 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .-------.,---------------------------------------------------------------. + * | F1| F2||Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| BkSpc |Ins| + * |---|---||---------------------------------------------------------------| + * | F3| F4||Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| |Del| + * |---|---||---------------------------------------------------------------| + * | F5| F6||CAPS | A| S| D| F| G| H| J| K| L| ;| '| \| Ent|PgU| + * |---|---||---------------------------------------------------------------| + * | F7| F8||Shft| <>| Z| X| C| V| B| N| M| ,| .| /| Shift| Up|PgD| + * |---|---||---------------------------------------------------------------| + * | F9|F10||LCtl|LGUI|LAlt| Space | Alt| FN||| Lt| Dn| Rt| + * `-------'`---------------------------------------------------------------' + */ +[0] = LAYOUT_default( + KC_F1, KC_F2, KC_ESC, 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_INS, + KC_F3, KC_F4, 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_DEL, + KC_F5, KC_F6, 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_PGUP, + KC_F7, KC_F8, 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_UP, KC_PGDN, + KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + +[1] = LAYOUT_default( + QK_BOOT, KC_F2, KC_ESC, 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_BSLS, KC_INS, + KC_F3, KC_F4, 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_DEL, + KC_F5, KC_F6, 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_PGUP, + KC_F7, KC_F8, 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_UP, KC_PGDN, + KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT + ), +}; diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c new file mode 100644 index 000000000000..48593fb6a0c3 --- /dev/null +++ b/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c @@ -0,0 +1,52 @@ +/* Copyright 2024 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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 . + */ + +#include QMK_KEYBOARD_H + +#define DB_CONT KC_F5 +#define DB_STOP LSFT(KC_F5) +#define DETACH LCTL(KC_F5) +#define STEP_IN KC_F11 +#define STEPOUT LSFT(KC_F11) +#define STEPOVR KC_F10 +#define UNXCOPY LCTL(KC_INS) +#define UNXPAST LSFT(KC_INS) +#define LSA_DEL LSA_T(KC_DEL) +#define FN_CALC LT(1,KC_CALC) +#define SCRNSHT SGUI(KC_S) +#define GUI_F16 LGUI_T(KC_F16) +#define ALT_GRV LALT_T(KC_GRV) +#define RALTHOM RALT_T(KC_HOME) +#define RGUIEND RGUI_T(KC_END) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_default( + DB_STOP, DB_CONT, 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_DEL, + STEP_IN, DETACH, 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_PGUP, + STEPOUT, UNXCOPY, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, + STEPOVR, UNXPAST, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, LSA_DEL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, FN_CALC, + KC_INS, SCRNSHT, KC_RCTL, GUI_F16, ALT_GRV, KC_SPC, RALTHOM, RGUIEND, KC_LEFT, KC_DOWN, KC_RGHT + ), + +[1] = LAYOUT_default( + EE_CLR, KC_NO, QK_BOOT, 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_TRNS, KC_TRNS, + KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, + KC_NO, KC_NO, KC_CAPS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_INT3, KC_TRNS, KC_TRNS, + KC_NO, KC_NO, KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_INT1, KC_TRNS, KC_TRNS, KC_TRNS, + KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c b/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c new file mode 100644 index 000000000000..0e2fe8224096 --- /dev/null +++ b/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c @@ -0,0 +1,56 @@ +/* Copyright 2024 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Keymap BASE: (Base Layer) Default Layer + * .-------.,---------------------------------------------------------------. + * | F1| F2||Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| BkSpc |Ins| + * |---|---||---------------------------------------------------------------| + * | F3| F4||Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| |Del| + * |---|---||---------------------------------------------------------------| + * | F5| F6||CAPS | A| S| D| F| G| H| J| K| L| ;| '| \| Ent|PgU| + * |---|---||---------------------------------------------------------------| + * | F7| F8||Shft| <>| Z| X| C| V| B| N| M| ,| .| /| Shift| Up|PgD| + * |---|---||---------------------------------------------------------------| + * | F9|F10||LCtl|LGUI|LAlt| Space | Alt| FN||| Lt| Dn| Rt| + * `-------'`---------------------------------------------------------------' + */ +[0] = LAYOUT_default( + KC_F1, KC_F2, KC_ESC, 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_INS, + KC_F3, KC_F4, 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_DEL, + KC_F5, KC_F6, 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_PGUP, + KC_F7, KC_F8, 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_UP, KC_PGDN, + KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + +[1] = LAYOUT_default( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + +[2] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/via/rules.mk b/keyboards/nopunin10did/styrkatmel/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/nopunin10did/styrkatmel/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/nopunin10did/styrkatmel/readme.md b/keyboards/nopunin10did/styrkatmel/readme.md new file mode 100644 index 000000000000..a9e440fcd698 --- /dev/null +++ b/keyboards/nopunin10did/styrkatmel/readme.md @@ -0,0 +1,35 @@ +# Jabberwocky Gen. 2 + +![Jabberwocky v2 CNC Edition](https://i.imgur.com/xfpl9H2h.jpg) + +A full-size, columnar-staggered, Alice-style keyboard. Specifically, this firmware is for the second generation (v2) of Jabberwocky PCBs, all of which use the same MCU (Atmega 32u4) and firmware. + +| PCB Variant | Numpad Side | Daughterboard | Soldered / Hotswap | In-switch LEDs | +| ------------- | ----------------- | ------------- | ------------------------- | --------------------- | +| Blue | Left (Sinister) | Elite C | Soldered (SMD DIY kit) | Caps & Num Indicators | +| Red | Right (Dexterous) | Elite C | Soldered (SMD DIY kit) | Caps & Num Indicators | +| Green\* | Left (Sinister) | Unified DB | Soldered (switches only) | Backlit + Indicators | +| Yellow | Right (Dexterous) | Unified DB | Soldered (switches only) | Backlit + Indicators | +| Black\* | Left (Sinister) | Unified DB | Hotswap Hybrid | None | +| White | Right (Dexterous) | Unified DB | Hotswap Hybrid | None | + +\* *Only the Green and Black PCBs will be compatible with the upcoming Sinister Jabberwocky CNC case.* + + +For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w). + +- Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as [NoPunIn10Did](https://github.com/NoPunIn10Did) +- Hardware Supported: Jabberwocky 2nd Generation PCBs +- Hardware Availability: Currently by request only + +To reset the board into bootloader mode, do one of the following: + +- If loaded with the default layout, use Function-Escape or Function-R *(the function buttons are the 1u keys next to B and N)* +- If using the Blue or Red PCBs, use the onboard Reset button on your Elite C +- If using any of the other PCBs, use the onboard Reset button on the PCB itself + +Make example for this keyboard (after setting up your build environment): + + make nopunin10did/jabberwocky/v2: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). From bd950b041a8e13e70d55c41cb214fae859e93c2e Mon Sep 17 00:00:00 2001 From: NoPunIn10Did Date: Wed, 4 Sep 2024 15:53:08 -0400 Subject: [PATCH 5/7] Styrka Atmel fixes to compile and readme --- .../styrkatmel/keymaps/default/keymap.c | 4 +- .../styrkatmel/keymaps/nopunin10did/keymap.c | 8 ++-- .../styrkatmel/keymaps/via/keymap.c | 6 +-- keyboards/nopunin10did/styrkatmel/readme.md | 38 ++++++------------- 4 files changed, 21 insertions(+), 35 deletions(-) diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c b/keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c index 31f80a4f3150..30feaae1cec7 100644 --- a/keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c +++ b/keyboards/nopunin10did/styrkatmel/keymaps/default/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | F9|F10||LCtl|LGUI|LAlt| Space | Alt| FN||| Lt| Dn| Rt| * `-------'`---------------------------------------------------------------' */ -[0] = LAYOUT_default( +[0] = LAYOUT( KC_F1, KC_F2, KC_ESC, 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_INS, KC_F3, KC_F4, 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_DEL, KC_F5, KC_F6, 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_PGUP, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), -[1] = LAYOUT_default( +[1] = LAYOUT( QK_BOOT, KC_F2, KC_ESC, 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_BSLS, KC_INS, KC_F3, KC_F4, 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_DEL, KC_F5, KC_F6, 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_PGUP, diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c index 48593fb6a0c3..d8e0a5938911 100644 --- a/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c +++ b/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c @@ -18,7 +18,7 @@ #define DB_CONT KC_F5 #define DB_STOP LSFT(KC_F5) -#define DETACH LCTL(KC_F5) +#define DB_DTCH LCTL(KC_F5) #define STEP_IN KC_F11 #define STEPOUT LSFT(KC_F11) #define STEPOVR KC_F10 @@ -34,15 +34,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_default( +[0] = LAYOUT( DB_STOP, DB_CONT, 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_DEL, - STEP_IN, DETACH, 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_PGUP, + STEP_IN, DB_DTCH, 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_PGUP, STEPOUT, UNXCOPY, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, STEPOVR, UNXPAST, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, LSA_DEL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, FN_CALC, KC_INS, SCRNSHT, KC_RCTL, GUI_F16, ALT_GRV, KC_SPC, RALTHOM, RGUIEND, KC_LEFT, KC_DOWN, KC_RGHT ), -[1] = LAYOUT_default( +[1] = LAYOUT( EE_CLR, KC_NO, QK_BOOT, 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_TRNS, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_CAPS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_INT3, KC_TRNS, KC_TRNS, diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c b/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c index 0e2fe8224096..10f33785810e 100644 --- a/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c +++ b/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | F9|F10||LCtl|LGUI|LAlt| Space | Alt| FN||| Lt| Dn| Rt| * `-------'`---------------------------------------------------------------' */ -[0] = LAYOUT_default( +[0] = LAYOUT( KC_F1, KC_F2, KC_ESC, 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_INS, KC_F3, KC_F4, 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_DEL, KC_F5, KC_F6, 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_PGUP, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), -[1] = LAYOUT_default( +[1] = LAYOUT( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -[2] = LAYOUT_default( +[2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/nopunin10did/styrkatmel/readme.md b/keyboards/nopunin10did/styrkatmel/readme.md index a9e440fcd698..03288b77c378 100644 --- a/keyboards/nopunin10did/styrkatmel/readme.md +++ b/keyboards/nopunin10did/styrkatmel/readme.md @@ -1,35 +1,21 @@ -# Jabberwocky Gen. 2 +# Viktus Styrka Atmel Edition -![Jabberwocky v2 CNC Edition](https://i.imgur.com/xfpl9H2h.jpg) +![Styrka](https://i.imgur.com/) -A full-size, columnar-staggered, Alice-style keyboard. Specifically, this firmware is for the second generation (v2) of Jabberwocky PCBs, all of which use the same MCU (Atmega 32u4) and firmware. +The Viktus Styrka is a 65% + left macro block created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). -| PCB Variant | Numpad Side | Daughterboard | Soldered / Hotswap | In-switch LEDs | -| ------------- | ----------------- | ------------- | ------------------------- | --------------------- | -| Blue | Left (Sinister) | Elite C | Soldered (SMD DIY kit) | Caps & Num Indicators | -| Red | Right (Dexterous) | Elite C | Soldered (SMD DIY kit) | Caps & Num Indicators | -| Green\* | Left (Sinister) | Unified DB | Soldered (switches only) | Backlit + Indicators | -| Yellow | Right (Dexterous) | Unified DB | Soldered (switches only) | Backlit + Indicators | -| Black\* | Left (Sinister) | Unified DB | Hotswap Hybrid | None | -| White | Right (Dexterous) | Unified DB | Hotswap Hybrid | None | +This is a custom Atmel ISO Hotswap PCB for the Viktus Styrka designed and maintained by NoPunIn10Did. -\* *Only the Green and Black PCBs will be compatible with the upcoming Sinister Jabberwocky CNC case.* +* Firmware Maintainer: [nopunin10did](https://github.com/nopunin10did) +* Hardware Supported: Styrka +* Hardware Availability: +Make example for this keyboard (after setting up your build environment): -For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w). - -- Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as [NoPunIn10Did](https://github.com/NoPunIn10Did) -- Hardware Supported: Jabberwocky 2nd Generation PCBs -- Hardware Availability: Currently by request only - -To reset the board into bootloader mode, do one of the following: - -- If loaded with the default layout, use Function-Escape or Function-R *(the function buttons are the 1u keys next to B and N)* -- If using the Blue or Red PCBs, use the onboard Reset button on your Elite C -- If using any of the other PCBs, use the onboard Reset button on the PCB itself + make nopunin10did/styrkatmel:default -Make example for this keyboard (after setting up your build environment): +Flashing example for this keyboard: - make nopunin10did/jabberwocky/v2:default + make nopunin10did/styrkatmel: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). +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). From 8dbe703a4220a844145d919a6a5e19d0e9894ca9 Mon Sep 17 00:00:00 2001 From: NoPunIn10Did Date: Mon, 9 Sep 2024 16:19:34 -0400 Subject: [PATCH 6/7] Remove VIA keymap --- .../styrkatmel/keymaps/via/keymap.c | 56 ------------------- .../styrkatmel/keymaps/via/rules.mk | 2 - 2 files changed, 58 deletions(-) delete mode 100644 keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c delete mode 100644 keyboards/nopunin10did/styrkatmel/keymaps/via/rules.mk diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c b/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c deleted file mode 100644 index 10f33785810e..000000000000 --- a/keyboards/nopunin10did/styrkatmel/keymaps/via/keymap.c +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2024 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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 . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Keymap BASE: (Base Layer) Default Layer - * .-------.,---------------------------------------------------------------. - * | F1| F2||Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| BkSpc |Ins| - * |---|---||---------------------------------------------------------------| - * | F3| F4||Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| |Del| - * |---|---||---------------------------------------------------------------| - * | F5| F6||CAPS | A| S| D| F| G| H| J| K| L| ;| '| \| Ent|PgU| - * |---|---||---------------------------------------------------------------| - * | F7| F8||Shft| <>| Z| X| C| V| B| N| M| ,| .| /| Shift| Up|PgD| - * |---|---||---------------------------------------------------------------| - * | F9|F10||LCtl|LGUI|LAlt| Space | Alt| FN||| Lt| Dn| Rt| - * `-------'`---------------------------------------------------------------' - */ -[0] = LAYOUT( - KC_F1, KC_F2, KC_ESC, 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_INS, - KC_F3, KC_F4, 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_DEL, - KC_F5, KC_F6, 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_PGUP, - KC_F7, KC_F8, 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_UP, KC_PGDN, - KC_F9, KC_F10, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - -[1] = LAYOUT( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - -[2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/via/rules.mk b/keyboards/nopunin10did/styrkatmel/keymaps/via/rules.mk deleted file mode 100644 index 36b7ba9cbc98..000000000000 --- a/keyboards/nopunin10did/styrkatmel/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes From 1ce6e08374148f8122eb6309b98e8badc263323c Mon Sep 17 00:00:00 2001 From: NoPunIn10Did Date: Wed, 11 Sep 2024 14:25:40 -0400 Subject: [PATCH 7/7] Remove user keymap and edit readme --- .../styrkatmel/keymaps/nopunin10did/keymap.c | 52 ------------------- keyboards/nopunin10did/styrkatmel/readme.md | 8 ++- 2 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c diff --git a/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c b/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c deleted file mode 100644 index d8e0a5938911..000000000000 --- a/keyboards/nopunin10did/styrkatmel/keymaps/nopunin10did/keymap.c +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2024 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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 . - */ - -#include QMK_KEYBOARD_H - -#define DB_CONT KC_F5 -#define DB_STOP LSFT(KC_F5) -#define DB_DTCH LCTL(KC_F5) -#define STEP_IN KC_F11 -#define STEPOUT LSFT(KC_F11) -#define STEPOVR KC_F10 -#define UNXCOPY LCTL(KC_INS) -#define UNXPAST LSFT(KC_INS) -#define LSA_DEL LSA_T(KC_DEL) -#define FN_CALC LT(1,KC_CALC) -#define SCRNSHT SGUI(KC_S) -#define GUI_F16 LGUI_T(KC_F16) -#define ALT_GRV LALT_T(KC_GRV) -#define RALTHOM RALT_T(KC_HOME) -#define RGUIEND RGUI_T(KC_END) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -[0] = LAYOUT( - DB_STOP, DB_CONT, 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_DEL, - STEP_IN, DB_DTCH, 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_PGUP, - STEPOUT, UNXCOPY, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_PGDN, - STEPOVR, UNXPAST, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, LSA_DEL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, FN_CALC, - KC_INS, SCRNSHT, KC_RCTL, GUI_F16, ALT_GRV, KC_SPC, RALTHOM, RGUIEND, KC_LEFT, KC_DOWN, KC_RGHT - ), - -[1] = LAYOUT( - EE_CLR, KC_NO, QK_BOOT, 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_TRNS, KC_TRNS, - KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, - KC_NO, KC_NO, KC_CAPS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCRL, KC_TRNS, KC_TRNS, KC_INT3, KC_TRNS, KC_TRNS, - KC_NO, KC_NO, KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, KC_APP, KC_TRNS, KC_TRNS, KC_INT1, KC_TRNS, KC_TRNS, KC_TRNS, - KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; diff --git a/keyboards/nopunin10did/styrkatmel/readme.md b/keyboards/nopunin10did/styrkatmel/readme.md index 03288b77c378..df9656d1a679 100644 --- a/keyboards/nopunin10did/styrkatmel/readme.md +++ b/keyboards/nopunin10did/styrkatmel/readme.md @@ -1,7 +1,5 @@ # Viktus Styrka Atmel Edition -![Styrka](https://i.imgur.com/) - The Viktus Styrka is a 65% + left macro block created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). This is a custom Atmel ISO Hotswap PCB for the Viktus Styrka designed and maintained by NoPunIn10Did. @@ -19,3 +17,9 @@ Flashing example for this keyboard: make nopunin10did/styrkatmel: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). + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at the top left in the macro columns (default: F1) and plug in the keyboard. +* **Physical reset button**: Briefly press the button on the back of the PCB. +* **Keycode in layout**: Press the key mapped to `QK_BOOT`. For the default layout, hold down the rightmost 1.25u key on the bottom row, then tap the top-left key in the macro columns. \ No newline at end of file