Merge pull request #1136 from Keychron/master

Add keyboard q2 and update keyboard q1.
the-via · Feb 28, 2022 · 9617a1a · 9617a1a
2 parents 115fe9b + 7044a9f
commit 9617a1a
Show file tree

Hide file tree

Showing 7 changed files with 1,118 additions and 2 deletions.
diff --git a/src/keychron/q1/rev_0100.json b/src/keychron/q1/rev_0100.json
@@ -2,8 +2,32 @@
   "name": "Keychron Q1",
   "vendorId": "0x3434",
   "productId": "0x0100",
-  "lighting": "none",
+  "lighting": {
+    "extends": "qmk_rgblight",
+    "underglowEffects": [
+      ["None", 0],
+      ["SOLID_COLOR", 1],
+      ["BREATHING", 1],
+      ["CYCLE_ALL", 1],
+      ["CYCLE_LEFT_RIGHT", 1],
+      ["CYCLE_UP_DOWN", 1],
+      ["RAINBOW_MOVING_CHEVRON", 1],
+      ["CYCLE_OUT_IN", 1],
+      ["CYCLE_OUT_IN_DUAL", 1],
+      ["CYCLE_PINWHEEL", 1],
+      ["CYCKE_SPIRAL", 1],
+      ["DUAL_BEACON", 1],
+      ["RAINBOW_BEACON", 1],
+      ["RAINDROPS", 1]
+    ]
+  },
   "matrix": {"rows": 6, "cols": 15},
+  "customKeycodes": [
+    {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "Mission Control"},
+    {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "Launch Pad"},
+    {"name": "Task View", "title": "Task View in windows", "shortName": "Task View"},
+    {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File Explorer"}
+  ],
   "layouts": {
     "keymap":[
    [

diff --git a/src/keychron/q1/rev_0101.json b/src/keychron/q1/rev_0101.json
@@ -0,0 +1,244 @@
+{
+  "name": "Keychron Q1",
+  "vendorId": "0x3434",
+  "productId": "0x0101",
+  "lighting": {
+    "extends": "qmk_rgblight",
+    "underglowEffects": [
+      ["None", 0],
+      ["SOLID_COLOR", 1],
+      ["BREATHING", 1],
+      ["CYCLE_ALL", 1],
+      ["CYCLE_LEFT_RIGHT", 1],
+      ["CYCLE_UP_DOWN", 1],
+      ["RAINBOW_MOVING_CHEVRON", 1],
+      ["CYCLE_OUT_IN", 1],
+      ["CYCLE_OUT_IN_DUAL", 1],
+      ["CYCLE_PINWHEEL", 1],
+      ["CYCKE_SPIRAL", 1],
+      ["DUAL_BEACON", 1],
+      ["RAINBOW_BEACON", 1],
+      ["RAINDROPS", 1]
+    ]
+  },
+  "matrix": {"rows": 6, "cols": 15},
+  "customKeycodes": [
+    {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "Mission Control"},
+    {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "Launch Pad"},
+    {"name": "Task View", "title": "Task View in windows", "shortName": "Task View"},
+    {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File Explorer"}
+  ],
+  "layouts": {
+    "keymap": [
+  [
+    {
+      "c": "#777777"
+    },
+    "0,0\nESC",
+    {
+      "x": 0.25,
+      "c": "#cccccc"
+    },
+    "0,2",
+    "0,3",
+    "0,4",
+    "0,5",
+    {
+      "x": 0.25
+    },
+    "0,6",
+    "0,7",
+    "0,8",
+    "0,9",
+    {
+      "x": 0.25
+    },
+    "0,10",
+    "0,11",
+    "0,12",
+    "0,13",
+    {
+      "x": 0.25,
+      "c": "#aaaaaa"
+    },
+    "4,14",
+    {
+      "x": 0.25,
+      "w": 0.75
+    },
+    "0,14",
+    {
+      "h": 0.5
+    },
+    "5,7",
+    {
+      "x": -1,
+      "y": 0.5,
+      "h": 0.5
+    },
+    "5,8"
+  ],
+  [
+    {
+      "y": -0.25
+    },
+    "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",
+    {
+      "c": "#aaaaaa",
+      "w": 2
+    },
+    "1,13",
+    {
+      "x": 0.25
+    },
+    "1,14"
+  ],
+  [
+    {
+      "w": 1.5
+    },
+    "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",
+    "2,12",
+    {
+      "w": 1.5
+    },
+    "2,13",
+    {
+      "x": 0.25,
+      "c": "#aaaaaa"
+    },
+    "2,14"
+  ],
+  [
+    {
+      "w": 1.75
+    },
+    "3,0",
+    {
+      "c": "#cccccc"
+    },
+    "3,1",
+    "3,2",
+    "3,3",
+    "3,4",
+    "3,5",
+    "3,6",
+    "3,7",
+    "3,8",
+    "3,9",
+    "3,10",
+    "3,11",
+    {
+      "c": "#777777",
+      "w": 2.25
+    },
+    "3,13",
+    {
+      "x": 0.25,
+      "c": "#aaaaaa"
+    },
+    "3,14"
+  ],
+  [
+    {
+      "w": 2.25
+    },
+    "4,0",
+    {
+      "c": "#cccccc"
+    },
+    "4,2",
+    "4,3",
+    "4,4",
+    "4,5",
+    "4,6",
+    "4,7",
+    "4,8",
+    "4,9",
+    "4,10",
+    "4,11",
+    {
+      "c": "#aaaaaa",
+      "w": 1.75
+    },
+    "4,13"
+  ],
+  [
+    {
+      "y": -0.75,
+      "x": 14.25,
+      "c": "#777777"
+    },
+    "3,12"
+  ],
+  [
+    {
+      "y": -0.25,
+      "c": "#aaaaaa",
+      "w": 1.25
+    },
+    "5,0",
+    {
+      "w": 1.25
+    },
+    "5,1",
+    {
+      "w": 1.25
+    },
+    "5,2",
+    {
+      "c": "#cccccc",
+      "a": 7,
+      "w": 6.25
+    },
+    "5,6",
+    {
+      "c": "#aaaaaa",
+      "a": 4
+    },
+    "5,10",
+    "5,11",
+    "5,12"
+  ],
+  [
+    {
+      "y": -0.75,
+      "x": 13.25,
+      "c": "#777777"
+    },
+    "5,13",
+    "4,12",
+    "5,14"
+  ]
+]
+  }
+}
diff --git a/src/keychron/q1/rev_0102.json b/src/keychron/q1/rev_0102.json
@@ -2,8 +2,32 @@
   "name": "Keychron Q1",
   "vendorId": "0x3434",
   "productId": "0x0102",
-  "lighting": "none",
+  "lighting": {
+    "extends": "qmk_rgblight",
+    "underglowEffects": [
+      ["None", 0],
+      ["SOLID_COLOR", 1],
+      ["BREATHING", 1],
+      ["CYCLE_ALL", 1],
+      ["CYCLE_LEFT_RIGHT", 1],
+      ["CYCLE_UP_DOWN", 1],
+      ["RAINBOW_MOVING_CHEVRON", 1],
+      ["CYCLE_OUT_IN", 1],
+      ["CYCLE_OUT_IN_DUAL", 1],
+      ["CYCLE_PINWHEEL", 1],
+      ["CYCKE_SPIRAL", 1],
+      ["DUAL_BEACON", 1],
+      ["RAINBOW_BEACON", 1],
+      ["RAINDROPS", 1]
+    ]
+  },
   "matrix": {"rows": 6, "cols": 15},
+  "customKeycodes": [
+    {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "Mission Control"},
+    {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "Launch Pad"},
+    {"name": "Task View", "title": "Task View in windows", "shortName": "Task View"},
+    {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File Explorer"}
+  ],
   "layouts": {
     "keymap":[
    [