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

18 files changed, 394 insertions, 0 deletions

diff --git a/keyboards/makenova/omega/omega4/config.h b/keyboards/makenova/omega/omega4/config.h
new file mode 100644
index 0000000000..acd482324d
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/config.h
@@ -0,0 +1,26 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/info.json
new file mode 100644
index 0000000000..5e9bf22595
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/info.json
@@ -0,0 +1,37 @@
+{
+    "manufacturer": "makenova",
+    "keyboard_name": "omega4",
+    "maintainer": "makenova",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "F4", "B5", "F5", "F6", "B6", "B2", "B3", "B1", "F7"],
+        "rows": ["C6", "D7", "E6", "B4"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/makenova/omega",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"", "x":0.75, "y":3}, {"label":"", "x":1.75, "y":3}, {"label":"Space", "x":2.75, "y":3, "w":6}, {"label":"", "x":8.75, "y":3}, {"label":"", "x":9.75, "y":3}]
+        },
+        "LAYOUT_6u_bar": {
+            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"", "x":0.75, "y":3}, {"label":"Space", "x":1.75, "y":3, "w":8}, {"label":"", "x":9.75, "y":3}]
+        },
+        "LAYOUT_10u_bar": {
+            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"Space", "x":0.75, "y":3, "w":10}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/config.h b/keyboards/makenova/omega/omega4/keymaps/default/config.h
new file mode 100644
index 0000000000..1d2dd05351
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default/config.h
@@ -0,0 +1,12 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 4
+#    define COMBO_TERM 50
+#endif
+
+#define TAPPING_TERM 150
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
new file mode 100644
index 0000000000..26c5ada806
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
@@ -0,0 +1,64 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// ctrl
+#define CTRL_S LCTL_T(KC_S)
+#define CTRL_L RCTL_T(KC_L)
+// alt
+#define ALT_D LALT_T(KC_D)
+#define ALT_K RALT_T(KC_K)
+//gui
+#define GUI_F LGUI_T(KC_F)
+#define GUI_J RGUI_T(KC_J)
+// shift
+#define SFT_A LSFT_T(KC_A)
+#define SFT_SCLN RSFT_T(KC_SCLN)
+// layers
+#define OS_SFT OSM(MOD_RSFT)
+#define OS_3 OSL(3)
+#define OS_4 OSL(4)
+#define LT1_SPC LT(1,KC_SPC)
+#define LT2_ESC LT(2,KC_ESC)
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {GUI_J, ALT_K,   COMBO_END};
+const uint16_t PROGMEM combo_ent[]  = {ALT_D, GUI_F,   COMBO_END};
+const uint16_t PROGMEM combo_tab[]  = {KC_C,  KC_V,    COMBO_END};
+const uint16_t PROGMEM combo_del[]  = {KC_M,  KC_COMM, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  COMBO(combo_bspc,KC_BSPC), // 1
+  COMBO(combo_ent,KC_ENT), // 2
+  COMBO(combo_tab,KC_TAB), // 3
+  COMBO(combo_del,KC_DEL), // 4
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,  KC_Y, KC_U,  KC_I,    KC_O,   KC_P,
+    SFT_A,   CTRL_S,  ALT_D,   GUI_F, KC_G,  KC_H, GUI_J, ALT_K,   CTRL_L, SFT_SCLN,
+    KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,  KC_N, KC_M,  KC_COMM, KC_DOT, KC_SLSH,
+    OS_4,    LT2_ESC, LT1_SPC, OS_3,  OS_SFT
+    ),
+    LAYOUT(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_QUOT,
+    KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_MINS, KC_EQL,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    LAYOUT(
+    KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO,
+    KC_TILDE, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_UNDS, KC_PLUS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    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_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU,  KC_TRNS,
+    RESET,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/readme.md b/keyboards/makenova/omega/omega4/keymaps/default/readme.md
new file mode 100644
index 0000000000..9e5e5aeb1e
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for omega4
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/rules.mk b/keyboards/makenova/omega/omega4/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
new file mode 100644
index 0000000000..1d2dd05351
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
@@ -0,0 +1,12 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 4
+#    define COMBO_TERM 50
+#endif
+
+#define TAPPING_TERM 150
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
new file mode 100644
index 0000000000..b60275d3ab
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
@@ -0,0 +1,65 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// ctrl
+#define CTRL_S LCTL_T(KC_S)
+#define CTRL_L RCTL_T(KC_L)
+// alt
+#define ALT_D LALT_T(KC_D)
+#define ALT_K RALT_T(KC_K)
+//gui
+#define GUI_F LGUI_T(KC_F)
+#define GUI_J RGUI_T(KC_J)
+// shift
+#define SFT_A LSFT_T(KC_A)
+#define SFT_SCLN RSFT_T(KC_SCLN)
+// layers
+#define OS_SFT OSM(MOD_RSFT)
+#define OS_3 OSL(3)
+#define OS_4 OSL(4)
+#define LT1_SPC LT(1,KC_SPC)
+#define LT2_Z LT(2,KC_Z)
+#define LT3_SLSH LT(3,KC_SLSH)
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {GUI_J, ALT_K,   COMBO_END};
+const uint16_t PROGMEM combo_ent[]  = {ALT_D, GUI_F,   COMBO_END};
+const uint16_t PROGMEM combo_tab[]  = {KC_C,  KC_V,    COMBO_END};
+const uint16_t PROGMEM combo_del[]  = {KC_M,  KC_COMM, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  COMBO(combo_bspc,KC_BSPC), // 1
+  COMBO(combo_ent,KC_ENT), // 2
+  COMBO(combo_tab,KC_TAB), // 3
+  COMBO(combo_del,KC_DEL), // 4
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_10u_bar(
+    KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,  KC_Y, KC_U,  KC_I,    KC_O,   KC_P,
+    SFT_A,   CTRL_S,  ALT_D,   GUI_F, KC_G,  KC_H, GUI_J, ALT_K,   CTRL_L, SFT_SCLN,
+    LT2_Z,   KC_X,    KC_C,    KC_V,  KC_B,  KC_N, KC_M,  KC_COMM, KC_DOT, LT3_SLSH,
+    LT1_SPC
+    ),
+    LAYOUT_10u_bar(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_QUOT,
+    KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_MINS, KC_EQL,   KC_TRNS,
+    KC_TRNS
+    ),
+    LAYOUT_10u_bar(
+    KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO,
+    KC_TRNS,  KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_UNDS, KC_PLUS, KC_TILDE,
+    KC_TRNS
+    ),
+    LAYOUT_10u_bar(
+    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_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU,  KC_TRNS,
+    RESET
+    )
+};
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md
new file mode 100644
index 0000000000..3089385415
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md
@@ -0,0 +1 @@
+# The default keymap for 10u spacebar omega4
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/rules.mk b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
new file mode 100644
index 0000000000..1d2dd05351
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
@@ -0,0 +1,12 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 4
+#    define COMBO_TERM 50
+#endif
+
+#define TAPPING_TERM 150
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
new file mode 100644
index 0000000000..477582613c
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
@@ -0,0 +1,64 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// ctrl
+#define CTRL_S LCTL_T(KC_S)
+#define CTRL_L RCTL_T(KC_L)
+// alt
+#define ALT_D LALT_T(KC_D)
+#define ALT_K RALT_T(KC_K)
+//gui
+#define GUI_F LGUI_T(KC_F)
+#define GUI_J RGUI_T(KC_J)
+// shift
+#define SFT_A LSFT_T(KC_A)
+#define SFT_SCLN RSFT_T(KC_SCLN)
+// layers
+#define OS_SFT OSM(MOD_RSFT)
+#define OS_3 OSL(3)
+#define OS_4 OSL(4)
+#define LT1_SPC LT(1,KC_SPC)
+#define LT2_ESC LT(2,KC_ESC)
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {GUI_J, ALT_K,   COMBO_END};
+const uint16_t PROGMEM combo_ent[]  = {ALT_D, GUI_F,   COMBO_END};
+const uint16_t PROGMEM combo_tab[]  = {KC_C,  KC_V,    COMBO_END};
+const uint16_t PROGMEM combo_del[]  = {KC_M,  KC_COMM, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  COMBO(combo_bspc,KC_BSPC), // 1
+  COMBO(combo_ent,KC_ENT), // 2
+  COMBO(combo_tab,KC_TAB), // 3
+  COMBO(combo_del,KC_DEL), // 4
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_6u_bar(
+    KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,  KC_Y, KC_U,  KC_I,    KC_O,   KC_P,
+    SFT_A,   CTRL_S,  ALT_D,   GUI_F, KC_G,  KC_H, GUI_J, ALT_K,   CTRL_L, SFT_SCLN,
+    KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,  KC_N, KC_M,  KC_COMM, KC_DOT, KC_SLSH,
+    LT2_ESC, LT1_SPC, OS_3
+    ),
+    LAYOUT_6u_bar(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_QUOT,
+    KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_MINS, KC_EQL,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    LAYOUT_6u_bar(
+    KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO,
+    KC_TILDE, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_UNDS, KC_PLUS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS
+    ),
+    LAYOUT_6u_bar(
+    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_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU,  KC_TRNS,
+    RESET,   KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md
new file mode 100644
index 0000000000..31f6b4c019
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md
@@ -0,0 +1 @@
+# The default keymap for 6u spacebar omega4
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/rules.mk b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/makenova/omega/omega4/omega4.c b/keyboards/makenova/omega/omega4/omega4.c
new file mode 100644
index 0000000000..b64ae638bd
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/omega4.c
@@ -0,0 +1,4 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "omega4.h"
diff --git a/keyboards/makenova/omega/omega4/omega4.h b/keyboards/makenova/omega/omega4/omega4.h
new file mode 100644
index 0000000000..754b58ee35
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/omega4.h
@@ -0,0 +1,51 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+    K30, K31,                K35,           K38, K39 \
+){ \
+    { K00, K01, K02,   K03,   K04,   K05, K06,   K07,   K08, K09 }, \
+    { K10, K11, K12,   K13,   K14,   K15, K16,   K17,   K18, K19 }, \
+    { K20, K21, K22,   K23,   K24,   K25, K26,   K27,   K28, K29 }, \
+    { K30, K31, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, K39 } \
+}
+
+#define LAYOUT_6u_bar( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+    K30,                     K35,                K39 \
+){ \
+    { K00,   K01,   K02,   K03,   K04,   K05, K06,   K07,   K08,   K09 }, \
+    { K10,   K11,   K12,   K13,   K14,   K15, K16,   K17,   K18,   K19 }, \
+    { K20,   K21,   K22,   K23,   K24,   K25, K26,   K27,   K28,   K29 }, \
+    { K30,   KC_NO, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, K39 } \
+}
+
+#define LAYOUT_10u_bar( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
+                             K35                      \
+){ \
+    { K00,   K01,   K02,   K03,   K04,   K05, K06,   K07,   K08,   K09 }, \
+    { K10,   K11,   K12,   K13,   K14,   K15, K16,   K17,   K18,   K19 }, \
+    { K20,   K21,   K22,   K23,   K24,   K25, K26,   K27,   K28,   K29 }, \
+    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
diff --git a/keyboards/makenova/omega/omega4/readme.md b/keyboards/makenova/omega/omega4/readme.md
new file mode 100644
index 0000000000..0b4db785d5
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/readme.md
@@ -0,0 +1,23 @@
+# omega4
+
+![omega4](https://i.imgur.com/tV4iCoD.png)
+
+uniform stagger 4 row board.
+
+-   Keyboard Maintainer: [makenova](https://github.com/makenova)
+-   Hardware Supported: [omega4](https://github.com/makenova/omega)
+-   Hardware Availability: https://www.cbkbd.com/product/omega4-keyboard-kit
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb makenova/omega/omega4 -km default
+
+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/makenova/omega/omega4/rules.mk b/keyboards/makenova/omega/omega4/rules.mk
new file mode 100644
index 0000000000..515ca5621f
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/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
+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