From 265b96a12ca1580e0cb8c3b5bac3687f005e4f30 Mon Sep 17 00:00:00 2001 From: makenova Date: Thu, 10 Mar 2022 12:10:05 -0700 Subject: [Keyboard] Add omega4 (#16464) --- .../makenova/omega/omega4/keymaps/default/config.h | 12 ++++ .../makenova/omega/omega4/keymaps/default/keymap.c | 64 +++++++++++++++++++++ .../omega/omega4/keymaps/default/readme.md | 1 + .../makenova/omega/omega4/keymaps/default/rules.mk | 1 + .../omega/omega4/keymaps/default_10u_bar/config.h | 12 ++++ .../omega/omega4/keymaps/default_10u_bar/keymap.c | 65 ++++++++++++++++++++++ .../omega/omega4/keymaps/default_10u_bar/readme.md | 1 + .../omega/omega4/keymaps/default_10u_bar/rules.mk | 1 + .../omega/omega4/keymaps/default_6u_bar/config.h | 12 ++++ .../omega/omega4/keymaps/default_6u_bar/keymap.c | 64 +++++++++++++++++++++ .../omega/omega4/keymaps/default_6u_bar/readme.md | 1 + .../omega/omega4/keymaps/default_6u_bar/rules.mk | 1 + 12 files changed, 235 insertions(+) create mode 100644 keyboards/makenova/omega/omega4/keymaps/default/config.h create mode 100644 keyboards/makenova/omega/omega4/keymaps/default/keymap.c create mode 100644 keyboards/makenova/omega/omega4/keymaps/default/readme.md create mode 100644 keyboards/makenova/omega/omega4/keymaps/default/rules.mk create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_10u_bar/rules.mk create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_6u_bar/rules.mk (limited to 'keyboards/makenova/omega/omega4/keymaps') 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 -- cgit v1.2.3