summaryrefslogtreecommitdiff
path: root/keyboards/bbrfkr
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bbrfkr')
-rw-r--r--keyboards/bbrfkr/dynamis/config.h8
-rw-r--r--keyboards/bbrfkr/dynamis/dynamis.c2
-rw-r--r--keyboards/bbrfkr/dynamis/dynamis.h78
-rw-r--r--keyboards/bbrfkr/dynamis/info.json288
-rw-r--r--keyboards/bbrfkr/dynamis/keymaps/via/keymap.c2
5 files changed, 152 insertions, 226 deletions
diff --git a/keyboards/bbrfkr/dynamis/config.h b/keyboards/bbrfkr/dynamis/config.h
index 28c21cb9f5..4cad8086cd 100644
--- a/keyboards/bbrfkr/dynamis/config.h
+++ b/keyboards/bbrfkr/dynamis/config.h
@@ -16,13 +16,8 @@
#pragma once
-
-#define MATRIX_ROW_PINS { B6, B4, D6, D5, D1, C6, B5, D7, D4, D0 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 }
-
/* rgb num */
#define RGBLED_NUM 10
-#define RGB_DI_PIN D3
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -34,8 +29,5 @@
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define PMW33XX_CS_PIN SPI_SS_PIN
#define POINTING_DEVICE_INVERT_Y
diff --git a/keyboards/bbrfkr/dynamis/dynamis.c b/keyboards/bbrfkr/dynamis/dynamis.c
index 8655cbc7bc..f21bf24900 100644
--- a/keyboards/bbrfkr/dynamis/dynamis.c
+++ b/keyboards/bbrfkr/dynamis/dynamis.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "dynamis.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/bbrfkr/dynamis/dynamis.h b/keyboards/bbrfkr/dynamis/dynamis.h
deleted file mode 100644
index a88b81669c..0000000000
--- a/keyboards/bbrfkr/dynamis/dynamis.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2022 bbrfkr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
- * │00 │01 │02 │03 │04 │05 │06 │56 │55 │54 │53 │52 │51 │50 │90 │ │50 │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └─┬─────┤
- * │10 │11 │12 │13 │14 │15 │16 │66 │65 │64 │63 │62 │61 │60 │ │ │
- * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐70 │ ISO Enter
- * LShift │20 │21 │22 │23 │24 │25 │26 │76 │75 │74 │73 │72 │70 │ │71 │ │
- * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤┌───┐ ┌─┴───┴────┤
- * │31 │ │30 │31 │32 │33 │34 │35 │36 │86 │85 │84 │83 │82 │81 │80 ││91 │ │81 │ 2.75u RShift
- * └────────┘ ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴┬──┴┼───┼───┐ └──────────┘
- * │40 │41 │42 │43 │44 │45 │46 │96 │95 │ │94 │93 │92 │
- * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┘ └───┴───┴───┘
- * ┌────┬────┬────┬────────────────────────┬────┬────┬────┐
- * │40 │41 │42 │43 │46 │96 │95 │ 6.25u Spacebar
- * └────┴────┴────┴────────────────────────┴────┴────┴────┘
- */
-
-#define LAYOUT_ansi( \
- C00, C01, C02, C03, C04, C05, C06, C56, C55, C54, C53, C52, C51, C50, C90, \
- C10, C11, C12, C13, C14, C15, C16, C66, C65, C64, C63, C62, C61, C60, \
- C20, C21, C22, C23, C24, C25, C26, C76, C75, C74, C73, C72, C70, \
- C30, C31, C32, C33, C34, C35, C36, C86, C85, C84, C83, C82, C81, C80, C91, \
- C40, C41, C42, C43, C44, C45, C46, C96, C95, C94, C93, C92 \
- ) \
- { \
- { C00, C01, C02, C03, C04, C05, C06 }, \
- { C10, C11, C12, C13, C14, C15, C16 }, \
- { C20, C21, C22, C23, C24, C25, C26 }, \
- { C30, C31, C32, C33, C34, C35, C36 }, \
- { C40, C41, C42, C43, C44, C45, C46 }, \
- { C50, C51, C52, C53, C54, C55, C56 }, \
- { C60, C61, C62, C63, C64, C65, C66 }, \
- { C70, XXX, C72, C73, C74, C75, C76 }, \
- { C80, C81, C82, C83, C84, C85, C86 }, \
- { C90, C91, C92, C93, C94, C95, C96 } \
- }
-
-#define LAYOUT_iso( \
- C00, C01, C02, C03, C04, C05, C06, C56, C55, C54, C53, C52, C51, C50, C90, \
- C10, C11, C12, C13, C14, C15, C16, C66, C65, C64, C63, C62, C61, \
- C20, C21, C22, C23, C24, C25, C26, C76, C75, C74, C73, C72, C71, C70, \
- C30, C31, C32, C33, C34, C35, C36, C86, C85, C84, C83, C82, C81, C80, C91, \
- C40, C41, C42, C43, C44, C45, C46, C96, C95, C94, C93, C92 \
- ) \
- { \
- { C00, C01, C02, C03, C04, C05, C06 }, \
- { C10, C11, C12, C13, C14, C15, C16 }, \
- { C20, C21, C22, C23, C24, C25, C26 }, \
- { C30, C31, C32, C33, C34, C35, C36 }, \
- { C40, C41, C42, C43, C44, C45, C46 }, \
- { C50, C51, C52, C53, C54, C55, C56 }, \
- { XXX, C61, C62, C63, C64, C65, C66 }, \
- { C70, C71, C72, C73, C74, C75, C76 }, \
- { C80, C81, C82, C83, C84, C85, C86 }, \
- { C90, C91, C92, C93, C94, C95, C96 } \
- }
diff --git a/keyboards/bbrfkr/dynamis/info.json b/keyboards/bbrfkr/dynamis/info.json
index 4f256e8ac5..c9f403a045 100644
--- a/keyboards/bbrfkr/dynamis/info.json
+++ b/keyboards/bbrfkr/dynamis/info.json
@@ -8,166 +8,178 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"],
+ "rows": ["B6", "B4", "D6", "D5", "D1", "C6", "B5", "D7", "D4", "D0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B7", "pin_b": "E6"}
]
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
"layouts": {
"LAYOUT_ansi": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Back space", "x":13, "y":0},
- {"label":"Delete", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [5, 6], "x": 7, "y": 0},
+ {"matrix": [5, 5], "x": 8, "y": 0},
+ {"matrix": [5, 4], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 0], "x": 13, "y": 0},
+ {"matrix": [9, 0], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [6, 6], "x": 7.5, "y": 1},
+ {"matrix": [6, 5], "x": 8.5, "y": 1},
+ {"matrix": [6, 4], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 2], "x": 11.5, "y": 1},
+ {"matrix": [6, 1], "x": 12.5, "y": 1},
+ {"matrix": [6, 0], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
- {"label":"\\", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 0], "x": 12.75, "y": 2, "w": 2.25},
- {"label":"CapsLock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":";", "x":10.75, "y":2},
- {"label":"'", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [8, 6], "x": 7.25, "y": 3},
+ {"matrix": [8, 5], "x": 8.25, "y": 3},
+ {"matrix": [8, 4], "x": 9.25, "y": 3},
+ {"matrix": [8, 3], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 0], "x": 14, "y": 3},
- { "x": 0, "y": 3, "w": 1.25 },
- {"label":"Shift", "x":1.25, "y":3},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":",", "x":9.25, "y":3},
- {"label":".", "x":10.25, "y":3},
- {"label":"/", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"Lower", "x":14, "y":3},
- {"label":"Up", "x":15.25, "y":3},
+ {"matrix": [9, 1], "x": 15.25, "y": 3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Alt", "x":1.25, "y":4, "w":1.25},
- {"label":"Lower", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":2.25},
- {"label":"Space", "x":6, "y":4, "w":1.25},
- {"label":"Enter", "x":7.25, "y":4, "w":2.75},
- {"label":"Raise", "x":10, "y":4, "w":1.25},
- {"label":"Alt", "x":11.25, "y":4, "w":1.25},
- {"label":"Ctrl", "x":12.5, "y":4, "w":1.25},
- {"label":"Left", "x":14.25, "y":4},
- {"label":"Down", "x":15.25, "y":4},
- {"label":"Right", "x":16.25, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 3], "x": 15.25, "y": 4},
+ {"matrix": [9, 2], "x": 16.25, "y": 4}
]
},
"LAYOUT_iso": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "y":0},
- {"label":"Back space", "x":13, "y":0},
- {"label":"Delete", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [5, 6], "x": 7, "y": 0},
+ {"matrix": [5, 5], "x": 8, "y": 0},
+ {"matrix": [5, 4], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 2], "x": 11, "y": 0},
+ {"matrix": [5, 1], "x": 12, "y": 0},
+ {"matrix": [5, 0], "x": 13, "y": 0},
+ {"matrix": [9, 0], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [6, 6], "x": 7.5, "y": 1},
+ {"matrix": [6, 5], "x": 8.5, "y": 1},
+ {"matrix": [6, 4], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 2], "x": 11.5, "y": 1},
+ {"matrix": [6, 1], "x": 12.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [7, 6], "x": 7.75, "y": 2},
+ {"matrix": [7, 5], "x": 8.75, "y": 2},
+ {"matrix": [7, 4], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 2], "x": 11.75, "y": 2},
+ {"matrix": [7, 1], "x": 12.75, "y": 2},
+ {"matrix": [7, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"[", "x":11.5, "y":1},
- {"label":"]", "x":12.5, "y":1},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [8, 6], "x": 7.25, "y": 3},
+ {"matrix": [8, 5], "x": 8.25, "y": 3},
+ {"matrix": [8, 4], "x": 9.25, "y": 3},
+ {"matrix": [8, 3], "x": 10.25, "y": 3},
+ {"matrix": [8, 2], "x": 11.25, "y": 3},
+ {"matrix": [8, 1], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 0], "x": 14, "y": 3},
- {"label":"CapsLock", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":";", "x":10.75, "y":2},
- {"label":"'", "x":11.75, "y":2},
- {"label":"#", "x":12.75, "y":2},
- {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+ {"matrix": [9, 1], "x": 15.25, "y": 3},
- { "x": 0, "y": 3, "w": 1.25 },
- {"label":"Shift", "x":1.25, "y":3},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":",", "x":9.25, "y":3},
- {"label":".", "x":10.25, "y":3},
- {"label":"/", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"Lower", "x":14, "y":3},
- {"label":"Up", "x":15.25, "y":3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 4], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 7.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [9, 6], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 5], "x": 12.5, "y": 4, "w": 1.25},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Alt", "x":1.25, "y":4, "w":1.25},
- {"label":"Lower", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":2.25},
- {"label":"Space", "x":6, "y":4, "w":1.25},
- {"label":"Enter", "x":7.25, "y":4, "w":2.75},
- {"label":"Raise", "x":10, "y":4, "w":1.25},
- {"label":"Alt", "x":11.25, "y":4, "w":1.25},
- {"label":"Ctrl", "x":12.5, "y":4, "w":1.25},
- {"label":"Left", "x":14.25, "y":4},
- {"label":"Down", "x":15.25, "y":4},
- {"label":"Right", "x":16.25, "y":4}
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 3], "x": 15.25, "y": 4},
+ {"matrix": [9, 2], "x": 16.25, "y": 4}
]
}
}
diff --git a/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c b/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c
index 0d1ed9e01f..5412fa0df0 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c
+++ b/keyboards/bbrfkr/dynamis/keymaps/via/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_QWERTY] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D), },
[_LOWER] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
[_RAISE] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) },
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 23:21:39 +0000