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

9 files changed, 508 insertions, 0 deletions

diff --git a/keyboards/cutie_club/novus/config.h b/keyboards/cutie_club/novus/config.h
new file mode 100644
index 0000000000..842ec901d0
--- /dev/null
+++ b/keyboards/cutie_club/novus/config.h
@@ -0,0 +1,56 @@
+/*
+Copyright 2022 Cutie Club
+
+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    0xFB9C
+#define PRODUCT_ID   0x3F42
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Cutie Club
+#define PRODUCT      Novus
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
+#define MATRIX_COL_PINS { B6, C6, C7, B2, B3, D0, D1, D2, D3, D7, B4, B5, D5, D4, D6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* 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
diff --git a/keyboards/cutie_club/novus/info.json b/keyboards/cutie_club/novus/info.json
new file mode 100644
index 0000000000..cae4e25c89
--- /dev/null
+++ b/keyboards/cutie_club/novus/info.json
@@ -0,0 +1,277 @@
+{
+    "keyboard_name": "Novus",
+    "url": "",
+    "maintainer": "Cutie Club",
+    "layouts": {
+        "LAYOUT_all": {
+            "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": 6,
+                    "y": 0
+                },
+                {
+                    "x": 7,
+                    "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": 14,
+                    "y": 0
+                },
+                {
+                    "x": 0,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "x": 1.5,
+                    "y": 1
+                },
+                {
+                    "x": 2.5,
+                    "y": 1
+                },
+                {
+                    "x": 3.5,
+                    "y": 1
+                },
+                {
+                    "x": 4.5,
+                    "y": 1
+                },
+                {
+                    "x": 5.5,
+                    "y": 1
+                },
+                {
+                    "x": 6.5,
+                    "y": 1
+                },
+                {
+                    "x": 7.5,
+                    "y": 1
+                },
+                {
+                    "x": 8.5,
+                    "y": 1
+                },
+                {
+                    "x": 9.5,
+                    "y": 1
+                },
+                {
+                    "x": 10.5,
+                    "y": 1
+                },
+                {
+                    "x": 11.5,
+                    "y": 1
+                },
+                {
+                    "x": 12.5,
+                    "y": 1
+                },
+                {
+                    "x": 13.5,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "x": 0,
+                    "y": 2,
+                    "w": 1.75
+                },
+                {
+                    "x": 1.75,
+                    "y": 2
+                },
+                {
+                    "x": 2.75,
+                    "y": 2
+                },
+                {
+                    "x": 3.75,
+                    "y": 2
+                },
+                {
+                    "x": 4.75,
+                    "y": 2
+                },
+                {
+                    "x": 5.75,
+                    "y": 2
+                },
+                {
+                    "x": 6.75,
+                    "y": 2
+                },
+                {
+                    "x": 7.75,
+                    "y": 2
+                },
+                {
+                    "x": 8.75,
+                    "y": 2
+                },
+                {
+                    "x": 9.75,
+                    "y": 2
+                },
+                {
+                    "x": 10.75,
+                    "y": 2
+                },
+                {
+                    "x": 11.75,
+                    "y": 2
+                },
+                {
+                    "x": 12.75,
+                    "y": 2,
+                    "w": 2.25
+                },
+                {
+                    "x": 0,
+                    "y": 3,
+                    "w": 2.25
+                },
+                {
+                    "x": 2.25,
+                    "y": 3
+                },
+                {
+                    "x": 3.25,
+                    "y": 3
+                },
+                {
+                    "x": 4.25,
+                    "y": 3
+                },
+                {
+                    "x": 5.25,
+                    "y": 3
+                },
+                {
+                    "x": 6.25,
+                    "y": 3
+                },
+                {
+                    "x": 7.25,
+                    "y": 3
+                },
+                {
+                    "x": 8.25,
+                    "y": 3
+                },
+                {
+                    "x": 9.25,
+                    "y": 3
+                },
+                {
+                    "x": 10.25,
+                    "y": 3
+                },
+                {
+                    "x": 11.25,
+                    "y": 3
+                },
+                {
+                    "x": 12.25,
+                    "y": 3,
+                    "w": 1.75
+                },
+                {
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "x": 0,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 1.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 2.5,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 3.75,
+                    "y": 4,
+                    "w": 6.25
+                },
+                {
+                    "x": 10,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 11.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 12.5,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 13.75,
+                    "y": 4,
+                    "w": 1.25
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/cutie_club/novus/keymaps/default/keymap.c b/keyboards/cutie_club/novus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..feeb27de8c
--- /dev/null
+++ b/keyboards/cutie_club/novus/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 Cutie Club
+ *
+ * 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_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_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_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_LSFT,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,      MO(1),
+        KC_LCTL,    KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RGUI,  KC_APP,       KC_RCTRL
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______, _______,
+        _______,    _______,     KC_UP,       _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______,
+        _______,    KC_LEFT,     KC_DOWN,     KC_RIGHT,    _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,                               _______,                                            _______,     _______,   _______,      _______
+    )
+};
diff --git a/keyboards/cutie_club/novus/keymaps/via/keymap.c b/keyboards/cutie_club/novus/keymaps/via/keymap.c
new file mode 100644
index 0000000000..24e55dc1cf
--- /dev/null
+++ b/keyboards/cutie_club/novus/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2022 Cutie Club
+ *
+ * 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_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_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_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_LSFT,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,      MO(1),
+        KC_LCTL,    KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RGUI,  KC_APP,       KC_RCTRL
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______, _______,
+        _______,    _______,     KC_UP,       _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______,
+        _______,    KC_LEFT,     KC_DOWN,     KC_RIGHT,    _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,                               _______,                                            _______,     _______,   _______,      _______
+    ),
+    [2] = LAYOUT_all(
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______, _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,                               _______,                                            _______,     _______,   _______,      _______
+    ),
+    [3] = LAYOUT_all(
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______, _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,                               _______,                                            _______,     _______,   _______,      _______
+    )
+};
diff --git a/keyboards/cutie_club/novus/keymaps/via/rules.mk b/keyboards/cutie_club/novus/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/cutie_club/novus/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/cutie_club/novus/novus.c b/keyboards/cutie_club/novus/novus.c
new file mode 100644
index 0000000000..2fe5fbfc8f
--- /dev/null
+++ b/keyboards/cutie_club/novus/novus.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Cutie Club
+ *
+ * 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 "novus.h"
diff --git a/keyboards/cutie_club/novus/novus.h b/keyboards/cutie_club/novus/novus.h
new file mode 100644
index 0000000000..31ed6a8ac6
--- /dev/null
+++ b/keyboards/cutie_club/novus/novus.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 Cutie Club
+ *
+ * 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"
+
+#define LAYOUT_all( \
+    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, \
+    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13,         \
+    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12,                 \
+    k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12,                 \
+    k04_00, k04_01, k04_02,                 k04_05,                         k04_09, k04_10, k04_11, k04_12                  \
+) { \
+    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14 }, \
+    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO  }, \
+    { k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, KC_NO,  KC_NO  }, \
+    { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, KC_NO,  KC_NO  }, \
+    { k04_00, k04_01, k04_02, KC_NO,  KC_NO,  k04_05, KC_NO,  KC_NO,  KC_NO,  k04_09, k04_10, k04_11, k04_12, KC_NO,  KC_NO  }  \
+}
diff --git a/keyboards/cutie_club/novus/readme.md b/keyboards/cutie_club/novus/readme.md
new file mode 100644
index 0000000000..94e284e33e
--- /dev/null
+++ b/keyboards/cutie_club/novus/readme.md
@@ -0,0 +1,26 @@
+# Novus
+
+![Novus](https://i.imgur.com/kuCDFb0h.png)
+
+Novus 60% Keyboard
+
+* Keyboard Maintainer: [Cutie Club](https://github.com/cutie-club)
+* Hardware Supported: Atmega32u4 based pcb for Novus keyboard
+* Hardware Availability: https://mechsandco.com/products/gb-novus60-keyboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cutie_club/novus:default
+
+Flashing example for this keyboard:
+
+    make cutie_club/novus: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
+
+Using the default keymaps you can enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard
+* **Physical reset button**: Press the button on the back of the PCB
\ No newline at end of file
diff --git a/keyboards/cutie_club/novus/rules.mk b/keyboards/cutie_club/novus/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/cutie_club/novus/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# 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
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+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