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

9 files changed, 315 insertions, 0 deletions

diff --git a/keyboards/skergo/config.h b/keyboards/skergo/config.h
new file mode 100644
index 0000000000..e736e4c8d4
--- /dev/null
+++ b/keyboards/skergo/config.h
@@ -0,0 +1,53 @@
+/* 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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#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
+
+/* 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 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
diff --git a/keyboards/skergo/info.json b/keyboards/skergo/info.json
new file mode 100644
index 0000000000..0a2bb1efd0
--- /dev/null
+++ b/keyboards/skergo/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "SKErgo",
+    "url": "https://keyz.io",
+    "maintainer": "Keyz.io",
+    "width": 19.25,
+    "height": 6,
+    "layouts": {
+      "LAYOUT": {
+        "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 0000000000..dd11616a4e
--- /dev/null
+++ b/keyboards/skergo/keymaps/default/keymap.c
@@ -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 <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[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(
+		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)
+
+
+};
diff --git a/keyboards/skergo/keymaps/via/keymap.c b/keyboards/skergo/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d393c3937c
--- /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 <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[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(
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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(
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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(
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/skergo/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/skergo/readme.md b/keyboards/skergo/readme.md
new file mode 100644
index 0000000000..ee10a5b7c0
--- /dev/null
+++ b/keyboards/skergo/readme.md
@@ -0,0 +1,15 @@
+# SKErgo
+
+![skergo](https://i.imgur.com/WIqxiMfh.png)
+
+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 0000000000..3076166479
--- /dev/null
+++ b/keyboards/skergo/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+BOOTLOADER = USBasp
+
+# Build 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
+# 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
diff --git a/keyboards/skergo/skergo.c b/keyboards/skergo/skergo.c
new file mode 100644
index 0000000000..2d2f2b47ae
--- /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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "skergo.h"
diff --git a/keyboards/skergo/skergo.h b/keyboards/skergo/skergo.h
new file mode 100644
index 0000000000..b12493e8df
--- /dev/null
+++ b/keyboards/skergo/skergo.h
@@ -0,0 +1,33 @@
+/* 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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#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, \
+	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 }  \
+}