Merge upstream master

4 files changed, 226 insertions, 0 deletions

diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
new file mode 100644
index 0000000000..64435afa5d
--- /dev/null
+++ b/keyboards/momoka_ergo/config.h
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 StefanGrindelwald
+
+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"
+
+/* key matrix size */
+#define MATRIX_ROWS 14
+#define MATRIX_COLS 6
+
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+#define SELECT_SOFT_SERIAL_SPEED 5
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D1  // or D1, D2, D3, E6
+
+#define RGB_DI_PIN C7
+#define RGBLED_NUM 22
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_SPLIT { 11, 11 }
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* 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
+
+#define SPLIT_USB_DETECT
+#define EE_HANDS
diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json
new file mode 100644
index 0000000000..67603d505e
--- /dev/null
+++ b/keyboards/momoka_ergo/info.json
@@ -0,0 +1,94 @@
+{
+    "keyboard_name": "Momoka Ergo",
+    "manufacturer": "StefanGrindelwald",
+    "url": "",
+    "maintainer": "StefanGrindelwald",
+    "usb": {
+        "vid": "0x4F4D",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L05", "x":0, "y":0.375, "w":1.5},
+                {"label":"L04", "x":1.5, "y":0.375},
+                {"label":"L03", "x":2.5, "y":0.125},
+                {"label":"L02", "x":3.5, "y":0},
+                {"label":"L01", "x":4.5, "y":0.125},
+                {"label":"L00", "x":5.5, "y":0.25},
+                {"label":"R70", "x":12.5, "y":0.25},
+                {"label":"R71", "x":13.5, "y":0.125},
+                {"label":"R72", "x":14.5, "y":0},
+                {"label":"R73", "x":15.5, "y":0.125},
+                {"label":"R74", "x":16.5, "y":0.375},
+                {"label":"R75", "x":17.5, "y":0.375, "w":1.5},
+
+                {"label":"L15", "x":0, "y":1.375, "w":1.5},
+                {"label":"L14", "x":1.5, "y":1.375},
+                {"label":"L13", "x":2.5, "y":1.125},
+                {"label":"L12", "x":3.5, "y":1},
+                {"label":"L11", "x":4.5, "y":1.125},
+                {"label":"L10", "x":5.5, "y":1.25},
+                {"label":"R80", "x":12.5, "y":1.25},
+                {"label":"R81", "x":13.5, "y":1.125},
+                {"label":"R82", "x":14.5, "y":1},
+                {"label":"R83", "x":15.5, "y":1.125},
+                {"label":"R84", "x":16.5, "y":1.375},
+                {"label":"R85", "x":17.5, "y":1.375, "w":1.5},
+
+                {"label":"L25", "x":0, "y":2.375, "w":1.5},
+                {"label":"L24", "x":1.5, "y":2.375},
+                {"label":"L23", "x":2.5, "y":2.125},
+                {"label":"L22", "x":3.5, "y":2},
+                {"label":"L21", "x":4.5, "y":2.125},
+                {"label":"L20", "x":5.5, "y":2.25},
+                {"label":"R90", "x":12.5, "y":2.25},
+                {"label":"R91", "x":13.5, "y":2.125},
+                {"label":"R92", "x":14.5, "y":2},
+                {"label":"R93", "x":15.5, "y":2.125},
+                {"label":"R94", "x":16.5, "y":2.375},
+                {"label":"R95", "x":17.5, "y":2.375, "w":1.5},
+
+                {"label":"L35", "x":0, "y":3.375, "w":1.5},
+                {"label":"L34", "x":1.5, "y":3.375},
+                {"label":"L33", "x":2.5, "y":3.125},
+                {"label":"L32", "x":3.5, "y":3},
+                {"label":"L31", "x":4.5, "y":3.125},
+                {"label":"L30", "x":5.5, "y":3.25},
+                {"label":"RA0", "x":12.5, "y":3.25},
+                {"label":"RA1", "x":13.5, "y":3.125},
+                {"label":"RA2", "x":14.5, "y":3},
+                {"label":"RA3", "x":15.5, "y":3.125},
+                {"label":"RA4", "x":16.5, "y":3.375},
+                {"label":"RA5", "x":17.5, "y":3.375, "w":1.5},
+
+                {"label":"L45", "x":0.5, "y":4.375},
+                {"label":"L44", "x":1.5, "y":4.375},
+                {"label":"L43", "x":2.5, "y":4.125},
+                {"label":"L42", "x":3.5, "y":4},
+                {"label":"L41", "x":4.5, "y":4.125},
+                {"label":"RB1", "x":13.5, "y":4.125},
+                {"label":"RB2", "x":14.5, "y":4},
+                {"label":"RB3", "x":15.5, "y":4.125},
+                {"label":"RB4", "x":16.5, "y":4.375},
+                {"label":"RB5", "x":17.5, "y":4.375},
+
+                {"label":"L51", "x":7, "y":4.875},
+                {"label":"L40", "x":8, "y":4.875},
+                {"label":"RB0", "x":10, "y":4.875},
+                {"label":"RC1", "x":11, "y":4.875},
+
+                {"label":"L50", "x":8, "y":5.875},
+                {"label":"RC0", "x":10, "y":5.875},
+
+                {"label":"L52", "x":6, "y":5.875, "h":2},
+                {"label":"L61", "x":7, "y":5.875, "h":2},
+                {"label":"L60", "x":8, "y":6.875},
+                {"label":"RD0", "x":10, "y":6.875},
+                {"label":"RD1", "x":11, "y":5.875, "h":2},
+                {"label":"RC2", "x":12, "y":5.875, "h":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/momoka_ergo/keymaps/via/keymap.c b/keyboards/momoka_ergo/keymaps/via/keymap.c
new file mode 100644
index 0000000000..34b363841e
--- /dev/null
+++ b/keyboards/momoka_ergo/keymaps/via/keymap.c
@@ -0,0 +1,70 @@
+/* Copyright 2022 Kevin Boss <kevin.boss@outlook.com>
+ *
+ * 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
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = 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_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        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_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                                           KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        MO(_FN1), KC_GRV,  KC_EQL,  KC_LEFT, KC_RGHT,                                                          KC_UP,   KC_DOWN, KC_LBRC, KC_RBRC, MO(_FN1),
+                                                               KC_LCTL, KC_LALT,    KC_RGUI, KC_RCTL,
+                                                                        KC_HOME,    KC_PGUP,
+                                                      KC_BSPC, KC_DEL,  KC_END,     KC_PGDN, KC_ENT,  KC_SPC
+    ),
+    [_FN1] = LAYOUT(
+        QK_BOOT,  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,
+        MO(_FN2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, MO(_FN2),
+        KC_TRNS,  KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU,                                                          RGB_VAI, RGB_VAD,  RGB_SAI, RGB_SAD, KC_TRNS,
+                                                               KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS,
+                                                                        KC_TRNS,    RGB_HUI,
+                                                      KC_TRNS, KC_TRNS, KC_TRNS,    RGB_HUD, KC_TRNS, KC_TRNS
+    ),
+    [_FN2] = LAYOUT(
+        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, QK_BOOT,   KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, QK_BOOT,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, RGB_RMOD, RGB_MOD, RGB_TOG, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU,                                                          RGB_VAI, RGB_VAD,  RGB_SAI, RGB_SAD, KC_TRNS,
+                                                              KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS,
+                                                                       KC_TRNS,    RGB_HUI,
+                                                     KC_TRNS, KC_TRNS, KC_TRNS,    RGB_HUD, KC_TRNS, KC_TRNS
+    ),
+    [_FN3] = 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,    KC_TRNS, KC_TRNS, KC_TRNS
+    )
+
+};
diff --git a/keyboards/momoka_ergo/keymaps/via/rules.mk b/keyboards/momoka_ergo/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/momoka_ergo/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes