[pull] master from the-via:master

.github/pull_request_template.md

@@ -18,11 +18,22 @@
 <!--- IF THERE IS NO LINK TO SHOW VIA SUPPORT IS IN QMK MASTER ALREADY, -->
 <!--- THIS PR WILL BE CLOSED IMMEDIATELY FOR WORKFLOW REASONS. -->
 
+## VIA Keymap Pull Request
+
+<!--- Add your VIA keymap PR here -->
+<!--- PR to https://github.com/the-via/qmk_userspace_via/pulls -->
+
+<!--- All keyboards merge into QMK including and after 0.26.0 must have this VIA keymap PR -->
+
+<!--- IF THERE IS NO LINK TO SHOW VIA KEYMAP PR, -->
+<!--- THIS PR WILL BE CLOSED IMMEDIATELY FOR WORKFLOW REASONS. -->
+
 ## Checklist
 
 <!--- Put an `x` in all the boxes that apply. -->
 
 - [ ] The VIA support for this keyboard is **MERGED** in QMK master already **(MANDATORY)**
+- [ ] VIA keymap is **MERGED** in VIA userspace master already **(MANDATORY)**
 - [ ] The VIA definition follows the guide here: https://caniusevia.com/docs/layouts
 - [ ] I have a V3 JSON version for this keyboard definition.**(MANDATORY)**
 - [ ] I have formatted the JSON file to have consistent formatting with the rest of the repository.

package.json

@@ -29,7 +29,7 @@
  "simple-git-hooks": "^2.8.1"
  },
  "dependencies": {
- "@the-via/reader": "^1.8.0",
+ "@the-via/reader": "^1.9.0",
  "@types/fs-extra": "^11.0.1",
  "@types/glob": "^8.0.1",
  "@types/rimraf": "^3.0.2",

src/ai03/equinox_xl/equinox_xl.json

@@ -0,0 +1,195 @@
+{
+ "name": "Equinox XL",
+ "vendorId": "0xa103",
+ "productId": "0x0020",
+ "matrix": {
+ "rows": 4,
+ "cols": 14
+ },
+ "lighting": "none",
+ "layouts": {
+ "labels": [
+ [
+ "Enter",
+ "ANSI",
+ "ISO"
+ ],
+ "Split Left Shift",
+ "Split Right Shift",
+ "Winkeyless",
+ "Split Space"
+ ],
+ "keymap": [
+ [
+ {
+ "x": 2.5,
+ "c": "#777777",
+ "w": 1.5
+ },
+ "0,0",
+ {
+ "c": "#cccccc"
+ },
+ "0,1",
+ "0,2",
+ "0,3",
+ "0,4",
+ "0,5",
+ "0,6",
+ "0,7",
+ "0,8",
+ "0,9",
+ "0,10",
+ "0,11",
+ "0,12",
+ {
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "0,13\n\n\n0,0",
+ {
+ "x": 1.75,
+ "c": "#777777",
+ "w": 1.25,
+ "h": 2,
+ "w2": 1.5,
+ "h2": 1,
+ "x2": -0.25
+ },
+ "1,13\n\n\n0,1"
+ ],
+ [
+ {
+ "x": 2.5,
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "1,0",
+ {
+ "c": "#cccccc"
+ },
+ "1,1",
+ "1,2",
+ "1,3",
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7",
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11",
+ {
+ "c": "#777777",
+ "w": 2.25
+ },
+ "1,13\n\n\n0,0",
+ {
+ "x": 0.75,
+ "c": "#aaaaaa"
+ },
+ "0,13\n\n\n0,1"
+ ],
+ [
+ {
+ "w": 1.25
+ },
+ "2,0\n\n\n1,1",
+ "2,1\n\n\n1,1",
+ {
+ "x": 0.25,
+ "w": 2.25
+ },
+ "2,0\n\n\n1,0",
+ {
+ "c": "#cccccc"
+ },
+ "2,2",
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6",
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11",
+ {
+ "c": "#aaaaaa",
+ "w": 2.75
+ },
+ "2,13\n\n\n2,0",
+ {
+ "x": 0.25,
+ "w": 1.75
+ },
+ "2,12\n\n\n2,1",
+ "2,13\n\n\n2,1"
+ ],
+ [
+ {
+ "x": 2.5,
+ "w": 1.5
+ },
+ "3,0\n\n\n3,0",
+ "3,1\n\n\n3,0",
+ {
+ "w": 1.5
+ },
+ "3,2\n\n\n3,0",
+ {
+ "c": "#cccccc",
+ "w": 7
+ },
+ "3,7\n\n\n4,0",
+ {
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "3,11\n\n\n3,0",
+ "3,12\n\n\n3,0",
+ {
+ "w": 1.5
+ },
+ "3,13\n\n\n3,0"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 2.5,
+ "w": 1.5
+ },
+ "3,0\n\n\n3,1",
+ {
+ "x": 1,
+ "w": 1.5
+ },
+ "3,2\n\n\n3,1",
+ {
+ "x": 7,
+ "w": 1.5
+ },
+ "3,11\n\n\n3,1",
+ {
+ "x": 1,
+ "w": 1.5
+ },
+ "3,13\n\n\n3,1"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 6.5,
+ "c": "#cccccc",
+ "w": 3
+ },
+ "3,5\n\n\n4,1",
+ "3,7\n\n\n4,1",
+ {
+ "w": 3
+ },
+ "3,9\n\n\n4,1"
+ ]
+ ]
+ }
+}

src/atxkb/1894/1894.json

@@ -9,10 +9,26 @@
  "lighting": "qmk_backlight_rgblight",
  "layouts": {
  "labels": [
- ["Backspace", "Unified", "Split"],
- ["Enter", "ANSI", "ISO"],
- ["Left Shift", "ANSI", "ISO"],
- ["Right Shift", "Split", "Unified"],
+ [
+ "Backspace",
+ "Unified",
+ "Split"
+ ],
+ [
+ "Enter",
+ "ANSI",
+ "ISO"
+ ],
+ [
+ "Left Shift",
+ "ANSI",
+ "ISO"
+ ],
+ [
+ "Right Shift",
+ "Split",
+ "Unified"
+ ],
  [
  "Bottom Row",
  "Tsangan",

src/boardsource/3x4/3x4.json

@@ -9,9 +9,24 @@
  "lighting": "none",
  "layouts": {
  "keymap": [
- ["0,0", "0,1", "0,2", "0,3"],
- ["1,0", "1,1", "1,2", "1,3"],
- ["2,0", "2,1", "2,2", "2,3"]
+ [
+ "0,0",
+ "0,1",
+ "0,2",
+ "0,3"
+ ],
+ [
+ "1,0",
+ "1,1",
+ "1,2",
+ "1,3"
+ ],
+ [
+ "2,0",
+ "2,1",
+ "2,2",
+ "2,3"
+ ]
  ]
  }
 }

src/yiancardesigns/nebula12b/nebula12b.json

@@ -174,7 +174,7 @@
  1
  ],
  [
- "Spash",
+ "Splash",
  1
  ],
  [

src/yiancardesigns/nebula68b/nebula68b.json

@@ -174,7 +174,7 @@
  1
  ],
  [
- "Spash",
+ "Splash",
  1
  ],
  [

src/yiancardesigns/nk20/nk20.json

@@ -174,7 +174,7 @@
  1
  ],
  [
- "Spash",
+ "Splash",
  1
  ],
  [

src/yiancardesigns/nk65b/nk65b.json

@@ -174,7 +174,7 @@
  1
  ],
  [
- "Spash",
+ "Splash",
  1
  ],
  [