LailaTheElf/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bbrfkr Dynamis Refactor (#18733)

Browse Source 
* dynamis.h: use XXX for KC_NO

* dynamis.h: add matrix diagram

* info.json: apply friendly formatting

* refactor keymaps

- use four-space indent
- grid-align keycodes for readability

* info.json: fix LAYOUT_iso key sequence
This commit is contained in:
James Young 2022-10-15 14:25:53 -07:00 committed by GitHub
parent ccdd28930a
commit 679cbb8426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 251 additions and 804 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
keyboards/bbrfkr/dynamis/dynamis.h
View File

@ -18,6 +18,25 @@
#include "quantum.h" #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( \ #define LAYOUT_ansi( \
C00, C01, C02, C03, C04, C05, C06, C56, C55, C54, C53, C52, C51, C50, C90, \ 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, \ C10, C11, C12, C13, C14, C15, C16, C66, C65, C64, C63, C62, C61, C60, \
@ -33,7 +52,7 @@
{ C40, C41, C42, C43, C44, C45, C46 }, \ { C40, C41, C42, C43, C44, C45, C46 }, \
{ C50, C51, C52, C53, C54, C55, C56 }, \ { C50, C51, C52, C53, C54, C55, C56 }, \
{ C60, C61, C62, C63, C64, C65, C66 }, \ { C60, C61, C62, C63, C64, C65, C66 }, \
{ C70, KC_NO, C72, C73, C74, C75, C76 }, \ { C70, XXX, C72, C73, C74, C75, C76 }, \
{ C80, C81, C82, C83, C84, C85, C86 }, \ { C80, C81, C82, C83, C84, C85, C86 }, \
{ C90, C91, C92, C93, C94, C95, C96 } \ { C90, C91, C92, C93, C94, C95, C96 } \
} }
@ -52,7 +71,7 @@
{ C30, C31, C32, C33, C34, C35, C36 }, \ { C30, C31, C32, C33, C34, C35, C36 }, \
{ C40, C41, C42, C43, C44, C45, C46 }, \ { C40, C41, C42, C43, C44, C45, C46 }, \
{ C50, C51, C52, C53, C54, C55, C56 }, \ { C50, C51, C52, C53, C54, C55, C56 }, \
{ KC_NO, C61, C62, C63, C64, C65, C66 }, \ { XXX, C61, C62, C63, C64, C65, C66 }, \
{ C70, C71, C72, C73, C74, C75, C76 }, \ { C70, C71, C72, C73, C74, C75, C76 }, \
{ C80, C81, C82, C83, C84, C85, C86 }, \ { C80, C81, C82, C83, C84, C85, C86 }, \
{ C90, C91, C92, C93, C94, C95, C96 } \ { C90, C91, C92, C93, C94, C95, C96 } \

864
keyboards/bbrfkr/dynamis/info.json
View File

@ -11,728 +11,156 @@
"layouts": { "layouts": {
"LAYOUT_ansi": { "LAYOUT_ansi": {
"layout": [ "layout": [
{ {"label":"`", "x":0, "y":0},
"label": "`", {"label":"1", "x":1, "y":0},
"x": 0, {"label":"2", "x":2, "y":0},
"y": 0 {"label":"3", "x":3, "y":0},
}, {"label":"4", "x":4, "y":0},
{ {"label":"5", "x":5, "y":0},
"label": "1", {"label":"6", "x":6, "y":0},
"x": 1, {"label":"7", "x":7, "y":0},
"y": 0 {"label":"8", "x":8, "y":0},
}, {"label":"9", "x":9, "y":0},
{ {"label":"0", "x":10, "y":0},
"label": "2", {"label":"-", "x":11, "y":0},
"x": 2, {"label":"=", "x":12, "y":0},
"y": 0 {"label":"Back space", "x":13, "y":0},
}, {"label":"Delete", "x":14, "y":0},
{
"label": "3", {"label":"Tab", "x":0, "y":1, "w":1.5},
"x": 3, {"label":"Q", "x":1.5, "y":1},
"y": 0 {"label":"W", "x":2.5, "y":1},
}, {"label":"E", "x":3.5, "y":1},
{ {"label":"R", "x":4.5, "y":1},
"label": "4", {"label":"T", "x":5.5, "y":1},
"x": 4, {"label":"Y", "x":6.5, "y":1},
"y": 0 {"label":"U", "x":7.5, "y":1},
}, {"label":"I", "x":8.5, "y":1},
{ {"label":"O", "x":9.5, "y":1},
"label": "5", {"label":"P", "x":10.5, "y":1},
"x": 5, {"label":"[", "x":11.5, "y":1},
"y": 0 {"label":"]", "x":12.5, "y":1},
}, {"label":"\\", "x":13.5, "y":1, "w":1.5},
{
"label": "6", {"label":"CapsLock", "x":0, "y":2, "w":1.75},
"x": 6, {"label":"A", "x":1.75, "y":2},
"y": 0 {"label":"S", "x":2.75, "y":2},
}, {"label":"D", "x":3.75, "y":2},
{ {"label":"F", "x":4.75, "y":2},
"label": "7", {"label":"G", "x":5.75, "y":2},
"x": 7, {"label":"H", "x":6.75, "y":2},
"y": 0 {"label":"J", "x":7.75, "y":2},
}, {"label":"K", "x":8.75, "y":2},
{ {"label":"L", "x":9.75, "y":2},
"label": "8", {"label":";", "x":10.75, "y":2},
"x": 8, {"label":"'", "x":11.75, "y":2},
"y": 0 {"label":"Enter", "x":12.75, "y":2, "w":2.25},
},
{ { "x": 0, "y": 3, "w": 1.25 },
"label": "9", {"label":"Shift", "x":1.25, "y":3},
"x": 9, {"label":"Z", "x":2.25, "y":3},
"y": 0 {"label":"X", "x":3.25, "y":3},
}, {"label":"C", "x":4.25, "y":3},
{ {"label":"V", "x":5.25, "y":3},
"label": "0", {"label":"B", "x":6.25, "y":3},
"x": 10, {"label":"N", "x":7.25, "y":3},
"y": 0 {"label":"M", "x":8.25, "y":3},
}, {"label":",", "x":9.25, "y":3},
{ {"label":".", "x":10.25, "y":3},
"label": "-", {"label":"/", "x":11.25, "y":3},
"x": 11, {"label":"Shift", "x":12.25, "y":3, "w":1.75},
"y": 0 {"label":"Lower", "x":14, "y":3},
}, {"label":"Up", "x":15.25, "y":3},
{
"label": "=", {"label":"Ctrl", "x":0, "y":4, "w":1.25},
"x": 12, {"label":"Alt", "x":1.25, "y":4, "w":1.25},
"y": 0 {"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": "Back space", {"label":"Enter", "x":7.25, "y":4, "w":2.75},
"x": 13, {"label":"Raise", "x":10, "y":4, "w":1.25},
"y": 0 {"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": "Delete", {"label":"Down", "x":15.25, "y":4},
"x": 14, {"label":"Right", "x":16.25, "y":4}
"y": 0
},
{
"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
},
{
"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
},
{
"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
},
{
"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
}
] ]
}, },
"LAYOUT_iso": { "LAYOUT_iso": {
"layout": [ "layout": [
{ {"label":"`", "x":0, "y":0},
"label": "`", {"label":"1", "x":1, "y":0},
"x": 0, {"label":"2", "x":2, "y":0},
"y": 0 {"label":"3", "x":3, "y":0},
}, {"label":"4", "x":4, "y":0},
{ {"label":"5", "x":5, "y":0},
"label": "1", {"label":"6", "x":6, "y":0},
"x": 1, {"label":"7", "x":7, "y":0},
"y": 0 {"label":"8", "x":8, "y":0},
}, {"label":"9", "x":9, "y":0},
{ {"label":"0", "x":10, "y":0},
"label": "2", {"label":"-", "x":11, "y":0},
"x": 2, {"label":"=", "x":12, "y":0},
"y": 0 {"label":"Back space", "x":13, "y":0},
}, {"label":"Delete", "x":14, "y":0},
{
"label": "3", {"label":"Tab", "x":0, "y":1, "w":1.5},
"x": 3, {"label":"Q", "x":1.5, "y":1},
"y": 0 {"label":"W", "x":2.5, "y":1},
}, {"label":"E", "x":3.5, "y":1},
{ {"label":"R", "x":4.5, "y":1},
"label": "4", {"label":"T", "x":5.5, "y":1},
"x": 4, {"label":"Y", "x":6.5, "y":1},
"y": 0 {"label":"U", "x":7.5, "y":1},
}, {"label":"I", "x":8.5, "y":1},
{ {"label":"O", "x":9.5, "y":1},
"label": "5", {"label":"P", "x":10.5, "y":1},
"x": 5, {"label":"[", "x":11.5, "y":1},
"y": 0 {"label":"]", "x":12.5, "y":1},
},
{ {"label":"CapsLock", "x":0, "y":2, "w":1.75},
"label": "6", {"label":"A", "x":1.75, "y":2},
"x": 6, {"label":"S", "x":2.75, "y":2},
"y": 0 {"label":"D", "x":3.75, "y":2},
}, {"label":"F", "x":4.75, "y":2},
{ {"label":"G", "x":5.75, "y":2},
"label": "7", {"label":"H", "x":6.75, "y":2},
"x": 7, {"label":"J", "x":7.75, "y":2},
"y": 0 {"label":"K", "x":8.75, "y":2},
}, {"label":"L", "x":9.75, "y":2},
{ {"label":";", "x":10.75, "y":2},
"label": "8", {"label":"'", "x":11.75, "y":2},
"x": 8, {"label":"#", "x":12.75, "y":2},
"y": 0 {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
},
{ { "x": 0, "y": 3, "w": 1.25 },
"label": "9", {"label":"Shift", "x":1.25, "y":3},
"x": 9, {"label":"Z", "x":2.25, "y":3},
"y": 0 {"label":"X", "x":3.25, "y":3},
}, {"label":"C", "x":4.25, "y":3},
{ {"label":"V", "x":5.25, "y":3},
"label": "0", {"label":"B", "x":6.25, "y":3},
"x": 10, {"label":"N", "x":7.25, "y":3},
"y": 0 {"label":"M", "x":8.25, "y":3},
}, {"label":",", "x":9.25, "y":3},
{ {"label":".", "x":10.25, "y":3},
"label": "-", {"label":"/", "x":11.25, "y":3},
"x": 11, {"label":"Shift", "x":12.25, "y":3, "w":1.75},
"y": 0 {"label":"Lower", "x":14, "y":3},
}, {"label":"Up", "x":15.25, "y":3},
{
"label": "=", {"label":"Ctrl", "x":0, "y":4, "w":1.25},
"x": 12, {"label":"Alt", "x":1.25, "y":4, "w":1.25},
"y": 0 {"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": "Back space", {"label":"Enter", "x":7.25, "y":4, "w":2.75},
"x": 13, {"label":"Raise", "x":10, "y":4, "w":1.25},
"y": 0 {"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": "Delete", {"label":"Down", "x":15.25, "y":4},
"x": 14, {"label":"Right", "x":16.25, "y":4}
"y": 0
},
{
"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": "Enter",
"x": 13.75,
"y": 1,
"w": 1.25,
"h": 2
},
{
"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
},
{
"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
},
{
"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
}
] ]
} }
} }