From 7c5d4484f69d9bcb24a16affbe16273fca552a4d Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 7 Feb 2022 19:44:19 -0800
Subject: Wings42: add QMK Configurator data (#16267)
* add info.json for wings42/rev1
* add info.json for wings42/rev1_extkeys
* add info.json for wings42/rev2
---
keyboards/wings42/rev1/info.json | 56 +++++++++++++++++++++++++++++
keyboards/wings42/rev1_extkeys/info.json | 60 ++++++++++++++++++++++++++++++++
keyboards/wings42/rev2/info.json | 60 ++++++++++++++++++++++++++++++++
3 files changed, 176 insertions(+)
create mode 100644 keyboards/wings42/rev1/info.json
create mode 100644 keyboards/wings42/rev1_extkeys/info.json
create mode 100644 keyboards/wings42/rev2/info.json
diff --git a/keyboards/wings42/rev1/info.json b/keyboards/wings42/rev1/info.json
new file mode 100644
index 0000000000..863bb3d34e
--- /dev/null
+++ b/keyboards/wings42/rev1/info.json
@@ -0,0 +1,56 @@
+{
+ "keyboard_name": "wings42 rev1",
+ "url": "",
+ "maintainer": "yfuku",
+ "layouts": {
+ "LAYOUT_split_3x6_3": {
+ "layout": [
+ {"label":"L00", "x":0, "y":0.875},
+ {"label":"L01", "x":1, "y":0.625},
+ {"label":"L02", "x":2, "y":0.375},
+ {"label":"L03", "x":3, "y":0},
+ {"label":"L04", "x":4, "y":0},
+ {"label":"L05", "x":5, "y":0.125},
+ {"label":"R00", "x":9, "y":0.125},
+ {"label":"R01", "x":10, "y":0},
+ {"label":"R02", "x":11, "y":0},
+ {"label":"R03", "x":12, "y":0.375},
+ {"label":"R04", "x":13, "y":0.625},
+ {"label":"R05", "x":14, "y":0.875},
+
+ {"label":"L10", "x":0, "y":1.875},
+ {"label":"L11", "x":1, "y":1.625},
+ {"label":"L12", "x":2, "y":1.375},
+ {"label":"L13", "x":3, "y":1},
+ {"label":"L14", "x":4, "y":1},
+ {"label":"L15", "x":5, "y":1.125},
+ {"label":"R10", "x":9, "y":1.125},
+ {"label":"R11", "x":10, "y":1},
+ {"label":"R12", "x":11, "y":1},
+ {"label":"R13", "x":12, "y":1.375},
+ {"label":"R14", "x":13, "y":1.625},
+ {"label":"R15", "x":14, "y":1.875},
+
+ {"label":"L20", "x":0, "y":2.875},
+ {"label":"L21", "x":1, "y":2.625},
+ {"label":"L22", "x":2, "y":2.375},
+ {"label":"L23", "x":3, "y":2},
+ {"label":"L24", "x":4, "y":2},
+ {"label":"L25", "x":5, "y":2.125},
+ {"label":"R20", "x":9, "y":2.125},
+ {"label":"R21", "x":10, "y":2},
+ {"label":"R22", "x":11, "y":2},
+ {"label":"R23", "x":12, "y":2.375},
+ {"label":"R24", "x":13, "y":2.625},
+ {"label":"R25", "x":14, "y":2.875},
+
+ {"label":"L30", "x":4, "y":3},
+ {"label":"L31", "x":5, "y":3.125},
+ {"label":"L32", "x":6, "y":3.375},
+ {"label":"R30", "x":8, "y":3.375},
+ {"label":"R31", "x":9, "y":3.125},
+ {"label":"R32", "x":10, "y":3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wings42/rev1_extkeys/info.json b/keyboards/wings42/rev1_extkeys/info.json
new file mode 100644
index 0000000000..b9a793f112
--- /dev/null
+++ b/keyboards/wings42/rev1_extkeys/info.json
@@ -0,0 +1,60 @@
+{
+ "keyboard_name": "wings42 rev1_extkeys",
+ "url": "",
+ "maintainer": "yfuku",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label":"L00", "x":0, "y":0.875},
+ {"label":"L01", "x":1, "y":0.625},
+ {"label":"L02", "x":2, "y":0.375},
+ {"label":"L03", "x":3, "y":0},
+ {"label":"L04", "x":4, "y":0},
+ {"label":"L05", "x":5, "y":0.125},
+ {"label":"R00", "x":9, "y":0.125},
+ {"label":"R01", "x":10, "y":0},
+ {"label":"R02", "x":11, "y":0},
+ {"label":"R03", "x":12, "y":0.375},
+ {"label":"R04", "x":13, "y":0.625},
+ {"label":"R05", "x":14, "y":0.875},
+
+ {"label":"L10", "x":0, "y":1.875},
+ {"label":"L11", "x":1, "y":1.625},
+ {"label":"L12", "x":2, "y":1.375},
+ {"label":"L13", "x":3, "y":1},
+ {"label":"L14", "x":4, "y":1},
+ {"label":"L15", "x":5, "y":1.125},
+ {"label":"E01", "x":6, "y":1.625},
+ {"label":"E03", "x":8, "y":1.625},
+ {"label":"R10", "x":9, "y":1.125},
+ {"label":"R11", "x":10, "y":1},
+ {"label":"R12", "x":11, "y":1},
+ {"label":"R13", "x":12, "y":1.375},
+ {"label":"R14", "x":13, "y":1.625},
+ {"label":"R15", "x":14, "y":1.875},
+
+ {"label":"L20", "x":0, "y":2.875},
+ {"label":"L21", "x":1, "y":2.625},
+ {"label":"L22", "x":2, "y":2.375},
+ {"label":"L23", "x":3, "y":2},
+ {"label":"L24", "x":4, "y":2},
+ {"label":"L25", "x":5, "y":2.125},
+ {"label":"E02", "x":6, "y":2.625},
+ {"label":"E04", "x":8, "y":2.625},
+ {"label":"R20", "x":9, "y":2.125},
+ {"label":"R21", "x":10, "y":2},
+ {"label":"R22", "x":11, "y":2},
+ {"label":"R23", "x":12, "y":2.375},
+ {"label":"R24", "x":13, "y":2.625},
+ {"label":"R25", "x":14, "y":2.875},
+
+ {"label":"L30", "x":4, "y":3},
+ {"label":"L31", "x":5, "y":3.125},
+ {"label":"L32", "x":6, "y":3.375},
+ {"label":"R30", "x":8, "y":3.375},
+ {"label":"R31", "x":9, "y":3.125},
+ {"label":"R32", "x":10, "y":3}
+ ]
+ }
+ }
+}
diff --git a/keyboards/wings42/rev2/info.json b/keyboards/wings42/rev2/info.json
new file mode 100644
index 0000000000..4e78697627
--- /dev/null
+++ b/keyboards/wings42/rev2/info.json
@@ -0,0 +1,60 @@
+{
+ "keyboard_name": "wings42 rev2",
+ "url": "",
+ "maintainer": "yfuku",
+ "layouts": {
+ "LAYOUT_split_3x6_3_2": {
+ "layout": [
+ {"label":"L00", "x":0, "y":0.875},
+ {"label":"L01", "x":1, "y":0.625},
+ {"label":"L02", "x":2, "y":0.375},
+ {"label":"L03", "x":3, "y":0},
+ {"label":"L04", "x":4, "y":0},
+ {"label":"L05", "x":5, "y":0.125},
+ {"label":"R00", "x":9, "y":0.125},
+ {"label":"R01", "x":10, "y":0},
+ {"label":"R02", "x":11, "y":0},
+ {"label":"R03", "x":12, "y":0.375},
+ {"label":"R04", "x":13, "y":0.625},
+ {"label":"R05", "x":14, "y":0.875},
+
+ {"label":"L10", "x":0, "y":1.875},
+ {"label":"L11", "x":1, "y":1.625},
+ {"label":"L12", "x":2, "y":1.375},
+ {"label":"L13", "x":3, "y":1},
+ {"label":"L14", "x":4, "y":1},
+ {"label":"L15", "x":5, "y":1.125},
+ {"label":"L31", "x":6, "y":1.625},
+ {"label":"R33", "x":8, "y":1.625},
+ {"label":"R10", "x":9, "y":1.125},
+ {"label":"R11", "x":10, "y":1},
+ {"label":"R12", "x":11, "y":1},
+ {"label":"R13", "x":12, "y":1.375},
+ {"label":"R14", "x":13, "y":1.625},
+ {"label":"R15", "x":14, "y":1.875},
+
+ {"label":"L20", "x":0, "y":2.875},
+ {"label":"L21", "x":1, "y":2.625},
+ {"label":"L22", "x":2, "y":2.375},
+ {"label":"L23", "x":3, "y":2},
+ {"label":"L24", "x":4, "y":2},
+ {"label":"L25", "x":5, "y":2.125},
+ {"label":"L32", "x":6, "y":2.625},
+ {"label":"R34", "x":8, "y":2.625},
+ {"label":"R20", "x":9, "y":2.125},
+ {"label":"R21", "x":10, "y":2},
+ {"label":"R22", "x":11, "y":2},
+ {"label":"R23", "x":12, "y":2.375},
+ {"label":"R24", "x":13, "y":2.625},
+ {"label":"R25", "x":14, "y":2.875},
+
+ {"label":"L33", "x":4, "y":3},
+ {"label":"L34", "x":5, "y":3.125},
+ {"label":"L35", "x":6, "y":3.375},
+ {"label":"R30", "x":8, "y":3.375},
+ {"label":"R31", "x":9, "y":3.125},
+ {"label":"R32", "x":10, "y":3}
+ ]
+ }
+ }
+}
--
cgit v1.2.3
From f3aa5db4147f9a5e80a81e76b74280aa1087a281 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 7 Feb 2022 19:45:44 -0800
Subject: Boardsource The Mark 65 Touch-Up and Layout Additions (#16270)
* the_mark.h: use ____ for KC_NO
* the_mark.h: number matrix positions electrically
`K300` and `K301` has misleading identifiers - `K300` was on column 1 and `K301` on column 0.
* the_mark.h: use QMK 3-character notation
* the_mark.h: add matrix diagram
* refactor reference keymaps
- convert tabs to spaces
- use four-space indent
- grid align keycodes
- remove extra line breaks
- add layer indexes to `via` keymap
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_bs_space
Includes reference keymap.
* add LAYOUT_iso_split_bs_space
Includes reference keymap.
* info.json: edit maintainer value
There is a Boardsource GitHub account, but knowing the user who maintains it is helpful.
---
keyboards/boardsource/the_mark/info.json | 588 +++++++++++++--------
.../boardsource/the_mark/keymaps/default/keymap.c | 30 +-
.../the_mark/keymaps/default_ansi/keymap.c | 30 +-
.../keymaps/default_ansi_split_bs_space/keymap.c | 41 ++
.../the_mark/keymaps/default_iso/keymap.c | 30 +-
.../keymaps/default_iso_split_bs_space/keymap.c | 41 ++
.../boardsource/the_mark/keymaps/via/keymap.c | 58 +-
keyboards/boardsource/the_mark/the_mark.h | 112 ++--
8 files changed, 598 insertions(+), 332 deletions(-)
create mode 100644 keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c
create mode 100644 keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c
diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index 07e3a34e54..792585d12a 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -1,229 +1,393 @@
{
"keyboard_name": "The Mark: 65",
"url": "",
- "maintainer": "Boardsource",
+ "maintainer": "daysgobye, Boardsource",
"layouts": {
"LAYOUT_all": {
"layout": [
- { "x": 0, "y": 0, "w": 1 },
- { "x": 1, "y": 0, "w": 1 },
- { "x": 2, "y": 0, "w": 1 },
- { "x": 3, "y": 0, "w": 1 },
- { "x": 4, "y": 0, "w": 1 },
- { "x": 5, "y": 0, "w": 1 },
- { "x": 6, "y": 0, "w": 1 },
- { "x": 7, "y": 0, "w": 1 },
- { "x": 8, "y": 0, "w": 1 },
- { "x": 9, "y": 0, "w": 1 },
- { "x": 10, "y": 0, "w": 1 },
- { "x": 11, "y": 0, "w": 1 },
- { "x": 12, "y": 0, "w": 1 },
- { "x": 13, "y": 0, "w": 1 },
- { "x": 14, "y": 0, "w": 1 },
- { "x": 15.25, "y": 0, "w": 1 },
- { "x": 0, "y": 1, "w": 1.5 },
- { "x": 1.5, "y": 1, "w": 1 },
- { "x": 2.5, "y": 1, "w": 1 },
- { "x": 3.5, "y": 1, "w": 1 },
- { "x": 4.5, "y": 1, "w": 1 },
- { "x": 5.5, "y": 1, "w": 1 },
- { "x": 6.5, "y": 1, "w": 1 },
- { "x": 7.5, "y": 1, "w": 1 },
- { "x": 8.5, "y": 1, "w": 1 },
- { "x": 9.5, "y": 1, "w": 1 },
- { "x": 10.5, "y": 1, "w": 1 },
- { "x": 11.5, "y": 1, "w": 1 },
- { "x": 12.5, "y": 1, "w": 1 },
- { "x": 13.5, "y": 1, "w": 1.5 },
- { "x": 15.25, "y": 1, "w": 1 },
- { "x": 0, "y": 2, "w": 1.75 },
- { "x": 1.75, "y": 2, "w": 1 },
- { "x": 2.75, "y": 2, "w": 1 },
- { "x": 3.75, "y": 2, "w": 1 },
- { "x": 4.75, "y": 2, "w": 1 },
- { "x": 5.75, "y": 2, "w": 1 },
- { "x": 6.75, "y": 2, "w": 1 },
- { "x": 7.75, "y": 2, "w": 1 },
- { "x": 8.75, "y": 2, "w": 1 },
- { "x": 9.75, "y": 2, "w": 1 },
- { "x": 10.75, "y": 2, "w": 1 },
- { "x": 11.75, "y": 2, "w": 1 },
- { "x": 12.75, "y": 2, "w": 2.25 },
- { "x": 15.25, "y": 2, "w": 1 },
- { "x": 0, "y": 3, "w": 1.25 },
- { "x": 1.25, "y": 3, "w": 1 },
- { "x": 2.25, "y": 3, "w": 1 },
- { "x": 3.25, "y": 3, "w": 1 },
- { "x": 4.25, "y": 3, "w": 1 },
- { "x": 5.25, "y": 3, "w": 1 },
- { "x": 6.25, "y": 3, "w": 1 },
- { "x": 7.25, "y": 3, "w": 1 },
- { "x": 8.25, "y": 3, "w": 1 },
- { "x": 9.25, "y": 3, "w": 1 },
- { "x": 10.25, "y": 3, "w": 1 },
- { "x": 11.25, "y": 3, "w": 1 },
- { "x": 12.25, "y": 3, "w": 1.75 },
- { "x": 14.25, "y": 3.25, "w": 1 },
- { "x": 0, "y": 4, "w": 1.25 },
- { "x": 1.25, "y": 4, "w": 1.25 },
- { "x": 2.5, "y": 4, "w": 1.25 },
- { "x": 3.75, "y": 4, "w": 2.25 },
- { "x": 6, "y": 4, "w": 1.25 },
- { "x": 7.25, "y": 4, "w": 2.75 },
- { "x": 10, "y": 4, "w": 1 },
- { "x": 11, "y": 4, "w": 1 },
- { "x": 12, "y": 4, "w": 1 },
- { "x": 13.25, "y": 4.25, "w": 1 },
- { "x": 14.25, "y": 4.25, "w": 1 },
- { "x": 15.25, "y": 4.25, "w": 1 }
+ {"label":"Esc", "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":"Backspace", "x":13, "y":0},
+ {"label":"Backspace", "x":14, "y":0},
+ {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1},
+
+ {"label":"Ctrl", "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},
+ {"label":"Fn", "x":15.25, "y":2},
+
+ {"label":"Shift", "x":0, "y":3, "w":1.25},
+ {"label":"\\|", "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":"\u2191", "x":14.25, "y":3.25},
+
+ {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+ {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+ {"label":"Alt", "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":"Space", "x":7.25, "y":4, "w":2.75},
+ {"label":"Alt", "x":10, "y":4},
+ {"label":"Ctrl", "x":11, "y":4},
+ {"label":"`~", "x":12, "y":4},
+ {"label":"\u2190", "x":13.25, "y":4.25},
+ {"label":"\u2193", "x":14.25, "y":4.25},
+ {"label":"\u2192", "x":15.25, "y":4.25}
]
},
"LAYOUT_ansi": {
"layout": [
- { "x": 0, "y": 0, "w": 1 },
- { "x": 1, "y": 0, "w": 1 },
- { "x": 2, "y": 0, "w": 1 },
- { "x": 3, "y": 0, "w": 1 },
- { "x": 4, "y": 0, "w": 1 },
- { "x": 5, "y": 0, "w": 1 },
- { "x": 6, "y": 0, "w": 1 },
- { "x": 7, "y": 0, "w": 1 },
- { "x": 8, "y": 0, "w": 1 },
- { "x": 9, "y": 0, "w": 1 },
- { "x": 10, "y": 0, "w": 1 },
- { "x": 11, "y": 0, "w": 1 },
- { "x": 12, "y": 0, "w": 1 },
- { "x": 13, "y": 0, "w": 2 },
- { "x": 15.25, "y": 0, "w": 1 },
- { "x": 0, "y": 1, "w": 1.5 },
- { "x": 1.5, "y": 1, "w": 1 },
- { "x": 2.5, "y": 1, "w": 1 },
- { "x": 3.5, "y": 1, "w": 1 },
- { "x": 4.5, "y": 1, "w": 1 },
- { "x": 5.5, "y": 1, "w": 1 },
- { "x": 6.5, "y": 1, "w": 1 },
- { "x": 7.5, "y": 1, "w": 1 },
- { "x": 8.5, "y": 1, "w": 1 },
- { "x": 9.5, "y": 1, "w": 1 },
- { "x": 10.5, "y": 1, "w": 1 },
- { "x": 11.5, "y": 1, "w": 1 },
- { "x": 12.5, "y": 1, "w": 1 },
- { "x": 13.5, "y": 1, "w": 1.5 },
- { "x": 15.25, "y": 1, "w": 1 },
- { "x": 0, "y": 2, "w": 1.75 },
- { "x": 1.75, "y": 2, "w": 1 },
- { "x": 2.75, "y": 2, "w": 1 },
- { "x": 3.75, "y": 2, "w": 1 },
- { "x": 4.75, "y": 2, "w": 1 },
- { "x": 5.75, "y": 2, "w": 1 },
- { "x": 6.75, "y": 2, "w": 1 },
- { "x": 7.75, "y": 2, "w": 1 },
- { "x": 8.75, "y": 2, "w": 1 },
- { "x": 9.75, "y": 2, "w": 1 },
- { "x": 10.75, "y": 2, "w": 1 },
- { "x": 11.75, "y": 2, "w": 1 },
- { "x": 12.75, "y": 2, "w": 2.25 },
- { "x": 15.25, "y": 2, "w": 1 },
- { "x": 0, "y": 3, "w": 2.25 },
- { "x": 2.25, "y": 3, "w": 1 },
- { "x": 3.25, "y": 3, "w": 1 },
- { "x": 4.25, "y": 3, "w": 1 },
- { "x": 5.25, "y": 3, "w": 1 },
- { "x": 6.25, "y": 3, "w": 1 },
- { "x": 7.25, "y": 3, "w": 1 },
- { "x": 8.25, "y": 3, "w": 1 },
- { "x": 9.25, "y": 3, "w": 1 },
- { "x": 10.25, "y": 3, "w": 1 },
- { "x": 11.25, "y": 3, "w": 1 },
- { "x": 12.25, "y": 3, "w": 1.75 },
- { "x": 14.25, "y": 3.25, "w": 1 },
- { "x": 0, "y": 4, "w": 1.25 },
- { "x": 1.25, "y": 4, "w": 1.25 },
- { "x": 2.5, "y": 4, "w": 1.25 },
- { "x": 3.75, "y": 4, "w": 6.25 },
- { "x": 10, "y": 4, "w": 1 },
- { "x": 11, "y": 4, "w": 1 },
- { "x": 12, "y": 4, "w": 1 },
- { "x": 13.25, "y": 4.25, "w": 1 },
- { "x": 14.25, "y": 4.25, "w": 1 },
- { "x": 15.25, "y": 4.25, "w": 1 }
+ {"label":"Esc", "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":"Backspace", "x":13, "y":0, "w":2},
+ {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1},
+
+ {"label":"Ctrl", "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},
+ {"label":"Fn", "x":15.25, "y":2},
+
+ {"label":"Shift", "x":0, "y":3, "w":2.25},
+ {"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":"\u2191", "x":14.25, "y":3.25},
+
+ {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+ {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4, "w":6.25},
+ {"label":"Alt", "x":10, "y":4},
+ {"label":"Ctrl", "x":11, "y":4},
+ {"label":"`~", "x":12, "y":4},
+ {"label":"\u2190", "x":13.25, "y":4.25},
+ {"label":"\u2193", "x":14.25, "y":4.25},
+ {"label":"\u2192", "x":15.25, "y":4.25}
+ ]
+ },
+ "LAYOUT_ansi_split_bs_space": {
+ "layout": [
+ {"label":"Esc", "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":"Backspace", "x":13, "y":0},
+ {"label":"Backspace", "x":14, "y":0},
+ {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1},
+
+ {"label":"Ctrl", "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},
+ {"label":"Fn", "x":15.25, "y":2},
+
+ {"label":"Shift", "x":0, "y":3, "w":2.25},
+ {"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":"\u2191", "x":14.25, "y":3.25},
+
+ {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+ {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+ {"label":"Alt", "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":"Space", "x":7.25, "y":4, "w":2.75},
+ {"label":"Alt", "x":10, "y":4},
+ {"label":"Ctrl", "x":11, "y":4},
+ {"label":"`~", "x":12, "y":4},
+ {"label":"\u2190", "x":13.25, "y":4.25},
+ {"label":"\u2193", "x":14.25, "y":4.25},
+ {"label":"\u2192", "x":15.25, "y":4.25}
]
},
"LAYOUT_iso": {
"layout": [
- { "x": 0, "y": 0, "w": 1 },
- { "x": 1, "y": 0, "w": 1 },
- { "x": 2, "y": 0, "w": 1 },
- { "x": 3, "y": 0, "w": 1 },
- { "x": 4, "y": 0, "w": 1 },
- { "x": 5, "y": 0, "w": 1 },
- { "x": 6, "y": 0, "w": 1 },
- { "x": 7, "y": 0, "w": 1 },
- { "x": 8, "y": 0, "w": 1 },
- { "x": 9, "y": 0, "w": 1 },
- { "x": 10, "y": 0, "w": 1 },
- { "x": 11, "y": 0, "w": 1 },
- { "x": 12, "y": 0, "w": 1 },
- { "x": 13, "y": 0, "w": 2 },
- { "x": 15.25, "y": 0, "w": 1 },
- { "x": 0, "y": 1, "w": 1.5 },
- { "x": 1.5, "y": 1, "w": 1 },
- { "x": 2.5, "y": 1, "w": 1 },
- { "x": 3.5, "y": 1, "w": 1 },
- { "x": 4.5, "y": 1, "w": 1 },
- { "x": 5.5, "y": 1, "w": 1 },
- { "x": 6.5, "y": 1, "w": 1 },
- { "x": 7.5, "y": 1, "w": 1 },
- { "x": 8.5, "y": 1, "w": 1 },
- { "x": 9.5, "y": 1, "w": 1 },
- { "x": 10.5, "y": 1, "w": 1 },
- { "x": 11.5, "y": 1, "w": 1 },
- { "x": 12.5, "y": 1, "w": 1 },
- { "x": 15.25, "y": 1, "w": 1 },
- { "x": 0, "y": 2, "w": 1.75 },
- { "x": 1.75, "y": 2, "w": 1 },
- { "x": 2.75, "y": 2, "w": 1 },
- { "x": 3.75, "y": 2, "w": 1 },
- { "x": 4.75, "y": 2, "w": 1 },
- { "x": 5.75, "y": 2, "w": 1 },
- { "x": 6.75, "y": 2, "w": 1 },
- { "x": 7.75, "y": 2, "w": 1 },
- { "x": 8.75, "y": 2, "w": 1 },
- { "x": 9.75, "y": 2, "w": 1 },
- { "x": 10.75, "y": 2, "w": 1 },
- { "x": 11.75, "y": 2, "w": 1 },
- { "x": 12.75, "y": 2, "w": 1 },
- {
- "x": 13.75,
- "y": 1,
- "w": 1.25,
- "h": 2
- },
- { "x": 15.25, "y": 2, "w": 1 },
- { "x": 0, "y": 3, "w": 1.25 },
- { "x": 1.25, "y": 3, "w": 1 },
- { "x": 2.25, "y": 3, "w": 1 },
- { "x": 3.25, "y": 3, "w": 1 },
- { "x": 4.25, "y": 3, "w": 1 },
- { "x": 5.25, "y": 3, "w": 1 },
- { "x": 6.25, "y": 3, "w": 1 },
- { "x": 7.25, "y": 3, "w": 1 },
- { "x": 8.25, "y": 3, "w": 1 },
- { "x": 9.25, "y": 3, "w": 1 },
- { "x": 10.25, "y": 3, "w": 1 },
- { "x": 11.25, "y": 3, "w": 1 },
- { "x": 12.25, "y": 3, "w": 1.75 },
- { "x": 14.25, "y": 3.25, "w": 1 },
- { "x": 0, "y": 4, "w": 1.25 },
- { "x": 1.25, "y": 4, "w": 1.25 },
- { "x": 2.5, "y": 4, "w": 1.25 },
- { "x": 3.75, "y": 4, "w": 6.25 },
- { "x": 10, "y": 4, "w": 1 },
- { "x": 11, "y": 4, "w": 1 },
- { "x": 12, "y": 4, "w": 1 },
- { "x": 13.25, "y": 4.25, "w": 1 },
- { "x": 14.25, "y": 4.25, "w": 1 },
- { "x": 15.25, "y": 4.25, "w": 1 }
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"1!", "x":1, "y":0},
+ {"label":"2\"", "x":2, "y":0},
+ {"label":"3\u00a3", "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":"Backspace", "x":13, "y":0, "w":2},
+ {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1},
+
+ {"label":"Ctrl", "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},
+ {"label":"Fn", "x":15.25, "y":2},
+
+ {"label":"Shift", "x":0, "y":3, "w":1.25},
+ {"label":"\\|", "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":"\u2191", "x":14.25, "y":3.25},
+
+ {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+ {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+ {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+ {"label":"Space", "x":3.75, "y":4, "w":6.25},
+ {"label":"Alt", "x":10, "y":4},
+ {"label":"Ctrl", "x":11, "y":4},
+ {"label":"`\u00ac", "x":12, "y":4},
+ {"label":"\u2190", "x":13.25, "y":4.25},
+ {"label":"\u2193", "x":14.25, "y":4.25},
+ {"label":"\u2192", "x":15.25, "y":4.25}
+ ]
+ },
+ "LAYOUT_iso_split_bs_space": {
+ "layout": [
+ {"label":"Esc", "x":0, "y":0},
+ {"label":"1!", "x":1, "y":0},
+ {"label":"2\"", "x":2, "y":0},
+ {"label":"3\u00a3", "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":"Backspace", "x":13, "y":0},
+ {"label":"Backspace", "x":14, "y":0},
+ {"label":"Toggle RGB", "x":15.25, "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":"RGB Mode +", "x":15.25, "y":1},
+
+ {"label":"Ctrl", "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},
+ {"label":"Fn", "x":15.25, "y":2},
+
+ {"label":"Shift", "x":0, "y":3, "w":1.25},
+ {"label":"\\|", "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":"\u2191", "x":14.25, "y":3.25},
+
+ {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+ {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+ {"label":"Alt", "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":"Space", "x":7.25, "y":4, "w":2.75},
+ {"label":"Alt", "x":10, "y":4},
+ {"label":"Ctrl", "x":11, "y":4},
+ {"label":"`\u00ac", "x":12, "y":4},
+ {"label":"\u2190", "x":13.25, "y":4.25},
+ {"label":"\u2193", "x":14.25, "y":4.25},
+ {"label":"\u2192", "x":15.25, "y":4.25}
]
}
}
diff --git a/keyboards/boardsource/the_mark/keymaps/default/keymap.c b/keyboards/boardsource/the_mark/keymaps/default/keymap.c
index ead93baf55..148795b0c3 100644
--- a/keyboards/boardsource/the_mark/keymaps/default/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/default/keymap.c
@@ -21,24 +21,20 @@ enum layer_names {
_FN
};
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT_all(
- 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_BSPC, KC_BSPC, RGB_TOG,
- 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_BSLS, RGB_MOD,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(_FN),
- KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-[_FN] = LAYOUT_all(
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,
- RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
+ 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_BSPC, KC_BSPC, RGB_TOG,
+ 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_BSLS, RGB_MOD,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(_FN),
+ KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_FN] = LAYOUT_all(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
};
-
diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
index 250ecf7669..4174e03603 100644
--- a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
@@ -21,24 +21,20 @@ enum layer_names {
_FN
};
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT_ansi(
- 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_BSPC, RGB_TOG,
- 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_BSLS, RGB_MOD,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(_FN),
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-[_FN] = LAYOUT_ansi(
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END,
- RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
+ 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_BSPC, RGB_TOG,
+ 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_BSLS, RGB_MOD,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(_FN),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_FN] = LAYOUT_ansi(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END,
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
};
-
diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c
new file mode 100644
index 0000000000..d59378c78f
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 Boardsource
+ * 2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+ _BASE,
+ _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Base */
+ [_BASE] = LAYOUT_ansi_split_bs_space(
+ 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_BSPC, KC_BSPC, RGB_TOG,
+ 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_BSLS, RGB_MOD,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(_FN),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_FN] = LAYOUT_ansi_split_bs_space(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END,
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
index 6aeace190a..347bc19a35 100644
--- a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
@@ -21,24 +21,20 @@ enum layer_names {
_FN
};
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
[_BASE] = LAYOUT_iso(
- 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_BSPC, RGB_TOG,
- 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, RGB_MOD,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, MO(_FN),
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-[_FN] = LAYOUT_iso(
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_END,
- RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,KC_MUTE, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
+ 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_BSPC, RGB_TOG,
+ 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, RGB_MOD,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, MO(_FN),
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_FN] = LAYOUT_iso(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_HOME,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_END,
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
};
-
diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c
new file mode 100644
index 0000000000..617ee540d1
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 Boardsource
+ * 2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+ _BASE,
+ _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ /* Base */
+ [_BASE] = LAYOUT_iso_split_bs_space(
+ 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_BSPC, KC_BSPC, RGB_TOG,
+ 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, RGB_MOD,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, MO(_FN),
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_FN] = LAYOUT_iso_split_bs_space(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_END,
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/boardsource/the_mark/keymaps/via/keymap.c b/keyboards/boardsource/the_mark/keymaps/via/keymap.c
index 2b0477f39f..1d2a97b756 100644
--- a/keyboards/boardsource/the_mark/keymaps/via/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/via/keymap.c
@@ -15,40 +15,34 @@
*/
#include QMK_KEYBOARD_H
-
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
- LAYOUT_all(
- 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_BSPC, KC_BSPC, RGB_TOG,
- 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_BSLS, KC_PGDN,
- KC_LCTL, 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_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
+ [0] = LAYOUT_all(
+ 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_BSPC, KC_BSPC, RGB_TOG,
+ 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_BSLS, KC_PGDN,
+ KC_LCTL, 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_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_LALT, KC_LCTL, KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT
),
-LAYOUT_all(
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,
- RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-LAYOUT_all(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-LAYOUT_all(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-)
-
-
-
+ [1] = LAYOUT_all(
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_HOME,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,
+ RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [2] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [3] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
};
-
diff --git a/keyboards/boardsource/the_mark/the_mark.h b/keyboards/boardsource/the_mark/the_mark.h
index 9d527f9467..163d5c256c 100644
--- a/keyboards/boardsource/the_mark/the_mark.h
+++ b/keyboards/boardsource/the_mark/the_mark.h
@@ -18,54 +18,92 @@
#include "quantum.h"
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+#define ___ KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐ ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E ││0F │ │0D │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤ └─┬─────┤
+ * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E ││1F │ │ │
+ * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤ ┌──┴┐2D │ ISO Enter
+ * LShift │20 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D ││2F │ │1E │ │
+ * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─