Skip to content

Commit

Permalink
Merge branch 'vial' into merge-2023-06-03
Browse files Browse the repository at this point in the history
  • Loading branch information
xyzz committed Jul 16, 2023
2 parents e0e9788 + b0778e3 commit c053564
Show file tree
Hide file tree
Showing 255 changed files with 14,290 additions and 437 deletions.
23 changes: 23 additions & 0 deletions keyboards/aeternus/omnibus/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
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 <http://www.gnu.org/licenses/>.
*/

#pragma once

#define RGBLED_NUM 22

#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
148 changes: 148 additions & 0 deletions keyboards/aeternus/omnibus/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
{
"manufacturer": "Aeternus",
"keyboard_name": "Omnibus",
"maintainer": "KnoblesseOblige",
"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 }
]
}
}
}
44 changes: 44 additions & 0 deletions keyboards/aeternus/omnibus/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/* 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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[0] = LAYOUT_all(
QK_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
)
};
7 changes: 7 additions & 0 deletions keyboards/aeternus/omnibus/keymaps/vial/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */

#pragma once

#define VIAL_KEYBOARD_UID {0x61, 0x6F, 0x6D, 0x6E, 0x69, 0x62, 0x75, 0x73}
#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 }
#define VIAL_UNLOCK_COMBO_COLS { 0, 11 }
53 changes: 53 additions & 0 deletions keyboards/aeternus/omnibus/keymaps/vial/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/* 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 <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H

#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
[1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
[2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[3] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
};
#endif

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[0] = LAYOUT_all(
QK_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
)
};
7 changes: 7 additions & 0 deletions keyboards/aeternus/omnibus/keymaps/vial/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
VIA_ENABLE = yes
VIAL_ENABLE = yes
LTO_ENABLE = yes
ENCODER_MAP_ENABLE = yes

QMK_SETTINGS = no
TAP_DANCE_ENABLE = no
Loading

0 comments on commit c053564

Please sign in to comment.