From cb2a99a415e8bce8ba814b9684c3979ff934ee91 Mon Sep 17 00:00:00 2001
From: Zicodia <82699172+Z1codia@users.noreply.github.com>
Date: Fri, 30 Sep 2022 00:42:11 -0500
Subject: [PATCH 1/2] [Keyboard] Fix tklfrlnrlmlao layout (#18543)
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
keyboards/zicodia/tklfrlnrlmlao/info.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/keyboards/zicodia/tklfrlnrlmlao/info.json b/keyboards/zicodia/tklfrlnrlmlao/info.json
index 8b2cdc58e4..dd01bef783 100644
--- a/keyboards/zicodia/tklfrlnrlmlao/info.json
+++ b/keyboards/zicodia/tklfrlnrlmlao/info.json
@@ -29,7 +29,7 @@
{ "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1.25, "y": 0 }, { "matrix": [0, 2], "x": 2.25, "y": 0 }, { "matrix": [0, 3], "x": 3.25, "y": 0 }, { "matrix": [0, 4], "x": 4.5, "y": 0 }, { "matrix": [0, 5], "x": 5.5, "y": 0 }, { "matrix": [0, 6], "x": 6.5, "y": 0 }, { "matrix": [0, 7], "x": 7.75, "y": 0 }, { "matrix": [0, 8], "x": 8.75, "y": 0 }, { "matrix": [0, 9], "x": 9.75, "y": 0 },
{ "matrix": [1, 0], "x": 0, "y": 1.25 }, { "matrix": [1, 1], "x": 1, "y": 1.25 }, { "matrix": [1, 2], "x": 2, "y": 1.25 }, { "matrix": [1, 3], "x": 3, "y": 1.25 }, { "matrix": [1, 4], "x": 4, "y": 1.25 }, { "matrix": [1, 5], "x": 5, "y": 1.25 }, { "matrix": [1, 6], "x": 6, "y": 1.25, "w": 1.5 }, { "matrix": [1, 7], "x": 7.75, "y": 1 }, { "matrix": [1, 8], "x": 8.75, "y": 1 }, { "matrix": [1, 9], "x": 9.75, "y": 1 },
{ "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5 }, { "matrix": [2, 1], "x": 1.5, "y": 2.25 }, { "matrix": [2, 2], "x": 2.5, "y": 2.25 }, { "matrix": [2, 3], "x": 3.5, "y": 2.25 }, { "matrix": [2, 4], "x": 4.5, "y": 2.25 }, { "matrix": [2, 5], "x": 5.5, "y": 2.25 }, { "matrix": [2, 6], "x": 6.5, "y": 2.25 }, { "matrix": [2, 8], "x": 8.75, "y": 2.25 },
- { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1.25, "y": 3.25 }, { "matrix": [3, 3], "x": 2.25, "y": 3.25, "w": 3 }, { "matrix": [3, 5], "x": 5.25, "y": 3.25 }, { "matrix": [3, 6], "x": 6.25, "y": 3.25, "w": 1.25 }, { "matrix": [3, 7], "x": 7.75, "y": 3.25 }, { "matrix": [3, 8], "x": 7.75, "y": 3.25 }, { "matrix": [3, 9], "x": 8.75, "y": 3.25 }
+ { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25 }, { "matrix": [3, 1], "x": 1.25, "y": 3.25 }, { "matrix": [3, 3], "x": 2.25, "y": 3.25, "w": 3 }, { "matrix": [3, 5], "x": 5.25, "y": 3.25 }, { "matrix": [3, 6], "x": 6.25, "y": 3.25, "w": 1.25 }, { "matrix": [3, 7], "x": 7.75, "y": 3.25 }, { "matrix": [3, 8], "x": 8.75, "y": 3.25 }, { "matrix": [3, 9], "x": 9.75, "y": 3.25 }
]
}
}
From f3351c6bfb4833505f3b2b4484d14d6f6446125a Mon Sep 17 00:00:00 2001
From: Ramon Imbao <ramonimbao@gmail.com>
Date: Fri, 30 Sep 2022 13:42:29 +0800
Subject: [PATCH 2/2] [Keyboard] Add saevus cor (#18368)
---
keyboards/saevus/cor/info.json | 109 ++++++++++++++++++
keyboards/saevus/cor/keymaps/default/keymap.c | 34 ++++++
keyboards/saevus/cor/keymaps/via/keymap.c | 48 ++++++++
keyboards/saevus/cor/keymaps/via/rules.mk | 1 +
keyboards/saevus/cor/readme.md | 26 +++++
keyboards/saevus/cor/rules.mk | 1 +
6 files changed, 219 insertions(+)
create mode 100644 keyboards/saevus/cor/info.json
create mode 100644 keyboards/saevus/cor/keymaps/default/keymap.c
create mode 100644 keyboards/saevus/cor/keymaps/via/keymap.c
create mode 100644 keyboards/saevus/cor/keymaps/via/rules.mk
create mode 100644 keyboards/saevus/cor/readme.md
create mode 100644 keyboards/saevus/cor/rules.mk
diff --git a/keyboards/saevus/cor/info.json b/keyboards/saevus/cor/info.json
new file mode 100644
index 0000000000..3f129518d9
--- /dev/null
+++ b/keyboards/saevus/cor/info.json
@@ -0,0 +1,109 @@
+{
+ "manufacturer": "saevus",
+ "keyboard_name": "cor",
+ "maintainer": "ramonimbao",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
+ "matrix_pins": {
+ "rows": ["F0", "F1", "F4", "B3", "B6"],
+ "cols": ["F5", "F6", "F7", "C6", "C7", "B1", "B7", "B5", "B4", "D7", "D6", "D4", "D5", "D2", "D2", "D1", "D0"]
+ },
+ "processor": "atmega32u4",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "vid": "0x5001",
+ "pid": "0x0002"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ { "matrix": [0,0], "x":0, "y":0 },
+ { "matrix": [0,1], "x":1.25, "y":0 },
+ { "matrix": [0,2], "x":2.25, "y":0 },
+ { "matrix": [0,3], "x":3.25, "y":0 },
+ { "matrix": [0,4], "x":4.25, "y":0 },
+ { "matrix": [0,5], "x":5.25, "y":0 },
+ { "matrix": [0,6], "x":6.25, "y":0 },
+ { "matrix": [0,7], "x":7.25, "y":0 },
+ { "matrix": [0,8], "x":8.25, "y":0 },
+ { "matrix": [0,9], "x":9.25, "y":0 },
+ { "matrix": [0,10], "x":10.25, "y":0 },
+ { "matrix": [0,11], "x":11.25, "y":0 },
+ { "matrix": [0,12], "x":12.25, "y":0 },
+ { "matrix": [0,13], "x":13.25, "y":0 },
+ { "matrix": [0,14], "x":14.25, "y":0 },
+ { "matrix": [0,15], "x":15.25, "y":0 },
+ { "matrix": [0,16], "x":16.75, "y":0 },
+
+ { "matrix": [1,0], "x":0, "y":1 },
+ { "matrix": [1,1], "x":1.25, "y":1, "w":1.5 },
+ { "matrix": [1,2], "x":2.75, "y":1 },
+ { "matrix": [1,3], "x":3.75, "y":1 },
+ { "matrix": [1,4], "x":4.75, "y":1 },
+ { "matrix": [1,5], "x":5.75, "y":1 },
+ { "matrix": [1,6], "x":6.75, "y":1 },
+ { "matrix": [1,7], "x":7.75, "y":1 },
+ { "matrix": [1,8], "x":8.75, "y":1 },
+ { "matrix": [1,9], "x":9.75, "y":1 },
+ { "matrix": [1,10], "x":10.75, "y":1 },
+ { "matrix": [1,11], "x":11.75, "y":1 },
+ { "matrix": [1,12], "x":12.75, "y":1 },
+ { "matrix": [1,13], "x":13.75, "y":1 },
+ { "matrix": [1,15], "x":14.75, "y":1, "w":1.5 },
+ { "matrix": [1,16], "x":16.75, "y":1 },
+
+ { "matrix": [2,0], "x":0, "y":2 },
+ { "matrix": [2,1], "x":1.25, "y":2, "w":1.75 },
+ { "matrix": [2,2], "x":3, "y":2 },
+ { "matrix": [2,3], "x":4, "y":2 },
+ { "matrix": [2,4], "x":5, "y":2 },
+ { "matrix": [2,5], "x":6, "y":2 },
+ { "matrix": [2,6], "x":7, "y":2 },
+ { "matrix": [2,7], "x":8, "y":2 },
+ { "matrix": [2,8], "x":9, "y":2 },
+ { "matrix": [2,9], "x":10, "y":2 },
+ { "matrix": [2,10], "x":11, "y":2 },
+ { "matrix": [2,11], "x":12, "y":2 },
+ { "matrix": [2,12], "x":13, "y":2 },
+ { "matrix": [2,14], "x":14, "y":2, "w":2.25 },
+ { "matrix": [2,16], "x":16.75, "y":2 },
+
+ { "matrix": [3,0], "x":0, "y":3 },
+ { "matrix": [3,1], "x":1.25, "y":3, "w":2.25 },
+ { "matrix": [3,3], "x":3.5, "y":3 },
+ { "matrix": [3,4], "x":4.5, "y":3 },
+ { "matrix": [3,5], "x":5.5, "y":3 },
+ { "matrix": [3,6], "x":6.5, "y":3 },
+ { "matrix": [3,7], "x":7.5, "y":3 },
+ { "matrix": [3,8], "x":8.5, "y":3 },
+ { "matrix": [3,9], "x":9.5, "y":3 },
+ { "matrix": [3,10], "x":10.5, "y":3 },
+ { "matrix": [3,11], "x":11.5, "y":3 },
+ { "matrix": [3,12], "x":12.5, "y":3 },
+ { "matrix": [3,13], "x":13.5, "y":3, "w":1.75 },
+ { "matrix": [3,15], "x":15.5, "y":3.25 },
+ { "matrix": [3,16], "x":16.75, "y":3 },
+
+ { "matrix": [4,0], "x":0, "y":4 },
+ { "matrix": [4,1], "x":1.25, "y":4, "w":1.25 },
+ { "matrix": [4,2], "x":2.5, "y":4, "w":1.25 },
+ { "matrix": [4,3], "x":3.75, "y":4, "w":1.25 },
+ { "matrix": [4,7], "x":5, "y":4, "w":6.25 },
+ { "matrix": [4,11], "x":11.25, "y":4, "w":1.25 },
+ { "matrix": [4,12], "x":12.5, "y":4, "w":1.25 },
+ { "matrix": [4,14], "x":14.5, "y":4.25 },
+ { "matrix": [4,15], "x":15.5, "y":4.25 },
+ { "matrix": [4,16], "x":16.5, "y":4.25 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/saevus/cor/keymaps/default/keymap.c b/keyboards/saevus/cor/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ca7c340333
--- /dev/null
+++ b/keyboards/saevus/cor/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_F1, 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_F2, 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_F3, 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_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
+ KC_F5, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_all(
+ KC_F6, 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_F7, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
+ KC_F8, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+ KC_F9, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_F10, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/saevus/cor/keymaps/via/keymap.c b/keyboards/saevus/cor/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5cb1d224b9
--- /dev/null
+++ b/keyboards/saevus/cor/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 Ramon Imbao
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_F1, 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_F2, 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_F3, 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_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
+ KC_F5, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_all(
+ KC_F6, 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_F7, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
+ KC_F8, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+ KC_F9, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_F10, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [2] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [3] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/saevus/cor/keymaps/via/rules.mk b/keyboards/saevus/cor/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/saevus/cor/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/saevus/cor/readme.md b/keyboards/saevus/cor/readme.md
new file mode 100644
index 0000000000..2c158e1a63
--- /dev/null
+++ b/keyboards/saevus/cor/readme.md
@@ -0,0 +1,26 @@
+# saevus cor
+
+
+
+An exploded 65% with a macro column.
+
+* Keyboard Maintainer: [Ramon Imbao](https://github.com/ramonimbao)
+* Hardware Supported: ATmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+ make saevus/cor:via
+
+Flashing example for this keyboard:
+
+ make saevus/cor:via:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the upper left key and plug in the keyboard
+* **Physical reset button**: Briefly press the reset button on the back of the PCB.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/saevus/cor/rules.mk b/keyboards/saevus/cor/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/saevus/cor/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank