From dcee9cacc09a2e8c27ed658346a1e003880f2f8d Mon Sep 17 00:00:00 2001 From: nuess0r Date: Wed, 18 Jan 2023 21:07:46 +0100 Subject: [PATCH 1/7] Add ctrl-M a replacement controller for the IBM Model M 101/102 --- src/modelm/ctrl_m/ctrl_m.json | 245 ++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) create mode 100644 src/modelm/ctrl_m/ctrl_m.json diff --git a/src/modelm/ctrl_m/ctrl_m.json b/src/modelm/ctrl_m/ctrl_m.json new file mode 100644 index 0000000000..cb00d2fc90 --- /dev/null +++ b/src/modelm/ctrl_m/ctrl_m.json @@ -0,0 +1,245 @@ +{ + "name": "ctrl-M replacement controller for the IBM Model M 101/102", + "vendorId": "0xFEED", + "productId": "0x6805", + "matrix": {"rows": 8, "cols": 16}, + "lighting": "none", + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,2", + { + "x": 1 + }, + "2,3", + "2,4", + "1,4", + "0,4", + { + "x": 0.5 + }, + "0,6", + "0,8", + "1,9", + "2,9", + { + "x": 0.5 + }, + "2,6", + "3,6", + "3,11", + "3,12", + { + "x": 0.25 + }, + "3,15", + "4,15", + "6,14" + ], + [ + { + "y": 0.5, + "c": "#cccccc" + }, + "2,2", + "3,2", + "3,3", + "3,4", + "3,5", + "2,5", + "2,7", + "3,7", + "3,8", + "3,9", + "3,10", + "2,10", + "2,8", + { + "c": "#777777", + "w": 2 + }, + "1,6", + { + "x": 0.25 + }, + "2,12", + "2,14", + "2,13", + { + "x": 0.25 + }, + "6,11", + { + "c": "#cccccc" + }, + "6,12", + "6,13", + "7,13" + ], + [ + { + "c": "#777777", + "w": 1.5 + }, + "1,2", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "1,5", + "1,7", + "4,7", + "4,8", + "4,9", + "4,10", + "1,10", + "1,8", + { + "x": 0.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "6,6", + { + "x": 0.25 + }, + "2,11", + "3,14", + "3,13", + { + "x": 0.25, + "c": "#cccccc" + }, + "4,11", + "4,12", + "4,13", + { + "h": 2 + }, + "4,14" + ], + [ + { + "c": "#777777", + "w": 1.75 + }, + "1,3", + { + "c": "#cccccc" + }, + "5,2", + "5,3", + "5,4", + "5,5", + "0,5", + "0,7", + "5,7", + "5,8", + "5,9", + "5,10", + "0,10", + "6,10", + { + "x": 4.75 + }, + "1,11", + "1,12", + "1,13" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "1,1", + { + "c": "#cccccc" + }, + "0,3", + "6,2", + "6,3", + "6,4", + "6,5", + "7,5", + "7,7", + "6,7", + "6,8", + "6,9", + "7,10", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "6,1", + { + "x": 1.25, + "c": "#777777" + }, + "0,14", + { + "x": 1.25, + "c": "#cccccc" + }, + "5,11", + "5,12", + "5,13", + { + "c": "#777777", + "h": 2 + }, + "5,14" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "2,0", + { + "x": 1.25, + "w": 1.25 + }, + "0,15", + { + "c": "#cccccc", + "w": 6.25 + }, + "7,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "7,15", + { + "x": 2.5, + "w": 1.25 + }, + "6,0", + { + "x": 0.25, + "c": "#777777" + }, + "7,14", + "7,11", + "7,12", + { + "x": 0.25, + "c": "#cccccc", + "w": 2 + }, + "0,12", + "0,13" + ] + ] + } +} From 75edabb2ea176a8adf23793cb1cc0ab3ca644e63 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sat, 29 Apr 2023 18:57:06 +0200 Subject: [PATCH 2/7] Update to V3. Harmonize folder with QMK upstream --- src/{ => ibm}/modelm/ctrl_m/ctrl_m.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{ => ibm}/modelm/ctrl_m/ctrl_m.json (100%) diff --git a/src/modelm/ctrl_m/ctrl_m.json b/src/ibm/modelm/ctrl_m/ctrl_m.json similarity index 100% rename from src/modelm/ctrl_m/ctrl_m.json rename to src/ibm/modelm/ctrl_m/ctrl_m.json From 080f5afecd974194ed3d3cb1023b32fdac72ebf6 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Mon, 8 May 2023 23:44:58 +0200 Subject: [PATCH 3/7] Adjust VID:PID and folder name to upstream change --- src/ibm/{modelm => model_m}/ctrl_m/ctrl_m.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ibm/{modelm => model_m}/ctrl_m/ctrl_m.json (100%) diff --git a/src/ibm/modelm/ctrl_m/ctrl_m.json b/src/ibm/model_m/ctrl_m/ctrl_m.json similarity index 100% rename from src/ibm/modelm/ctrl_m/ctrl_m.json rename to src/ibm/model_m/ctrl_m/ctrl_m.json From 9e729ee9ae68a8eb988a52351abbb4d4a213ee74 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Wed, 31 May 2023 17:20:04 +0200 Subject: [PATCH 4/7] Change USB VID:PID to officially asigned one https://github.com/openmoko/openmoko-usb-oui/pull/51 --- src/ibm/model_m/ctrl_m/ctrl_m.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ibm/model_m/ctrl_m/ctrl_m.json b/src/ibm/model_m/ctrl_m/ctrl_m.json index cb00d2fc90..563162d364 100644 --- a/src/ibm/model_m/ctrl_m/ctrl_m.json +++ b/src/ibm/model_m/ctrl_m/ctrl_m.json @@ -1,9 +1,8 @@ { "name": "ctrl-M replacement controller for the IBM Model M 101/102", - "vendorId": "0xFEED", - "productId": "0x6805", + "vendorId": "0x1D50", + "productId": "0x6180", "matrix": {"rows": 8, "cols": 16}, - "lighting": "none", "layouts": { "keymap": [ [ From e2849246765f550805836f2bf5c2e6bea5443d07 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Wed, 23 Oct 2024 22:20:12 +0200 Subject: [PATCH 5/7] Add layouts for ANSI and ISO keyboards Add layout variants to support both 101 and 102 key variants with the same VIA definition. --- src/ibm/model_m/ctrl_m/ctrl_m.json | 31 +++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/src/ibm/model_m/ctrl_m/ctrl_m.json b/src/ibm/model_m/ctrl_m/ctrl_m.json index 563162d364..4c7ce63b9f 100644 --- a/src/ibm/model_m/ctrl_m/ctrl_m.json +++ b/src/ibm/model_m/ctrl_m/ctrl_m.json @@ -4,6 +4,9 @@ "productId": "0x6180", "matrix": {"rows": 8, "cols": 16}, "layouts": { + "labels": [ + "ISO Enter" + ], "keymap": [ [ { @@ -100,7 +103,11 @@ "1,10", "1,8", { - "x": 0.25, + "w": 1.5 + }, + "5,6\n\n\n0,0", + { + "x": -1.25, "c": "#777777", "w": 1.25, "h": 2, @@ -108,7 +115,7 @@ "h2": 1, "x2": -0.25 }, - "6,6", + "6,6\n\n\n0,1", { "x": 0.25 }, @@ -147,7 +154,16 @@ "5,9", "5,10", "0,10", - "6,10", + { + "c": "#777777", + "w": 2.25 + }, + "6,6\n\n\n0,0", + { + "x": -2.25, + "c": "#cccccc" + }, + "6,10\n\n\n0,1", { "x": 4.75 }, @@ -158,13 +174,18 @@ [ { "c": "#aaaaaa", + "w": 2.25 + }, + "1,1\n\n\n0,0", + { + "x": -2.25, "w": 1.25 }, - "1,1", + "1,1\n\n\n0,1", { "c": "#cccccc" }, - "0,3", + "0,3\n\n\n0,1", "6,2", "6,3", "6,4", From c3f5185662c8683860dd1938c1b873aad1fd4d26 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:44:42 +0100 Subject: [PATCH 6/7] Update src/ibm/model_m/ctrl_m/ctrl_m.json --- src/ibm/model_m/ctrl_m/ctrl_m.json | 65 ++++++++++++++++++------------ 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/src/ibm/model_m/ctrl_m/ctrl_m.json b/src/ibm/model_m/ctrl_m/ctrl_m.json index 4c7ce63b9f..9338becb01 100644 --- a/src/ibm/model_m/ctrl_m/ctrl_m.json +++ b/src/ibm/model_m/ctrl_m/ctrl_m.json @@ -1,8 +1,11 @@ { - "name": "ctrl-M replacement controller for the IBM Model M 101/102", + "name": "ctrl-M", "vendorId": "0x1D50", "productId": "0x6180", - "matrix": {"rows": 8, "cols": 16}, + "matrix": { + "rows": 8, + "cols": 16 + }, "layouts": { "labels": [ "ISO Enter" @@ -10,6 +13,7 @@ "keymap": [ [ { + "x": 2.5, "c": "#777777" }, "0,2", @@ -44,6 +48,7 @@ [ { "y": 0.5, + "x": 2.5, "c": "#cccccc" }, "2,2", @@ -83,6 +88,7 @@ ], [ { + "x": 2.5, "c": "#777777", "w": 1.5 }, @@ -107,17 +113,8 @@ }, "5,6\n\n\n0,0", { - "x": -1.25, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "6,6\n\n\n0,1", - { - "x": 0.25 + "x": 0.25, + "c": "#777777" }, "2,11", "3,14", @@ -132,11 +129,21 @@ { "h": 2 }, - "4,14" + "4,14", + { + "x": 1.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "6,6\n\n\n0,1" ], [ { - "c": "#777777", + "x": 2.5, "w": 1.75 }, "1,3", @@ -160,25 +167,20 @@ }, "6,6\n\n\n0,0", { - "x": -2.25, + "x": 3.5, "c": "#cccccc" }, - "6,10\n\n\n0,1", - { - "x": 4.75 - }, "1,11", "1,12", - "1,13" + "1,13", + { + "x": 1.25 + }, + "6,10\n\n\n0,1" ], [ { "c": "#aaaaaa", - "w": 2.25 - }, - "1,1\n\n\n0,0", - { - "x": -2.25, "w": 1.25 }, "1,1\n\n\n0,1", @@ -186,6 +188,15 @@ "c": "#cccccc" }, "0,3\n\n\n0,1", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 2.25 + }, + "1,1\n\n\n0,0", + { + "c": "#cccccc" + }, "6,2", "6,3", "6,4", @@ -221,6 +232,7 @@ ], [ { + "x": 2.5, "c": "#aaaaaa", "w": 1.25 }, @@ -263,3 +275,4 @@ ] } } + From 0eb90c42a2b710ec62912acf0fdd4a2cb16bca97 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sat, 21 Dec 2024 18:10:23 +0100 Subject: [PATCH 7/7] Moved ctrl_m from src to correct v3 folder --- {src => v3}/ibm/model_m/ctrl_m/ctrl_m.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {src => v3}/ibm/model_m/ctrl_m/ctrl_m.json (100%) diff --git a/src/ibm/model_m/ctrl_m/ctrl_m.json b/v3/ibm/model_m/ctrl_m/ctrl_m.json similarity index 100% rename from src/ibm/model_m/ctrl_m/ctrl_m.json rename to v3/ibm/model_m/ctrl_m/ctrl_m.json