From 34cb8b04b54410dced33e9a4d9565febb8f04b3a Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Sun, 15 Jan 2023 23:33:35 -0800 Subject: [PATCH] Switch `VIAL_UNLOCK_COMBO_ROWS` for Q3, Q5, Q6, Q9 and Q10 and update JSONs for Q8, and Q9 (#336) * Switch `VIAL_UNLOCK_COMBO_ROWS` for Q3, Q5, Q6, Q9 and Q10 and update JSONs for Q8, and Q9 * Update `VIAL_UNLOCK_COMBO_ROWS` for Q10 --- .../q10/ansi_encoder/keymaps/vial/config.h | 2 +- .../q10/ansi_encoder/keymaps/vial/vial.json | 24 ++++------- .../q10/iso_encoder/keymaps/vial/config.h | 2 +- .../keychron/q3/ansi/keymaps/vial/config.h | 2 +- .../q3/ansi_encoder/keymaps/vial/config.h | 2 +- .../keychron/q3/iso/keymaps/vial/config.h | 2 +- .../q3/iso_encoder/keymaps/vial/config.h | 2 +- .../keychron/q5/ansi/keymaps/vial/config.h | 2 +- .../q5/ansi_encoder/keymaps/vial/config.h | 2 +- .../keychron/q5/iso/keymaps/vial/config.h | 2 +- .../q5/iso_encoder/keymaps/vial/config.h | 2 +- .../keychron/q6/ansi/keymaps/vial/config.h | 2 +- .../q6/ansi_encoder/keymaps/vial/config.h | 2 +- .../keychron/q6/iso/keymaps/vial/config.h | 2 +- .../q6/iso_encoder/keymaps/vial/config.h | 2 +- .../keychron/q8/ansi/keymaps/vial/vial.json | 42 ++++++++++--------- .../keychron/q9/ansi/keymaps/vial/config.h | 2 +- .../keychron/q9/ansi/keymaps/vial/vial.json | 31 +++++++------- .../q9/ansi_encoder/keymaps/vial/config.h | 2 +- .../keychron/q9/iso/keymaps/vial/config.h | 2 +- .../keychron/q9/iso/keymaps/vial/vial.json | 18 ++++---- .../q9/iso_encoder/keymaps/vial/config.h | 2 +- .../q9/iso_encoder/keymaps/vial/vial.json | 4 +- 23 files changed, 74 insertions(+), 81 deletions(-) diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/vial/config.h b/keyboards/keychron/q10/ansi_encoder/keymaps/vial/config.h index d44bd5d8a4..f846ecf9a8 100644 --- a/keyboards/keychron/q10/ansi_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q10/ansi_encoder/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x01, 0x9F, 0x49, 0xAA, 0xDF, 0xB6, 0xF1, 0x58} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/vial/vial.json b/keyboards/keychron/q10/ansi_encoder/keymaps/vial/vial.json index 2ed5116e6c..6383a19b3c 100644 --- a/keyboards/keychron/q10/ansi_encoder/keymaps/vial/vial.json +++ b/keyboards/keychron/q10/ansi_encoder/keymaps/vial/vial.json @@ -54,13 +54,7 @@ "y": -0.8, "c": "#cccccc" }, - "0,0\n\n\n\n\n\n\n\n\ne" - ], - [ - { - "y": -1, - "x": 1 - }, + "0,0\n\n\n\n\n\n\n\n\ne", "0,1\n\n\n\n\n\n\n\n\ne" ], [ @@ -292,9 +286,9 @@ [ { "r": -6, - "rx": 1, + "rx": 2.5, "y": 2.7, - "x": 10.15, + "x": 8.65, "c": "#cccccc" }, "1,8", @@ -304,7 +298,7 @@ ], [ { - "x": 9.65 + "x": 8.15 }, "2,7", "2,8", @@ -314,7 +308,7 @@ ], [ { - "x": 10.15 + "x": 8.65 }, "3,8", "3,9", @@ -323,7 +317,7 @@ ], [ { - "x": 9.6 + "x": 8.1 }, "4,8", "4,9", @@ -333,7 +327,7 @@ ], [ { - "x": 9.6, + "x": 8.1, "w": 2.55 }, "5,8", @@ -345,9 +339,9 @@ ], [ { - "rx": 1.75, + "rx": 3.25, "y": 1.45, - "x": 10.05 + "x": 8.55 }, "0,8", "0,9", diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/vial/config.h b/keyboards/keychron/q10/iso_encoder/keymaps/vial/config.h index 30ec14e2dc..89b21383d1 100644 --- a/keyboards/keychron/q10/iso_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q10/iso_encoder/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0xE6, 0x2F, 0xF7, 0x8E, 0x5D, 0x94, 0x53, 0x44} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q3/ansi/keymaps/vial/config.h b/keyboards/keychron/q3/ansi/keymaps/vial/config.h index 8b33ed898d..f399d1b555 100644 --- a/keyboards/keychron/q3/ansi/keymaps/vial/config.h +++ b/keyboards/keychron/q3/ansi/keymaps/vial/config.h @@ -5,5 +5,5 @@ //Vial Keyboard UID #define VIAL_KEYBOARD_UID {0x5C, 0x0E, 0xC0, 0x71, 0x7A, 0x35, 0x35, 0xAD} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/keychron/q3/ansi_encoder/keymaps/vial/config.h b/keyboards/keychron/q3/ansi_encoder/keymaps/vial/config.h index 96e5ea3dd7..82d4d9387d 100644 --- a/keyboards/keychron/q3/ansi_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q3/ansi_encoder/keymaps/vial/config.h @@ -5,5 +5,5 @@ //Vial Keyboard UID #define VIAL_KEYBOARD_UID {0xF4, 0x6E, 0xF8, 0x3A, 0x5B, 0x50, 0xBC, 0x06} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/keychron/q3/iso/keymaps/vial/config.h b/keyboards/keychron/q3/iso/keymaps/vial/config.h index 0b14f73971..8553aa8abe 100644 --- a/keyboards/keychron/q3/iso/keymaps/vial/config.h +++ b/keyboards/keychron/q3/iso/keymaps/vial/config.h @@ -5,5 +5,5 @@ //Vial Keyboard UID #define VIAL_KEYBOARD_UID {0x0A, 0x74, 0x0C, 0x7A, 0x62, 0xA7, 0xDA, 0x12} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/keychron/q3/iso_encoder/keymaps/vial/config.h b/keyboards/keychron/q3/iso_encoder/keymaps/vial/config.h index ec3465ba3a..d643ecca72 100644 --- a/keyboards/keychron/q3/iso_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q3/iso_encoder/keymaps/vial/config.h @@ -5,5 +5,5 @@ //Vial Keyboard UID #define VIAL_KEYBOARD_UID {0x84, 0x51, 0xD6, 0xC6, 0x02, 0x93, 0x64, 0x96} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/keychron/q5/ansi/keymaps/vial/config.h b/keyboards/keychron/q5/ansi/keymaps/vial/config.h index 783b0a243f..ac8bf1c5b1 100644 --- a/keyboards/keychron/q5/ansi/keymaps/vial/config.h +++ b/keyboards/keychron/q5/ansi/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x57, 0x1B, 0xE7, 0x6D, 0x98, 0xA5, 0x35, 0x36} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q5/ansi_encoder/keymaps/vial/config.h b/keyboards/keychron/q5/ansi_encoder/keymaps/vial/config.h index f73dd625a6..0cb8e22e69 100644 --- a/keyboards/keychron/q5/ansi_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q5/ansi_encoder/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x4F, 0x65, 0x6C, 0xB9, 0x2A, 0x60, 0x29, 0x4E} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q5/iso/keymaps/vial/config.h b/keyboards/keychron/q5/iso/keymaps/vial/config.h index 326ee7804b..c3e95760e9 100644 --- a/keyboards/keychron/q5/iso/keymaps/vial/config.h +++ b/keyboards/keychron/q5/iso/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x4A, 0x90, 0xD3, 0x28, 0xDD, 0x90, 0xC2, 0x76} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q5/iso_encoder/keymaps/vial/config.h b/keyboards/keychron/q5/iso_encoder/keymaps/vial/config.h index d6f8c6384d..be444e39c8 100644 --- a/keyboards/keychron/q5/iso_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q5/iso_encoder/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x1F, 0x7A, 0x73, 0x45, 0x5A, 0x86, 0x8C, 0x56} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q6/ansi/keymaps/vial/config.h b/keyboards/keychron/q6/ansi/keymaps/vial/config.h index 4ea9523ced..9e2f81d44e 100644 --- a/keyboards/keychron/q6/ansi/keymaps/vial/config.h +++ b/keyboards/keychron/q6/ansi/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x9C, 0x64, 0xE8, 0x7E, 0x6E, 0xB4, 0x96, 0x74} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q6/ansi_encoder/keymaps/vial/config.h b/keyboards/keychron/q6/ansi_encoder/keymaps/vial/config.h index 31e8327bef..6eb4304bb0 100644 --- a/keyboards/keychron/q6/ansi_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q6/ansi_encoder/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x99, 0xB7, 0xD1, 0xF5, 0x63, 0x7B, 0xA9, 0x04} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q6/iso/keymaps/vial/config.h b/keyboards/keychron/q6/iso/keymaps/vial/config.h index 24d948e3a8..3a7054326e 100644 --- a/keyboards/keychron/q6/iso/keymaps/vial/config.h +++ b/keyboards/keychron/q6/iso/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x52, 0xC0, 0xBB, 0x46, 0xB8, 0x25, 0xC1, 0x02} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q6/iso_encoder/keymaps/vial/config.h b/keyboards/keychron/q6/iso_encoder/keymaps/vial/config.h index d37ee235d0..2a4b95587d 100644 --- a/keyboards/keychron/q6/iso_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q6/iso_encoder/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0xC1, 0xD6, 0xE4, 0x90, 0x99, 0xF4, 0x0B, 0x29} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } \ No newline at end of file diff --git a/keyboards/keychron/q8/ansi/keymaps/vial/vial.json b/keyboards/keychron/q8/ansi/keymaps/vial/vial.json index e49f2fc931..a12010d2ef 100644 --- a/keyboards/keychron/q8/ansi/keymaps/vial/vial.json +++ b/keyboards/keychron/q8/ansi/keymaps/vial/vial.json @@ -29,14 +29,14 @@ }, "0,11", { - "x": 3.5, + "x": 3.5000000000000018, "c": "#aaaaaa" }, "0,14" ], [ { - "y": -0.85, + "y": -0.7000000000000001, "x": 0.75, "c": "#777777" }, @@ -44,12 +44,9 @@ { "c": "#cccccc" }, - "0,1" - ], - [ + "0,1", { - "y": -0.85, - "x": 13.6 + "x": 10.85 }, "0,12", { @@ -60,17 +57,9 @@ ], [ { - "x": 0.5, - "w": 1.5 - }, - "1,0", - { + "x": 13.3, "c": "#cccccc" }, - "1,1", - { - "x": 10.3 - }, "1,11", "1,12", { @@ -80,7 +69,20 @@ ], [ { - "y": -0.9, + "y": -0.9999999999999998, + "x": 0.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1" + ], + [ + { + "y": -0.8999999999999999, "x": 17.3, "c": "#aaaaaa" }, @@ -88,7 +90,7 @@ ], [ { - "y": -0.1, + "y": -0.10000000000000009, "x": 0.25, "w": 1.75 }, @@ -110,7 +112,7 @@ ], [ { - "y": -0.9, + "y": -0.8999999999999999, "x": 17.5, "c": "#aaaaaa" }, @@ -118,7 +120,7 @@ ], [ { - "y": -0.1, + "y": -0.10000000000000009, "w": 2.25 }, "3,0", diff --git a/keyboards/keychron/q9/ansi/keymaps/vial/config.h b/keyboards/keychron/q9/ansi/keymaps/vial/config.h index e8f3012921..50e1fb4352 100644 --- a/keyboards/keychron/q9/ansi/keymaps/vial/config.h +++ b/keyboards/keychron/q9/ansi/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x60, 0xB4, 0x3E, 0xDF, 0x73, 0x78, 0x8B, 0x56} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/keychron/q9/ansi/keymaps/vial/vial.json b/keyboards/keychron/q9/ansi/keymaps/vial/vial.json index 1b67ccbc7b..dfddbba564 100644 --- a/keyboards/keychron/q9/ansi/keymaps/vial/vial.json +++ b/keyboards/keychron/q9/ansi/keymaps/vial/vial.json @@ -15,16 +15,23 @@ {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File Explorer"} ], "layouts": { - "keymap":[ + "keymap":[ [ { + "y": -0.25, + "x": 15.25, + "c": "#aaaaaa" + }, + "0,14" + ], + [ + { + "y": -0.75, + "c": "#cccccc", "w": 1.5 }, "0,0", - { - "c": "#cccccc" - }, - "0,1", + "0,1", "0,2", "0,3", "0,4", @@ -39,17 +46,11 @@ { "w": 1.5 }, - "0,13", - { - "x": 0.25, - "y": -0.25, - "c": "#aaaaaa" - }, - "0,14" + "0,13" ], [ { - "y": 0.25, + "c": "#aaaaaa", "w": 1.75 }, "1,0", @@ -127,13 +128,11 @@ "3,2", { "c": "#cccccc", - "a": 7, "w": 6.25 }, "3,6", { - "c": "#aaaaaa", - "a": 4 + "c": "#aaaaaa" }, "3,10", "3,11", diff --git a/keyboards/keychron/q9/ansi_encoder/keymaps/vial/config.h b/keyboards/keychron/q9/ansi_encoder/keymaps/vial/config.h index c432cf0124..322082b306 100644 --- a/keyboards/keychron/q9/ansi_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q9/ansi_encoder/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x67, 0xAD, 0x95, 0x8A, 0x2C, 0x15, 0xDE, 0x25} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/keychron/q9/iso/keymaps/vial/config.h b/keyboards/keychron/q9/iso/keymaps/vial/config.h index a4ef4249f3..9b2f35061b 100644 --- a/keyboards/keychron/q9/iso/keymaps/vial/config.h +++ b/keyboards/keychron/q9/iso/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x50, 0xC7, 0x47, 0x76, 0xA2, 0x5B, 0x31, 0x50} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/keychron/q9/iso/keymaps/vial/vial.json b/keyboards/keychron/q9/iso/keymaps/vial/vial.json index 23e9613fb6..d3a15f0a6d 100644 --- a/keyboards/keychron/q9/iso/keymaps/vial/vial.json +++ b/keyboards/keychron/q9/iso/keymaps/vial/vial.json @@ -18,14 +18,14 @@ "keymap":[ [ { - "w": 1.5, - "c": "#777777" + "c": "#777777", + "w": 1.5 }, "0,0", { "c": "#cccccc" }, - "0,1", + "0,1", "0,2", "0,3", "0,4", @@ -72,10 +72,12 @@ "1,9", "1,10", "1,11", - "1,13", + "1,13" + ], + [ { - "x": 1.5, - "y": 0.25, + "y": -0.75, + "x": 15.25, "c": "#aaaaaa" }, "1,14" @@ -126,13 +128,11 @@ "3,2", { "c": "#cccccc", - "a": 7, "w": 6.25 }, "3,6", { - "c": "#aaaaaa", - "a": 4 + "c": "#aaaaaa" }, "3,10", "3,11", diff --git a/keyboards/keychron/q9/iso_encoder/keymaps/vial/config.h b/keyboards/keychron/q9/iso_encoder/keymaps/vial/config.h index b3e7417c1e..af4a573ce7 100644 --- a/keyboards/keychron/q9/iso_encoder/keymaps/vial/config.h +++ b/keyboards/keychron/q9/iso_encoder/keymaps/vial/config.h @@ -4,5 +4,5 @@ #define VIAL_KEYBOARD_UID {0x18, 0x6A, 0x03, 0x9A, 0x4A, 0x7B, 0x89, 0x51} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 1 } #define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/keychron/q9/iso_encoder/keymaps/vial/vial.json b/keyboards/keychron/q9/iso_encoder/keymaps/vial/vial.json index ee8e813ff7..f6755f9476 100644 --- a/keyboards/keychron/q9/iso_encoder/keymaps/vial/vial.json +++ b/keyboards/keychron/q9/iso_encoder/keymaps/vial/vial.json @@ -135,13 +135,11 @@ "3,2", { "c": "#cccccc", - "a": 7, "w": 6.25 }, "3,6", { - "c": "#aaaaaa", - "a": 4 + "c": "#aaaaaa" }, "3,10", "3,11",