From 9425a1c5997d1c3d35f94ecad370642b1de798b7 Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Tue, 27 Jun 2023 09:25:30 -0400 Subject: [PATCH] refactor: aeternus/omnibus --- keyboards/aeternus/omnibus/config.h | 28 +- keyboards/aeternus/omnibus/info.json | 389 +++++++----------- .../aeternus/omnibus/keymaps/via/keymap.c | 44 -- .../aeternus/omnibus/keymaps/via/rules.mk | 1 - .../aeternus/omnibus/keymaps/vial/rules.mk | 4 +- keyboards/aeternus/omnibus/omnibus.c | 17 - keyboards/aeternus/omnibus/omnibus.h | 53 --- keyboards/aeternus/omnibus/rules.mk | 23 +- 8 files changed, 148 insertions(+), 411 deletions(-) delete mode 100644 keyboards/aeternus/omnibus/keymaps/via/keymap.c delete mode 100644 keyboards/aeternus/omnibus/keymaps/via/rules.mk delete mode 100644 keyboards/aeternus/omnibus/omnibus.c delete mode 100644 keyboards/aeternus/omnibus/omnibus.h diff --git a/keyboards/aeternus/omnibus/config.h b/keyboards/aeternus/omnibus/config.h index 01d376f0d5..0a7d501827 100644 --- a/keyboards/aeternus/omnibus/config.h +++ b/keyboards/aeternus/omnibus/config.h @@ -17,33 +17,7 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xAE7E -#define PRODUCT_ID 0x4F42 /* "OB" */ -#define DEVICE_VER 0x0001 -#define MANUFACTURER KnoblesseOblige -#define PRODUCT Omnibus - -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 - -#define MATRIX_ROW_PINS { B1, B0, D6, D4 } -#define MATRIX_COL_PINS { B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, D7 } - -#define DIODE_DIRECTION COL2ROW - -#define ENCODERS_PAD_A { B2 } -#define ENCODERS_PAD_B { B3 } - -#define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN -# define RGBLED_NUM 22 -# define RGBLIGHT_ANIMATIONS -#endif - -#define DEBOUNCE 5 +#define RGBLED_NUM 22 #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aeternus/omnibus/info.json b/keyboards/aeternus/omnibus/info.json index e1f62ecc27..5fa0b4f152 100644 --- a/keyboards/aeternus/omnibus/info.json +++ b/keyboards/aeternus/omnibus/info.json @@ -1,249 +1,148 @@ { - "keyboard_name": "omnibus", - "url": "", + "manufacturer": "Aeternus", + "keyboard_name": "Omnibus", "maintainer": "KnoblesseOblige", - "layouts": { - "LAYOUT": { - "layout": [ - { - "label": "k00", - "x": 0, - "y": 0 - }, - { - "label": "k01", - "x": 1, - "y": 0 - }, - { - "label": "k02", - "x": 2, - "y": 0 - }, - { - "label": "k03", - "x": 3, - "y": 0 - }, - { - "label": "k04", - "x": 4, - "y": 0 - }, - { - "label": "k05", - "x": 5, - "y": 0 - }, - { - "label": "k06", - "x": 6, - "y": 0 - }, - { - "label": "k07", - "x": 7, - "y": 0 - }, - { - "label": "k08", - "x": 8, - "y": 0 - }, - { - "label": "k09", - "x": 9, - "y": 0 - }, - { - "label": "k0a", - "x": 10, - "y": 0 - }, - { - "label": "k0b", - "x": 11, - "y": 0, - "w": 1.75 - }, - { - "label": "k37", - "x": 7, - "y": 3 - }, - { - "label": "k10", - "x": 0, - "y": 1 - }, - { - "label": "k11", - "x": 1, - "y": 1 - }, - { - "label": "k12", - "x": 2, - "y": 1 - }, - { - "label": "k13", - "x": 3, - "y": 1 - }, - { - "label": "k14", - "x": 4, - "y": 1 - }, - { - "label": "k15", - "x": 5, - "y": 1 - }, - { - "label": "k16", - "x": 6, - "y": 1 - }, - { - "label": "k17", - "x": 7, - "y": 1 - }, - { - "label": "k18", - "x": 8, - "y": 1 - }, - { - "label": "k19", - "x": 9, - "y": 1 - }, - { - "label": "k1a", - "x": 10, - "y": 1 - }, - { - "label": "k1b", - "x": 11, - "y": 1 - }, - { - "label": "k20", - "x": 0, - "y": 2 - }, - { - "label": "k21", - "x": 1, - "y": 2 - }, - { - "label": "k22", - "x": 2, - "y": 2 - }, - { - "label": "k23", - "x": 3, - "y": 2 - }, - { - "label": "k24", - "x": 4, - "y": 2 - }, - { - "label": "k25", - "x": 5, - "y": 2 - }, - { - "label": "k26", - "x": 6, - "y": 2 - }, - { - "label": "k27", - "x": 7, - "y": 2 - }, - { - "label": "k28", - "x": 8, - "y": 2 - }, - { - "label": "k29", - "x": 9, - "y": 2 - }, - { - "label": "k2a", - "x": 10, - "y": 2 - }, - { - "label": "k2b", - "x": 11, - "y": 2 - }, - - - { - "label": "k30", - "x": 0, - "y": 3 - }, - { - "label": "k31", - "x": 1, - "y": 3 - }, - { - "label": "k32", - "x": 2, - "y": 3 - }, - { - "label": "k33", - "x": 3, - "y": 3 - }, - { - "label": "k34", - "x": 4, - "y": 3 - }, - { - "label": "k36", - "x": 6, - "y": 3 - }, - { - "label": "k38", - "x": 8, - "y": 3 - }, - { - "label": "k39", - "x": 9, - "y": 3 - }, - { - "label": "k3a", - "x": 10, - "y": 3 - }, - { - "label": "k3b", - "x": 11, - "y": 3 - } + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B2", "pin_b": "B3"} ] - } + }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D7"], + "rows": ["B1", "B0", "D6", "D4"] + }, + "processor": "atmega32u4", + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "pin": "B7" + }, + "url": "", + "usb": { + "device_version": "0.0.1", + "pid": "0x4F42", + "vid": "0xAE7E" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "1u", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "1u", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "1u", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "1u", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "1u", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "1u", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "1u", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "1u", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "1u", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "1u", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "1u", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "nono", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "enc", "matrix": [3, 7], "w": 0.75, "x": 12, "y": 0 }, + { "label": "1.25u", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, + { "label": "1u", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, + { "label": "1u", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, + { "label": "1u", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, + { "label": "1u", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, + { "label": "1u", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, + { "label": "1u", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 }, + { "label": "1u", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 }, + { "label": "1u", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 }, + { "label": "1u", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 }, + { "label": "1u", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 }, + { "label": "1.5u", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 }, + { "label": "1.75u", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "1u", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "1u", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "1u", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "1u", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "1u", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "1u", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "1u", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "1u", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "1u", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": "1u", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "1u", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "1u", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, + { "label": "1u", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, + { "label": "1u", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, + { "label": "1u", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, + { "label": "2.25u", "matrix": [3, 4], "w": 2.25, "x": 4, "y": 3 }, + { "label": "2u", "matrix": [3, 6], "w": 2, "x": 6.25, "y": 3 }, + { "label": "1.5u", "matrix": [3, 8], "w": 1.5, "x": 8.25, "y": 3 }, + { "label": "1u", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3 }, + { "label": "1u", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3 }, + { "label": "1u", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3 } + ] + }, + "LAYOUT_southpaw": { + "layout": [ + { "label": "1u", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "1u", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "1u", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "1u", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "1u", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "1u", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "1u", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "1u", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "1u", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "1u", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "1u", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "nono", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0 }, + { "label": "1.25u", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, + { "label": "1u", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, + { "label": "1u", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, + { "label": "1u", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, + { "label": "1u", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, + { "label": "1u", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1 }, + { "label": "1u", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1 }, + { "label": "1u", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1 }, + { "label": "1u", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1 }, + { "label": "1u", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1 }, + { "label": "1u", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1 }, + { "label": "1.5u", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1 }, + { "label": "1.75u", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "1u", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "1u", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "1u", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "1u", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "1u", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "1u", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "1u", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "1u", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "1u", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": "1u", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "1u", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "1u", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, + { "label": "1u", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, + { "label": "1u", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, + { "label": "1u", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, + { "label": "2.25u", "matrix": [3, 4], "w": 2.25, "x": 4, "y": 3 }, + { "label": "2u", "matrix": [3, 6], "w": 2, "x": 6.25, "y": 3 }, + { "label": "1.5u", "matrix": [3, 8], "w": 1.5, "x": 8.25, "y": 3 }, + { "label": "1u", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3 }, + { "label": "1u", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3 }, + { "label": "1u", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3 } + ] + } } - } +} diff --git a/keyboards/aeternus/omnibus/keymaps/via/keymap.c b/keyboards/aeternus/omnibus/keymaps/via/keymap.c deleted file mode 100644 index 41e2be18b9..0000000000 --- a/keyboards/aeternus/omnibus/keymaps/via/keymap.c +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 KnoblesseOblige - * - * 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 . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [0] = LAYOUT_all( - KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL, - LCTL_T(KC_TAB), 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_ENT, - MO(1), KC_LALT, KC_LGUI, MO(2), KC_SPC, KC_SPC, MO(3), MO(1), TT(2), MO(2) - ), - [1] = LAYOUT_all( - KC_GRAVE, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - 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 - ), - [2] = LAYOUT_all( - 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_UP, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [3] = LAYOUT_all( - KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, 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/aeternus/omnibus/keymaps/via/rules.mk b/keyboards/aeternus/omnibus/keymaps/via/rules.mk deleted file mode 100644 index 036bd6d1c3..0000000000 --- a/keyboards/aeternus/omnibus/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/aeternus/omnibus/keymaps/vial/rules.mk b/keyboards/aeternus/omnibus/keymaps/vial/rules.mk index bacb882dc8..3e91f08bde 100644 --- a/keyboards/aeternus/omnibus/keymaps/vial/rules.mk +++ b/keyboards/aeternus/omnibus/keymaps/vial/rules.mk @@ -1,7 +1,7 @@ VIA_ENABLE = yes VIAL_ENABLE = yes +LTO_ENABLE = yes +ENCODER_MAP_ENABLE = yes QMK_SETTINGS = no -LTO_ENABLE = yes TAP_DANCE_ENABLE = no -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/aeternus/omnibus/omnibus.c b/keyboards/aeternus/omnibus/omnibus.c deleted file mode 100644 index 6fd5199509..0000000000 --- a/keyboards/aeternus/omnibus/omnibus.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 KnoblesseOblige - * - * 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 . - */ - -#include "omnibus.h" diff --git a/keyboards/aeternus/omnibus/omnibus.h b/keyboards/aeternus/omnibus/omnibus.h deleted file mode 100644 index ec716e9ae5..0000000000 --- a/keyboards/aeternus/omnibus/omnibus.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2021 KnoblesseOblige - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -#define kxx KC_NO - -/* 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_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k37, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ - k30, k31, k32, k33, k34, k36, k38, k39, k3a, k3b \ -) { \ - { 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 }, \ - { k30, k31, k32, k33, k34, kxx, k36, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_all_no_encoder( \ - 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, \ - k30, k31, k32, k33, k34, k36, k38, k39, k3a, k3b \ -) { \ - { 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 }, \ - { k30, k31, k32, k33, k34, kxx, k36, kxx, k38, k39, k3a, k3b } \ -} diff --git a/keyboards/aeternus/omnibus/rules.mk b/keyboards/aeternus/omnibus/rules.mk index c28edc9134..6e7633bfe0 100644 --- a/keyboards/aeternus/omnibus/rules.mk +++ b/keyboards/aeternus/omnibus/rules.mk @@ -1,22 +1 @@ -# 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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = no # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes +# This file intentionally left blank