From bd733795fd9c3f6ebb698976851e0fc03893e8d5 Mon Sep 17 00:00:00 2001
From: DriftKingTW <driftkingtw@gmail.com>
Date: Tue, 26 Mar 2024 00:53:34 +0800
Subject: [PATCH] chore: update default configs

---
 data/keyconfig.default.json | 41 +++++++++++++++++++++++++--
 data/keyconfig.json         | 55 +++++++++++++++++++++----------------
 2 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/data/keyconfig.default.json b/data/keyconfig.default.json
index 19108a9..2608140 100644
--- a/data/keyconfig.default.json
+++ b/data/keyconfig.default.json
@@ -14,18 +14,53 @@
         ["Tab", "Q", "W", "E", "R", "T", "Delete"],
         ["Caps Lock", "A", "S", "D", "F", "G", "NULL"],
         ["Shift", "Z", "X", "C", "V", "B", "Enter"],
-        ["Ctrl", "FN", "Option", "Command", "Space", "Command", "Command"]
+        ["Ctrl", "FN", "Opt/Alt", "Cmd/Win", "Space", "Cmd/Win", "Cmd/Win"]
+      ]
+    },
+    {
+      "title": "Procreate",
+      "keymap": [
+        [177, 49, 50, 51, 52, 53, 0],
+        [179, 115, 119, 101, 114, 116, 8],
+        [128, 91, 93, 108, 98, 103, 0],
+        [129, 122, 120, 99, 118, 98, 176],
+        [128, 0, 130, 131, 32, 131, 131]
+      ],
+      "keyInfo": [
+        ["Escape", "1", "2", "3", "4", "5", "NULL"],
+        ["MACRO_1", "Select", "W", "Eraser", "MACRO_2", "MACRO_3", "Delete"],
+        [
+          "Control",
+          "BrushDown",
+          "BrushUp",
+          "Layers",
+          "Brush",
+          "MACRO_4",
+          "NULL"
+        ],
+        ["Shift", "Z", "X", "C(Colors)", "V(Transform)", "B", "Enter"],
+        ["Ctrl", "FN", "Opt/Alt", "Cmd/Win", "Space", "Cmd/Win", "Cmd/Win"]
       ]
     }
   ],
   "macros": [],
   "onBoardRotaryEncoder": [
     {
-      "rotaryMap": [0, 216, 215],
-      "rotaryInfo": ["NULL", "ArrowLeft", "ArrowRight"]
+      "rotaryMap": [131, 216, 215],
+      "rotaryInfo": ["Command", "ArrowLeft", "ArrowRight"]
+    },
+    {
+      "rotaryMap": [131, 91, 93],
+      "rotaryInfo": ["Command", "BracketLeft", "BracketRight"]
     }
   ],
   "rotaryExtension": [
+    {
+      "keymap": [97, 98, 99],
+      "keyInfo": ["A", "B", "C"],
+      "rotaryMap": [32, 91, 93],
+      "rotaryInfo": ["Space", "BracketLeft", "BracketRight"]
+    },
     {
       "keymap": [97, 98, 99],
       "keyInfo": ["A", "B", "C"],
diff --git a/data/keyconfig.json b/data/keyconfig.json
index 12943af..0a3d04f 100644
--- a/data/keyconfig.json
+++ b/data/keyconfig.json
@@ -7,14 +7,14 @@
         [179, 113, 119, 101, 114, 116, 8],
         [128, 97, 115, 100, 102, 103, 0],
         [129, 122, 120, 99, 118, 98, 176],
-        [0, 130, 131, 0, 32, 131, 0]
+        [128, 0, 130, 131, 32, 131, 131]
       ],
       "keyInfo": [
         ["Escape", "1", "2", "3", "4", "5", "NULL"],
         ["Tab", "Q", "W", "E", "R", "T", "Delete"],
         ["Ctrl", "A", "S", "D", "F", "G", "NULL"],
         ["Shift", "Z", "X", "C", "V", "B", "Enter"],
-        ["FN", "Option", "Command", "NULL", "Space", "Command", "NULL"]
+        ["Ctrl", "FN", "Opt/Alt", "Cmd/Win", "Space", "Cmd/Win", "Cmd/Win"]
       ]
     },
     {
@@ -24,7 +24,7 @@
         [179, 115, 119, 101, 114, 116, 8],
         [128, 91, 93, 108, 98, 103, 0],
         [129, 122, 120, 99, 118, 98, 176],
-        [0, 130, 131, 0, 32, 131, 0]
+        [128, 0, 130, 131, 32, 131, 131]
       ],
       "keyInfo": [
         ["Escape", "1", "2", "3", "4", "5", "NULL"],
@@ -39,24 +39,7 @@
           "NULL"
         ],
         ["Shift", "Z", "X", "C(Colors)", "V(Transform)", "B", "Enter"],
-        ["FN", "Option", "Command", "NULL", "Space", "Command", "NULL"]
-      ]
-    },
-    {
-      "title": "Numpad",
-      "keymap": [
-        [0, 0, 0, 47, 42, 45, 0],
-        [0, 0, 0, 55, 56, 57, 43],
-        [0, 0, 0, 52, 53, 54, 0],
-        [0, 0, 0, 49, 50, 51, 69],
-        [0, 0, 68, 0, 48, 46, 0]
-      ],
-      "keyInfo": [
-        [" ", " ", " ", "/", "*", "-", " "],
-        [" ", " ", " ", "7", "8", "9", "+"],
-        [" ", " ", " ", "4", "5", "6", " "],
-        [" ", " ", " ", "1", "2", "3", "Enter"],
-        ["FN", " ", "Delete", " ", "0", ".", "NULL"]
+        ["Ctrl", "FN", "Opt/Alt", "Cmd/Win", "Space", "Cmd/Win", "Cmd/Win"]
       ]
     },
     {
@@ -66,14 +49,14 @@
         [179, 113, 119, 101, 114, 116, 178],
         [128, 97, 115, 100, 102, 103, 0],
         [129, 122, 120, 99, 118, 98, 224],
-        [0, 130, 131, 0, 32, 0, 131]
+        [128, 0, 130, 131, 32, 131, 131]
       ],
       "keyInfo": [
         ["Escape", "MACRO_5", "MACRO_6", "3", "4", "5", " "],
         ["Tab", "KeyQ", "KeyW", "KeyE", "KeyR", "KeyT", "Backspace"],
-        ["ControlLeft", "KeyA", "KeyS", "KeyD", "KeyF", "KeyG", " "],
+        ["Ctrl", "KeyA", "KeyS", "KeyD", "KeyF", "KeyG", " "],
         ["Shift", "KeyZ", "KeyX", "KeyC", "KeyV", "KeyB", "NumpadEnter"],
-        ["FN", "Option", "Command", " ", "Space", " ", "Command"]
+        ["Ctrl", "FN", "Option", "Cmd/Win", "Space", "Cmd/Win", "Cmd/Win"]
       ]
     }
   ],
@@ -121,6 +104,24 @@
       "stringContent": ""
     }
   ],
+  "onBoardRotaryEncoder": [
+    {
+      "rotaryMap": [50, 49, 51],
+      "rotaryInfo": ["2", "1", "3"]
+    },
+    {
+      "rotaryMap": [104, 91, 93],
+      "rotaryInfo": ["KeyH", "BracketLeft", "BracketRight"]
+    },
+    {
+      "rotaryMap": [104, 103, 106],
+      "rotaryInfo": ["KeyH", "KeyG", "KeyJ"]
+    },
+    {
+      "rotaryMap": [104, 91, 93],
+      "rotaryInfo": ["KeyH", "BracketLeft", "BracketRight"]
+    }
+  ],
   "rotaryExtension": [
     {
       "keymap": [97, 98, 99],
@@ -139,6 +140,12 @@
       "keyInfo": ["KeyC", "KeyD", "KeyC"],
       "rotaryMap": [104, 103, 106],
       "rotaryInfo": ["KeyH", "KeyG", "KeyJ"]
+    },
+    {
+      "keymap": [97, 98, 99],
+      "keyInfo": ["KeyA", "KeyB", "KeyC"],
+      "rotaryMap": [104, 91, 93],
+      "rotaryInfo": ["KeyH", "BracketLeft", "BracketRight"]
     }
   ]
 }