From aac4cd69b1d334be05a6631aa597e98ae1ba8f04 Mon Sep 17 00:00:00 2001 From: nachie Date: Sat, 7 Sep 2024 13:21:05 -0700 Subject: [PATCH 1/4] Fix layout in evelyn info/keyboard json (#783) Co-authored-by: Nachiket Kulkarni --- keyboards/nachie/evelyn/info.json | 78 +++++++++--------- keyboards/nachie/evelyn/keyboard.json | 80 +++++++++---------- .../nachie/evelyn/keymaps/vial/vial.json | 62 +++++--------- keyboards/nachie/evelyn/readme.md | 14 ++-- 4 files changed, 106 insertions(+), 128 deletions(-) diff --git a/keyboards/nachie/evelyn/info.json b/keyboards/nachie/evelyn/info.json index 7b0c80d08e..919c6a7a91 100644 --- a/keyboards/nachie/evelyn/info.json +++ b/keyboards/nachie/evelyn/info.json @@ -1,5 +1,5 @@ { - "manufacturer": "nachie", + "manufacturer": "Nachie", "keyboard_name": "Syndrome", "maintainer": "nachie", "board": "GENERIC_RP_RP2040", @@ -43,44 +43,44 @@ "layouts": { "LAYOUT": { "layout": [ - {"y": 0.0, "x": 0.29, "matrix": [0, 0], "label": "0,0"}, - {"y": 0.0, "x": 10.190000000000001, "matrix": [1, 4], "label": "1,4"}, - {"y": 0.0, "x": 11.190000000000001, "matrix": [0, 5], "label": "0,5"}, - {"y": 0.99, "x": 0.15, "matrix": [2, 0], "w": 1.25, "label": "2,0"}, - {"y": 0.99, "x": 10.58, "matrix": [2, 5], "w": 1.75, "label": "2,5"}, - {"y": 1.99, "x": 0.0, "matrix": [4, 0], "w": 1.75, "label": "4,0"}, - {"y": 2.99, "x": 0.09000000000000001, "matrix": [6, 0], "w": 1.25, "label": "6,0"}, - {"y": 6.23, "x": 3.97, "matrix": [5, 4], "w": 1.25, "label": "5,4"}, - {"y": 6.23, "x": 5.220000000000001, "matrix": [4, 5], "label": "4,5"}, - {"y": 7.23, "x": 4.87, "matrix": [6, 5], "w": 1.25, "label": "6,5"}, - {"y": 8.23, "x": 1.43, "matrix": [1, 0], "label": "1,0"}, - {"y": 8.23, "x": 2.43, "matrix": [0, 1], "label": "0,1"}, - {"y": 8.23, "x": 3.43, "matrix": [1, 1], "label": "1,1"}, - {"y": 8.23, "x": 4.430000000000001, "matrix": [0, 2], "label": "0,2"}, - {"y": 9.23, "x": 1.68, "matrix": [3, 0], "label": "3,0"}, - {"y": 9.23, "x": 2.68, "matrix": [2, 1], "label": "2,1"}, - {"y": 9.23, "x": 3.68, "matrix": [3, 1], "label": "3,1"}, - {"y": 9.23, "x": 4.680000000000001, "matrix": [2, 2], "label": "2,2"}, - {"y": 10.23, "x": 2.18, "matrix": [5, 0], "label": "5,0"}, - {"y": 10.23, "x": 3.18, "matrix": [4, 1], "label": "4,1"}, - {"y": 10.23, "x": 4.180000000000001, "matrix": [5, 1], "label": "5,1"}, - {"y": 10.23, "x": 5.180000000000001, "matrix": [4, 2], "label": "4,2"}, - {"y": 11.23, "x": 2.93, "matrix": [6, 1], "label": "6,1"}, - {"y": 11.23, "x": 3.93, "matrix": [6, 2], "w": 2.25, "label": "6,2"}, - {"y": 9.89, "x": 5.930000000000001, "matrix": [1, 2], "label": "1,2"}, - {"y": 9.89, "x": 6.930000000000001, "matrix": [0, 3], "label": "0,3"}, - {"y": 9.89, "x": 7.930000000000001, "matrix": [1, 3], "label": "1,3"}, - {"y": 9.89, "x": 8.93, "matrix": [0, 4], "label": "0,4"}, - {"y": 10.89, "x": 6.180000000000001, "matrix": [3, 2], "label": "3,2"}, - {"y": 10.89, "x": 7.180000000000001, "matrix": [2, 3], "label": "2,3"}, - {"y": 10.89, "x": 8.18, "matrix": [3, 3], "label": "3,3"}, - {"y": 10.89, "x": 9.18, "matrix": [2, 4], "label": "2,4"}, - {"y": 11.89, "x": 5.680000000000001, "matrix": [5, 2], "label": "5,2"}, - {"y": 11.89, "x": 6.680000000000001, "matrix": [4, 3], "label": "4,3"}, - {"y": 11.89, "x": 7.680000000000001, "matrix": [5, 3], "label": "5,3"}, - {"y": 11.89, "x": 8.68, "matrix": [4, 4], "label": "4,4"}, - {"y": 12.89, "x": 5.680000000000001, "matrix": [6, 3], "w": 2, "label": "6,3"}, - {"y": 12.89, "x": 7.680000000000001, "matrix": [6, 4], "label": "6,4"} + {"y": 0, "x": 0, "matrix": [0, 0], "label": "0,0"}, + {"y": 0, "x": 1, "matrix": [1, 0], "label": "1,0"}, + {"y": 0, "x": 2, "matrix": [0, 1], "label": "0,1"}, + {"y": 0, "x": 3, "matrix": [1, 1], "label": "1,1"}, + {"y": 0, "x": 4, "matrix": [0, 2], "label": "0,2"}, + {"y": 0, "x": 6.25, "matrix": [1, 2], "label": "1,2"}, + {"y": 0, "x": 7.25, "matrix": [0, 3], "label": "0,3"}, + {"y": 0, "x": 8.25, "matrix": [1, 3], "label": "1,3"}, + {"y": 0, "x": 9.25, "matrix": [0, 4], "label": "0,4"}, + {"y": 0, "x": 10.25, "matrix": [1, 4], "label": "1,4"}, + {"y": 0, "x": 11.25, "matrix": [0, 5], "label": "0,5"}, + {"y": 1, "x": 0, "matrix": [2, 0], "w": 1.25, "label": "2,0"}, + {"y": 1, "x": 1.25, "matrix": [3, 0], "label": "3,0"}, + {"y": 1, "x": 2.25, "matrix": [2, 1], "label": "2,1"}, + {"y": 1, "x": 3.25, "matrix": [3, 1], "label": "3,1"}, + {"y": 1, "x": 4.25, "matrix": [2, 2], "label": "2,2"}, + {"y": 1, "x": 6.5, "matrix": [3, 2], "label": "3,2"}, + {"y": 1, "x": 7.5, "matrix": [2, 3], "label": "2,3"}, + {"y": 1, "x": 8.5, "matrix": [3, 3], "label": "3,3"}, + {"y": 1, "x": 9.5, "matrix": [2, 4], "label": "2,4"}, + {"y": 1, "x": 10.5, "matrix": [2, 5], "w": 1.75, "label": "2,5"}, + {"y": 2, "x": 0, "matrix": [4, 0], "w": 1.75, "label": "4,0"}, + {"y": 2, "x": 1.75, "matrix": [5, 0], "label": "5,0"}, + {"y": 2, "x": 2.75, "matrix": [4, 1], "label": "4,1"}, + {"y": 2, "x": 3.75, "matrix": [5, 1], "label": "5,1"}, + {"y": 2, "x": 4.75, "matrix": [4, 2], "label": "4,2"}, + {"y": 2, "x": 6, "matrix": [5, 2], "label": "5,2"}, + {"y": 2, "x": 7, "matrix": [4, 3], "label": "4,3"}, + {"y": 2, "x": 8, "matrix": [5, 3], "label": "5,3"}, + {"y": 2, "x": 9, "matrix": [4, 4], "label": "4,4"}, + {"y": 3, "x": 0, "matrix": [6, 0], "w": 1.25, "label": "6,0"}, + {"y": 3, "x": 2.5, "matrix": [6, 1], "label": "6,1"}, + {"y": 3, "x": 3.5, "matrix": [6, 2], "w": 2.25, "label": "6,2"}, + {"y": 3, "x": 6, "matrix": [6, 3], "w": 2, "label": "6,3"}, + {"y": 3, "x": 8, "matrix": [6, 4], "label": "6,4"}, + {"y": 6, "x": 3.75, "matrix": [5, 4], "w": 1.25, "label": "5,4"}, + {"y": 6, "x": 5, "matrix": [4, 5], "label": "4,5"}, + {"y": 7, "x": 4.75, "matrix": [6, 5], "w": 1.25, "label": "6,5"} ] } } diff --git a/keyboards/nachie/evelyn/keyboard.json b/keyboards/nachie/evelyn/keyboard.json index 61d598a52b..8df38e45d0 100644 --- a/keyboards/nachie/evelyn/keyboard.json +++ b/keyboards/nachie/evelyn/keyboard.json @@ -1,6 +1,6 @@ { - "manufacturer": "nachie", - "keyboard_name": "Syndrome", + "manufacturer": "Nachie", + "keyboard_name": "Evelyn", "maintainer": "nachie", "board": "GENERIC_RP_RP2040", "bootloader": "rp2040", @@ -43,44 +43,44 @@ "layouts": { "LAYOUT": { "layout": [ - {"y": 0.0, "x": 0.29, "matrix": [0, 0], "label": "0,0"}, - {"y": 0.0, "x": 10.190000000000001, "matrix": [1, 4], "label": "1,4"}, - {"y": 0.0, "x": 11.190000000000001, "matrix": [0, 5], "label": "0,5"}, - {"y": 0.99, "x": 0.15, "matrix": [2, 0], "w": 1.25, "label": "2,0"}, - {"y": 0.99, "x": 10.58, "matrix": [2, 5], "w": 1.75, "label": "2,5"}, - {"y": 1.99, "x": 0.0, "matrix": [4, 0], "w": 1.75, "label": "4,0"}, - {"y": 2.99, "x": 0.09000000000000001, "matrix": [6, 0], "w": 1.25, "label": "6,0"}, - {"y": 6.23, "x": 3.97, "matrix": [5, 4], "w": 1.25, "label": "5,4"}, - {"y": 6.23, "x": 5.220000000000001, "matrix": [4, 5], "label": "4,5"}, - {"y": 7.23, "x": 4.87, "matrix": [6, 5], "w": 1.25, "label": "6,5"}, - {"y": 8.23, "x": 1.43, "matrix": [1, 0], "label": "1,0"}, - {"y": 8.23, "x": 2.43, "matrix": [0, 1], "label": "0,1"}, - {"y": 8.23, "x": 3.43, "matrix": [1, 1], "label": "1,1"}, - {"y": 8.23, "x": 4.430000000000001, "matrix": [0, 2], "label": "0,2"}, - {"y": 9.23, "x": 1.68, "matrix": [3, 0], "label": "3,0"}, - {"y": 9.23, "x": 2.68, "matrix": [2, 1], "label": "2,1"}, - {"y": 9.23, "x": 3.68, "matrix": [3, 1], "label": "3,1"}, - {"y": 9.23, "x": 4.680000000000001, "matrix": [2, 2], "label": "2,2"}, - {"y": 10.23, "x": 2.18, "matrix": [5, 0], "label": "5,0"}, - {"y": 10.23, "x": 3.18, "matrix": [4, 1], "label": "4,1"}, - {"y": 10.23, "x": 4.180000000000001, "matrix": [5, 1], "label": "5,1"}, - {"y": 10.23, "x": 5.180000000000001, "matrix": [4, 2], "label": "4,2"}, - {"y": 11.23, "x": 2.93, "matrix": [6, 1], "label": "6,1"}, - {"y": 11.23, "x": 3.93, "matrix": [6, 2], "w": 2.25, "label": "6,2"}, - {"y": 9.89, "x": 5.930000000000001, "matrix": [1, 2], "label": "1,2"}, - {"y": 9.89, "x": 6.930000000000001, "matrix": [0, 3], "label": "0,3"}, - {"y": 9.89, "x": 7.930000000000001, "matrix": [1, 3], "label": "1,3"}, - {"y": 9.89, "x": 8.93, "matrix": [0, 4], "label": "0,4"}, - {"y": 10.89, "x": 6.180000000000001, "matrix": [3, 2], "label": "3,2"}, - {"y": 10.89, "x": 7.180000000000001, "matrix": [2, 3], "label": "2,3"}, - {"y": 10.89, "x": 8.18, "matrix": [3, 3], "label": "3,3"}, - {"y": 10.89, "x": 9.18, "matrix": [2, 4], "label": "2,4"}, - {"y": 11.89, "x": 5.680000000000001, "matrix": [5, 2], "label": "5,2"}, - {"y": 11.89, "x": 6.680000000000001, "matrix": [4, 3], "label": "4,3"}, - {"y": 11.89, "x": 7.680000000000001, "matrix": [5, 3], "label": "5,3"}, - {"y": 11.89, "x": 8.68, "matrix": [4, 4], "label": "4,4"}, - {"y": 12.89, "x": 5.680000000000001, "matrix": [6, 3], "w": 2, "label": "6,3"}, - {"y": 12.89, "x": 7.680000000000001, "matrix": [6, 4], "label": "6,4"} + {"y": 0, "x": 0, "matrix": [0, 0], "label": "0,0"}, + {"y": 0, "x": 1, "matrix": [1, 0], "label": "1,0"}, + {"y": 0, "x": 2, "matrix": [0, 1], "label": "0,1"}, + {"y": 0, "x": 3, "matrix": [1, 1], "label": "1,1"}, + {"y": 0, "x": 4, "matrix": [0, 2], "label": "0,2"}, + {"y": 0, "x": 6.25, "matrix": [1, 2], "label": "1,2"}, + {"y": 0, "x": 7.25, "matrix": [0, 3], "label": "0,3"}, + {"y": 0, "x": 8.25, "matrix": [1, 3], "label": "1,3"}, + {"y": 0, "x": 9.25, "matrix": [0, 4], "label": "0,4"}, + {"y": 0, "x": 10.25, "matrix": [1, 4], "label": "1,4"}, + {"y": 0, "x": 11.25, "matrix": [0, 5], "label": "0,5"}, + {"y": 1, "x": 0, "matrix": [2, 0], "w": 1.25, "label": "2,0"}, + {"y": 1, "x": 1.25, "matrix": [3, 0], "label": "3,0"}, + {"y": 1, "x": 2.25, "matrix": [2, 1], "label": "2,1"}, + {"y": 1, "x": 3.25, "matrix": [3, 1], "label": "3,1"}, + {"y": 1, "x": 4.25, "matrix": [2, 2], "label": "2,2"}, + {"y": 1, "x": 6.5, "matrix": [3, 2], "label": "3,2"}, + {"y": 1, "x": 7.5, "matrix": [2, 3], "label": "2,3"}, + {"y": 1, "x": 8.5, "matrix": [3, 3], "label": "3,3"}, + {"y": 1, "x": 9.5, "matrix": [2, 4], "label": "2,4"}, + {"y": 1, "x": 10.5, "matrix": [2, 5], "w": 1.75, "label": "2,5"}, + {"y": 2, "x": 0, "matrix": [4, 0], "w": 1.75, "label": "4,0"}, + {"y": 2, "x": 1.75, "matrix": [5, 0], "label": "5,0"}, + {"y": 2, "x": 2.75, "matrix": [4, 1], "label": "4,1"}, + {"y": 2, "x": 3.75, "matrix": [5, 1], "label": "5,1"}, + {"y": 2, "x": 4.75, "matrix": [4, 2], "label": "4,2"}, + {"y": 2, "x": 6, "matrix": [5, 2], "label": "5,2"}, + {"y": 2, "x": 7, "matrix": [4, 3], "label": "4,3"}, + {"y": 2, "x": 8, "matrix": [5, 3], "label": "5,3"}, + {"y": 2, "x": 9, "matrix": [4, 4], "label": "4,4"}, + {"y": 3, "x": 0, "matrix": [6, 0], "w": 1.25, "label": "6,0"}, + {"y": 3, "x": 2.5, "matrix": [6, 1], "label": "6,1"}, + {"y": 3, "x": 3.5, "matrix": [6, 2], "w": 2.25, "label": "6,2"}, + {"y": 3, "x": 6, "matrix": [6, 3], "w": 2, "label": "6,3"}, + {"y": 3, "x": 8, "matrix": [6, 4], "label": "6,4"}, + {"y": 6, "x": 3.75, "matrix": [5, 4], "w": 1.25, "label": "5,4"}, + {"y": 6, "x": 5, "matrix": [4, 5], "label": "4,5"}, + {"y": 7, "x": 4.75, "matrix": [6, 5], "w": 1.25, "label": "6,5"} ] } } diff --git a/keyboards/nachie/evelyn/keymaps/vial/vial.json b/keyboards/nachie/evelyn/keymaps/vial/vial.json index 4597db1978..34376bd1ac 100644 --- a/keyboards/nachie/evelyn/keymaps/vial/vial.json +++ b/keyboards/nachie/evelyn/keymaps/vial/vial.json @@ -1,5 +1,5 @@ { - "name": "Syndrome", + "name": "Evelyn", "vendorId": "0x4B43", "productId": "0x6F75", "matrix": { "rows": 7, "cols": 6 }, @@ -16,15 +16,7 @@ "keymap": [ [ { - "y": 0.16, - "x": 12.25 - }, - "1,0\n\n\n\n\n\n\n\n\ne", - "1,1\n\n\n\n\n\n\n\n\ne" - ], - [ - { - "y": -0.9199999999999999, + "y": 0.24, "x": 0.3, "c": "#ffffff", "t": "#2e2525" @@ -59,7 +51,7 @@ [ { "y": -0.9899999999999998, - "x": 12.73, + "x": 10.23, "w": 2.25 }, "5,4\n\n\n0,1" @@ -72,28 +64,11 @@ }, "6,0" ], - [ - { - "y": 0.6799999999999997, - "x": 3.5, - "c": "#cccccc", - "t": "#000000" - }, - "2,0\n\n\n\n\n\n\n\n\ne", - "2,1\n\n\n\n\n\n\n\n\ne", - { - "x": 0.75 - }, - "3,0\n\n\n\n\n\n\n\n\ne", - "3,1\n\n\n\n\n\n\n\n\ne" - ], [ { "rx": 6.25, "y": 2.24, "x": 3.9800000000000004, - "c": "#ffffff", - "t": "#2e2525", "w": 1.25 }, "5,4\n\n\n0,0", @@ -141,19 +116,20 @@ }, "6,1\n\n\n1,0", { - "w": 2.25 - }, - "6,2\n\n\n1,0" - ], - [ - { - "x": 2.94, + "x": -1, "t": "#000000", "w": 1.5 }, "6,1\n\n\n1,1", { - "x": 8.881784197001252e-16, + "x": -0.49999999999999956, + "t": "#2e2525", + "w": 2.25 + }, + "6,2\n\n\n1,0", + { + "x": -1.7499999999999991, + "t": "#000000", "w": 1.75 }, "6,2\n\n\n1,1" @@ -161,7 +137,7 @@ [ { "r": -8, - "y": -3.34, + "y": -2.34, "x": 5.9399999999999995, "t": "#2e2525" }, @@ -194,11 +170,8 @@ "w": 2 }, "6,3\n\n\n2,0", - "6,4\n\n\n2,0" - ], - [ { - "x": 5.69, + "x": -2, "t": "#000000", "w": 1.75 }, @@ -206,7 +179,12 @@ { "w": 1.25 }, - "6,4\n\n\n2,1" + "6,4\n\n\n2,1", + { + "x": -1.0000000000000009, + "t": "#2e2525" + }, + "6,4\n\n\n2,0" ] ] } diff --git a/keyboards/nachie/evelyn/readme.md b/keyboards/nachie/evelyn/readme.md index 2259be9671..1ba064a734 100644 --- a/keyboards/nachie/evelyn/readme.md +++ b/keyboards/nachie/evelyn/readme.md @@ -1,23 +1,23 @@ -# Båge +# Evelyn -Firmware for the Båge +Firmware for the Evelyn pcb * Keyboard Maintainer: [nachie](https://github.com/nachie) * Hardware Supported: Båge -* Hardware Availability: [nachie](https://littlecraftery.com/products/Båge) +* Hardware Availability: [nachie](https://littlecraftery.com/products/evelyn) Make example for this keyboard (after setting up your build environment): - make nachie/syndrome:default + make nachie/evelyn:default Or to make and flash: - make nachie/syndrome:default:flash + make nachie/evelyn:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). ## Bootloader -* **Bootmagic reset**: Hold down ESC key (top left) and plug in the keyboard -* **Physical reset button**: Briefly press the button labeled "SW_RST1" on the back of the PCB +* **Bootmagic reset**: Hold down Q key (top left) and plug in the keyboard +* **Physical reset button**: Press and hold reset, press and hold boot, let go off reset while holding boot From 71d25b36f37ee00de82456d25f342295f84d4c8a Mon Sep 17 00:00:00 2001 From: Yuri Paharev Date: Sat, 7 Sep 2024 23:21:22 +0300 Subject: [PATCH 2/4] Add VIAL support for tofu65v2/tofu_jr (#776) * Add VIAL support for tofu65v2/tofu_jr * Added VIALRGB support * Move vial keymap to v1 folder * Update keyboards/dztech/tofu/jr/v1/keymaps/vial/vial.json remove excess objects Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> --------- Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> --- .../dztech/tofu/jr/v1/keymaps/vial/config.h | 9 + .../dztech/tofu/jr/v1/keymaps/vial/keymap.c | 48 ++++++ .../dztech/tofu/jr/v1/keymaps/vial/rules.mk | 3 + .../dztech/tofu/jr/v1/keymaps/vial/vial.json | 159 ++++++++++++++++++ 4 files changed, 219 insertions(+) create mode 100644 keyboards/dztech/tofu/jr/v1/keymaps/vial/config.h create mode 100644 keyboards/dztech/tofu/jr/v1/keymaps/vial/keymap.c create mode 100644 keyboards/dztech/tofu/jr/v1/keymaps/vial/rules.mk create mode 100644 keyboards/dztech/tofu/jr/v1/keymaps/vial/vial.json diff --git a/keyboards/dztech/tofu/jr/v1/keymaps/vial/config.h b/keyboards/dztech/tofu/jr/v1/keymaps/vial/config.h new file mode 100644 index 0000000000..7848627619 --- /dev/null +++ b/keyboards/dztech/tofu/jr/v1/keymaps/vial/config.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x79, 0x6C, 0xEF, 0x4E, 0xC6, 0x63, 0x5F, 0xF2} + +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } + +#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } diff --git a/keyboards/dztech/tofu/jr/v1/keymaps/vial/keymap.c b/keyboards/dztech/tofu/jr/v1/keymaps/vial/keymap.c new file mode 100644 index 0000000000..406c8f7fd5 --- /dev/null +++ b/keyboards/dztech/tofu/jr/v1/keymaps/vial/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2022 DZTECH + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_65_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_65_ansi( + QK_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT, KC_PGUP, + KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, KC_PGDN, + KC_LSFT, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT + ), + [2] = LAYOUT_65_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_65_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/dztech/tofu/jr/v1/keymaps/vial/rules.mk b/keyboards/dztech/tofu/jr/v1/keymaps/vial/rules.mk new file mode 100644 index 0000000000..31bb6d699f --- /dev/null +++ b/keyboards/dztech/tofu/jr/v1/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIALRGB_ENABLE = yes \ No newline at end of file diff --git a/keyboards/dztech/tofu/jr/v1/keymaps/vial/vial.json b/keyboards/dztech/tofu/jr/v1/keymaps/vial/vial.json new file mode 100644 index 0000000000..66c15b323b --- /dev/null +++ b/keyboards/dztech/tofu/jr/v1/keymaps/vial/vial.json @@ -0,0 +1,159 @@ +{ + "name": "TOFU_JR", + "vendorId": "0x445A", + "productId": "0x1426", + "matrix": { + "rows": 5, + "cols": 15 + }, + "lighting": "vialrgb", + "layouts": { + "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", + { + "w": 2 + }, + "0,13", + { + "c": "#cccccc" + }, + "0,14" + ], + [ + { + "c": "#aaaaaa", + "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", + "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,12", + { + "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,11", + "3,13", + { + "c": "#cccccc" + }, + "3,14" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6", + { + "c": "#aaaaaa" + }, + "4,8", + "4,9", + "4,10", + "4,12", + "4,13", + "4,14" + ] + ] + } +} \ No newline at end of file From 608fb51485d96dd56bd074d75cee7b7cc798e388 Mon Sep 17 00:00:00 2001 From: Arkaprobho Das <89677542+arko9699@users.noreply.github.com> Date: Sun, 8 Sep 2024 02:42:28 +0530 Subject: [PATCH 3/4] Added vial support for For_Science (#769) * Added vial support for For_Science * Update rules.mk * Disabled QMK features to keep firmware size in check for AVR * moved qmk feature flags from keyboard.json to vial/rules.mk Moved QMK feature disables to vial/rules.mk to maintain compatibility with upstream QMK. * Delete rules.mk --- keyboards/for_science/keymaps/vial/config.h | 7 ++ keyboards/for_science/keymaps/vial/keymap.c | 113 +++++++++++++++++++ keyboards/for_science/keymaps/vial/rules.mk | 5 + keyboards/for_science/keymaps/vial/vial.json | 15 +++ 4 files changed, 140 insertions(+) create mode 100644 keyboards/for_science/keymaps/vial/config.h create mode 100644 keyboards/for_science/keymaps/vial/keymap.c create mode 100644 keyboards/for_science/keymaps/vial/rules.mk create mode 100644 keyboards/for_science/keymaps/vial/vial.json diff --git a/keyboards/for_science/keymaps/vial/config.h b/keyboards/for_science/keymaps/vial/config.h new file mode 100644 index 0000000000..2dca0d3c3c --- /dev/null +++ b/keyboards/for_science/keymaps/vial/config.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x89, 0xFB, 0xBB, 0x3C, 0xA4, 0x75, 0x46, 0x11} +#define VIAL_UNLOCK_COMBO_ROWS { 0,0 } +#define VIAL_UNLOCK_COMBO_COLS { 0,1 } diff --git a/keyboards/for_science/keymaps/vial/keymap.c b/keyboards/for_science/keymaps/vial/keymap.c new file mode 100644 index 0000000000..ef743a387a --- /dev/null +++ b/keyboards/for_science/keymaps/vial/keymap.c @@ -0,0 +1,113 @@ +/* Copyright 2017 Paul James (paul@peej.co.uk) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _LAYER, + _MOD_LAYER, + _FUNCT +}; + +#define SFT_A SFT_T(KC_A) +#define SFT_F1 SFT_T(KC_F1) +#define SFT_Z SFT_T(KC_Z) +#define SFT_F6 SFT_T(KC_F6) +#define LAY_X LT(_LAYER, KC_X) +#define LAY_F7 LT(_LAYER, KC_F7) +#define LAY_SLS LT(_LAYER, KC_SLSH) +#define LAY_SPC LT(_LAYER, KC_SPACE) + +#define LOCK LGUI(KC_L) +#define MAC_LCK LGUI(LCTL(KC_Q)) + +#define LAYER MO(_LAYER) +#define FUNCT MO(_FUNCT) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* + * ,---------------------------------------- ----------------------------------------. + * | Tab | Esc | ( | { | [ | | ] | } | ) | ' | BkSp | + * | ~ | ` | < | _ | - | | + | = | > | \ | Del | + * |-------+-------+-------+-------+-------+ |-------+-------+-------+-------+-------| + * | Q | W | E | R | T | | Y | U | I | O | P | + * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | + * |-------+-------+-------+-------+-------+ |-------+-------+-------+-------+-------| + * | A | S | D | F | G | | H | J | K | L | Enter | + * | F1 | F2 F3 | F4 | F5 | | PgUp | Home | Up | End | ; | + * |-Shift-+-------+-------+-------+-------+ |-------+-------+-------+-------+-------| + * | Z | X | C | V | B | | N | M | , | . | / | + * | F6 | F7 | F8 | F9 | F10 | | PgDn | Left | Down | Right | | + * `-Shift---Layer-+-------+-------+-------+ |-------+-------+-------+---------Layer-' + * | Ctrl | Gui | Alt | | Space | Layer | Shift | + * | | | | | Funct | | | + * `------------------------ `-Layer-----------------' + */ + +[_BASE] = LAYOUT_split_4x5_3( + KC_TAB, KC_ESC, KC_LPRN, KC_LCBR, KC_LBRC, KC_RBRC, KC_RCBR, KC_RPRN, KC_QUOT, KC_BSPC, + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + SFT_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, + SFT_Z, LAY_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, LAY_SLS, + KC_LCTL, KC_LGUI, KC_LALT, LAY_SPC, LAYER, KC_RSFT +), + +[_LAYER] = LAYOUT_split_4x5_3( + KC_TILD, KC_GRV, KC_LABK, KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_RABK, KC_BSLS, KC_DEL, + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, + SFT_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_SCLN, + SFT_F6, LAY_F7, KC_F8, KC_F9, KC_F10, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______, + _______, _______, _______, FUNCT, _______, _______ +), + +[_MOD_LAYER] = LAYOUT_split_4x5_3( + KC_TILD, _______, _______, _______, _______, KC_Q, _______, _______, _______, _______, + KC_TAB, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ +), + +[_FUNCT] = LAYOUT_split_4x5_3( + QK_BOOT, _______, _______, _______, LOCK, MAC_LCK, _______, _______, _______, QK_MAGIC_SWAP_LALT_LGUI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ +), + +}; + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (get_mods() & MOD_MASK_CAG) { + if (record->event.pressed) { + layer_on(_MOD_LAYER); + } else { + layer_off(_MOD_LAYER); + } + } + + if (record->event.pressed) { + if (keycode == KC_BSPC && (get_mods() & MOD_MASK_ALT)) { + tap_code(KC_DEL); + return false; + } + } + + return true; +}; diff --git a/keyboards/for_science/keymaps/vial/rules.mk b/keyboards/for_science/keymaps/vial/rules.mk new file mode 100644 index 0000000000..d57394ae1e --- /dev/null +++ b/keyboards/for_science/keymaps/vial/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes +CONSOLE_ENABLE = no +COMMAND_ENABLE = no diff --git a/keyboards/for_science/keymaps/vial/vial.json b/keyboards/for_science/keymaps/vial/vial.json new file mode 100644 index 0000000000..6369ce2e1c --- /dev/null +++ b/keyboards/for_science/keymaps/vial/vial.json @@ -0,0 +1,15 @@ +{ + "matrix": { + "rows": 10, + "cols": 5 + }, + "layouts": { + "keymap": [ + ["0,0","0,1","0,2","0,3","0,4",{"x":1.25},"5,0","5,1","5,2","5,3","5,4"], + ["1,0","1,1","1,2","1,3","1,4",{"x":1.25},"6,0","6,1","6,2","6,3","6,4"], + ["2,0","2,1","2,2","2,3","2,4",{"x":1.25},"7,0","7,1","7,2","7,3","7,4"], + ["3,0","3,1","3,2","3,3","3,4",{"x":1.25},"8,0","8,1","8,2","8,3","8,4"], + [{"x":2}, "4,2","4,3","4,4",{"x":1.25},"9,0","9,1","9,2" ] + ] + } +} From bb7961c3c27666c154393bca22aef31f8e60f5b9 Mon Sep 17 00:00:00 2001 From: dawnshadow42 Date: Sat, 7 Sep 2024 20:23:41 -0500 Subject: [PATCH 4/4] Ported magic_force/mf34 to VIAL (#780) --- .../magic_force/mf34/keymaps/vial/config.h | 9 ++ .../magic_force/mf34/keymaps/vial/keymap.c | 39 ++++++++ .../magic_force/mf34/keymaps/vial/rules.mk | 4 + .../magic_force/mf34/keymaps/vial/vial.json | 93 +++++++++++++++++++ 4 files changed, 145 insertions(+) create mode 100644 keyboards/magic_force/mf34/keymaps/vial/config.h create mode 100644 keyboards/magic_force/mf34/keymaps/vial/keymap.c create mode 100644 keyboards/magic_force/mf34/keymaps/vial/rules.mk create mode 100644 keyboards/magic_force/mf34/keymaps/vial/vial.json diff --git a/keyboards/magic_force/mf34/keymaps/vial/config.h b/keyboards/magic_force/mf34/keymaps/vial/config.h new file mode 100644 index 0000000000..2a57a0161f --- /dev/null +++ b/keyboards/magic_force/mf34/keymaps/vial/config.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x5E, 0x7B, 0xF6, 0x40, 0x62, 0x3D, 0xB4, 0x60} +#define VIAL_UNLOCK_COMBO_ROWS {0, 0} +#define VIAL_UNLOCK_COMBO_COLS {1, 6} + +#define MIDI_ADVANCED \ No newline at end of file diff --git a/keyboards/magic_force/mf34/keymaps/vial/keymap.c b/keyboards/magic_force/mf34/keymaps/vial/keymap.c new file mode 100644 index 0000000000..03135be226 --- /dev/null +++ b/keyboards/magic_force/mf34/keymaps/vial/keymap.c @@ -0,0 +1,39 @@ +/* +Copyright 2012,2013 gezhaoyou + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ +#include QMK_KEYBOARD_H +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + KC_ESC, MO(1), KC_EQL, KC_LPRN, KC_RPRN, KC_CALCULATOR, KC_BSPC, + KC_INSERT, KC_HOME, KC_PGUP, KC_NUM_LOCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_UP, KC_P1, KC_P2, KC_P3, + KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT), + [_FN] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOTLOADER, + RGB_TOG, RGB_HUI, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_HUD, RGB_RMOD, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_SPD, RGB_VAD, RGB_SPI, KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM), +}; + diff --git a/keyboards/magic_force/mf34/keymaps/vial/rules.mk b/keyboards/magic_force/mf34/keymaps/vial/rules.mk new file mode 100644 index 0000000000..8ee8be001e --- /dev/null +++ b/keyboards/magic_force/mf34/keymaps/vial/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +MIDI_ENABLE = yes +VIALRGB_ENABLE = yes \ No newline at end of file diff --git a/keyboards/magic_force/mf34/keymaps/vial/vial.json b/keyboards/magic_force/mf34/keymaps/vial/vial.json new file mode 100644 index 0000000000..a429bf6ae7 --- /dev/null +++ b/keyboards/magic_force/mf34/keymaps/vial/vial.json @@ -0,0 +1,93 @@ +{ + "name":"mf34cloneR1", + "vendorId":"0x1a53", + "productId":"0x4f51", + "vial": { + "midi": "advanced"}, + "lighting": "qmk_rgblight", + "matrix": { + "rows": 6, + "cols": 7 + }, + "layouts": { + "keymap": [ + [ + "0,0", + "0,1", + "0,2", + { + "x": 0.25 + }, + "0,3", + "0,4", + "0,5", + "0,6" + ], + [ + { + "y": 0.25 + }, + "1,0", + "1,1", + "1,2", + { + "x": 0.25 + }, + "1,3", + "1,4", + "1,5", + "1,6" + ], + [ + "2,0", + "2,1", + "2,2", + { + "x": 0.25 + }, + "2,3", + "2,4", + "2,5", + { + "h": 2 + }, + "3,6" + ], + [ + { + "x": 3.25 + }, + "3,3", + "3,4", + "3,5" + ], + [ + { + "x": 1 + }, + "4,1", + { + "x": 1.25 + }, + "4,3", + "4,4", + "4,5", + { + "h": 2 + }, + "5,6" + ], + [ + "5,0", + "5,1", + "5,2", + { + "x": 0.25, + "w": 2 + }, + "5,4", + "5,5" + ] +] + } +} \ No newline at end of file