aboutsummaryrefslogtreecommitdiff
path: root/keyboards/viktus
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/viktus')
-rw-r--r--keyboards/viktus/at101_bh/keyboard.json (renamed from keyboards/viktus/at101_bh/info.json)8
-rw-r--r--keyboards/viktus/at101_bh/keymaps/default/keymap.c2
-rw-r--r--keyboards/viktus/at101_bh/rules.mk12
-rw-r--r--keyboards/viktus/minne/info.json365
-rw-r--r--keyboards/viktus/minne/keyboard.json365
-rw-r--r--keyboards/viktus/minne/rules.mk1
-rw-r--r--keyboards/viktus/minne_topre/ec.c28
-rw-r--r--keyboards/viktus/minne_topre/info.json256
-rw-r--r--keyboards/viktus/minne_topre/keyboard.json253
-rw-r--r--keyboards/viktus/omnikey_bh/keyboard.json (renamed from keyboards/viktus/omnikey_bh/info.json)8
-rw-r--r--keyboards/viktus/omnikey_bh/keymaps/default/keymap.c25
-rw-r--r--keyboards/viktus/omnikey_bh/rules.mk12
-rw-r--r--keyboards/viktus/osav2/info.json474
-rw-r--r--keyboards/viktus/osav2/keyboard.json474
-rw-r--r--keyboards/viktus/osav2/rules.mk1
-rw-r--r--keyboards/viktus/osav2_numpad/keyboard.json (renamed from keyboards/viktus/osav2_numpad/info.json)0
-rw-r--r--keyboards/viktus/osav2_numpad/rules.mk1
-rw-r--r--keyboards/viktus/osav2_numpad_topre/ec.c28
-rw-r--r--keyboards/viktus/osav2_numpad_topre/keyboard.json (renamed from keyboards/viktus/osav2_numpad_topre/info.json)0
-rw-r--r--keyboards/viktus/osav2_topre/ec.c28
-rw-r--r--keyboards/viktus/osav2_topre/keyboard.json (renamed from keyboards/viktus/osav2_topre/info.json)0
-rw-r--r--keyboards/viktus/smolka/keyboard.json (renamed from keyboards/viktus/smolka/info.json)9
-rw-r--r--keyboards/viktus/smolka/keymaps/default/keymap.c2
-rw-r--r--keyboards/viktus/smolka/keymaps/via/keymap.c2
-rw-r--r--keyboards/viktus/smolka/rules.mk13
-rw-r--r--keyboards/viktus/sp111/keyboard.json (renamed from keyboards/viktus/sp111/info.json)9
-rw-r--r--keyboards/viktus/sp111/matrix.c18
-rw-r--r--keyboards/viktus/sp111/rules.mk15
-rw-r--r--keyboards/viktus/sp111/sp111.c16
-rw-r--r--keyboards/viktus/sp111_v2/keyboard.json (renamed from keyboards/viktus/sp111_v2/info.json)0
-rw-r--r--keyboards/viktus/sp111_v2/rules.mk1
-rw-r--r--keyboards/viktus/sp111_v2/sp111_v2.c4
-rw-r--r--keyboards/viktus/sp_mini/keyboard.json (renamed from keyboards/viktus/sp_mini/info.json)11
-rw-r--r--keyboards/viktus/sp_mini/keymaps/default/keymap.c2
-rw-r--r--keyboards/viktus/sp_mini/keymaps/via/keymap.c2
-rw-r--r--keyboards/viktus/sp_mini/rules.mk14
-rw-r--r--keyboards/viktus/sp_mini/sp_mini.c4
-rw-r--r--keyboards/viktus/styrka/keyboard.json (renamed from keyboards/viktus/styrka/info.json)8
-rw-r--r--keyboards/viktus/styrka/keymaps/default/keymap.c2
-rw-r--r--keyboards/viktus/styrka/keymaps/via/keymap.c2
-rw-r--r--keyboards/viktus/styrka/rules.mk12
-rw-r--r--keyboards/viktus/styrka_topre/ec.c28
-rw-r--r--keyboards/viktus/styrka_topre/keyboard.json (renamed from keyboards/viktus/styrka_topre/info.json)0
-rw-r--r--keyboards/viktus/z150_bh/keyboard.json (renamed from keyboards/viktus/z150_bh/info.json)8
-rw-r--r--keyboards/viktus/z150_bh/keymaps/default/keymap.c2
-rw-r--r--keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c2
-rw-r--r--keyboards/viktus/z150_bh/rules.mk12
47 files changed, 1247 insertions, 1292 deletions
diff --git a/keyboards/viktus/at101_bh/info.json b/keyboards/viktus/at101_bh/keyboard.json
index 23148f16cf..b950aec2d0 100644
--- a/keyboards/viktus/at101_bh/info.json
+++ b/keyboards/viktus/at101_bh/keyboard.json
@@ -9,6 +9,14 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "D2", "D3"],
"rows": ["F0", "F1", "F4", "D4", "F6", "F5", "F7", "B6", "B5", "D5", "C7", "C6"]
diff --git a/keyboards/viktus/at101_bh/keymaps/default/keymap.c b/keyboards/viktus/at101_bh/keymaps/default/keymap.c
index d05e549d21..cef4ad93cb 100644
--- a/keyboards/viktus/at101_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/at101_bh/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
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,
- QK_BOOT, 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,
+ QK_BOOT, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/viktus/at101_bh/rules.mk b/keyboards/viktus/at101_bh/rules.mk
deleted file mode 100644
index 06845b8e21..0000000000
--- a/keyboards/viktus/at101_bh/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/viktus/minne/info.json b/keyboards/viktus/minne/info.json
deleted file mode 100644
index 41efd58676..0000000000
--- a/keyboards/viktus/minne/info.json
+++ /dev/null
@@ -1,365 +0,0 @@
-{
- "manufacturer": "Viktus Design LLC",
- "keyboard_name": "Viktus Minne",
- "maintainer": "BlindAssassin111",
- "url": "https://viktus.design",
- "usb": {
- "device_version": "1.0.0",
- "vid": "0x5644",
- "pid": "0x4D49"
- },
- "bootloader": "atmel-dfu",
- "processor": "atmega32u4",
- "features": {
- "rgblight": true,
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true
- },
- "bootmagic": {
- "matrix": [1, 0]
- },
- "build": {
- "lto": true
- },
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["B7", "F7", "D5", "D3", "D2", "D1", "D0"],
- "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "C6", "C7"]
- },
- "rgblight": {
- "led_count": 14,
- "max_brightness": 191,
- "animations": {
- "breathing": true,
- "rainbow_swirl": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "pin": "F6"
- },
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
- {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
- {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
- {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
- {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
- {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
- {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3},
- {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3},
- {"label": "K72", "matrix": [7, 2], "w": 1.25, "x": 4.625, "y": 3},
- {"label": "K73", "matrix": [7, 3], "w": 1, "x": 5.875, "y": 3},
- {"label": "K63", "matrix": [6, 3], "w": 1.25, "x": 6.875, "y": 3},
- {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_dual175u": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
- {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
- {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
- {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
- {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
- {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
- {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3},
- {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3},
- {"label": "K72", "matrix": [7, 2], "w": 1.75, "x": 4.625, "y": 3},
- {"label": "K63", "matrix": [6, 3], "w": 1.75, "x": 6.375, "y": 3},
- {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_275_225u": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
- {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
- {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
- {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
- {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
- {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
- {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
- {"label": "K61", "matrix": [6, 1], "w": 1.5, "x": 2.375, "y": 3},
- {"label": "K72", "matrix": [7, 2], "w": 2.75, "x": 3.875, "y": 3},
- {"label": "K63", "matrix": [6, 3], "w": 2.25, "x": 6.625, "y": 3},
- {"label": "K74", "matrix": [7, 4], "w": 1.5, "x": 8.875, "y": 3},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_dual3u": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
- {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
- {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
- {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
- {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
- {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
- {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3},
- {"label": "K72", "matrix": [7, 2], "w": 3, "x": 3.375, "y": 3},
- {"label": "K63", "matrix": [6, 3], "w": 3, "x": 6.375, "y": 3},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_6u": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
- {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
- {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
- {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
- {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
- {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
- {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 1.375, "y": 3},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 2.375, "y": 3},
- {"label": "K73", "matrix": [7, 3], "w": 6, "x": 3.375, "y": 3},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 9.375, "y": 3},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_7u": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
- {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
- {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
- {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
- {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
- {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
- {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1.5, "x": 1.375, "y": 3},
- {"label": "K73", "matrix": [7, 3], "w": 7, "x": 2.875, "y": 3},
- {"label": "K75", "matrix": [7, 5], "w": 1.5, "x": 9.875, "y": 3}
- ]
- },
- "LAYOUT_10u": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3, "y": 0},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 4, "y": 0},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 5, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 6, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 7, "y": 0},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 8, "y": 0},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 9, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 10, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
- {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 2.25, "y": 1},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3.25, "y": 1},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 4.25, "y": 1},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 5.25, "y": 1},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 6.25, "y": 1},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 7.25, "y": 1},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 8.25, "y": 1},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 9.25, "y": 1},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 10.25, "y": 1},
- {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K41", "matrix": [4, 1], "w": 1, "x": 2.75, "y": 2},
- {"label": "K42", "matrix": [4, 2], "w": 1, "x": 3.75, "y": 2},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 4.75, "y": 2},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 5.75, "y": 2},
- {"label": "K43", "matrix": [4, 3], "w": 1, "x": 6.75, "y": 2},
- {"label": "K44", "matrix": [4, 4], "w": 1, "x": 7.75, "y": 2},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 8.75, "y": 2},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 9.75, "y": 2},
- {"label": "K45", "matrix": [4, 5], "w": 1, "x": 10.75, "y": 2},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 11.75, "y": 2},
- {"label": "K73", "matrix": [7, 3], "w": 10, "x": 1.375, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/viktus/minne/keyboard.json b/keyboards/viktus/minne/keyboard.json
new file mode 100644
index 0000000000..bfb3f8a8a6
--- /dev/null
+++ b/keyboards/viktus/minne/keyboard.json
@@ -0,0 +1,365 @@
+{
+ "manufacturer": "Viktus Design LLC",
+ "keyboard_name": "Viktus Minne",
+ "maintainer": "BlindAssassin111",
+ "url": "https://viktus.design",
+ "usb": {
+ "device_version": "1.0.0",
+ "vid": "0x5644",
+ "pid": "0x4D49"
+ },
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "features": {
+ "rgblight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "bootmagic": {
+ "matrix": [1, 0]
+ },
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B7", "F7", "D5", "D3", "D2", "D1", "D0"],
+ "rows": ["B6", "B5", "B4", "D7", "D6", "D4", "C6", "C7"]
+ },
+ "rgblight": {
+ "led_count": 14,
+ "max_brightness": 191,
+ "animations": {
+ "breathing": true,
+ "rainbow_swirl": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "pin": "F6"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+ {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+ {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+ {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+ {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+ {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+ {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+ {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+ {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+ {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+ {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+ {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+ {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
+ {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+ {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+ {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+ {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+ {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+ {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+ {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+ {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+ {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+ {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+ {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
+ {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3},
+ {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3},
+ {"label": "K72", "matrix": [7, 2], "w": 1.25, "x": 4.625, "y": 3},
+ {"label": "K73", "matrix": [7, 3], "x": 5.875, "y": 3},
+ {"label": "K63", "matrix": [6, 3], "w": 1.25, "x": 6.875, "y": 3},
+ {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3},
+ {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3},
+ {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_dual175u": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+ {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+ {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+ {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+ {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+ {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+ {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+ {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+ {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+ {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+ {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+ {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+ {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
+ {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+ {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+ {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+ {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+ {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+ {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+ {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+ {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+ {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+ {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+ {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
+ {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3},
+ {"label": "K62", "matrix": [6, 2], "w": 1.25, "x": 3.375, "y": 3},
+ {"label": "K72", "matrix": [7, 2], "w": 1.75, "x": 4.625, "y": 3},
+ {"label": "K63", "matrix": [6, 3], "w": 1.75, "x": 6.375, "y": 3},
+ {"label": "K64", "matrix": [6, 4], "w": 1.25, "x": 8.125, "y": 3},
+ {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3},
+ {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_275_225u": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+ {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+ {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+ {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+ {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+ {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+ {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+ {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+ {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+ {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+ {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+ {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+ {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
+ {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+ {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+ {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+ {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+ {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+ {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+ {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+ {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+ {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+ {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+ {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
+ {"label": "K61", "matrix": [6, 1], "w": 1.5, "x": 2.375, "y": 3},
+ {"label": "K72", "matrix": [7, 2], "w": 2.75, "x": 3.875, "y": 3},
+ {"label": "K63", "matrix": [6, 3], "w": 2.25, "x": 6.625, "y": 3},
+ {"label": "K74", "matrix": [7, 4], "w": 1.5, "x": 8.875, "y": 3},
+ {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_dual3u": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+ {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+ {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+ {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+ {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+ {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+ {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+ {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+ {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+ {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+ {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+ {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+ {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
+ {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+ {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+ {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+ {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+ {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+ {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+ {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+ {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+ {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+ {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+ {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
+ {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3},
+ {"label": "K72", "matrix": [7, 2], "w": 3, "x": 3.375, "y": 3},
+ {"label": "K63", "matrix": [6, 3], "w": 3, "x": 6.375, "y": 3},
+ {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3},
+ {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_6u": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+ {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+ {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+ {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+ {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+ {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+ {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+ {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+ {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+ {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+ {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+ {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+ {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
+ {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+ {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+ {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+ {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+ {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+ {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+ {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+ {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+ {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+ {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+ {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 1.375, "y": 3},
+ {"label": "K61", "matrix": [6, 1], "x": 2.375, "y": 3},
+ {"label": "K73", "matrix": [7, 3], "w": 6, "x": 3.375, "y": 3},
+ {"label": "K74", "matrix": [7, 4], "x": 9.375, "y": 3},
+ {"label": "K75", "matrix": [7, 5], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_7u": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+ {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+ {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+ {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+ {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+ {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+ {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+ {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+ {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+ {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+ {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+ {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+ {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
+ {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+ {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+ {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+ {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+ {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+ {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+ {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+ {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+ {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+ {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+ {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "w": 1.5, "x": 1.375, "y": 3},
+ {"label": "K73", "matrix": [7, 3], "w": 7, "x": 2.875, "y": 3},
+ {"label": "K75", "matrix": [7, 5], "w": 1.5, "x": 9.875, "y": 3}
+ ]
+ },
+ "LAYOUT_10u": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0, "y": 0},
+ {"label": "K11", "matrix": [1, 1], "x": 1, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "K12", "matrix": [1, 2], "x": 4, "y": 0},
+ {"label": "K13", "matrix": [1, 3], "x": 5, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 6, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 7, "y": 0},
+ {"label": "K14", "matrix": [1, 4], "x": 8, "y": 0},
+ {"label": "K15", "matrix": [1, 5], "x": 9, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 10, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K30", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K31", "matrix": [3, 1], "x": 1.25, "y": 1},
+ {"label": "K21", "matrix": [2, 1], "x": 2.25, "y": 1},
+ {"label": "K22", "matrix": [2, 2], "x": 3.25, "y": 1},
+ {"label": "K32", "matrix": [3, 2], "x": 4.25, "y": 1},
+ {"label": "K33", "matrix": [3, 3], "x": 5.25, "y": 1},
+ {"label": "K23", "matrix": [2, 3], "x": 6.25, "y": 1},
+ {"label": "K24", "matrix": [2, 4], "x": 7.25, "y": 1},
+ {"label": "K34", "matrix": [3, 4], "x": 8.25, "y": 1},
+ {"label": "K35", "matrix": [3, 5], "x": 9.25, "y": 1},
+ {"label": "K25", "matrix": [2, 5], "x": 10.25, "y": 1},
+ {"label": "K26", "matrix": [2, 6], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K50", "matrix": [5, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K51", "matrix": [5, 1], "x": 1.75, "y": 2},
+ {"label": "K41", "matrix": [4, 1], "x": 2.75, "y": 2},
+ {"label": "K42", "matrix": [4, 2], "x": 3.75, "y": 2},
+ {"label": "K52", "matrix": [5, 2], "x": 4.75, "y": 2},
+ {"label": "K53", "matrix": [5, 3], "x": 5.75, "y": 2},
+ {"label": "K43", "matrix": [4, 3], "x": 6.75, "y": 2},
+ {"label": "K44", "matrix": [4, 4], "x": 7.75, "y": 2},
+ {"label": "K54", "matrix": [5, 4], "x": 8.75, "y": 2},
+ {"label": "K55", "matrix": [5, 5], "x": 9.75, "y": 2},
+ {"label": "K45", "matrix": [4, 5], "x": 10.75, "y": 2},
+ {"label": "K46", "matrix": [4, 6], "x": 11.75, "y": 2},
+ {"label": "K73", "matrix": [7, 3], "w": 10, "x": 1.375, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/viktus/minne/rules.mk b/keyboards/viktus/minne/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/viktus/minne/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c
index 569c878582..12ca8a3c80 100644
--- a/keyboards/viktus/minne_topre/ec.c
+++ b/keyboards/viktus/minne_topre/ec.c
@@ -14,8 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
#include "ec.h"
+#include <avr/interrupt.h>
#include "analog.h"
//#include "debug.h" // needed for debugging
@@ -48,35 +48,35 @@ _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS");
static ec_config_t config;
static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS];
-static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); }
+static inline void discharge_capacitor(void) { gpio_set_pin_output(DISCHARGE_PIN); }
static inline void charge_capacitor(uint8_t col) {
- setPinInput(DISCHARGE_PIN);
- writePinHigh(col_pins[col]);
+ gpio_set_pin_input(DISCHARGE_PIN);
+ gpio_write_pin_high(col_pins[col]);
}
static inline void clear_all_col_pins(void) {
for (int col = 0; col < sizeof(col_pins); col++) {
- writePinLow(col_pins[col]);
+ gpio_write_pin_low(col_pins[col]);
}
}
void init_mux_sel(void) {
for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) {
- setPinOutput(mux_sel_pins[idx]);
+ gpio_set_pin_output(mux_sel_pins[idx]);
}
}
void select_mux(uint8_t row) {
uint8_t ch = row_channels[row];
- writePin(mux_sel_pins[0], ch & 1);
- writePin(mux_sel_pins[1], ch & 2);
- writePin(mux_sel_pins[2], ch & 4);
+ gpio_write_pin(mux_sel_pins[0], ch & 1);
+ gpio_write_pin(mux_sel_pins[1], ch & 2);
+ gpio_write_pin(mux_sel_pins[2], ch & 4);
}
void init_col(void) {
for (int idx = 0; idx < sizeof(col_pins); idx++) {
- setPinOutput(col_pins[idx]);
- writePinLow(col_pins[idx]);
+ gpio_set_pin_output(col_pins[idx]);
+ gpio_write_pin_low(col_pins[idx]);
}
}
@@ -85,8 +85,8 @@ void ec_init(ec_config_t const* const ec_config) {
config = *ec_config;
// initialize discharge pin as discharge mode
- writePinLow(DISCHARGE_PIN);
- setPinOutput(DISCHARGE_PIN);
+ gpio_write_pin_low(DISCHARGE_PIN);
+ gpio_set_pin_output(DISCHARGE_PIN);
// set analog reference
analogReference(ADC_REF_POWER);
@@ -98,7 +98,7 @@ void ec_init(ec_config_t const* const ec_config) {
init_mux_sel();
// set discharge pin to charge mode
- setPinInput(DISCHARGE_PIN);
+ gpio_set_pin_input(DISCHARGE_PIN);
}
uint16_t ec_readkey_raw(uint8_t col, uint8_t row) {
diff --git a/keyboards/viktus/minne_topre/info.json b/keyboards/viktus/minne_topre/info.json
deleted file mode 100644
index 4f795e082f..0000000000
--- a/keyboards/viktus/minne_topre/info.json
+++ /dev/null
@@ -1,256 +0,0 @@
-{
- "manufacturer": "Viktus Design LLC",
- "keyboard_name": "Viktus Minne - Topre",
- "maintainer": "BlindAssassin111",
- "url": "https://viktus.design",
- "usb": {
- "device_version": "1.3.0",
- "vid": "0x5644",
- "pid": "0x4D54"
- },
- "bootloader": "atmel-dfu",
- "processor": "atmega32u4",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true
- },
- "bootmagic": {
- "matrix": [0, 0]
- },
- "build": {
- "lto": true
- },
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
- "rows": ["A0", "A1", "A3", "A4"]
- },
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 5.875, "y": 3},
- {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3},
- {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_dual_3u": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3},
- {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3},
- {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_6u": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 1, "x": 1.375, "y": 3},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 2.375, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3},
- {"label": "K39", "matrix": [3, 9], "w": 1, "x": 9.375, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "w": 1, "x": 10.375, "y": 3}
- ]
- },
- "LAYOUT_7u": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3},
- {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3}
- ]
- },
- "LAYOUT_10u": {
- "layout": [
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
- {"label": "K07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
- {"label": "K08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
- {"label": "K09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
- {"label": "K0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
- {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
- {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 5.25, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 6.25, "y": 1},
- {"label": "K17", "matrix": [1, 7], "w": 1, "x": 7.25, "y": 1},
- {"label": "K18", "matrix": [1, 8], "w": 1, "x": 8.25, "y": 1},
- {"label": "K19", "matrix": [1, 9], "w": 1, "x": 9.25, "y": 1},
- {"label": "K1A", "matrix": [1, 10], "w": 1, "x": 10.25, "y": 1},
- {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
- {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
- {"label": "K27", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
- {"label": "K28", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
- {"label": "K29", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
- {"label": "K2A", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
- {"label": "K2B", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
- {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3}
- ]
- }
- }
-}
diff --git a/keyboards/viktus/minne_topre/keyboard.json b/keyboards/viktus/minne_topre/keyboard.json
new file mode 100644
index 0000000000..6919e7f9cc
--- /dev/null
+++ b/keyboards/viktus/minne_topre/keyboard.json
@@ -0,0 +1,253 @@
+{
+ "manufacturer": "Viktus Design LLC",
+ "keyboard_name": "Viktus Minne - Topre",
+ "maintainer": "BlindAssassin111",
+ "url": "https://viktus.design",
+ "usb": {
+ "device_version": "1.3.0",
+ "vid": "0x5644",
+ "pid": "0x4D54"
+ },
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B7", "D0", "B6", "D6", "C6", "C7", "D7", "F7", "B4", "F6", "F5", "B5"],
+ "rows": ["A0", "A1", "A3", "A4"]
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "w": 2.5, "x": 3.375, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 5.875, "y": 3},
+ {"label": "K37", "matrix": [3, 7], "w": 2.5, "x": 6.875, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_dual_3u": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "w": 3, "x": 3.375, "y": 3},
+ {"label": "K37", "matrix": [3, 7], "w": 3, "x": 6.375, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_6u": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "x": 1.375, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 2.375, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "w": 6, "x": 3.375, "y": 3},
+ {"label": "K39", "matrix": [3, 9], "x": 9.375, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "x": 10.375, "y": 3}
+ ]
+ },
+ "LAYOUT_7u": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "w": 1.5, "x": 1.375, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "w": 7, "x": 2.875, "y": 3},
+ {"label": "K3A", "matrix": [3, 10], "w": 1.5, "x": 9.875, "y": 3}
+ ]
+ },
+ "LAYOUT_10u": {
+ "layout": [
+ {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "K0B", "matrix": [0, 11], "w": 1.75, "x": 11, "y": 0},
+ {"label": "K10", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "x": 1.25, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 2.25, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 3.25, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 4.25, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 5.25, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 6.25, "y": 1},
+ {"label": "K17", "matrix": [1, 7], "x": 7.25, "y": 1},
+ {"label": "K18", "matrix": [1, 8], "x": 8.25, "y": 1},
+ {"label": "K19", "matrix": [1, 9], "x": 9.25, "y": 1},
+ {"label": "K1A", "matrix": [1, 10], "x": 10.25, "y": 1},
+ {"label": "K1B", "matrix": [1, 11], "w": 1.5, "x": 11.25, "y": 1},
+ {"label": "K20", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "K27", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K28", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "K29", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": "K2A", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "K2B", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "K35", "matrix": [3, 5], "w": 10, "x": 1.375, "y": 3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/viktus/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/keyboard.json
index a641192f32..a44b23d655 100644
--- a/keyboards/viktus/omnikey_bh/info.json
+++ b/keyboards/viktus/omnikey_bh/keyboard.json
@@ -9,6 +9,14 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["C2", "C3", "C4", "C7", "C1", "C0", "E1", "E0", "D7", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1", "B2", "B3"],
"rows": ["B7", "D0", "D1", "D2", "D3", "D4"]
diff --git a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
index e5fb6bf902..cf976da330 100644
--- a/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/omnikey_bh/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, XXXXXXX, _______, _______, _______, _______,
@@ -23,24 +23,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
bool led_update_user(led_t led_state) {
- DDRB |= (1 << 4) | (1 << 5) | (1 << 6);
+ gpio_set_pin_output(B4);
+ gpio_set_pin_output(B5);
+ gpio_set_pin_output(B6);
- if (led_state.num_lock) {
- PORTB |= (1 << 4);
- } else {
- PORTB &= ~(1 << 4);
- }
+ gpio_write_pin(B4, led_state.num_lock);
+ gpio_write_pin(B5, led_state.caps_lock);
+ gpio_write_pin(B6, led_state.scroll_lock);
- if (led_state.caps_lock) {
- PORTB |= (1 << 5);
- } else {
- PORTB &= ~(1 << 5);
- }
-
- if (led_state.scroll_lock) {
- PORTB |= (1 << 6);
- } else {
- PORTB &= ~(1 << 6);
- }
return false;
}
diff --git a/keyboards/viktus/omnikey_bh/rules.mk b/keyboards/viktus/omnikey_bh/rules.mk
deleted file mode 100644
index 06845b8e21..0000000000
--- a/keyboards/viktus/omnikey_bh/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/viktus/osav2/info.json b/keyboards/viktus/osav2/info.json
deleted file mode 100644
index b528bac281..0000000000
--- a/keyboards/viktus/osav2/info.json
+++ /dev/null
@@ -1,474 +0,0 @@
-{
- "manufacturer": "Viktus Design LLC",
- "keyboard_name": "OSAv2",
- "maintainer": "BlindAssassin111",
- "url": "https://viktus.design",
- "usb": {
- "device_version": "2.1.0",
- "vid": "0x5644",
- "pid": "0x5632"
- },
- "bootloader": "atmel-dfu",
- "processor": "atmega32u4",
- "features": {
- "backlight": true,
- "rgblight": true,
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true
- },
- "bootmagic": {
- "matrix": [1, 0]
- },
- "build": {
- "lto": true
- },
- "diode_direction": "COL2ROW",
- "matrix_pins": {
- "cols": ["B4", "D7", "D5", "D3", "D2", "D1", "D0", "B5"],
- "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"]
- },
- "rgblight": {
- "led_count": 23,
- "max_brightness": 191,
- "animations": {
- "breathing": true,
- "rainbow_swirl": true,
- "twinkle": true
- }
- },
- "ws2812": {
- "pin": "D4"
- },
- "backlight": {
- "driver": "timer",
- "levels": 6,
- "max_brightness": 191,
- "pin": "D6"
- },
- "indicators": {
- "num_lock": "C7",
- "caps_lock": "C6",
- "scroll_lock": "B6"
- },
- "layouts": {
- "LAYOUT_split_normal": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
- {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
- {"label": "K50", "matrix": [5, 0], "w": 1, "x": 15.75, "y": 0},
- {"label": "K57", "matrix": [5, 7], "w": 1, "x": 16.75, "y": 0},
- {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
- {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
- {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
- {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
- {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
- {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
- {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
- {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
- {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
- {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
- {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
- {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
- {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
- {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
- {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
- {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
- {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
- {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
- {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
- {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
- {"label": "K80", "matrix": [8, 0], "w": 2.75, "x": 15.75, "y": 3},
- {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
- {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
- {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4},
- {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
- {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
- {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
- ]
- },
- "LAYOUT_split_normal_split": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
- {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
- {"label": "K50", "matrix": [5, 0], "w": 1, "x": 15.75, "y": 0},
- {"label": "K57", "matrix": [5, 7], "w": 1, "x": 16.75, "y": 0},
- {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
- {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
- {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
- {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
- {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
- {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
- {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
- {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
- {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
- {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
- {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
- {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
- {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
- {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
- {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
- {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
- {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
- {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
- {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
- {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
- {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
- {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3},
- {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
- {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
- {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4},
- {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
- {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
- {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
- ]
- },
- "LAYOUT_split_mirrored_split": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
- {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
- {"label": "K50", "matrix": [5, 0], "w": 1, "x": 15.75, "y": 0},
- {"label": "K57", "matrix": [5, 7], "w": 1, "x": 16.75, "y": 0},
- {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
- {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
- {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
- {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
- {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
- {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
- {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
- {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
- {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
- {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
- {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
- {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
- {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
- {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
- {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
- {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
- {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
- {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
- {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
- {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
- {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
- {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3},
- {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
- {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
- {"label": "K45", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 4},
- {"label": "K46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4},
- {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
- {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
- {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
- ]
- },
- "LAYOUT_2u_normal": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
- {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
- {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0},
- {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
- {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
- {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
- {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
- {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
- {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
- {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
- {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
- {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
- {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
- {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
- {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
- {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
- {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
- {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
- {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
- {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
- {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
- {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
- {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
- {"label": "K80", "matrix": [8, 0], "w": 2.75, "x": 15.75, "y": 3},
- {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
- {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
- {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4},
- {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
- {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
- {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
- ]
- },
- "LAYOUT_2u_normal_split": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
- {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
- {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0},
- {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
- {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
- {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
- {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
- {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
- {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
- {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
- {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
- {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
- {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
- {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
- {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
- {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
- {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
- {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
- {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
- {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
- {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
- {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
- {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
- {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
- {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3},
- {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
- {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
- {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
- {"label": "K46", "matrix": [4, 6], "w": 1, "x": 7.75, "y": 4},
- {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
- {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
- {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
- ]
- },
- "LAYOUT_2u_mirrored_split": {
- "layout": [
- {"label": "K10", "matrix": [1, 0], "w": 1, "x": 0.5, "y": 0},
- {"label": "K00", "matrix": [0, 0], "w": 1, "x": 1.75, "y": 0},
- {"label": "K01", "matrix": [0, 1], "w": 1, "x": 2.75, "y": 0},
- {"label": "K02", "matrix": [0, 2], "w": 1, "x": 3.75, "y": 0},
- {"label": "K03", "matrix": [0, 3], "w": 1, "x": 4.75, "y": 0},
- {"label": "K04", "matrix": [0, 4], "w": 1, "x": 5.75, "y": 0},
- {"label": "K05", "matrix": [0, 5], "w": 1, "x": 6.75, "y": 0},
- {"label": "K06", "matrix": [0, 6], "w": 1, "x": 7.75, "y": 0},
- {"label": "K56", "matrix": [5, 6], "w": 1, "x": 9.75, "y": 0},
- {"label": "K55", "matrix": [5, 5], "w": 1, "x": 10.75, "y": 0},
- {"label": "K54", "matrix": [5, 4], "w": 1, "x": 11.75, "y": 0},
- {"label": "K53", "matrix": [5, 3], "w": 1, "x": 12.75, "y": 0},
- {"label": "K52", "matrix": [5, 2], "w": 1, "x": 13.75, "y": 0},
- {"label": "K51", "matrix": [5, 1], "w": 1, "x": 14.75, "y": 0},
- {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0},
- {"label": "K20", "matrix": [2, 0], "w": 1, "x": 0.25, "y": 1},
- {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
- {"label": "K12", "matrix": [1, 2], "w": 1, "x": 3, "y": 1},
- {"label": "K13", "matrix": [1, 3], "w": 1, "x": 4, "y": 1},
- {"label": "K14", "matrix": [1, 4], "w": 1, "x": 5, "y": 1},
- {"label": "K15", "matrix": [1, 5], "w": 1, "x": 6, "y": 1},
- {"label": "K16", "matrix": [1, 6], "w": 1, "x": 7, "y": 1},
- {"label": "K66", "matrix": [6, 6], "w": 1, "x": 9.5, "y": 1},
- {"label": "K65", "matrix": [6, 5], "w": 1, "x": 10.5, "y": 1},
- {"label": "K64", "matrix": [6, 4], "w": 1, "x": 11.5, "y": 1},
- {"label": "K63", "matrix": [6, 3], "w": 1, "x": 12.5, "y": 1},
- {"label": "K62", "matrix": [6, 2], "w": 1, "x": 13.5, "y": 1},
- {"label": "K61", "matrix": [6, 1], "w": 1, "x": 14.5, "y": 1},
- {"label": "K60", "matrix": [6, 0], "w": 1, "x": 15.5, "y": 1},
- {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
- {"label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 2},
- {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
- {"label": "K22", "matrix": [2, 2], "w": 1, "x": 3, "y": 2},
- {"label": "K23", "matrix": [2, 3], "w": 1, "x": 4, "y": 2},
- {"label": "K24", "matrix": [2, 4], "w": 1, "x": 5, "y": 2},
- {"label": "K25", "matrix": [2, 5], "w": 1, "x": 6, "y": 2},
- {"label": "K26", "matrix": [2, 6], "w": 1, "x": 7, "y": 2},
- {"label": "K76", "matrix": [7, 6], "w": 1, "x": 10, "y": 2},
- {"label": "K75", "matrix": [7, 5], "w": 1, "x": 11, "y": 2},
- {"label": "K74", "matrix": [7, 4], "w": 1, "x": 12, "y": 2},
- {"label": "K73", "matrix": [7, 3], "w": 1, "x": 13, "y": 2},
- {"label": "K72", "matrix": [7, 2], "w": 1, "x": 14, "y": 2},
- {"label": "K71", "matrix": [7, 1], "w": 1, "x": 15, "y": 2},
- {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
- {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
- {"label": "K32", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3},
- {"label": "K33", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3},
- {"label": "K34", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3},
- {"label": "K35", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3},
- {"label": "K36", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3},
- {"label": "K86", "matrix": [8, 6], "w": 1, "x": 9.75, "y": 3},
- {"label": "K85", "matrix": [8, 5], "w": 1, "x": 10.75, "y": 3},
- {"label": "K84", "matrix": [8, 4], "w": 1, "x": 11.75, "y": 3},
- {"label": "K83", "matrix": [8, 3], "w": 1, "x": 12.75, "y": 3},
- {"label": "K82", "matrix": [8, 2], "w": 1, "x": 13.75, "y": 3},
- {"label": "K81", "matrix": [8, 1], "w": 1, "x": 14.75, "y": 3},
- {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
- {"label": "K87", "matrix": [8, 7], "w": 1, "x": 17.5, "y": 3},
- {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
- {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
- {"label": "K45", "matrix": [4, 5], "w": 1, "x": 5.5, "y": 4},
- {"label": "K46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4},
- {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
- {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
- {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/viktus/osav2/keyboard.json b/keyboards/viktus/osav2/keyboard.json
new file mode 100644
index 0000000000..34c2089181
--- /dev/null
+++ b/keyboards/viktus/osav2/keyboard.json
@@ -0,0 +1,474 @@
+{
+ "manufacturer": "Viktus Design LLC",
+ "keyboard_name": "OSAv2",
+ "maintainer": "BlindAssassin111",
+ "url": "https://viktus.design",
+ "usb": {
+ "device_version": "2.1.0",
+ "vid": "0x5644",
+ "pid": "0x5632"
+ },
+ "bootloader": "atmel-dfu",
+ "processor": "atmega32u4",
+ "features": {
+ "backlight": true,
+ "rgblight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "bootmagic": {
+ "matrix": [1, 0]
+ },
+ "build": {
+ "lto": true
+ },
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["B4", "D7", "D5", "D3", "D2", "D1", "D0", "B5"],
+ "rows": ["F0", "F1", "F4", "F5", "F6", "B0", "B1", "B2", "B3", "B7"]
+ },
+ "rgblight": {
+ "led_count": 23,
+ "max_brightness": 191,
+ "animations": {
+ "breathing": true,
+ "rainbow_swirl": true,
+ "twinkle": true
+ }
+ },
+ "ws2812": {
+ "pin": "D4"
+ },
+ "backlight": {
+ "driver": "timer",
+ "levels": 6,
+ "max_brightness": 191,
+ "pin": "D6"
+ },
+ "indicators": {
+ "num_lock": "C7",
+ "caps_lock": "C6",
+ "scroll_lock": "B6"
+ },
+ "layouts": {
+ "LAYOUT_split_normal": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+ {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+ {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+ {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+ {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+ {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+ {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
+ {"label": "K50", "matrix": [5, 0], "x": 15.75, "y": 0},
+ {"label": "K57", "matrix": [5, 7], "x": 16.75, "y": 0},
+ {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+ {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+ {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+ {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+ {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+ {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+ {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+ {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
+ {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+ {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+ {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+ {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+ {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
+ {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+ {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+ {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+ {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+ {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+ {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
+ {"label": "K80", "matrix": [8, 0], "w": 2.75, "x": 15.75, "y": 3},
+ {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
+ {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
+ {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
+ {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4},
+ {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
+ {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
+ {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
+ ]
+ },
+ "LAYOUT_split_normal_split": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+ {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+ {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+ {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+ {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+ {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+ {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
+ {"label": "K50", "matrix": [5, 0], "x": 15.75, "y": 0},
+ {"label": "K57", "matrix": [5, 7], "x": 16.75, "y": 0},
+ {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+ {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+ {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+ {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+ {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+ {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+ {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+ {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
+ {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+ {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+ {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+ {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+ {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
+ {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+ {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+ {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+ {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+ {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+ {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
+ {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
+ {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3},
+ {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
+ {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
+ {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
+ {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4},
+ {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
+ {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
+ {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
+ ]
+ },
+ "LAYOUT_split_mirrored_split": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+ {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+ {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+ {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+ {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+ {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+ {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
+ {"label": "K50", "matrix": [5, 0], "x": 15.75, "y": 0},
+ {"label": "K57", "matrix": [5, 7], "x": 16.75, "y": 0},
+ {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+ {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+ {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+ {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+ {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+ {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+ {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+ {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
+ {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+ {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+ {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+ {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+ {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
+ {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+ {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+ {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+ {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+ {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+ {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
+ {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
+ {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3},
+ {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
+ {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
+ {"label": "K45", "matrix": [4, 5], "x": 5.5, "y": 4},
+ {"label": "K46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4},
+ {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
+ {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
+ {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
+ ]
+ },
+ "LAYOUT_2u_normal": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+ {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+ {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+ {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+ {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+ {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+ {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
+ {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0},
+ {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+ {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+ {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+ {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+ {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+ {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+ {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+ {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
+ {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+ {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+ {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+ {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+ {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
+ {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+ {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+ {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+ {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+ {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+ {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
+ {"label": "K80", "matrix": [8, 0], "w": 2.75, "x": 15.75, "y": 3},
+ {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
+ {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
+ {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
+ {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4},
+ {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
+ {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
+ {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
+ ]
+ },
+ "LAYOUT_2u_normal_split": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+ {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+ {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+ {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+ {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+ {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+ {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
+ {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0},
+ {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+ {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+ {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+ {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+ {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+ {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+ {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+ {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
+ {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+ {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+ {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+ {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+ {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
+ {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+ {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+ {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+ {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+ {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+ {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
+ {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
+ {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3},
+ {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
+ {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
+ {"label": "K45", "matrix": [4, 5], "w": 2.25, "x": 5.5, "y": 4},
+ {"label": "K46", "matrix": [4, 6], "x": 7.75, "y": 4},
+ {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
+ {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
+ {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
+ ]
+ },
+ "LAYOUT_2u_mirrored_split": {
+ "layout": [
+ {"label": "K10", "matrix": [1, 0], "x": 0.5, "y": 0},
+ {"label": "K00", "matrix": [0, 0], "x": 1.75, "y": 0},
+ {"label": "K01", "matrix": [0, 1], "x": 2.75, "y": 0},
+ {"label": "K02", "matrix": [0, 2], "x": 3.75, "y": 0},
+ {"label": "K03", "matrix": [0, 3], "x": 4.75, "y": 0},
+ {"label": "K04", "matrix": [0, 4], "x": 5.75, "y": 0},
+ {"label": "K05", "matrix": [0, 5], "x": 6.75, "y": 0},
+ {"label": "K06", "matrix": [0, 6], "x": 7.75, "y": 0},
+ {"label": "K56", "matrix": [5, 6], "x": 9.75, "y": 0},
+ {"label": "K55", "matrix": [5, 5], "x": 10.75, "y": 0},
+ {"label": "K54", "matrix": [5, 4], "x": 11.75, "y": 0},
+ {"label": "K53", "matrix": [5, 3], "x": 12.75, "y": 0},
+ {"label": "K52", "matrix": [5, 2], "x": 13.75, "y": 0},
+ {"label": "K51", "matrix": [5, 1], "x": 14.75, "y": 0},
+ {"label": "K57", "matrix": [5, 7], "w": 2, "x": 15.75, "y": 0},
+ {"label": "K20", "matrix": [2, 0], "x": 0.25, "y": 1},
+ {"label": "K11", "matrix": [1, 1], "w": 1.5, "x": 1.5, "y": 1},
+ {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1},
+ {"label": "K13", "matrix": [1, 3], "x": 4, "y": 1},
+ {"label": "K14", "matrix": [1, 4], "x": 5, "y": 1},
+ {"label": "K15", "matrix": [1, 5], "x": 6, "y": 1},
+ {"label": "K16", "matrix": [1, 6], "x": 7, "y": 1},
+ {"label": "K66", "matrix": [6, 6], "x": 9.5, "y": 1},
+ {"label": "K65", "matrix": [6, 5], "x": 10.5, "y": 1},
+ {"label": "K64", "matrix": [6, 4], "x": 11.5, "y": 1},
+ {"label": "K63", "matrix": [6, 3], "x": 12.5, "y": 1},
+ {"label": "K62", "matrix": [6, 2], "x": 13.5, "y": 1},
+ {"label": "K61", "matrix": [6, 1], "x": 14.5, "y": 1},
+ {"label": "K60", "matrix": [6, 0], "x": 15.5, "y": 1},
+ {"label": "K67", "matrix": [6, 7], "w": 1.5, "x": 16.5, "y": 1},
+ {"label": "K30", "matrix": [3, 0], "x": 0, "y": 2},
+ {"label": "K21", "matrix": [2, 1], "w": 1.75, "x": 1.25, "y": 2},
+ {"label": "K22", "matrix": [2, 2], "x": 3, "y": 2},
+ {"label": "K23", "matrix": [2, 3], "x": 4, "y": 2},
+ {"label": "K24", "matrix": [2, 4], "x": 5, "y": 2},
+ {"label": "K25", "matrix": [2, 5], "x": 6, "y": 2},
+ {"label": "K26", "matrix": [2, 6], "x": 7, "y": 2},
+ {"label": "K76", "matrix": [7, 6], "x": 10, "y": 2},
+ {"label": "K75", "matrix": [7, 5], "x": 11, "y": 2},
+ {"label": "K74", "matrix": [7, 4], "x": 12, "y": 2},
+ {"label": "K73", "matrix": [7, 3], "x": 13, "y": 2},
+ {"label": "K72", "matrix": [7, 2], "x": 14, "y": 2},
+ {"label": "K71", "matrix": [7, 1], "x": 15, "y": 2},
+ {"label": "K77", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2},
+ {"label": "K31", "matrix": [3, 1], "w": 2.25, "x": 1, "y": 3},
+ {"label": "K32", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "K33", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "K34", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "K35", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "K36", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "K86", "matrix": [8, 6], "x": 9.75, "y": 3},
+ {"label": "K85", "matrix": [8, 5], "x": 10.75, "y": 3},
+ {"label": "K84", "matrix": [8, 4], "x": 11.75, "y": 3},
+ {"label": "K83", "matrix": [8, 3], "x": 12.75, "y": 3},
+ {"label": "K82", "matrix": [8, 2], "x": 13.75, "y": 3},
+ {"label": "K81", "matrix": [8, 1], "x": 14.75, "y": 3},
+ {"label": "K80", "matrix": [8, 0], "w": 1.75, "x": 15.75, "y": 3},
+ {"label": "K87", "matrix": [8, 7], "x": 17.5, "y": 3},
+ {"label": "K41", "matrix": [4, 1], "w": 1.5, "x": 1, "y": 4},
+ {"label": "K43", "matrix": [4, 3], "w": 1.5, "x": 4, "y": 4},
+ {"label": "K45", "matrix": [4, 5], "x": 5.5, "y": 4},
+ {"label": "K46", "matrix": [4, 6], "w": 2.25, "x": 6.5, "y": 4},
+ {"label": "K95", "matrix": [9, 5], "w": 2.75, "x": 9.75, "y": 4},
+ {"label": "K93", "matrix": [9, 3], "w": 1.5, "x": 12.5, "y": 4},
+ {"label": "K90", "matrix": [9, 0], "w": 1.5, "x": 16.75, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/viktus/osav2/rules.mk b/keyboards/viktus/osav2/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/viktus/osav2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/viktus/osav2_numpad/info.json b/keyboards/viktus/osav2_numpad/keyboard.json
index 941d65f367..941d65f367 100644
--- a/keyboards/viktus/osav2_numpad/info.json
+++ b/keyboards/viktus/osav2_numpad/keyboard.json
diff --git a/keyboards/viktus/osav2_numpad/rules.mk b/keyboards/viktus/osav2_numpad/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/viktus/osav2_numpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/viktus/osav2_numpad_topre/ec.c b/keyboards/viktus/osav2_numpad_topre/ec.c
index e4f59c3b6b..f5890db50b 100644
--- a/keyboards/viktus/osav2_numpad_topre/ec.c
+++ b/keyboards/viktus/osav2_numpad_topre/ec.c
@@ -14,8 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
#include "ec.h"
+#include <avr/interrupt.h>
#include "analog.h"
//#include "debug.h" // needed for debugging
@@ -48,35 +48,35 @@ _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS");
static ec_config_t config;
static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS];
-static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); }
+static inline void discharge_capacitor(void) { gpio_set_pin_output(DISCHARGE_PIN); }
static inline void charge_capacitor(uint8_t col) {
- setPinInput(DISCHARGE_PIN);
- writePinHigh(col_pins[col]);
+ gpio_set_pin_input(DISCHARGE_PIN);
+ gpio_write_pin_high(col_pins[col]);
}
static inline void clear_all_col_pins(void) {
for (int col = 0; col < sizeof(col_pins); col++) {
- writePinLow(col_pins[col]);
+ gpio_write_pin_low(col_pins[col]);
}
}
void init_mux_sel(void) {
for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) {
- setPinOutput(mux_sel_pins[idx]);
+ gpio_set_pin_output(mux_sel_pins[idx]);
}
}
void select_mux(uint8_t row) {
uint8_t ch = row_channels[row];
- writePin(mux_sel_pins[0], ch & 1);
- writePin(mux_sel_pins[1], ch & 2);
- writePin(mux_sel_pins[2], ch & 4);
+ gpio_write_pin(mux_sel_pins[0], ch & 1);
+ gpio_write_pin(mux_sel_pins[1], ch & 2);
+ gpio_write_pin(mux_sel_pins[2], ch & 4);
}
void init_col(void) {
for (int idx = 0; idx < sizeof(col_pins); idx++) {
- setPinOutput(col_pins[idx]);
- writePinLow(col_pins[idx]);
+ gpio_set_pin_output(col_pins[idx]);
+ gpio_write_pin_low(col_pins[idx]);
}
}
@@ -85,8 +85,8 @@ void ec_init(ec_config_t const* const ec_config) {
config = *ec_config;
// initialize discharge pin as discharge mode
- writePinLow(DISCHARGE_PIN);
- setPinOutput(DISCHARGE_PIN);
+ gpio_write_pin_low(DISCHARGE_PIN);
+ gpio_set_pin_output(DISCHARGE_PIN);
// set analog reference
analogReference(ADC_REF_POWER);
@@ -98,7 +98,7 @@ void ec_init(ec_config_t const* const ec_config) {
init_mux_sel();
// set discharge pin to charge mode
- setPinInput(DISCHARGE_PIN);
+ gpio_set_pin_input(DISCHARGE_PIN);
}
uint16_t ec_readkey_raw(uint8_t col, uint8_t row) {
diff --git a/keyboards/viktus/osav2_numpad_topre/info.json b/keyboards/viktus/osav2_numpad_topre/keyboard.json
index 55ca939e3f..55ca939e3f 100644
--- a/keyboards/viktus/osav2_numpad_topre/info.json
+++ b/keyboards/viktus/osav2_numpad_topre/keyboard.json
diff --git a/keyboards/viktus/osav2_topre/ec.c b/keyboards/viktus/osav2_topre/ec.c
index 076ffc0ba8..702af681a2 100644
--- a/keyboards/viktus/osav2_topre/ec.c
+++ b/keyboards/viktus/osav2_topre/ec.c
@@ -14,8 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
#include "ec.h"
+#include <avr/interrupt.h>
#include "analog.h"
//#include "debug.h" // needed for debugging
@@ -48,35 +48,35 @@ _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS");
static ec_config_t config;
static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS];
-static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); }
+static inline void discharge_capacitor(void) { gpio_set_pin_output(DISCHARGE_PIN); }
static inline void charge_capacitor(uint8_t col) {
- setPinInput(DISCHARGE_PIN);
- writePinHigh(col_pins[col]);
+ gpio_set_pin_input(DISCHARGE_PIN);
+ gpio_write_pin_high(col_pins[col]);
}
static inline void clear_all_col_pins(void) {
for (int col = 0; col < sizeof(col_pins); col++) {
- writePinLow(col_pins[col]);
+ gpio_write_pin_low(col_pins[col]);
}
}
void init_mux_sel(void) {
for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) {
- setPinOutput(mux_sel_pins[idx]);
+ gpio_set_pin_output(mux_sel_pins[idx]);
}
}
void select_mux(uint8_t row) {
uint8_t ch = row_channels[row];
- writePin(mux_sel_pins[0], ch & 1);
- writePin(mux_sel_pins[1], ch & 2);
- writePin(mux_sel_pins[2], ch & 4);
+ gpio_write_pin(mux_sel_pins[0], ch & 1);
+ gpio_write_pin(mux_sel_pins[1], ch & 2);
+ gpio_write_pin(mux_sel_pins[2], ch & 4);
}
void init_col(void) {
for (int idx = 0; idx < sizeof(col_pins); idx++) {
- setPinOutput(col_pins[idx]);
- writePinLow(col_pins[idx]);
+ gpio_set_pin_output(col_pins[idx]);
+ gpio_write_pin_low(col_pins[idx]);
}
}
@@ -85,8 +85,8 @@ void ec_init(ec_config_t const* const ec_config) {
config = *ec_config;
// initialize discharge pin as discharge mode
- writePinLow(DISCHARGE_PIN);
- setPinOutput(DISCHARGE_PIN);
+ gpio_write_pin_low(DISCHARGE_PIN);
+ gpio_set_pin_output(DISCHARGE_PIN);
// set analog reference
analogReference(ADC_REF_POWER);
@@ -98,7 +98,7 @@ void ec_init(ec_config_t const* const ec_config) {
init_mux_sel();
// set discharge pin to charge mode
- setPinInput(DISCHARGE_PIN);
+ gpio_set_pin_input(DISCHARGE_PIN);
}
uint16_t ec_readkey_raw(uint8_t col, uint8_t row) {
diff --git a/keyboards/viktus/osav2_topre/info.json b/keyboards/viktus/osav2_topre/keyboard.json
index 1f2120ed57..1f2120ed57 100644
--- a/keyboards/viktus/osav2_topre/info.json
+++ b/keyboards/viktus/osav2_topre/keyboard.json
diff --git a/keyboards/viktus/smolka/info.json b/keyboards/viktus/smolka/keyboard.json
index cb44b43eb7..ade26b3735 100644
--- a/keyboards/viktus/smolka/info.json
+++ b/keyboards/viktus/smolka/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x0010",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D6", "D7", "B4", "B5", "B6", "D4", "B1", "B2"],
"rows": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"]
diff --git a/keyboards/viktus/smolka/keymaps/default/keymap.c b/keyboards/viktus/smolka/keymaps/default/keymap.c
index 8e91203f32..a51676e0df 100644
--- a/keyboards/viktus/smolka/keymaps/default/keymap.c
+++ b/keyboards/viktus/smolka/keymaps/default/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_all( /* Smolka Base */
- QK_BOOT, 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,
+ QK_BOOT, 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, 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/viktus/smolka/keymaps/via/keymap.c b/keyboards/viktus/smolka/keymaps/via/keymap.c
index 7f5fff9ee9..ac283cb7e8 100644
--- a/keyboards/viktus/smolka/keymaps/via/keymap.c
+++ b/keyboards/viktus/smolka/keymaps/via/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_all( /* Smolka Base */
- QK_BOOT, 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,
+ QK_BOOT, 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, 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/viktus/smolka/rules.mk b/keyboards/viktus/smolka/rules.mk
deleted file mode 100644
index 131aa72aeb..0000000000
--- a/keyboards/viktus/smolka/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/viktus/sp111/info.json b/keyboards/viktus/sp111/keyboard.json
index 67f5b63bca..a309c14afe 100644
--- a/keyboards/viktus/sp111/info.json
+++ b/keyboards/viktus/sp111/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x5111",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/viktus/sp111/matrix.c b/keyboards/viktus/sp111/matrix.c
index 33b232dca7..5ead535593 100644
--- a/keyboards/viktus/sp111/matrix.c
+++ b/keyboards/viktus/sp111/matrix.c
@@ -13,8 +13,10 @@
* 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 "matrix.h"
#include "mcp23018.h"
-#include "quantum.h"
+#include "print.h"
+#include "wait.h"
// Optimize scanning code for speed as a slight mitigation for the port expander
#pragma GCC push_options
@@ -31,22 +33,22 @@ static const pin_t col_pins[MATRIX_COLS] = {F5, F6, F7, C7, C6, B6, B5, D3,
//_____REGULAR funcs____________________________________________________________
static void select_row(uint8_t row) {
- setPinOutput(row_pins[row]);
- writePinLow(row_pins[row]);
+ gpio_set_pin_output(row_pins[row]);
+ gpio_write_pin_low(row_pins[row]);
}
-static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+static void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); }
static void unselect_rows(void) {
for (uint8_t x = 0; x < MATRIX_ROWS / 2; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
}
static void init_pins(void) {
unselect_rows();
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
- setPinInputHigh(col_pins[x]);
+ gpio_set_pin_input_high(col_pins[x]);
}
}
@@ -64,7 +66,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
// For each col...
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
// Select the col pin to read (active low)
- uint8_t pin_state = readPin(col_pins[col_index]);
+ uint8_t pin_state = gpio_read_pin(col_pins[col_index]);
// Populate the matrix row with the state of the col pin
current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
@@ -117,7 +119,7 @@ static void select_row_MCP23018(uint8_t row) {
static uint16_t read_cols_MCP23018(void) {
uint16_t tmp = 0xFFFF;
- mcp23018_errors += !mcp23018_readPins_all(I2C_ADDR, &tmp);
+ mcp23018_errors += !mcp23018_read_pins_all(I2C_ADDR, &tmp);
uint16_t state = ((tmp & 0b11111111) << 2) | ((tmp & 0b0110000000000000) >> 13);
return (~state) & 0b1111111111;
diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk
index 1be8c7ad68..d9b0148499 100644
--- a/keyboards/viktus/sp111/rules.mk
+++ b/keyboards/viktus/sp111/rules.mk
@@ -1,18 +1,3 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Smaller (and slightly faster) firmware
-
-
# custom matrix setup
CUSTOM_MATRIX = lite
diff --git a/keyboards/viktus/sp111/sp111.c b/keyboards/viktus/sp111/sp111.c
index 523666ed73..1626683804 100644
--- a/keyboards/viktus/sp111/sp111.c
+++ b/keyboards/viktus/sp111/sp111.c
@@ -17,16 +17,16 @@
void keyboard_pre_init_kb(void) {
// enable built in pullups to avoid timeouts when right hand not connected
- setPinInputHigh(D0);
- setPinInputHigh(D1);
+ gpio_set_pin_input_high(D0);
+ gpio_set_pin_input_high(D1);
keyboard_pre_init_user();
}
void matrix_init_kb(void) {
- setPinOutput(F0);
- setPinOutput(F1);
- setPinOutput(F4);
+ gpio_set_pin_output(F0);
+ gpio_set_pin_output(F1);
+ gpio_set_pin_output(F4);
matrix_init_user();
}
@@ -34,9 +34,9 @@ void matrix_init_kb(void) {
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if (res) {
- writePin(F0, led_state.num_lock);
- writePin(F1, led_state.caps_lock);
- writePin(F4, led_state.scroll_lock);
+ gpio_write_pin(F0, led_state.num_lock);
+ gpio_write_pin(F1, led_state.caps_lock);
+ gpio_write_pin(F4, led_state.scroll_lock);
}
return res;
}
diff --git a/keyboards/viktus/sp111_v2/info.json b/keyboards/viktus/sp111_v2/keyboard.json
index 63c531ee44..63c531ee44 100644
--- a/keyboards/viktus/sp111_v2/info.json
+++ b/keyboards/viktus/sp111_v2/keyboard.json
diff --git a/keyboards/viktus/sp111_v2/rules.mk b/keyboards/viktus/sp111_v2/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/viktus/sp111_v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/viktus/sp111_v2/sp111_v2.c b/keyboards/viktus/sp111_v2/sp111_v2.c
index 96a9aaa5fe..9d749ccbac 100644
--- a/keyboards/viktus/sp111_v2/sp111_v2.c
+++ b/keyboards/viktus/sp111_v2/sp111_v2.c
@@ -5,8 +5,8 @@
void keyboard_pre_init_kb(void) {
// enable built in pullups to avoid timeouts when right hand not connected
- setPinInputHigh(D0);
- setPinInputHigh(D1);
+ gpio_set_pin_input_high(D0);
+ gpio_set_pin_input_high(D1);
keyboard_pre_init_user();
}
diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/keyboard.json
index 6deb64c63c..25aa4c9494 100644
--- a/keyboards/viktus/sp_mini/info.json
+++ b/keyboards/viktus/sp_mini/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x534D",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", null],
"rows": ["F0", "B5", "B4", "D7", "D6"]
@@ -19,6 +29,7 @@
]
},
"split": {
+ "enabled": true,
"matrix_pins": {
"right": {
"cols": ["B6", "C6", "C7", "D4", "D2", "D3", "D5", "B7"],
diff --git a/keyboards/viktus/sp_mini/keymaps/default/keymap.c b/keyboards/viktus/sp_mini/keymaps/default/keymap.c
index 3f123b1cb1..939b545d0b 100644
--- a/keyboards/viktus/sp_mini/keymaps/default/keymap.c
+++ b/keyboards/viktus/sp_mini/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN1] = LAYOUT_all(
- _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______,
_______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______,
_______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, _______, KC_UP,
diff --git a/keyboards/viktus/sp_mini/keymaps/via/keymap.c b/keyboards/viktus/sp_mini/keymaps/via/keymap.c
index de6a889577..7fd1eb0961 100644
--- a/keyboards/viktus/sp_mini/keymaps/via/keymap.c
+++ b/keyboards/viktus/sp_mini/keymaps/via/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN1] = LAYOUT_all(
- _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______,
_______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4, KC_5, KC_6, KC_SCLN, _______, _______,
_______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR, KC_1, KC_2, KC_3, _______, KC_UP,
diff --git a/keyboards/viktus/sp_mini/rules.mk b/keyboards/viktus/sp_mini/rules.mk
deleted file mode 100644
index ca2a1036c3..0000000000
--- a/keyboards/viktus/sp_mini/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/viktus/sp_mini/sp_mini.c b/keyboards/viktus/sp_mini/sp_mini.c
index ffae6c5c54..1554dd3469 100644
--- a/keyboards/viktus/sp_mini/sp_mini.c
+++ b/keyboards/viktus/sp_mini/sp_mini.c
@@ -18,8 +18,8 @@
void keyboard_pre_init_kb(void) {
// enable built in pullups to avoid timeouts when right hand not connected
- setPinInputHigh(D0);
- setPinInputHigh(D1);
+ gpio_set_pin_input_high(D0);
+ gpio_set_pin_input_high(D1);
keyboard_pre_init_user();
}
diff --git a/keyboards/viktus/styrka/info.json b/keyboards/viktus/styrka/keyboard.json
index 52cf5823a0..e5a642e471 100644
--- a/keyboards/viktus/styrka/info.json
+++ b/keyboards/viktus/styrka/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"],
"rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"]
diff --git a/keyboards/viktus/styrka/keymaps/default/keymap.c b/keyboards/viktus/styrka/keymaps/default/keymap.c
index 47adf07313..9980519141 100644
--- a/keyboards/viktus/styrka/keymaps/default/keymap.c
+++ b/keyboards/viktus/styrka/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_default( /* Styrka Base */
- QK_BOOT, KC_F2, 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_BSLS, KC_INS,
+ QK_BOOT, KC_F2, 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_BSLS, KC_INS,
KC_F3, KC_F4, 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_BSPC, KC_DEL,
KC_F5, KC_F6, 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_PGUP,
KC_F7, KC_F8, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
diff --git a/keyboards/viktus/styrka/keymaps/via/keymap.c b/keyboards/viktus/styrka/keymaps/via/keymap.c
index 2950af5523..40fa021fcf 100644
--- a/keyboards/viktus/styrka/keymaps/via/keymap.c
+++ b/keyboards/viktus/styrka/keymaps/via/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_all( /* Styrka Base */
- QK_BOOT, 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,
+ QK_BOOT, 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, 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/viktus/styrka/rules.mk b/keyboards/viktus/styrka/rules.mk
deleted file mode 100644
index 718a1e8d09..0000000000
--- a/keyboards/viktus/styrka/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/viktus/styrka_topre/ec.c b/keyboards/viktus/styrka_topre/ec.c
index c9980461af..4a8ce5ca29 100644
--- a/keyboards/viktus/styrka_topre/ec.c
+++ b/keyboards/viktus/styrka_topre/ec.c
@@ -15,8 +15,8 @@
*/
#include "ec.h"
+#include <avr/interrupt.h>
-#include "quantum.h"
#include "analog.h"
//#include "debug.h"
@@ -49,35 +49,35 @@ _Static_assert(sizeof(mux_sel_pins) == 3, "invalid MUX_SEL_PINS");
static ec_config_t config;
static uint16_t ec_sw_value[MATRIX_COLS][MATRIX_ROWS];
-static inline void discharge_capacitor(void) { setPinOutput(DISCHARGE_PIN); }
+static inline void discharge_capacitor(void) { gpio_set_pin_output(DISCHARGE_PIN); }
static inline void charge_capacitor(uint8_t col) {
- setPinInput(DISCHARGE_PIN);
- writePinHigh(col_pins[col]);
+ gpio_set_pin_input(DISCHARGE_PIN);
+ gpio_write_pin_high(col_pins[col]);
}
static inline void clear_all_col_pins(void) {
for (int col = 0; col < sizeof(col_pins); col++) {
- writePinLow(col_pins[col]);
+ gpio_write_pin_low(col_pins[col]);
}
}
void init_mux_sel(void) {
for (int idx = 0; idx < sizeof(mux_sel_pins); idx++) {
- setPinOutput(mux_sel_pins[idx]);
+ gpio_set_pin_output(mux_sel_pins[idx]);
}
}
void select_mux(uint8_t row) {
uint8_t ch = row_channels[row];
- writePin(mux_sel_pins[0], ch & 1);
- writePin(mux_sel_pins[1], ch & 2);
- writePin(mux_sel_pins[2], ch & 4);
+ gpio_write_pin(mux_sel_pins[0], ch & 1);
+ gpio_write_pin(mux_sel_pins[1], ch & 2);
+ gpio_write_pin(mux_sel_pins[2], ch & 4);
}
void init_col(void) {
for (int idx = 0; idx < sizeof(col_pins); idx++) {
- setPinOutput(col_pins[idx]);
- writePinLow(col_pins[idx]);
+ gpio_set_pin_output(col_pins[idx]);
+ gpio_write_pin_low(col_pins[idx]);
}
}
@@ -86,8 +86,8 @@ void ec_init(ec_config_t const* const ec_config) {
config = *ec_config;
// initialize discharge pin as discharge mode
- writePinLow(DISCHARGE_PIN);
- setPinOutput(DISCHARGE_PIN);
+ gpio_write_pin_low(DISCHARGE_PIN);
+ gpio_set_pin_output(DISCHARGE_PIN);
// set analog reference
analogReference(ADC_REF_POWER);
@@ -99,7 +99,7 @@ void ec_init(ec_config_t const* const ec_config) {
init_mux_sel();
// set discharge pin to charge mode
- setPinInput(DISCHARGE_PIN);
+ gpio_set_pin_input(DISCHARGE_PIN);
}
uint16_t ec_readkey_raw(uint8_t col, uint8_t row) {
diff --git a/keyboards/viktus/styrka_topre/info.json b/keyboards/viktus/styrka_topre/keyboard.json
index 7095a8f484..7095a8f484 100644
--- a/keyboards/viktus/styrka_topre/info.json
+++ b/keyboards/viktus/styrka_topre/keyboard.json
diff --git a/keyboards/viktus/z150_bh/info.json b/keyboards/viktus/z150_bh/keyboard.json
index fb4970e259..5875b6d171 100644
--- a/keyboards/viktus/z150_bh/info.json
+++ b/keyboards/viktus/z150_bh/keyboard.json
@@ -9,6 +9,14 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "C7", "C6", "C5", "C4", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"],
"rows": ["C3", "C2", "C1", "C0", "E1"]
diff --git a/keyboards/viktus/z150_bh/keymaps/default/keymap.c b/keyboards/viktus/z150_bh/keymaps/default/keymap.c
index 8610ad1d66..7d58cf5255 100644
--- a/keyboards/viktus/z150_bh/keymaps/default/keymap.c
+++ b/keyboards/viktus/z150_bh/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT(
- _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c b/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c
index bcc5501bac..7da30d2f97 100644
--- a/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c
+++ b/keyboards/viktus/z150_bh/keymaps/default_tkl/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_z150_tkl(
- _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/viktus/z150_bh/rules.mk b/keyboards/viktus/z150_bh/rules.mk
deleted file mode 100644
index 06845b8e21..0000000000
--- a/keyboards/viktus/z150_bh/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no