From 4ef012ea7e7f129ed7d948e1049e60cb1a45b0ff Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Sat, 6 May 2023 17:01:07 +0800 Subject: [PATCH 01/10] move hfdkb/keyboard_sw/k83 --> inland/kb83 --- keyboards/{hfdkb/keyboard_sw => inland}/k83/config.h | 0 keyboards/{hfdkb/keyboard_sw => inland}/k83/halconf.h | 0 keyboards/{hfdkb/keyboard_sw => inland}/k83/info.json | 0 .../{hfdkb/keyboard_sw/k83/k83.c => inland/k83/kb83.c} | 0 .../keyboard_sw => inland}/k83/keymaps/default/keymap.c | 0 .../keyboard_sw => inland}/k83/keymaps/via/keymap.c | 0 .../keyboard_sw => inland}/k83/keymaps/via/rules.mk | 0 keyboards/{hfdkb/keyboard_sw => inland}/k83/mcuconf.h | 0 keyboards/{hfdkb/keyboard_sw => inland}/k83/readme.md | 9 +++++---- .../{hfdkb/keyboard_sw => inland}/k83/rgb_matrix_kb.inc | 0 keyboards/{hfdkb/keyboard_sw => inland}/k83/rules.mk | 0 11 files changed, 5 insertions(+), 4 deletions(-) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/config.h (100%) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/halconf.h (100%) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/info.json (100%) rename keyboards/{hfdkb/keyboard_sw/k83/k83.c => inland/k83/kb83.c} (100%) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/keymaps/default/keymap.c (100%) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/keymaps/via/keymap.c (100%) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/keymaps/via/rules.mk (100%) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/mcuconf.h (100%) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/readme.md (79%) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/rgb_matrix_kb.inc (100%) rename keyboards/{hfdkb/keyboard_sw => inland}/k83/rules.mk (100%) diff --git a/keyboards/hfdkb/keyboard_sw/k83/config.h b/keyboards/inland/k83/config.h similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/config.h rename to keyboards/inland/k83/config.h diff --git a/keyboards/hfdkb/keyboard_sw/k83/halconf.h b/keyboards/inland/k83/halconf.h similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/halconf.h rename to keyboards/inland/k83/halconf.h diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/inland/k83/info.json similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/info.json rename to keyboards/inland/k83/info.json diff --git a/keyboards/hfdkb/keyboard_sw/k83/k83.c b/keyboards/inland/k83/kb83.c similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/k83.c rename to keyboards/inland/k83/kb83.c diff --git a/keyboards/hfdkb/keyboard_sw/k83/keymaps/default/keymap.c b/keyboards/inland/k83/keymaps/default/keymap.c similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/keymaps/default/keymap.c rename to keyboards/inland/k83/keymaps/default/keymap.c diff --git a/keyboards/hfdkb/keyboard_sw/k83/keymaps/via/keymap.c b/keyboards/inland/k83/keymaps/via/keymap.c similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/keymaps/via/keymap.c rename to keyboards/inland/k83/keymaps/via/keymap.c diff --git a/keyboards/hfdkb/keyboard_sw/k83/keymaps/via/rules.mk b/keyboards/inland/k83/keymaps/via/rules.mk similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/keymaps/via/rules.mk rename to keyboards/inland/k83/keymaps/via/rules.mk diff --git a/keyboards/hfdkb/keyboard_sw/k83/mcuconf.h b/keyboards/inland/k83/mcuconf.h similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/mcuconf.h rename to keyboards/inland/k83/mcuconf.h diff --git a/keyboards/hfdkb/keyboard_sw/k83/readme.md b/keyboards/inland/k83/readme.md similarity index 79% rename from keyboards/hfdkb/keyboard_sw/k83/readme.md rename to keyboards/inland/k83/readme.md index 871e9b893649..e6f1d45990b3 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/readme.md +++ b/keyboards/inland/k83/readme.md @@ -1,17 +1,18 @@ -# k83 +# kb83 A customizable 75% encoder keyboard. * Keyboard Maintainer: [jonylee@hfd](https://github.com/jonylee1986) -* Hardware Supported: k83 +* Hardware Supported: kb83 +* Hardware Availability:[inland](https://www.microcenter.com) Make example for this keyboard (after setting up your build environment): - make hfdkb/keyboard_sw/k83:default + make inland/kb83:default Flashing example for this keyboard: - make hfdkb/keyboard_sw/k83:default:flash + make inland/kb83:default:flash **Reset Key**: Hold down the key located at *K01*, which programmed as *Esc* while plugging in the keyboard. diff --git a/keyboards/hfdkb/keyboard_sw/k83/rgb_matrix_kb.inc b/keyboards/inland/k83/rgb_matrix_kb.inc similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/rgb_matrix_kb.inc rename to keyboards/inland/k83/rgb_matrix_kb.inc diff --git a/keyboards/hfdkb/keyboard_sw/k83/rules.mk b/keyboards/inland/k83/rules.mk similarity index 100% rename from keyboards/hfdkb/keyboard_sw/k83/rules.mk rename to keyboards/inland/k83/rules.mk From ea88b3bb575e0834be5b60816ea4efe9865a8441 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Sat, 6 May 2023 17:04:28 +0800 Subject: [PATCH 02/10] move hfdkb/keyboard_sw/k83 --> inland/kb83 --- data/mappings/keyboard_aliases.hjson | 3 +++ keyboards/inland/{k83 => kb83}/config.h | 0 keyboards/inland/{k83 => kb83}/halconf.h | 0 keyboards/inland/{k83 => kb83}/info.json | 0 keyboards/inland/{k83 => kb83}/kb83.c | 0 keyboards/inland/{k83 => kb83}/keymaps/default/keymap.c | 0 keyboards/inland/{k83 => kb83}/keymaps/via/keymap.c | 0 keyboards/inland/{k83 => kb83}/keymaps/via/rules.mk | 0 keyboards/inland/{k83 => kb83}/mcuconf.h | 0 keyboards/inland/{k83 => kb83}/readme.md | 0 keyboards/inland/{k83 => kb83}/rgb_matrix_kb.inc | 0 keyboards/inland/{k83 => kb83}/rules.mk | 0 12 files changed, 3 insertions(+) rename keyboards/inland/{k83 => kb83}/config.h (100%) rename keyboards/inland/{k83 => kb83}/halconf.h (100%) rename keyboards/inland/{k83 => kb83}/info.json (100%) rename keyboards/inland/{k83 => kb83}/kb83.c (100%) rename keyboards/inland/{k83 => kb83}/keymaps/default/keymap.c (100%) rename keyboards/inland/{k83 => kb83}/keymaps/via/keymap.c (100%) rename keyboards/inland/{k83 => kb83}/keymaps/via/rules.mk (100%) rename keyboards/inland/{k83 => kb83}/mcuconf.h (100%) rename keyboards/inland/{k83 => kb83}/readme.md (100%) rename keyboards/inland/{k83 => kb83}/rgb_matrix_kb.inc (100%) rename keyboards/inland/{k83 => kb83}/rules.mk (100%) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index f005bb34c399..7d4d4581806c 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -868,6 +868,9 @@ "infinity60": { "target": "input_club/infinity60" }, + "hfdkb/keyboard_sw/k83":{ + "target":"inland/kb83" + }, "ivy/rev1": { "target": "maple_computing/ivy/rev1" }, diff --git a/keyboards/inland/k83/config.h b/keyboards/inland/kb83/config.h similarity index 100% rename from keyboards/inland/k83/config.h rename to keyboards/inland/kb83/config.h diff --git a/keyboards/inland/k83/halconf.h b/keyboards/inland/kb83/halconf.h similarity index 100% rename from keyboards/inland/k83/halconf.h rename to keyboards/inland/kb83/halconf.h diff --git a/keyboards/inland/k83/info.json b/keyboards/inland/kb83/info.json similarity index 100% rename from keyboards/inland/k83/info.json rename to keyboards/inland/kb83/info.json diff --git a/keyboards/inland/k83/kb83.c b/keyboards/inland/kb83/kb83.c similarity index 100% rename from keyboards/inland/k83/kb83.c rename to keyboards/inland/kb83/kb83.c diff --git a/keyboards/inland/k83/keymaps/default/keymap.c b/keyboards/inland/kb83/keymaps/default/keymap.c similarity index 100% rename from keyboards/inland/k83/keymaps/default/keymap.c rename to keyboards/inland/kb83/keymaps/default/keymap.c diff --git a/keyboards/inland/k83/keymaps/via/keymap.c b/keyboards/inland/kb83/keymaps/via/keymap.c similarity index 100% rename from keyboards/inland/k83/keymaps/via/keymap.c rename to keyboards/inland/kb83/keymaps/via/keymap.c diff --git a/keyboards/inland/k83/keymaps/via/rules.mk b/keyboards/inland/kb83/keymaps/via/rules.mk similarity index 100% rename from keyboards/inland/k83/keymaps/via/rules.mk rename to keyboards/inland/kb83/keymaps/via/rules.mk diff --git a/keyboards/inland/k83/mcuconf.h b/keyboards/inland/kb83/mcuconf.h similarity index 100% rename from keyboards/inland/k83/mcuconf.h rename to keyboards/inland/kb83/mcuconf.h diff --git a/keyboards/inland/k83/readme.md b/keyboards/inland/kb83/readme.md similarity index 100% rename from keyboards/inland/k83/readme.md rename to keyboards/inland/kb83/readme.md diff --git a/keyboards/inland/k83/rgb_matrix_kb.inc b/keyboards/inland/kb83/rgb_matrix_kb.inc similarity index 100% rename from keyboards/inland/k83/rgb_matrix_kb.inc rename to keyboards/inland/kb83/rgb_matrix_kb.inc diff --git a/keyboards/inland/k83/rules.mk b/keyboards/inland/kb83/rules.mk similarity index 100% rename from keyboards/inland/k83/rules.mk rename to keyboards/inland/kb83/rules.mk From b0d137ec98638af5dd9bea57d0d4cbf48e4dfea4 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 14 Jun 2023 10:10:55 +0800 Subject: [PATCH 03/10] Update data/mappings/keyboard_aliases.hjson Co-authored-by: Ryan --- data/mappings/keyboard_aliases.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 7d4d4581806c..7247fda5f31c 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -869,7 +869,7 @@ "target": "input_club/infinity60" }, "hfdkb/keyboard_sw/k83":{ - "target":"inland/kb83" + "target": "inland/kb83" }, "ivy/rev1": { "target": "maple_computing/ivy/rev1" From c085c547656d09a14b9b0fad6a00f9551106719f Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Wed, 14 Jun 2023 10:14:44 +0800 Subject: [PATCH 04/10] Update keyboard_aliases.hjson --- data/mappings/keyboard_aliases.hjson | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 7247fda5f31c..d27e37aaa6c5 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -844,6 +844,9 @@ "hecomi/alpha": { "target": "takashiski/hecomi/alpha" }, + "hfdkb/keyboard_sw/k83":{ + "target": "inland/kb83" + }, "hid_liber": { "target": "bpiphany/hid_liber" }, @@ -868,9 +871,6 @@ "infinity60": { "target": "input_club/infinity60" }, - "hfdkb/keyboard_sw/k83":{ - "target": "inland/kb83" - }, "ivy/rev1": { "target": "maple_computing/ivy/rev1" }, From eed07b201a1cc4f507af9f4c5aade4eaba9eb0bb Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Mon, 19 Jun 2023 11:00:44 +0800 Subject: [PATCH 05/10] fixed the Configurator layout data --- keyboards/inland/kb83/info.json | 45 +++++++++++++-------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json index 559fa3d790ef..4e94119f7582 100644 --- a/keyboards/inland/kb83/info.json +++ b/keyboards/inland/kb83/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "KB83", - "manufacturer": "www.hfd.cn", - "maintainer": "hfd", + "manufacturer": "Inland", + "maintainer": "jonylee@hfd", "usb": { "vid": "0xFFFE", "pid": "0x0007", @@ -27,24 +27,20 @@ "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [0, 2], "x": 3, "y": 0}, {"matrix": [0, 3], "x": 4, "y": 0}, {"matrix": [0, 4], "x": 5, "y": 0}, - {"matrix": [0, 5], "x": 6.5, "y": 0}, {"matrix": [0, 6], "x": 7.5, "y": 0}, {"matrix": [0, 7], "x": 8.5, "y": 0}, {"matrix": [0, 8], "x": 9.5, "y": 0}, - {"matrix": [0, 9], "x": 11, "y": 0}, {"matrix": [0, 10], "x": 12, "y": 0}, {"matrix": [0, 11], "x": 13, "y": 0}, {"matrix": [0, 12], "x": 14, "y": 0}, - - {"matrix": [0, 13], "x": 15.25, "y": 0}, - {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 13], "x": 16, "y": 0}, + {"matrix": [0, 15], "x": 16, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1.25}, {"matrix": [1, 1], "x": 1, "y": 1.25}, @@ -59,9 +55,8 @@ {"matrix": [1, 10], "x": 10, "y": 1.25}, {"matrix": [1, 11], "x": 11, "y": 1.25}, {"matrix": [1, 12], "x": 12, "y": 1.25}, - {"matrix": [1, 13], "x": 14, "y": 1.25}, - - {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [1, 15], "x": 16, "y": 1.25}, {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, {"matrix": [2, 1], "x": 1.5, "y": 2.25}, @@ -77,8 +72,7 @@ {"matrix": [2, 11], "x": 11.5, "y": 2.25}, {"matrix": [2, 12], "x": 12.5, "y": 2.25}, {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - - {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16, "y": 2.25}, {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, {"matrix": [3, 1], "x": 1.75, "y": 3.25}, @@ -92,11 +86,10 @@ {"matrix": [3, 9], "x": 9.75, "y": 3.25}, {"matrix": [3, 10], "x": 10.75, "y": 3.25}, {"matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, - - {"matrix": [3, 15], "x": 16.25, "y": 2.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 15], "x": 16, "y": 3.25}, - {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, {"matrix": [4, 1], "x": 2.25, "y": 4.25}, {"matrix": [4, 2], "x": 3.25, "y": 4.25}, {"matrix": [4, 3], "x": 4.25, "y": 4.25}, @@ -107,22 +100,20 @@ {"matrix": [4, 8], "x": 9.25, "y": 4.25}, {"matrix": [4, 9], "x": 10.25, "y": 4.25}, {"matrix": [4, 10], "x": 11.25, "y": 4.25}, - {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, - - {"matrix": [4, 14], "x": 16.25, "y": 4.25}, - {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 14], "x": 15, "y": 4.25}, + {"matrix": [4, 15], "x": 16, "y": 4.25}, {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, - {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25}, - {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25}, - - {"matrix": [5, 13], "x": 15.25, "y": 5.25}, - {"matrix": [5, 14], "x": 16.25, "y": 5.25}, - {"matrix": [5, 15], "x": 17.25, "y": 5.25} + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 14, "y": 5.25}, + {"matrix": [5, 14], "x": 15, "y": 5.25}, + {"matrix": [5, 15], "x": 16, "y": 5.25} ] } } From d97d1386212f612858de7dfdc61506231973332e Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Mon, 19 Jun 2023 11:13:03 +0800 Subject: [PATCH 06/10] fixed the Configurator layout data --- keyboards/inland/kb83/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json index 4e94119f7582..04a690c8f9eb 100644 --- a/keyboards/inland/kb83/info.json +++ b/keyboards/inland/kb83/info.json @@ -101,7 +101,7 @@ {"matrix": [4, 9], "x": 10.25, "y": 4.25}, {"matrix": [4, 10], "x": 11.25, "y": 4.25}, {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, - {"matrix": [4, 14], "x": 15, "y": 4.25}, + {"matrix": [4, 14], "x": 15, "y": 4.35}, {"matrix": [4, 15], "x": 16, "y": 4.25}, {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, @@ -111,9 +111,9 @@ {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, - {"matrix": [5, 13], "x": 14, "y": 5.25}, - {"matrix": [5, 14], "x": 15, "y": 5.25}, - {"matrix": [5, 15], "x": 16, "y": 5.25} + {"matrix": [5, 13], "x": 14, "y": 5.35}, + {"matrix": [5, 14], "x": 15, "y": 5.35}, + {"matrix": [5, 15], "x": 16, "y": 5.35} ] } } From 22d370ebc03483c4c794b1f827a8ad98a57981bf Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Mon, 19 Jun 2023 11:30:09 +0800 Subject: [PATCH 07/10] Revert "Update keyboard_aliases.hjson" This reverts commit c085c547656d09a14b9b0fad6a00f9551106719f. --- data/mappings/keyboard_aliases.hjson | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index d27e37aaa6c5..7247fda5f31c 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -844,9 +844,6 @@ "hecomi/alpha": { "target": "takashiski/hecomi/alpha" }, - "hfdkb/keyboard_sw/k83":{ - "target": "inland/kb83" - }, "hid_liber": { "target": "bpiphany/hid_liber" }, @@ -871,6 +868,9 @@ "infinity60": { "target": "input_club/infinity60" }, + "hfdkb/keyboard_sw/k83":{ + "target": "inland/kb83" + }, "ivy/rev1": { "target": "maple_computing/ivy/rev1" }, From 0fce07331a2a78063e57a519e0b49d78d88fb692 Mon Sep 17 00:00:00 2001 From: jonylee1986 <2532487686@qq.com> Date: Mon, 19 Jun 2023 11:39:47 +0800 Subject: [PATCH 08/10] Revert "fixed the Configurator layout data" --- keyboards/inland/kb83/info.json | 45 ++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json index 04a690c8f9eb..559fa3d790ef 100644 --- a/keyboards/inland/kb83/info.json +++ b/keyboards/inland/kb83/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "KB83", - "manufacturer": "Inland", - "maintainer": "jonylee@hfd", + "manufacturer": "www.hfd.cn", + "maintainer": "hfd", "usb": { "vid": "0xFFFE", "pid": "0x0007", @@ -27,20 +27,24 @@ "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, {"matrix": [0, 2], "x": 3, "y": 0}, {"matrix": [0, 3], "x": 4, "y": 0}, {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, {"matrix": [0, 6], "x": 7.5, "y": 0}, {"matrix": [0, 7], "x": 8.5, "y": 0}, {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, {"matrix": [0, 10], "x": 12, "y": 0}, {"matrix": [0, 11], "x": 13, "y": 0}, {"matrix": [0, 12], "x": 14, "y": 0}, - {"matrix": [0, 13], "x": 16, "y": 0}, - {"matrix": [0, 15], "x": 16, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 15.25, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1.25}, {"matrix": [1, 1], "x": 1, "y": 1.25}, @@ -55,8 +59,9 @@ {"matrix": [1, 10], "x": 10, "y": 1.25}, {"matrix": [1, 11], "x": 11, "y": 1.25}, {"matrix": [1, 12], "x": 12, "y": 1.25}, - {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, - {"matrix": [1, 15], "x": 16, "y": 1.25}, + {"matrix": [1, 13], "x": 14, "y": 1.25}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, {"matrix": [2, 1], "x": 1.5, "y": 2.25}, @@ -72,7 +77,8 @@ {"matrix": [2, 11], "x": 11.5, "y": 2.25}, {"matrix": [2, 12], "x": 12.5, "y": 2.25}, {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - {"matrix": [2, 15], "x": 16, "y": 2.25}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, {"matrix": [3, 1], "x": 1.75, "y": 3.25}, @@ -86,10 +92,11 @@ {"matrix": [3, 9], "x": 9.75, "y": 3.25}, {"matrix": [3, 10], "x": 10.75, "y": 3.25}, {"matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, - {"matrix": [3, 15], "x": 16, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"matrix": [3, 15], "x": 16.25, "y": 2.25}, - {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, {"matrix": [4, 1], "x": 2.25, "y": 4.25}, {"matrix": [4, 2], "x": 3.25, "y": 4.25}, {"matrix": [4, 3], "x": 4.25, "y": 4.25}, @@ -100,20 +107,22 @@ {"matrix": [4, 8], "x": 9.25, "y": 4.25}, {"matrix": [4, 9], "x": 10.25, "y": 4.25}, {"matrix": [4, 10], "x": 11.25, "y": 4.25}, - {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, - {"matrix": [4, 14], "x": 15, "y": 4.35}, - {"matrix": [4, 15], "x": 16, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [4, 14], "x": 16.25, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, - {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, - {"matrix": [5, 13], "x": 14, "y": 5.35}, - {"matrix": [5, 14], "x": 15, "y": 5.35}, - {"matrix": [5, 15], "x": 16, "y": 5.35} + {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 13], "x": 15.25, "y": 5.25}, + {"matrix": [5, 14], "x": 16.25, "y": 5.25}, + {"matrix": [5, 15], "x": 17.25, "y": 5.25} ] } } From 42d7a0ff2e61fccd63b6d560d53534b857b16d6a Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Jun 2023 11:43:35 +0800 Subject: [PATCH 09/10] Update keyboard_aliases.hjson --- data/mappings/keyboard_aliases.hjson | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 7247fda5f31c..d27e37aaa6c5 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -844,6 +844,9 @@ "hecomi/alpha": { "target": "takashiski/hecomi/alpha" }, + "hfdkb/keyboard_sw/k83":{ + "target": "inland/kb83" + }, "hid_liber": { "target": "bpiphany/hid_liber" }, @@ -868,9 +871,6 @@ "infinity60": { "target": "input_club/infinity60" }, - "hfdkb/keyboard_sw/k83":{ - "target": "inland/kb83" - }, "ivy/rev1": { "target": "maple_computing/ivy/rev1" }, From 7964e35b1b6f4a7cacc1a32974cc0666187c8fd0 Mon Sep 17 00:00:00 2001 From: "jonylee@hfd" <108282809+jonylee1986@users.noreply.github.com> Date: Mon, 19 Jun 2023 14:30:04 +0800 Subject: [PATCH 10/10] Update info.json --- keyboards/inland/kb83/info.json | 51 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json index 559fa3d790ef..b31fd86f1f88 100644 --- a/keyboards/inland/kb83/info.json +++ b/keyboards/inland/kb83/info.json @@ -28,22 +28,22 @@ "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 2, "y": 0}, - {"matrix": [0, 2], "x": 3, "y": 0}, - {"matrix": [0, 3], "x": 4, "y": 0}, - {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, - {"matrix": [0, 5], "x": 6.5, "y": 0}, - {"matrix": [0, 6], "x": 7.5, "y": 0}, - {"matrix": [0, 7], "x": 8.5, "y": 0}, - {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, - {"matrix": [0, 9], "x": 11, "y": 0}, - {"matrix": [0, 10], "x": 12, "y": 0}, - {"matrix": [0, 11], "x": 13, "y": 0}, - {"matrix": [0, 12], "x": 14, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, - {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, {"matrix": [0, 15], "x": 15.25, "y": 0}, {"matrix": [1, 0], "x": 0, "y": 1.25}, @@ -59,7 +59,7 @@ {"matrix": [1, 10], "x": 10, "y": 1.25}, {"matrix": [1, 11], "x": 11, "y": 1.25}, {"matrix": [1, 12], "x": 12, "y": 1.25}, - {"matrix": [1, 13], "x": 14, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, {"matrix": [1, 15], "x": 15.25, "y": 1.25}, @@ -92,11 +92,11 @@ {"matrix": [3, 9], "x": 9.75, "y": 3.25}, {"matrix": [3, 10], "x": 10.75, "y": 3.25}, {"matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, - {"matrix": [3, 15], "x": 16.25, "y": 2.25}, + {"matrix": [3, 15], "x": 15.25, "y": 3.25}, - {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, {"matrix": [4, 1], "x": 2.25, "y": 4.25}, {"matrix": [4, 2], "x": 3.25, "y": 4.25}, {"matrix": [4, 3], "x": 4.25, "y": 4.25}, @@ -109,20 +109,21 @@ {"matrix": [4, 10], "x": 11.25, "y": 4.25}, {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, - {"matrix": [4, 14], "x": 16.25, "y": 4.25}, - {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [4, 14], "x": 14.125, "y": 4.375}, + + {"matrix": [4, 15], "x": 15.25, "y": 4.25}, {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, - {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, - {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25}, - {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25}, + {"matrix": [5, 10], "x": 11, "y": 5.25}, + {"matrix": [5, 11], "x": 12, "y": 5.25}, - {"matrix": [5, 13], "x": 15.25, "y": 5.25}, - {"matrix": [5, 14], "x": 16.25, "y": 5.25}, - {"matrix": [5, 15], "x": 17.25, "y": 5.25} + {"matrix": [5, 13], "x": 13.125, "y": 5.375}, + {"matrix": [5, 14], "x": 14.125, "y": 5.375}, + {"matrix": [5, 15], "x": 15.125, "y": 5.375} ] } }