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

7 files changed, 204 insertions, 0 deletions

diff --git a/keyboards/akb/ogrn/config.h b/keyboards/akb/ogrn/config.h
new file mode 100644
index 0000000000..ef8bb6d07b
--- /dev/null
+++ b/keyboards/akb/ogrn/config.h
@@ -0,0 +1,20 @@
+// Copyright 2022 arnstadm (@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/ogrn/info.json b/keyboards/akb/ogrn/info.json
new file mode 100644
index 0000000000..23d4d77273
--- /dev/null
+++ b/keyboards/akb/ogrn/info.json
@@ -0,0 +1,59 @@
+{
+    "manufacturer": "akb",
+    "keyboard_name": "akb/ogrn",
+    "maintainer": "arnstadm",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["F1", "E6", "B2", "D2"],
+            ["F5", "F0", "B1", "D1"],
+            ["F6", "F7", "D5", "D3"],
+            ["C7", "C6", "D6", "D4"],
+            ["B5", "B6", "D7", "B4"]
+        ]
+    },
+    "indicators": {
+        "num_lock": "F4"
+    },
+    "processor": "atmega32u4",
+    "url": "https://alchemistkeyboards.com/projects/keyboards/ogr/",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x4F4E",
+        "vid": "0x414B"
+    },
+  "community_layouts": [
+    "numpad_5x4"
+  ],
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "h": 2, "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [4, 0], "w": 2, "x": 0, "y": 4 },
+                { "matrix": [4, 2], "x": 2, "y": 4 },
+                { "h": 2, "matrix": [3, 3], "x": 3, "y": 3 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/akb/ogrn/keymaps/default/keymap.c b/keyboards/akb/ogrn/keymaps/default/keymap.c
new file mode 100644
index 0000000000..35a275d055
--- /dev/null
+++ b/keyboards/akb/ogrn/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+// Copyright 2021 Martin Arnstad (@arnstadm)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┐
+     * │TG1│ / │ * │ - │
+     * ├───┼───┼───┼───┤
+     * │ 7 │ 8 │ 9 │   │
+     * ├───┼───┼───┤ + │
+     * │ 4 │ 5 │ 6 │   │
+     * ├───┼───┼───┼───┤
+     * │ 1 │ 2 │ 3 │   │
+     * ├───┴───┼───┤Ent│
+     * │   0   │ . │   │
+     * └───────┴───┴───┘
+     */
+    [0] = LAYOUT_numpad_5x4(
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,   KC_P8,   KC_P9,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,
+        KC_P0,   KC_PDOT,          KC_PENT
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┐
+     * │TG1│ / │ * │ - │
+     * ┌───┬───┬───┐───┤
+     * │Hom│ ↑ │PgU│   │
+     * ├───┼───┼───┤ + │
+     * │ ← │   │ → │   │
+     * ├───┼───┼───┤───┤
+     * │End│ ↓ │PgD│   │
+     * ├───┴───┼───┤Ent│
+     * │Insert │Del│   │
+     * └───────┴───┘───┘
+     */
+    [1] = LAYOUT_numpad_5x4(
+        _______, _______, _______, _______,
+        KC_HOME, KC_UP,   KC_PGUP,
+        KC_LEFT, XXXXXXX, KC_RGHT, _______,
+        KC_END,  KC_DOWN, KC_PGDN,
+        KC_INS,           KC_DEL,  _______
+    )
+};
diff --git a/keyboards/akb/ogrn/keymaps/via/keymap.c b/keyboards/akb/ogrn/keymaps/via/keymap.c
new file mode 100644
index 0000000000..7aec87a623
--- /dev/null
+++ b/keyboards/akb/ogrn/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+// Copyright 2021 Martin Arnstad (@arnstadm)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┐
+     * │NUM│ / │ * │ - │
+     * ├───┼───┼───┼───┤
+     * │ 7 │ 8 │ 9 │   │
+     * ├───┼───┼───┤ + │
+     * │ 4 │ 5 │ 6 │   │
+     * ├───┼───┼───┼───┤
+     * │ 1 │ 2 │ 3 │   │
+     * ├───┴───┼───┤Ent│
+     * │   0   │ . │   │
+     * └───────┴───┴───┘
+     */
+    [0] = LAYOUT_numpad_5x4(
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,   KC_P8,   KC_P9,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,
+        KC_P0,   KC_PDOT,          KC_PENT
+    ),
+
+    /*
+     * ┌───┬───┬───┬───┐
+     * │   │ / │ * │ - │
+     * ┌───┬───┬───┐───┤
+     * │Hom│ ↑ │PgU│   │
+     * ├───┼───┼───┤ + │
+     * │ ← │   │ → │   │
+     * ├───┼───┼───┤───┤
+     * │End│ ↓ │PgD│   │
+     * ├───┴───┼───┤Ent│
+     * │Insert │Del│   │
+     * └───────┴───┘───┘
+     */
+    [1] = LAYOUT_numpad_5x4(
+        _______, _______, _______, _______,
+        KC_HOME, KC_UP,   KC_PGUP,
+        KC_LEFT, XXXXXXX, KC_RGHT, _______,
+        KC_END,  KC_DOWN, KC_PGDN,
+        KC_INS,           KC_DEL,  _______
+    )
+};
diff --git a/keyboards/akb/ogrn/keymaps/via/rules.mk b/keyboards/akb/ogrn/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/akb/ogrn/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/akb/ogrn/readme.md b/keyboards/akb/ogrn/readme.md
new file mode 100644
index 0000000000..16d60538c7
--- /dev/null
+++ b/keyboards/akb/ogrn/readme.md
@@ -0,0 +1,27 @@
+# akb/ogrn
+
+![akb/ogrn](https://i.imgur.com/qbolyMal.png)
+
+Numpad for the OGR keyboard by AKB
+
+* Keyboard Maintainer: [akb](https://alchemistkeyboards.com/)
+* Hardware Supported: OGRN PCB
+* Hardware Availability: https://alchemistkeyboards.com/projects/keyboards/ogr/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make akb/ogrn:default
+
+Flashing example for this keyboard:
+
+    make akb/ogrn: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/ogrn/rules.mk b/keyboards/akb/ogrn/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/akb/ogrn/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank