Merge branch 'the-via:master' into add_ec_typeb

the-via · Apr 30, 2024 · 4bab89e · 4bab89e
2 parents f02c576 + d29d240
commit 4bab89e
Show file tree

Hide file tree

Showing 17 changed files with 3,165 additions and 126 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -7,7 +7,7 @@
 
 <!--- Describe your changes in detail here. -->
 
-## QMK Pull Request 
+## QMK Pull Request
 
 <!--- VIA support for new keyboards MUST be in QMK master already -->
 
@@ -25,6 +25,7 @@
 - [ ] The VIA support for this keyboard is **MERGED** in QMK 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.
 - [ ] I have tested this keyboard definition using VIA's "Design" tab.
 - [ ] I have tested this keyboard definition with firmware on a device.
 - [ ] I have assigned alpha keys and modifier keys with the correct colors.

diff --git a/v3/archetype/minervalx/minervalx.json b/v3/archetype/minervalx/minervalx.json
@@ -0,0 +1,271 @@
+{
+  "name": "Minerva LX",
+  "vendorId": "0x5453",
+  "productId": "0x0100",
+  "matrix": {
+    "rows": 5,
+    "cols": 15
+  },
+  "keycodes": [
+    "qmk_lighting"
+  ],
+  "menus": [
+    "qmk_backlight"
+  ],
+  "layouts": {
+    "labels": [
+      "Split Backspace",
+      "Split Right Shift",
+      [
+        "Bottom Row",
+        "Tsangan",
+        "Tsangan-Split",
+        "ANSI"
+      ]
+    ],
+    "keymap": [
+      [
+        {
+          "c": "#777777"
+        },
+        "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": 2
+        },
+        "0,13\n\n\n0,0",
+        {
+          "x": 0.25,
+          "c": "#cccccc"
+        },
+        "0,14",
+        {
+          "x": 0.5
+        },
+        "2,12\n\n\n0,1",
+        {
+          "c": "#aaaaaa"
+        },
+        "0,13\n\n\n0,1"
+      ],
+      [
+        {
+          "w": 1.5
+        },
+        "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",
+        "1,12",
+        {
+          "w": 1.5
+        },
+        "1,13",
+        {
+          "x": 0.25
+        },
+        "1,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1",
+        "2,2",
+        "2,3",
+        "2,4",
+        "2,5",
+        "2,6",
+        "2,7",
+        "2,8",
+        "2,9",
+        "2,10",
+        "2,11",
+        {
+          "c": "#777777",
+          "w": 2.25
+        },
+        "2,13",
+        {
+          "x": 0.25,
+          "c": "#cccccc"
+        },
+        "2,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 2.25
+        },
+        "3,0",
+        {
+          "c": "#cccccc"
+        },
+        "3,1",
+        "3,2",
+        "3,3",
+        "3,4",
+        "3,5",
+        "3,6",
+        "3,7",
+        "3,8",
+        "3,9",
+        "3,10",
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,12\n\n\n1,1",
+        {
+          "x": -1.75,
+          "w": 2.75
+        },
+        "3,12\n\n\n1,0",
+        {
+          "x": -1
+        },
+        "3,13\n\n\n1,1",
+        {
+          "x": 0.25,
+          "c": "#cccccc"
+        },
+        "3,14"
+      ],
+      [
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,0\n\n\n2,0",
+        "4,1\n\n\n2,0",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n2,0",
+        {
+          "c": "#cccccc",
+          "w": 7
+        },
+        "4,6\n\n\n2,0",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n2,0",
+        "4,12\n\n\n2,0",
+        {
+          "w": 1.5
+        },
+        "4,13\n\n\n2,0",
+        {
+          "x": 0.25
+        },
+        "4,14"
+      ],
+      [
+        {
+          "y": 0.25,
+          "w": 1.5
+        },
+        "4,0\n\n\n2,1",
+        "4,1\n\n\n2,1",
+        {
+          "w": 1.5
+        },
+        "4,2\n\n\n2,1",
+        {
+          "c": "#cccccc",
+          "w": 3
+        },
+        "4,4\n\n\n2,1",
+        {
+          "c": "#aaaaaa"
+        },
+        "4,6\n\n\n2,1",
+        {
+          "c": "#cccccc",
+          "w": 3
+        },
+        "4,8\n\n\n2,1",
+        {
+          "c": "#aaaaaa",
+          "w": 1.5
+        },
+        "4,10\n\n\n2,1",
+        "4,12\n\n\n2,1",
+        {
+          "w": 1.5
+        },
+        "4,13\n\n\n2,1"
+      ],
+      [
+        {
+          "w": 1.25
+        },
+        "4,0\n\n\n2,2",
+        {
+          "w": 1.25
+        },
+        "4,1\n\n\n2,2",
+        {
+          "w": 1.25
+        },
+        "4,2\n\n\n2,2",
+        {
+          "c": "#cccccc",
+          "w": 6.25
+        },
+        "4,6\n\n\n2,2",
+        {
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,9\n\n\n2,2",
+        {
+          "w": 1.25
+        },
+        "4,10\n\n\n2,2",
+        {
+          "w": 1.25
+        },
+        "4,12\n\n\n2,2",
+        {
+          "w": 1.25
+        },
+        "4,13\n\n\n2,2"
+      ]
+    ]
+  }
+}
+
diff --git a/v3/atlantis/ps17/ps17.json b/v3/atlantis/ps17/ps17.json
@@ -0,0 +1,67 @@
+{
+  "name": "Atlantis PS17",
+  "vendorId": "0x0015",
+  "productId": "0x414B",
+  "matrix": {
+    "rows": 6,
+    "cols": 4
+  },
+  "keycodes": [
+    "qmk_lighting"
+  ],
+  "menus": [
+    "qmk_rgb_matrix"
+  ],
+  "layouts": {
+    "keymap": [
+      [
+        "0,1\n\n\n\n\n\n\n\n\ne0"
+      ],
+      [
+        {
+          "c": "#aaaaaa"
+        },
+        "1,0",
+        {
+          "c": "#cccccc"
+        },
+        "1,1",
+        "1,2",
+        "1,3"
+      ],
+      [
+        "2,0",
+        "2,1",
+        "2,2",
+        {
+          "h": 2
+        },
+        "2,3"
+      ],
+      [
+        "3,0",
+        "3,1",
+        "3,2"
+      ],
+      [
+        "4,0",
+        "4,1",
+        "4,2",
+        {
+          "c": "#777777",
+          "h": 2
+        },
+        "4,3"
+      ],
+      [
+        {
+          "c": "#cccccc",
+          "w": 2
+        },
+        "5,0",
+        "5,2"
+      ]
+    ]
+  }
+}
+
diff --git a/v3/cannonkeys/is0gr/is0gr.json b/v3/cannonkeys/is0gr/is0gr.json
@@ -1,7 +1,7 @@
 {
   "name": "is0GR",
-  "vendorId": "0xCA04",
-  "productId": "0x0028",
+  "vendorId": "0x0028",
+  "productId": "0xCA04",
   "matrix": {
     "rows": 1,
     "cols": 1

diff --git a/v3/deemen17/de60fs.json b/v3/deemen17/de60fs.json
@@ -1,5 +1,5 @@
 {
-  "name": "De60fs Rev.1",
+  "name": "De60fs",
   "vendorId": "0xDE17",
   "productId": "0x60F0",
   "matrix": {