From ff052731175e831f7881964d385a073d4469e65d Mon Sep 17 00:00:00 2001 From: Nic Lake Date: Sun, 21 Jul 2024 01:33:48 -0500 Subject: [PATCH] Updating FoldKB to have layout options & more features (#759) --- keyboards/keebio/foldkb/keymaps/vial/config.h | 4 + keyboards/keebio/foldkb/keymaps/vial/rules.mk | 3 +- .../keebio/foldkb/keymaps/vial/vial.json | 249 ++++++++++++++++-- 3 files changed, 233 insertions(+), 23 deletions(-) diff --git a/keyboards/keebio/foldkb/keymaps/vial/config.h b/keyboards/keebio/foldkb/keymaps/vial/config.h index f599faef80..2172798c9b 100644 --- a/keyboards/keebio/foldkb/keymaps/vial/config.h +++ b/keyboards/keebio/foldkb/keymaps/vial/config.h @@ -9,3 +9,7 @@ // ECS + BACKSPACE = UNLOCK #define VIAL_UNLOCK_COMBO_ROWS { 0, 5 } #define VIAL_UNLOCK_COMBO_COLS { 1, 7 } +#define TAPPING_TOGGLE 2 +#define VIAL_COMBO_ENTRIES 24 +#define TAPPING_TERM 150 +#define COMBO_TERM 30 diff --git a/keyboards/keebio/foldkb/keymaps/vial/rules.mk b/keyboards/keebio/foldkb/keymaps/vial/rules.mk index 205eb1e075..6628c2c887 100644 --- a/keyboards/keebio/foldkb/keymaps/vial/rules.mk +++ b/keyboards/keebio/foldkb/keymaps/vial/rules.mk @@ -4,7 +4,6 @@ CONSOLE_ENABLE = no LTO_ENABLE = yes QMK_SETTINGS = no TAP_DANCE_ENABLE = no -COMBO_ENABLE = no RGBLIGHT_ENABLE = yes BACKLIGHT_ENABLE = no -KEY_OVERRIDE_ENABLE = yes +KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/keebio/foldkb/keymaps/vial/vial.json b/keyboards/keebio/foldkb/keymaps/vial/vial.json index 7167f2be1e..c54a8c45e3 100644 --- a/keyboards/keebio/foldkb/keymaps/vial/vial.json +++ b/keyboards/keebio/foldkb/keymaps/vial/vial.json @@ -1,5 +1,5 @@ { - "name": "FoldKB Rev. 1", + "name": "FoldKB rev1.1", "vendorId": "0xCB10", "productId": "0x1258", "firmwareVersion": 0, @@ -8,28 +8,235 @@ "rows": 10, "cols": 8 }, + "labels": [ + "Split Backspace", + "1U Slash Pipe", + "Split Right Shift", + "Split Right Space", + [ + "Left Bottom Row", + "2x 1.5U", + "3x 1U", + "1U + 2U" + ] + ], "layouts": { "keymap": [ - [ - {"c":"#aaaaaa"},"0,0",{"x":0.25,"c":"#777777"},"0,1",{"c":"#cccccc"},"0,2","0,3","0,4","0,5","0,6","0,7",{"x":0.75}, - "5,0","5,1","5,2","5,3","5,4","5,5","5,6",{"c":"#aaaaaa"},"5,7" - ], - [ - "1,0",{"x":0.75,"w":1.5},"1,2",{"c":"#cccccc"},"1,3","1,4","1,5","1,6","1,7",{"x":0.75}, - "6,0","6,1","6,2","6,3","6,4","6,5","6,6",{"w":1.5},"6,7" - ], - [ - {"c":"#aaaaaa"},"2,0",{"x":0.5,"w":1.75},"2,2",{"c":"#cccccc"},"2,3","2,4","2,5","2,6","2,7",{"x":0.75}, - "7,0","7,1","7,2","7,3","7,4","7,5",{"c":"#777777","w":2.25},"7,7" - ], - [ - {"c":"#aaaaaa"},"3,0",{"w":2.25},"3,2",{"c":"#cccccc"},"3,3","3,4","3,5","3,6","3,7",{"x":0.75}, - "8,0","8,1","8,2","8,3","8,4",{"c":"#aaaaaa","w":1.75},"8,5","8,7" - ], - [ - "4,0",{"x":0.5,"w":1.25},"4,2",{"w":1.25},"4,3",{"w":1.25},"4,4","4,5",{"w":2},"4,7",{"x":0.75,"w":2.75}, - "9,1",{"w":1.25},"9,3",{"w":1.25},"9,4",{"w":1.25},"9,5",{"w":1.25},"9,7" + [ + { + "c": "#aaaaaa" + }, + "0,0", + { + "x": 0.25, + "c": "#777777" + }, + "0,1", + { + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + { + "x": 0.75 + }, + "5,0", + "5,1", + "5,2", + "5,3", + "5,4", + "5,5", + { + "c": "#aaaaaa", + "w": 2 + }, + "5,7\n\n\n0,0", + { + "x": 1 + }, + "5,6\n\n\n0,1", + "5,7\n\n\n0,1" + ], + [ + { + "c": "#cccccc" + }, + "1,0", + { + "x": 0.75, + "w": 1.5 + }, + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + { + "x": 0.75 + }, + "6,0", + "6,1", + "6,2", + "6,3", + "6,4", + "6,5", + "6,6", + { + "w": 1.5 + }, + "6,7\n\n\n1,0", + { + "x": 0.5 + }, + "6,7\n\n\n1,1" + ], + [ + { + "c": "#aaaaaa" + }, + "2,0", + { + "x": 0.5, + "w": 1.75 + }, + "2,2", + { + "c": "#cccccc" + }, + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + { + "x": 0.75 + }, + "7,0", + "7,1", + "7,2", + "7,3", + "7,4", + "7,5", + { + "c": "#777777", + "w": 2.25 + }, + "7,7" + ], + [ + { + "c": "#aaaaaa" + }, + "3,0", + { + "w": 2.25 + }, + "3,2", + { + "c": "#cccccc" + }, + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + { + "x": 0.75 + }, + "8,0", + "8,1", + "8,2", + "8,3", + "8,4", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "8,5\n\n\n2,0", + { + "x": 1.25, + "w": 1.75 + }, + "8,5\n\n\n2,1", + "8,7\n\n\n2,1" + ], + [ + "4,0", + { + "x": 0.5, + "w": 1.25 + }, + "4,2", + { + "w": 1.25 + }, + "4,3", + { + "w": 1.25 + }, + "4,4", + { + "w": 1.5 + }, + "4,5\n\n\n4,0", + { + "w": 1.5 + }, + "4,7\n\n\n4,0", + { + "x": 0.75, + "w": 2.75 + }, + "9,1\n\n\n3,0", + { + "w": 1.25 + }, + "9,3", + { + "w": 1.25 + }, + "9,4", + { + "w": 1.25 + }, + "9,5", + { + "w": 1.25 + }, + "9,7" + ], + [ + { + "x": 5.25 + }, + "4,5\n\n\n4,1", + "4,6\n\n\n4,1", + "4,7\n\n\n4,1", + { + "x": 0.75, + "w": 1.25 + }, + "9,0\n\n\n3,1", + { + "w": 1.5 + }, + "9,1\n\n\n3,1" + ], + [ + { + "x": 5.25 + }, + "4,5\n\n\n4,2", + { + "w": 2 + }, + "4,7\n\n\n4,2" + ] ] - ] } }