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

7 files changed, 283 insertions, 0 deletions

diff --git a/keyboards/morizon/config.h b/keyboards/morizon/config.h
new file mode 100644
index 0000000000..bf9e1b9a35
--- /dev/null
+++ b/keyboards/morizon/config.h
@@ -0,0 +1,46 @@
+/*
+Copyright 2022 Steven Karrmann
+
+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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x0000
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Steven Karrmann
+#define PRODUCT      Morizon
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
+#define UNUSED_PINS { F4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+/* 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/morizon/info.json b/keyboards/morizon/info.json
new file mode 100644
index 0000000000..5e22001c79
--- /dev/null
+++ b/keyboards/morizon/info.json
@@ -0,0 +1,77 @@
+{
+  "keyboard_name": "Morizon",
+  "url": "https://github.com/skarrmann/morizon",
+  "maintainer": "Steven Karrmann",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 8, "y": 0 },
+        { "x": 9, "y": 0 },
+        { "x": 10, "y": 0 },
+        { "x": 11, "y": 0 },
+        { "x": 12, "y": 0 },
+        { "x": 13, "y": 0 },
+        { "x": 0, "y": 1 },
+        { "x": 1, "y": 1 },
+        { "x": 2, "y": 1 },
+        { "x": 3, "y": 1 },
+        { "x": 4, "y": 1 },
+        { "x": 5, "y": 1 },
+        { "x": 8, "y": 1 },
+        { "x": 9, "y": 1 },
+        { "x": 10, "y": 1 },
+        { "x": 11, "y": 1 },
+        { "x": 12, "y": 1 },
+        { "x": 13, "y": 1 },
+        { "x": 0, "y": 2 },
+        { "x": 1, "y": 2 },
+        { "x": 2, "y": 2 },
+        { "x": 3, "y": 2 },
+        { "x": 4, "y": 2 },
+        { "x": 5, "y": 2 },
+        { "x": 6, "y": 2 },
+        { "x": 7, "y": 2 },
+        { "x": 8, "y": 2 },
+        { "x": 9, "y": 2 },
+        { "x": 10, "y": 2 },
+        { "x": 11, "y": 2 },
+        { "x": 12, "y": 2 },
+        { "x": 13, "y": 2 },
+        { "x": 0, "y": 3 },
+        { "x": 1, "y": 3 },
+        { "x": 2, "y": 3 },
+        { "x": 3, "y": 3 },
+        { "x": 4, "y": 3 },
+        { "x": 5, "y": 3 },
+        { "x": 6, "y": 3 },
+        { "x": 7, "y": 3 },
+        { "x": 8, "y": 3 },
+        { "x": 9, "y": 3 },
+        { "x": 10, "y": 3 },
+        { "x": 11, "y": 3 },
+        { "x": 12, "y": 3 },
+        { "x": 13, "y": 3 },
+        { "x": 0, "y": 4 },
+        { "x": 1, "y": 4 },
+        { "x": 2, "y": 4 },
+        { "x": 3, "y": 4 },
+        { "x": 4, "y": 4 },
+        { "x": 5, "y": 4 },
+        { "x": 6, "y": 4 },
+        { "x": 7, "y": 4 },
+        { "x": 8, "y": 4 },
+        { "x": 9, "y": 4 },
+        { "x": 10, "y": 4 },
+        { "x": 11, "y": 4 },
+        { "x": 12, "y": 4 },
+        { "x": 13, "y": 4 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/morizon/keymaps/default/keymap.c b/keyboards/morizon/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9b7ce4b291
--- /dev/null
+++ b/keyboards/morizon/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 Steven Karrmann
+ *
+ * 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
+
+enum layer_names {
+    _BASE,
+    _SYMBOL,
+    _FUNCTION
+};
+
+#define MO_SYMB MO(_SYMBOL)
+#define MO_FUNC MO(_FUNCTION)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_CLCK, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                   KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSLS,
+        KC_GRV , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                   KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_MINS,
+        KC_EQL , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_LBRC, KC_RBRC, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_ESC , KC_ENT , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LALT, KC_LGUI, KC_APP , KC_DEL , KC_TAB , MO_SYMB, MO_FUNC, KC_SPC , KC_BSPC, KC_APP , KC_RGUI, KC_RALT, KC_RCTL
+    ),
+    [_SYMBOL] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                   KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_UNDS,
+        KC_PLUS, KC_EXLM, KC_LPRN, KC_RPRN, KC_DLR , KC_AMPR, _______, _______, KC_PIPE, KC_HASH, KC_LCBR, KC_RCBR, KC_COLN, KC_DQUO,
+        _______, KC_AT  , KC_LBRC, KC_RBRC, KC_BSLS, KC_PERC, _______, _______, KC_CIRC, KC_ASTR, KC_LABK, KC_RABK, KC_QUES, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [_FUNCTION] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+        _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_PSCR,                   KC_SLCK, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
+        _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_INS , _______, _______, KC_CLCK, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,
+        _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
\ No newline at end of file
diff --git a/keyboards/morizon/morizon.c b/keyboards/morizon/morizon.c
new file mode 100644
index 0000000000..1196375cd0
--- /dev/null
+++ b/keyboards/morizon/morizon.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Steven Karrmann
+ *
+ * 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 "morizon.h"
diff --git a/keyboards/morizon/morizon.h b/keyboards/morizon/morizon.h
new file mode 100644
index 0000000000..a6c84ee502
--- /dev/null
+++ b/keyboards/morizon/morizon.h
@@ -0,0 +1,48 @@
+/* Copyright 2022 Steven Karrmann
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15,           k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d  \
+) \
+{ \
+    { k00  , k01, k02, k03, k04, k05, KC_NO }, \
+    { k10  , k11, k12, k13, k14, k15, KC_NO }, \
+    { k20  , k21, k22, k23, k24, k25, k26   }, \
+    { k30  , k31, k32, k33, k34, k35, k36   }, \
+    { k40  , k41, k42, k43, k44, k45, k46   }, \
+    { KC_NO, k06, k07, k08, k09, k0a, k0b   }, \
+    { KC_NO, k16, k17, k18, k19, k1a, k1b   }, \
+    { k27  , k28, k29, k2a, k2b, k2c, k2d   }, \
+    { k37  , k38, k39, k3a, k3b, k3c, k3d   }, \
+    { k47  , k48, k49, k4a, k4b, k4c, k4d   }  \
+}
diff --git a/keyboards/morizon/readme.md b/keyboards/morizon/readme.md
new file mode 100644
index 0000000000..5c95e9788c
--- /dev/null
+++ b/keyboards/morizon/readme.md
@@ -0,0 +1,27 @@
+# Morizon
+
+![Morizon](https://i.imgur.com/2EEP412h.jpg)
+
+A simple 66-key (5x14) ortholinear keyboard, powered by an Arduino Pro Micro. The design is based on the [Horizon keyboard](https://github.com/skarrmann/horizon).
+
+* Keyboard Maintainer: [Steven Karrmann](https://github.com/skarrmann)
+* Hardware Supported: Morizon PCBs, Arduino Pro Micro
+* Hardware Availability: [Morizon GitHub repository](https://github.com/skarrmann/morizon)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make morizon:default
+
+Flashing example for this keyboard:
+
+    make morizon: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 top left key and plug in the keyboard.
+* **Physical reset button**: Briefly press the button on the top center of the PCB.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
diff --git a/keyboards/morizon/rules.mk b/keyboards/morizon/rules.mk
new file mode 100644
index 0000000000..9cfcaf1bbc
--- /dev/null
+++ b/keyboards/morizon/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+COMMAND_ENABLE = no         # Commands for debug and configuration
+CONSOLE_ENABLE = yes        # Console for debug
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output