From 630562c45fe0d3a95e5f8e63c444a92d56a27fd0 Mon Sep 17 00:00:00 2001 From: C1intMason Date: Sun, 16 May 2021 15:50:29 -0700 Subject: [PATCH 01/12] Add SKErgo support --- keyboards/skergo/config.h | 74 ++++++ keyboards/skergo/info.json | 86 ++++++ keyboards/skergo/keymaps/default/keymap.c | 26 ++ keyboards/skergo/keymaps/via/info.json | 302 ++++++++++++++++++++++ keyboards/skergo/keymaps/via/keymap.c | 49 ++++ keyboards/skergo/keymaps/via/rules.mk | 4 + keyboards/skergo/readme.md | 15 ++ keyboards/skergo/rules.mk | 56 ++++ keyboards/skergo/skergo.c | 17 ++ keyboards/skergo/skergo.h | 36 +++ 10 files changed, 665 insertions(+) create mode 100644 keyboards/skergo/config.h create mode 100644 keyboards/skergo/info.json create mode 100644 keyboards/skergo/keymaps/default/keymap.c create mode 100644 keyboards/skergo/keymaps/via/info.json create mode 100644 keyboards/skergo/keymaps/via/keymap.c create mode 100644 keyboards/skergo/keymaps/via/rules.mk create mode 100644 keyboards/skergo/readme.md create mode 100644 keyboards/skergo/rules.mk create mode 100644 keyboards/skergo/skergo.c create mode 100644 keyboards/skergo/skergo.h diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h new file mode 100644 index 000000000000..03076b2b0edc --- /dev/null +++ b/keyboards/skergo/config.h @@ -0,0 +1,74 @@ +/* Copyright (C) 2021 Keyz.io Ltd. +* +* 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 3 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 . +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4B49 +#define PRODUCT_ID 0x534B +#define DEVICE_VER 0x0001 +#define MANUFACTURER Keyzio +#define PRODUCT SKErgo +#define DESCRIPTION Through-hole Ergonomic Keyboard + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { B0, B4, B3, B2, B1 } +#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C2, C1, C0, D7 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* number of backlight levels */ + +// #ifdef BACKLIGHT_PIN +// #define BACKLIGHT_LEVELS 0 +// #endif + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING_DELAY 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* prevent stuck modifiers */ +#define PREVENT_STUCK_MODIFIERS + + +// #ifdef RGB_DI_PIN +// #define RGBLIGHT_ANIMATIONS +// #define RGBLED_NUM 0 +// #define RGBLIGHT_HUE_STEP 8 +// #define RGBLIGHT_SAT_STEP 8 +// #define RGBLIGHT_VAL_STEP 8 +// #endif + +#endif diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json new file mode 100644 index 000000000000..0f46b3be77f8 --- /dev/null +++ b/keyboards/skergo/info.json @@ -0,0 +1,86 @@ +{ + "keyboard_name": "SKErgo", + "url": "https://keyz.io", + "maintainer": "Keyz.io", + "width": 19.25, + "height": 6, + "key_count": 67, + "layouts": { + "LAYOUT_default": { + "layout": [ + {"label":"Esc", "x":0, "y":0}, + {"label":"1", "x":1, "y":0}, + {"label":"2", "x":2, "y":0}, + {"label":"3", "x":3.75, "y":0}, + {"label":"4", "x":4.75, "y":0}, + {"label":"5", "x":5.75, "y":0}, + {"label":"6", "x":6.75, "y":0}, + {"label":"7", "x":9.25, "y":0}, + {"label":"8", "x":10.25, "y":0}, + {"label":"9", "x":11.25, "y":0}, + {"label":"0", "x":12.25, "y":0}, + {"label":"-", "x":13.5, "y":0}, + {"label":"=", "x":14.5, "y":0}, + {"label":"~", "x":15.5, "y":0}, + {"label":"Backspace", "x":16.5, "y":0}, + + {"label":"Tab", "x":0, "y":1, "w":1.5}, + {"label":"Q", "x":1.5, "y":1}, + {"label":"W", "x":3.25, "y":1}, + {"label":"E", "x":4.25, "y":1}, + {"label":"R", "x":5.25, "y":1}, + {"label":"T", "x":6.25, "y":1}, + {"label":"Y", "x":8.75, "y":1}, + {"label":"U", "x":9.75, "y":1}, + {"label":"I", "x":10.75, "y":1}, + {"label":"O", "x":11.75, "y":1}, + {"label":"P", "x":12.75, "y":1}, + {"label":"{", "x":14.25, "y":1}, + {"label":"}", "x":15.25, "y":1}, + {"label":"|", "x":16.25, "y":1, "w":1.5}, + {"label":"Pg Up", "x":18, "y":0}, + + {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, + {"label":"A", "x":1.75, "y":2}, + {"label":"S", "x":3.5, "y":2}, + {"label":"D", "x":4.5, "y":2}, + {"label":"F", "x":5.5, "y":2}, + {"label":"G", "x":6.5, "y":2}, + {"label":"H", "x":9, "y":2}, + {"label":"J", "x":10, "y":2}, + {"label":"K", "x":11, "y":2}, + {"label":"L", "x":12, "y":2}, + {"label":":", "x":13.5, "y":2}, + {"label":"\"", "x":14.5, "y":2}, + {"label":"Enter", "x":15.5, "y":2, "w":2.25}, + {"label":"Pg Dn", "x":18.25, "y":1}, + + {"label":"Shift", "x":0, "y":3, "w":2.25}, + {"label":"Z", "x":2.25, "y":3}, + {"label":"X", "x":3.75, "y":3}, + {"label":"C", "x":4.75, "y":3}, + {"label":"V", "x":5.75, "y":3}, + {"label":"B", "x":6.75, "y":3}, + {"label":"N", "x":9.25, "y":3}, + {"label":"M", "x":10.25, "y":3}, + {"label":"<", "x":11.25, "y":3}, + {"label":">", "x":12.25, "y":3}, + {"label":"?", "x":14.25, "y":3}, + {"label":"Shift", "x":15.25, "y":3, "w":1.75}, + {"label":"Up", "x":17.25, "y":3}, + {"label":"End", "x":18.5, "y":2}, + + {"label":"L_Ctrl", "x":0, "y":4, "w":1.25}, + {"label":"L_Alt", "x":3.75, "y":4, "w":1.5}, + {"label":"L_Space", "x":5.25, "y":4, "w":2}, + {"label":"Fn", "x":7.25, "y":4}, + {"label":"R_Space", "x":9, "y":4, "w":2.75}, + + {"label":"R_Alt", "x":11.75, "y":4, "w":1.5}, + {"label":"Left","x":16.25, "y":4}, + {"label":"Down","x":17.25, "y":4}, + {"label":"Right","x":18.25, "y":4} + ] + } + } +} diff --git a/keyboards/skergo/keymaps/default/keymap.c b/keyboards/skergo/keymaps/default/keymap.c new file mode 100644 index 000000000000..a58b815661a5 --- /dev/null +++ b/keyboards/skergo/keymaps/default/keymap.c @@ -0,0 +1,26 @@ +#include "skergo.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_default( + 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_GRV, 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_PGUP, + 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_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_default( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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), + + [2] = LAYOUT_default( + 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/skergo/keymaps/via/info.json b/keyboards/skergo/keymaps/via/info.json new file mode 100644 index 000000000000..41e4ad97a58e --- /dev/null +++ b/keyboards/skergo/keymaps/via/info.json @@ -0,0 +1,302 @@ +{ + "name": "SKErgo", + "vendorId": "0x4B49", + "productId": "0x534B", + "lighting": "none", + "matrix": {"rows": 5, "cols": 15}, + "layouts": { + "keymap": [ + [ + { + "y": 1, + "x": 12.5, + "f": 1, + "fa": [ + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + }, + "0,11" + ], + [ + { + "y": -0.75, + "x": 0.5 + }, + "0,0", + "0,1", + { + "x": 11 + }, + "0,12", + "0,13", + "0,14", + { + "x": 0.25, + "f": 3 + }, + "1,14" + ], + [ + { + "x": 17 + }, + "2,14" + ], + [ + { + "y": -0.9500000000000002, + "x": 0.25, + "f": 1, + "fa": [ + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "w": 1.5 + }, + "1,0", + "1,1", + { + "x": 10.5 + }, + "1,11", + "1,12", + { + "f": 3, + "w": 1.5 + }, + "1,13" + ], + [ + { + "y": -0.04999999999999982, + "x": 17.1, + "f": 1, + "fa": [ + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + }, + "3,14" + ], + [ + { + "y": -0.9500000000000002, + "x": 0.15, + "w": 1.75 + }, + "2,0", + "2,1", + { + "x": 9.7 + }, + "2,10", + "2,11", + { + "w": 2.25 + }, + "2,12" + ], + [ + { + "w": 2.25 + }, + "3,0", + "3,1", + { + "x": 10 + }, + "3,10", + { + "w": 1.75 + }, + "3,11" + ], + [ + { + "y": -0.5499999999999998, + "x": 16.25 + }, + "3,13" + ], + [ + { + "y": -0.4500000000000002, + "w": 1.25 + }, + "4,0" + ], + [ + { + "y": -0.5499999999999998, + "x": 15.25, + "f2": 0 + }, + "4,12", + "4,13", + "4,14" + ], + [ + { + "rx": 3, + "ry": 4.25, + "y": -3, + "x": -0.5, + "fa": [ + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + }, + "0,2" + ], + [ + { + "r": 10, + "y": -1, + "x": 0.25 + }, + "0,3", + "0,4", + "0,5", + "0,6" + ], + [ + { + "x": -0.25 + }, + "1,2", + "1,3", + "1,4", + "1,5" + ], + [ + "2,2", + "2,3", + "2,4", + "2,5" + ], + [ + { + "x": 0.5 + }, + "3,2", + "3,3", + "3,4", + "3,5" + ], + [ + { + "x": 0.5, + "f2": 0, + "w": 1.5 + }, + "4,2", + { + "f": 3, + "w": 2 + }, + "4,4", + "4,5" + ], + [ + { + "r": -10, + "rx": 12.5, + "y": -3, + "x": -3.75, + "f": 1, + "fa": [ + 3, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + }, + "0,7", + "0,8", + "0,9", + "0,10" + ], + [ + { + "x": -4.25 + }, + "1,6", + "1,7", + "1,8", + "1,9", + "1,10" + ], + [ + { + "x": -4 + }, + "2,6", + "2,7", + "2,8", + "2,9" + ], + [ + { + "x": -3.5 + }, + "3,6", + "3,7", + "3,8", + "3,9" + ], + [ + { + "x": -4, + "f2": 0, + "w": 2.75 + }, + "4,7", + { + "w": 1.5 + }, + "4,9" + ] + + +] + } +} diff --git a/keyboards/skergo/keymaps/via/keymap.c b/keyboards/skergo/keymaps/via/keymap.c new file mode 100644 index 000000000000..9e41ea58cd98 --- /dev/null +++ b/keyboards/skergo/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +/* Copyright (C) 2021 Keyz.io Ltd. +* +* 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 3 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 "skergo.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_default( + 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_GRV, 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_PGUP, + 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_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END, + KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_default( + 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), + + [2] = LAYOUT_default( + 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), + + [3] = LAYOUT_default( + 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/skergo/keymaps/via/rules.mk b/keyboards/skergo/keymaps/via/rules.mk new file mode 100644 index 000000000000..d0e4977b849b --- /dev/null +++ b/keyboards/skergo/keymaps/via/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes +EXTRAKEY_ENABLE = no +MOUSEKEY_ENABLE = no \ No newline at end of file diff --git a/keyboards/skergo/readme.md b/keyboards/skergo/readme.md new file mode 100644 index 000000000000..3b65c34611d4 --- /dev/null +++ b/keyboards/skergo/readme.md @@ -0,0 +1,15 @@ +# SKErgo + +![skergo](https://cdn.shopify.com/s/files/1/0396/3001/2582/products/Keyzio-5_1024x1024@2x.jpg?v=1612909648) + +An ergonomic layout keyboard with a through-hole component design + +* Keyboard Maintainer: [Keyz.io](https://github.com/C1intMason) +* Hardware Supported: SKErgo, Atmega32a +* Hardware Availability: [Group Buy](https://keyz.io) + +Make example for this keyboard (after setting up your build environment): + + make skergo: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). diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk new file mode 100644 index 000000000000..7c6a4d391e8a --- /dev/null +++ b/keyboards/skergo/rules.mk @@ -0,0 +1,56 @@ +# MCU name +MCU = atmega32a + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +# ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +# F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +OPT_DEFS += -DBOOTLOADER_SIZE=2048 + + +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE ?= lite # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no # Commands for debug and configuration +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +NKRO_ENABLE ?= no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality +AUDIO_ENABLE ?= no +RGBLIGHT_ENABLE ?= no diff --git a/keyboards/skergo/skergo.c b/keyboards/skergo/skergo.c new file mode 100644 index 000000000000..2d2f2b47ae34 --- /dev/null +++ b/keyboards/skergo/skergo.c @@ -0,0 +1,17 @@ +/* Copyright (C) 2021 Keyz.io Ltd. +* +* 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 3 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 "skergo.h" diff --git a/keyboards/skergo/skergo.h b/keyboards/skergo/skergo.h new file mode 100644 index 000000000000..b0c0ea16abc8 --- /dev/null +++ b/keyboards/skergo/skergo.h @@ -0,0 +1,36 @@ +/* Copyright (C) 2021 Keyz.io Ltd. +* +* 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 3 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 . +*/ + +#ifndef KB_H +#define KB_H + +#include "quantum.h" + +#define LAYOUT_default( \ + K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ + K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ + K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ + K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ + K400, K402, K404, K405, K407, K409, K412, K413, K414 \ +) { \ + { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ + { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ + { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ + { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ + { K400, KC_NO, K402, KC_NO, K404, K405, KC_NO, K407, KC_NO, K409, KC_NO, KC_NO, K412, K413, K414 } \ +} + +#endif From c95231eace3c27a17e0665c8bbc25089c2b6245d Mon Sep 17 00:00:00 2001 From: C1intMason Date: Sun, 16 May 2021 16:03:13 -0700 Subject: [PATCH 02/12] Delete info.json from VIA folder --- keyboards/skergo/keymaps/via/info.json | 302 ------------------------- 1 file changed, 302 deletions(-) delete mode 100644 keyboards/skergo/keymaps/via/info.json diff --git a/keyboards/skergo/keymaps/via/info.json b/keyboards/skergo/keymaps/via/info.json deleted file mode 100644 index 41e4ad97a58e..000000000000 --- a/keyboards/skergo/keymaps/via/info.json +++ /dev/null @@ -1,302 +0,0 @@ -{ - "name": "SKErgo", - "vendorId": "0x4B49", - "productId": "0x534B", - "lighting": "none", - "matrix": {"rows": 5, "cols": 15}, - "layouts": { - "keymap": [ - [ - { - "y": 1, - "x": 12.5, - "f": 1, - "fa": [ - 3, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - }, - "0,11" - ], - [ - { - "y": -0.75, - "x": 0.5 - }, - "0,0", - "0,1", - { - "x": 11 - }, - "0,12", - "0,13", - "0,14", - { - "x": 0.25, - "f": 3 - }, - "1,14" - ], - [ - { - "x": 17 - }, - "2,14" - ], - [ - { - "y": -0.9500000000000002, - "x": 0.25, - "f": 1, - "fa": [ - 3, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "w": 1.5 - }, - "1,0", - "1,1", - { - "x": 10.5 - }, - "1,11", - "1,12", - { - "f": 3, - "w": 1.5 - }, - "1,13" - ], - [ - { - "y": -0.04999999999999982, - "x": 17.1, - "f": 1, - "fa": [ - 3, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - }, - "3,14" - ], - [ - { - "y": -0.9500000000000002, - "x": 0.15, - "w": 1.75 - }, - "2,0", - "2,1", - { - "x": 9.7 - }, - "2,10", - "2,11", - { - "w": 2.25 - }, - "2,12" - ], - [ - { - "w": 2.25 - }, - "3,0", - "3,1", - { - "x": 10 - }, - "3,10", - { - "w": 1.75 - }, - "3,11" - ], - [ - { - "y": -0.5499999999999998, - "x": 16.25 - }, - "3,13" - ], - [ - { - "y": -0.4500000000000002, - "w": 1.25 - }, - "4,0" - ], - [ - { - "y": -0.5499999999999998, - "x": 15.25, - "f2": 0 - }, - "4,12", - "4,13", - "4,14" - ], - [ - { - "rx": 3, - "ry": 4.25, - "y": -3, - "x": -0.5, - "fa": [ - 3, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - }, - "0,2" - ], - [ - { - "r": 10, - "y": -1, - "x": 0.25 - }, - "0,3", - "0,4", - "0,5", - "0,6" - ], - [ - { - "x": -0.25 - }, - "1,2", - "1,3", - "1,4", - "1,5" - ], - [ - "2,2", - "2,3", - "2,4", - "2,5" - ], - [ - { - "x": 0.5 - }, - "3,2", - "3,3", - "3,4", - "3,5" - ], - [ - { - "x": 0.5, - "f2": 0, - "w": 1.5 - }, - "4,2", - { - "f": 3, - "w": 2 - }, - "4,4", - "4,5" - ], - [ - { - "r": -10, - "rx": 12.5, - "y": -3, - "x": -3.75, - "f": 1, - "fa": [ - 3, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - }, - "0,7", - "0,8", - "0,9", - "0,10" - ], - [ - { - "x": -4.25 - }, - "1,6", - "1,7", - "1,8", - "1,9", - "1,10" - ], - [ - { - "x": -4 - }, - "2,6", - "2,7", - "2,8", - "2,9" - ], - [ - { - "x": -3.5 - }, - "3,6", - "3,7", - "3,8", - "3,9" - ], - [ - { - "x": -4, - "f2": 0, - "w": 2.75 - }, - "4,7", - { - "w": 1.5 - }, - "4,9" - ] - - -] - } -} From f4abf8727efd6a22bd3013cca96484de72114bff Mon Sep 17 00:00:00 2001 From: C1intMason Date: Sun, 16 May 2021 16:21:55 -0700 Subject: [PATCH 03/12] fixed conventions --- keyboards/skergo/keymaps/via/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skergo/keymaps/via/rules.mk b/keyboards/skergo/keymaps/via/rules.mk index d0e4977b849b..00c11acccda3 100644 --- a/keyboards/skergo/keymaps/via/rules.mk +++ b/keyboards/skergo/keymaps/via/rules.mk @@ -1,4 +1,4 @@ VIA_ENABLE = yes LTO_ENABLE = yes EXTRAKEY_ENABLE = no -MOUSEKEY_ENABLE = no \ No newline at end of file +MOUSEKEY_ENABLE = no From a21bc9673eb53bbb571eb10194d6df666ea3df2b Mon Sep 17 00:00:00 2001 From: C1intMason Date: Fri, 21 May 2021 23:21:24 -0700 Subject: [PATCH 04/12] Update keyboards/skergo/config.h Remove description definition Co-authored-by: Drashna Jaelre --- keyboards/skergo/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h index 03076b2b0edc..ce6c9876d075 100644 --- a/keyboards/skergo/config.h +++ b/keyboards/skergo/config.h @@ -25,7 +25,6 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER Keyzio #define PRODUCT SKErgo -#define DESCRIPTION Through-hole Ergonomic Keyboard /* key matrix size */ #define MATRIX_ROWS 5 From d7817a3bcf50cff460bd52995377b527d6f92335 Mon Sep 17 00:00:00 2001 From: C1intMason Date: Fri, 21 May 2021 23:22:47 -0700 Subject: [PATCH 05/12] Update keymap.c with license header --- keyboards/skergo/keymaps/default/keymap.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/keyboards/skergo/keymaps/default/keymap.c b/keyboards/skergo/keymaps/default/keymap.c index a58b815661a5..d2d7d70fc6a2 100644 --- a/keyboards/skergo/keymaps/default/keymap.c +++ b/keyboards/skergo/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* Copyright (C) 2021 Keyz.io Ltd. +* +* 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 3 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 "skergo.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 7098b1d96e50a08e6053529f8b721a19d05610ae Mon Sep 17 00:00:00 2001 From: C1intMason Date: Fri, 21 May 2021 23:24:45 -0700 Subject: [PATCH 06/12] Update keyboards/skergo/keymaps/default/keymap.c to make layout keyboard-agnostic Co-authored-by: Drashna Jaelre --- keyboards/skergo/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skergo/keymaps/default/keymap.c b/keyboards/skergo/keymaps/default/keymap.c index d2d7d70fc6a2..bec5d24977bd 100644 --- a/keyboards/skergo/keymaps/default/keymap.c +++ b/keyboards/skergo/keymaps/default/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "skergo.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 92cece378763f58c0776fd957d7fec016ad22021 Mon Sep 17 00:00:00 2001 From: C1intMason Date: Fri, 21 May 2021 23:25:31 -0700 Subject: [PATCH 07/12] Removed redundant layer from default keymap Co-authored-by: Drashna Jaelre --- keyboards/skergo/keymaps/default/keymap.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/keyboards/skergo/keymaps/default/keymap.c b/keyboards/skergo/keymaps/default/keymap.c index bec5d24977bd..fd93d45dcd87 100644 --- a/keyboards/skergo/keymaps/default/keymap.c +++ b/keyboards/skergo/keymaps/default/keymap.c @@ -30,13 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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) - [2] = LAYOUT_default( - 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), }; From efb7bef1c9408ac6536b2920e2089348a3a694b0 Mon Sep 17 00:00:00 2001 From: C1intMason Date: Fri, 21 May 2021 23:29:52 -0700 Subject: [PATCH 08/12] Updated code conventions Co-authored-by: Drashna Jaelre --- keyboards/skergo/config.h | 24 ++--------------- keyboards/skergo/keymaps/via/keymap.c | 2 +- keyboards/skergo/rules.mk | 37 ++------------------------- keyboards/skergo/skergo.h | 5 +--- 4 files changed, 6 insertions(+), 62 deletions(-) diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h index ce6c9876d075..e736e4c8d40d 100644 --- a/keyboards/skergo/config.h +++ b/keyboards/skergo/config.h @@ -14,8 +14,7 @@ * along with this program. If not, see . */ -#ifndef CONFIG_H -#define CONFIG_H +#pragma once #include "config_common.h" @@ -45,29 +44,10 @@ // #endif /* Set 0 if debouncing isn't needed */ -#define DEBOUNCING_DELAY 5 +#define DEBOUNCE 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* prevent stuck modifiers */ -#define PREVENT_STUCK_MODIFIERS - - -// #ifdef RGB_DI_PIN -// #define RGBLIGHT_ANIMATIONS -// #define RGBLED_NUM 0 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8 -// #endif - -#endif diff --git a/keyboards/skergo/keymaps/via/keymap.c b/keyboards/skergo/keymaps/via/keymap.c index 9e41ea58cd98..552a7c4fe394 100644 --- a/keyboards/skergo/keymaps/via/keymap.c +++ b/keyboards/skergo/keymaps/via/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "skergo.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk index 7c6a4d391e8a..236443bbcee3 100644 --- a/keyboards/skergo/rules.mk +++ b/keyboards/skergo/rules.mk @@ -2,43 +2,10 @@ MCU = atmega32a # Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. F_CPU = 16000000 -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -# ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -# F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -OPT_DEFS += -DBOOTLOADER_SIZE=2048 +# Bootloader +BOOTLOADER = USBasp # Build Options diff --git a/keyboards/skergo/skergo.h b/keyboards/skergo/skergo.h index b0c0ea16abc8..afee37a60175 100644 --- a/keyboards/skergo/skergo.h +++ b/keyboards/skergo/skergo.h @@ -14,8 +14,7 @@ * along with this program. If not, see . */ -#ifndef KB_H -#define KB_H +#pragma once #include "quantum.h" @@ -32,5 +31,3 @@ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ { K400, KC_NO, K402, KC_NO, K404, K405, KC_NO, K407, KC_NO, K409, KC_NO, KC_NO, K412, K413, K414 } \ } - -#endif From b199d70d059ca5c1bea88da08a1ecfa82a2446bb Mon Sep 17 00:00:00 2001 From: C1intMason Date: Fri, 21 May 2021 23:34:29 -0700 Subject: [PATCH 09/12] Enabled EXTRAKEY and MOUSEKEY --- keyboards/skergo/keymaps/via/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/skergo/keymaps/via/rules.mk b/keyboards/skergo/keymaps/via/rules.mk index 00c11acccda3..36b7ba9cbc98 100644 --- a/keyboards/skergo/keymaps/via/rules.mk +++ b/keyboards/skergo/keymaps/via/rules.mk @@ -1,4 +1,2 @@ VIA_ENABLE = yes LTO_ENABLE = yes -EXTRAKEY_ENABLE = no -MOUSEKEY_ENABLE = no From f3902d32e4a0506d130b2ede6bd54c41077b37ba Mon Sep 17 00:00:00 2001 From: C1intMason Date: Fri, 21 May 2021 23:37:44 -0700 Subject: [PATCH 10/12] Changed build options Co-authored-by: Drashna Jaelre --- keyboards/skergo/rules.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk index 236443bbcee3..7eae5d5b65fb 100644 --- a/keyboards/skergo/rules.mk +++ b/keyboards/skergo/rules.mk @@ -11,13 +11,13 @@ BOOTLOADER = USBasp # Build Options # comment out to disable the options. # -BOOTMAGIC_ENABLE ?= lite # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= no # Commands for debug and configuration -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality -AUDIO_ENABLE ?= no -RGBLIGHT_ENABLE ?= no +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +NKRO_ENABLE = no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +AUDIO_ENABLE = no +RGBLIGHT_ENABLE = no From d20ef68d8f3aae57400fcdde1fd68b70ec7b04cb Mon Sep 17 00:00:00 2001 From: C1intMason Date: Sat, 22 May 2021 01:04:04 -0700 Subject: [PATCH 11/12] Update keyboards/skergo/rules.mk Co-authored-by: Ryan --- keyboards/skergo/rules.mk | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/keyboards/skergo/rules.mk b/keyboards/skergo/rules.mk index 7eae5d5b65fb..3076166479fc 100644 --- a/keyboards/skergo/rules.mk +++ b/keyboards/skergo/rules.mk @@ -1,23 +1,25 @@ # MCU name MCU = atmega32a -# Processor frequency. +# Processor frequency F_CPU = 16000000 -# Bootloader +# Bootloader selection BOOTLOADER = USBasp - # Build Options -# comment out to disable the options. +# change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = no # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output From f5597d13f43a69adfa274a5b5c4c22b5939f74dd Mon Sep 17 00:00:00 2001 From: C1intMason Date: Sat, 22 May 2021 13:31:37 -0700 Subject: [PATCH 12/12] Changed naming conventions and updated readme photo URL Co-authored-by: Ryan --- keyboards/skergo/info.json | 3 +-- keyboards/skergo/keymaps/default/keymap.c | 4 ++-- keyboards/skergo/keymaps/via/keymap.c | 8 ++++---- keyboards/skergo/readme.md | 2 +- keyboards/skergo/skergo.h | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json index 0f46b3be77f8..0a2bb1efd099 100644 --- a/keyboards/skergo/info.json +++ b/keyboards/skergo/info.json @@ -4,9 +4,8 @@ "maintainer": "Keyz.io", "width": 19.25, "height": 6, - "key_count": 67, "layouts": { - "LAYOUT_default": { + "LAYOUT": { "layout": [ {"label":"Esc", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, diff --git a/keyboards/skergo/keymaps/default/keymap.c b/keyboards/skergo/keymaps/default/keymap.c index fd93d45dcd87..dd11616a4ee8 100644 --- a/keyboards/skergo/keymaps/default/keymap.c +++ b/keyboards/skergo/keymaps/default/keymap.c @@ -18,14 +18,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( + [0] = LAYOUT( 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_GRV, 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_PGUP, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [1] = LAYOUT_default( + [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_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/skergo/keymaps/via/keymap.c b/keyboards/skergo/keymaps/via/keymap.c index 552a7c4fe394..d393c3937c6b 100644 --- a/keyboards/skergo/keymaps/via/keymap.c +++ b/keyboards/skergo/keymaps/via/keymap.c @@ -18,28 +18,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( + [0] = LAYOUT( 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_GRV, 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_PGUP, 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_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [1] = LAYOUT_default( + [1] = LAYOUT( 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), - [2] = LAYOUT_default( + [2] = LAYOUT( 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), - [3] = LAYOUT_default( + [3] = LAYOUT( 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/skergo/readme.md b/keyboards/skergo/readme.md index 3b65c34611d4..ee10a5b7c078 100644 --- a/keyboards/skergo/readme.md +++ b/keyboards/skergo/readme.md @@ -1,6 +1,6 @@ # SKErgo -![skergo](https://cdn.shopify.com/s/files/1/0396/3001/2582/products/Keyzio-5_1024x1024@2x.jpg?v=1612909648) +![skergo](https://i.imgur.com/WIqxiMfh.png) An ergonomic layout keyboard with a through-hole component design diff --git a/keyboards/skergo/skergo.h b/keyboards/skergo/skergo.h index afee37a60175..b12493e8dfdd 100644 --- a/keyboards/skergo/skergo.h +++ b/keyboards/skergo/skergo.h @@ -18,7 +18,7 @@ #include "quantum.h" -#define LAYOUT_default( \ +#define LAYOUT( \ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \