diff --git a/Makefile b/Makefile index bd2a9710..3a3f7406 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,8 @@ vial-qmk-init: rm -rf src/vial-kb/vial-qmk/keyboards/tmp/${KB} mkdir -p src/vial-kb/vial-qmk/keyboards/tmp/${KB} cp -r $(shell pwd)/keyboards/${KB}/qmk/qmk_firmware/ src/vial-kb/vial-qmk/keyboards/tmp/${KB} - cp -r $(shell pwd)/keyboards/${KB}/vial-kb/vial-qmk/keymaps/* src/vial-kb/vial-qmk/keyboards/tmp/${KB}/keymaps + rm -rf src/vial-kb/vial-qmk/keyboards/tmp/${KB}/keymaps + ln -s $(shell pwd)/keyboards/${KB}/vial-kb/vial-qmk/keymaps src/vial-kb/vial-qmk/keyboards/tmp/${KB}/keymaps vial-qmk-compile: $(eval KB := ${kb}) diff --git a/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_mini_vial_mini.uf2 b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_mini_vial_mini.uf2 index b8605cab..83a550e8 100644 Binary files a/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_mini_vial_mini.uf2 and b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_mini_vial_mini.uf2 differ diff --git a/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_standard_vial.uf2 b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_standard_vial.uf2 index 7217a89f..c9c99fe4 100644 Binary files a/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_standard_vial.uf2 and b/keyboards/crkbd/vial-kb/vial-qmk/.build/crkbd_rev4_standard_vial.uf2 differ diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/rules.mk b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/rules.mk index 32136f98..899962aa 100644 --- a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/rules.mk +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/rules.mk @@ -1,6 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -LTO_ENABLE = yes VIALRGB_ENABLE = yes -QMK_SETTINGS = no ENCODER_MAP_ENABLE = yes diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/vial.json b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/vial.json index 82123c30..73365d96 100644 --- a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/vial.json +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial/vial.json @@ -16,21 +16,23 @@ [{"y": -0.875, "x": 2.5}, "0,2", {"x": 1}, "0,4", {"x": 5.5}, "4,4", {"x": 1}, "4,2"], [{"y": -0.875, "x": 5.5}, "0,5", {"x": 3.5}, "4,5"], [{"y": -0.875, "x": 0.5}, "0,0", "0,1", {"x": 11.5}, "4,1", "4,0"], - [{"y": -0.625, "x": 6.5}, "0,6\n\n\n0,0","0,6\n\n\n0,1\n\n\n\n\n\ne0", {"x": 0.5}, "4,6\n\n\n2,0","4,6\n\n\n2,1\n\n\n\n\n\ne2"], - [{"y": -0.75, "x": 3.5}, "1,3", {"x": 7.5}, "5,3"], + [{"y": -0.625, "x": 6.5}, "0,6\n\n\n0,0",{"w":0.5,"h":0.5},"0,0\n\n\n0,1\n\n\n\n\n\ne",{"w":0.5,"h":0.5},"0,1\n\n\n0,1\n\n\n\n\n\ne",{"x":-0.5},{"w":0.5,"h":0.5},"2,0\n\n\n2,1\n\n\n\n\n\ne",{"w":0.5,"h":0.5},"2,1\n\n\n2,1\n\n\n\n\n\ne","4,6\n\n\n2,0"], + [{"y": -0.5, "x": 7.5}, {"h":0.5},"0,6\n\n\n0,1", {"x":-0.5}, {"h":0.5},"4,6\n\n\n2,1"], + [{"y": -1.25, "x": 3.5}, "1,3", {"x": 7.5}, "5,3"], [{"y": -0.875, "x": 2.5}, "1,2", {"x": 1}, "1,4", {"x": 5.5}, "5,4", {"x": 1}, "5,2"], [{"y": -0.875, "x": 5.5}, "1,5", {"x": 3.5}, "5,5"], [{"y": -0.875, "x": 0.5}, "1,0", "1,1", {"x": 11.5}, "5,1", "5,0"], - [{"y": -0.625, "x": 6.5}, "1,6\n\n\n1,0","1,6\n\n\n1,1\n\n\n\n\n\ne1", {"x": 0.5}, "5,6\n\n\n3,0","5,6\n\n\n3,1\n\n\n\n\n\ne3"], - [{"y": -0.75, "x": 3.5}, "2,3", {"x": 7.5}, "6,3"], + [{"y": -0.625, "x": 6.5}, "1,6\n\n\n1,0",{"w":0.5,"h":0.5},"1,0\n\n\n1,1\n\n\n\n\n\ne",{"w":0.5,"h":0.5},"1,1\n\n\n1,1\n\n\n\n\n\ne",{"x":-0.5},{"w":0.5,"h":0.5},"3,0\n\n\n3,1\n\n\n\n\n\ne",{"w":0.5,"h":0.5},"3,1\n\n\n3,1\n\n\n\n\n\ne","5,6\n\n\n3,0"], + [{"y": -0.5, "x": 7.5}, {"h":0.5},"1,6\n\n\n1,1", {"x":-0.5}, {"h":0.5},"5,6\n\n\n3,1"], + [{"y": -1.25, "x": 3.5}, "2,3", {"x": 7.5}, "6,3"], [{"y": -0.875, "x": 2.5}, "2,2", {"x": 1}, "2,4", {"x": 5.5}, "6,4", {"x": 1}, "6,2"], [{"y": -0.875, "x": 5.5}, "2,5", {"x": 3.5}, "6,5"], [{"y": -0.875, "x": 0.5}, "2,0", "2,1", {"x": 11.5}, "6,1", "6,0"], - [{"y": -0.125, "x": 4}, "3,3", {"x": 6.5}, "7,3"], - [{"r": 15, "rx": 4.5, "ry": 9.1, "y": -4.85, "x": -0.5}, "3,4"], - [{"r": 30, "rx": 5.4, "ry": 9.3, "y": -5.05, "x": -1.4, "h": 1.5}, "3,5"], - [{"r": -30, "rx": 11.1, "y": -5.05, "x": 0.4, "h": 1.5}, "7,5"], - [{"r": -15, "rx": 12, "ry": 9.1, "y": -4.85, "x": -0.5}, "7,4"] + [{"y": -0.125, "x": 4 }, "3,3", {"x": 6.5}, "7,3"], + [{"r": 15, "rx": 4.5, "ry": 9.1, "y": -4.85, "x": -0.5}, "3,4"], + [{"r": 30, "rx": 5.4, "ry": 9.3, "y": -5.05, "x": -1.4, "h": 1.5}, "3,5"], + [{"r": -30, "rx": 11.1, "y": -5.05, "x": 0.4, "h": 1.5}, "7,5"], + [{"r": -15, "rx": 12, "ry": 9.1, "y": -4.85, "x": -0.5}, "7,4"] ] } } diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/rules.mk b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/rules.mk index 32136f98..899962aa 100644 --- a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/rules.mk +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/rules.mk @@ -1,6 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -LTO_ENABLE = yes VIALRGB_ENABLE = yes -QMK_SETTINGS = no ENCODER_MAP_ENABLE = yes diff --git a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/vial.json b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/vial.json index 1c3606d2..b7cf6278 100644 --- a/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/vial.json +++ b/keyboards/crkbd/vial-kb/vial-qmk/keymaps/vial_mini/vial.json @@ -16,21 +16,23 @@ [{"y": -0.875, "x": 1.5}, "0,2", {"x": 1}, "0,4", {"x": 5.5}, "4,4", {"x": 1}, "4,2"], [{"y": -0.875, "x": 4.5}, "0,5", {"x": 3.5}, "4,5"], [{"y": -0.875, "x": 0.5}, "0,1", {"x": 11.5}, "4,1"], - [{"y": -0.625, "x": 5.5}, "0,6\n\n\n0,0","0,6\n\n\n0,1\n\n\n\n\n\ne0", {"x": 0.5}, "4,6\n\n\n2,0","4,6\n\n\n2,1\n\n\n\n\n\ne2"], - [{"y": -0.75, "x": 2.5}, "1,3", {"x": 7.5}, "5,3"], + [{"y": -0.625, "x": 5.5}, "0,6\n\n\n0,0",{"w":0.5,"h":0.5},"0,0\n\n\n0,1\n\n\n\n\n\ne",{"w":0.5,"h":0.5},"0,1\n\n\n0,1\n\n\n\n\n\ne", {"x":-0.5}, {"w":0.5,"h":0.5},"2,0\n\n\n2,1\n\n\n\n\n\ne",{"w":0.5,"h":0.5},"2,1\n\n\n2,1\n\n\n\n\n\ne","4,6\n\n\n2,0"], + [{"y": -0.5, "x": 6.5}, {"h":0.5},"0,6\n\n\n0,1", {"x":-0.5}, {"h":0.5},"4,6\n\n\n2,1"], + [{"y": -1.25, "x": 2.5}, "1,3", {"x": 7.5}, "5,3"], [{"y": -0.875, "x": 1.5}, "1,2", {"x": 1}, "1,4", {"x": 5.5}, "5,4", {"x": 1}, "5,2"], [{"y": -0.875, "x": 4.5}, "1,5", {"x": 3.5}, "5,5"], [{"y": -0.875, "x": 0.5}, "1,1", {"x": 11.5}, "5,1"], - [{"y": -0.625, "x": 5.5}, "1,6\n\n\n1,0","1,6\n\n\n1,1\n\n\n\n\n\ne1", {"x": 0.5}, "5,6\n\n\n3,0","5,6\n\n\n3,1\n\n\n\n\n\ne3"], - [{"y": -0.75, "x": 2.5}, "2,3", {"x": 7.5}, "6,3"], + [{"y": -0.625, "x": 5.5}, "1,6\n\n\n1,0",{"w":0.5,"h":0.5},"1,0\n\n\n1,1\n\n\n\n\n\ne",{"w":0.5,"h":0.5},"1,1\n\n\n1,1\n\n\n\n\n\ne", {"x":-0.5}, {"w":0.5,"h":0.5},"3,0\n\n\n3,1\n\n\n\n\n\ne",{"w":0.5,"h":0.5},"3,1\n\n\n3,1\n\n\n\n\n\ne","5,6\n\n\n3,0"], + [{"y": -0.5, "x": 6.5}, {"h":0.5},"1,6\n\n\n1,1", {"x":-0.5}, {"h":0.5},"5,6\n\n\n3,1"], + [{"y": -1.25, "x": 2.5}, "2,3", {"x": 7.5}, "6,3"], [{"y": -0.875, "x": 1.5}, "2,2", {"x": 1}, "2,4", {"x": 5.5}, "6,4", {"x": 1}, "6,2"], [{"y": -0.875, "x": 4.5}, "2,5", {"x": 3.5}, "6,5"], [{"y": -0.875, "x": 0.5}, "2,1", {"x": 11.5}, "6,1"], - [{"y": -0.125, "x": 3}, "3,3", {"x": 6.5}, "7,3"], - [{"r": 15, "rx": 3.5, "ry": 9.1, "y": -4.85, "x": -0.5}, "3,4"], - [{"r": 30, "rx": 4.4, "ry": 9.3, "y": -5.05, "x": -1.4, "h": 1.5}, "3,5"], - [{"r": -30, "rx": 10.1, "y": -5.05, "x": 0.4, "h": 1.5}, "7,5"], - [{"r": -15, "rx": 11, "ry": 9.1, "y": -4.85, "x": -0.5}, "7,4"] + [{"y": -0.125, "x": 3 }, "3,3", {"x": 6.5}, "7,3"], + [{"r": 15, "rx": 3.5, "ry": 9.1, "y": -4.85, "x": -0.5}, "3,4"], + [{"r": 30, "rx": 4.4, "ry": 9.3, "y": -5.05, "x": -1.4, "h": 1.5}, "3,5"], + [{"r": -30, "rx": 10.1, "y": -5.05, "x": 0.4, "h": 1.5}, "7,5"], + [{"r": -15, "rx": 11, "ry": 9.1, "y": -4.85, "x": -0.5}, "7,4"] ] } }