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

7 files changed, 244 insertions, 0 deletions

diff --git a/keyboards/akb/ogr/config.h b/keyboards/akb/ogr/config.h
new file mode 100644
index 0000000000..5bb1cbd09f
--- /dev/null
+++ b/keyboards/akb/ogr/config.h
@@ -0,0 +1,20 @@
+// Copyright 2022 Martin Arnstad (@arnstadm)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/akb/ogr/info.json b/keyboards/akb/ogr/info.json
new file mode 100644
index 0000000000..f2583154ba
--- /dev/null
+++ b/keyboards/akb/ogr/info.json
@@ -0,0 +1,115 @@
+{
+    "manufacturer": "AKB",
+    "keyboard_name": "akb/ogr",
+    "maintainer": "arnstadm",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["F1", "E6", "B7", "B3", "B2", "B1", "C7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
+        "rows": ["F0", "F4", "F5", "F6", "F7"]
+    },
+    "indicators": {
+        "caps_lock": "B4"
+    },
+    "processor": "atmega32u4",
+    "url": "https://www.alchemistkeyboards.com/ogr",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4F47",
+        "vid": "0x414B"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+                { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+                { "matrix": [0, 2], "x": 2.5, "y": 0.0 },
+                { "matrix": [0, 3], "x": 3.5, "y": 0.0 },
+                { "matrix": [0, 4], "x": 4.5, "y": 0.0 },
+                { "matrix": [0, 5], "x": 5.5, "y": 0.0 },
+                { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
+                { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
+                { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
+                { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
+                { "matrix": [0, 10], "x": 10.5, "y": 0.0 },
+                { "matrix": [0, 11], "x": 11.5, "y": 0.0 },
+                { "matrix": [0, 12], "x": 12.5, "y": 0.0 },
+                { "matrix": [0, 13], "x": 13.5, "y": 0.0 },
+                { "matrix": [0, 14], "x": 14.5, "y": 0.0 },
+                { "matrix": [0, 15], "x": 15.5, "y": 0.0 },
+                { "matrix": [0, 16], "x": 16.5, "y": 0.0 },
+                { "matrix": [0, 17], "x": 17.5, "y": 0.0 },
+                { "matrix": [1, 0], "x": 0.0, "y": 1.0 },
+                { "matrix": [1, 1], "x": 1.0, "y": 1.0 },
+                { "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1.0 },
+                { "matrix": [1, 3], "x": 4.0, "y": 1.0 },
+                { "matrix": [1, 4], "x": 5.0, "y": 1.0 },
+                { "matrix": [1, 5], "x": 6.0, "y": 1.0 },
+                { "matrix": [1, 6], "x": 7.0, "y": 1.0 },
+                { "matrix": [1, 7], "x": 8.0, "y": 1.0 },
+                { "matrix": [1, 8], "x": 9.0, "y": 1.0 },
+                { "matrix": [1, 9], "x": 10.0, "y": 1.0 },
+                { "matrix": [1, 10], "x": 11.0, "y": 1.0 },
+                { "matrix": [1, 11], "x": 12.0, "y": 1.0 },
+                { "matrix": [1, 12], "x": 13.0, "y": 1.0 },
+                { "matrix": [1, 13], "x": 14.0, "y": 1.0 },
+                { "matrix": [1, 14], "x": 15.0, "y": 1.0 },
+                { "matrix": [1, 15], "w": 1.5, "x": 16.0, "y": 1.0 },
+                { "matrix": [1, 16], "x": 17.5, "y": 1.0 },
+                { "matrix": [2, 0], "x": 0.0, "y": 2.0 },
+                { "matrix": [2, 1], "x": 1.0, "y": 2.0 },
+                { "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2.0 },
+                { "matrix": [2, 3], "x": 4.25, "y": 2.0 },
+                { "matrix": [2, 4], "x": 5.25, "y": 2.0 },
+                { "matrix": [2, 5], "x": 6.25, "y": 2.0 },
+                { "matrix": [2, 6], "x": 7.25, "y": 2.0 },
+                { "matrix": [2, 7], "x": 8.25, "y": 2.0 },
+                { "matrix": [2, 8], "x": 9.25, "y": 2.0 },
+                { "matrix": [2, 9], "x": 10.25, "y": 2.0 },
+                { "matrix": [2, 10], "x": 11.25, "y": 2.0 },
+                { "matrix": [2, 11], "x": 12.25, "y": 2.0 },
+                { "matrix": [2, 12], "x": 13.25, "y": 2.0 },
+                { "matrix": [2, 13], "x": 14.25, "y": 2.0 },
+                { "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2.0 },
+                { "matrix": [2, 16], "x": 17.5, "y": 2.0 },
+                { "matrix": [3, 0], "x": 0.0, "y": 3.0 },
+                { "matrix": [3, 1], "x": 1.0, "y": 3.0 },
+                { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3.0 },
+                { "matrix": [3, 3], "x": 3.75, "y": 3.0 },
+                { "matrix": [3, 4], "x": 4.75, "y": 3.0 },
+                { "matrix": [3, 5], "x": 5.75, "y": 3.0 },
+                { "matrix": [3, 6], "x": 6.75, "y": 3.0 },
+                { "matrix": [3, 7], "x": 7.75, "y": 3.0 },
+                { "matrix": [3, 8], "x": 8.75, "y": 3.0 },
+                { "matrix": [3, 9], "x": 9.75, "y": 3.0 },
+                { "matrix": [3, 10], "x": 10.75, "y": 3.0 },
+                { "matrix": [3, 11], "x": 11.75, "y": 3.0 },
+                { "matrix": [3, 12], "x": 12.75, "y": 3.0 },
+                { "matrix": [3, 13], "x": 13.75, "y": 3.0 },
+                { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3.0 },
+                { "matrix": [3, 15], "x": 16.5, "y": 3.0 },
+                { "matrix": [3, 16], "x": 17.5, "y": 3.0 },
+                { "matrix": [4, 0], "x": 0.0, "y": 4.0 },
+                { "matrix": [4, 1], "x": 1.0, "y": 4.0 },
+                { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
+                { "matrix": [4, 3], "w": 1.25, "x": 3.75, "y": 4.0 },
+                { "matrix": [4, 4], "w": 1.25, "x": 5.0, "y": 4.0 },
+                { "matrix": [4, 9], "w": 6.25, "x": 6.25, "y": 4.0 },
+                { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
+                { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4.0 },
+                { "matrix": [4, 14], "x": 15.5, "y": 4.0 },
+                { "matrix": [4, 15], "x": 16.5, "y": 4.0 },
+                { "matrix": [4, 16], "x": 17.5, "y": 4.0 }
+            ]
+        }
+   
+    }
+}
\ No newline at end of file
diff --git a/keyboards/akb/ogr/keymaps/default/keymap.c b/keyboards/akb/ogr/keymaps/default/keymap.c
new file mode 100644
index 0000000000..fa95d127da
--- /dev/null
+++ b/keyboards/akb/ogr/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2018-2022 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /*
+     * ┌───┬───┐    ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │ F1│ F2│    │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│
+     * ├───┼───┤    ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * | F3| F4|    │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │PgU│
+     * ├───┼───┤    ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * | F5| F6|    │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PgD│
+     * ├───┼───┤    ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * | F7| F8|    │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
+     * ├───┼───┤    ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+     * | F9|F10|    │Ctrl│GUI │Alt │                        │Alt│Ctl│   │ ← │ ↓ │ → │
+     * └───┴───┘    └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_all(
+
+       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_DEL, KC_HOME,
+       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_BSLS, KC_PGUP,
+       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_ENT,  KC_PGDN,
+       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_END,
+       KC_F9, KC_F10,    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+
+    [1] = LAYOUT_all(
+        _______, _______, 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_DEL,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+       _______, _______,  _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
+       _______, _______,  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/akb/ogr/keymaps/via/keymap.c b/keyboards/akb/ogr/keymaps/via/keymap.c
new file mode 100644
index 0000000000..844a454fce
--- /dev/null
+++ b/keyboards/akb/ogr/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2018-2022 QMK (@qmk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /*
+     * ┌───┬───┐    ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │ F1│ F2│    │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│
+     * ├───┼───┤    ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * | F3| F4|    │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │PgU│
+     * ├───┼───┤    ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * | F5| F6|    │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PgD│
+     * ├───┼───┤    ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * | F7| F8|    │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
+     * ├───┼───┤    ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+     * | F9|F10|    │Ctrl│GUI │Alt │                        │Alt│Ctl│   │ ← │ ↓ │ → │
+     * └───┴───┘    └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_all(
+
+       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_DEL, KC_HOME,
+       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_BSLS, KC_PGUP,
+       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_ENT,  KC_PGDN,
+       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_END,
+       KC_F9, KC_F10,    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+
+    [1] = LAYOUT_all(
+        _______, _______,     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_DEL,  _______, _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, KC_INS,  _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______,    _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
+        _______, _______,    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/akb/ogr/keymaps/via/rules.mk b/keyboards/akb/ogr/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/akb/ogr/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/akb/ogr/readme.md b/keyboards/akb/ogr/readme.md
new file mode 100644
index 0000000000..667963bce0
--- /dev/null
+++ b/keyboards/akb/ogr/readme.md
@@ -0,0 +1,29 @@
+# akb/ogr
+
+![akb/ogr](https://i.imgur.com/qbolyMah.jpeg)
+
+OGR - Multi-functional keyboard with 75-78 keys for USB systems.
+
+Keyboard designed by [AKB](https://alchemistkeyboards.com/), PCB designed by [martin](https://github.com/arnstadm)
+
+* Keyboard Maintainer: [AKB](https://alchemistkeyboards.com/)
+* Hardware Supported: OGR PCB
+* Hardware Availability: https://alchemistkeyboards.com/projects/keyboards/ogr/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make akb/ogr:default
+
+Flashing example for this keyboard:
+
+    make akb/ogr:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/akb/ogr/rules.mk b/keyboards/akb/ogr/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/akb/ogr/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank