summaryrefslogtreecommitdiff
path: root/keyboards/ibm
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2023-04-03 20:59:24 +1000
committerfauxpark <fauxpark@gmail.com>2023-04-03 20:59:24 +1000
commitbd4899f0ca1f687ac2ede437ffb5ad1af04f1abe (patch)
tree01d9f6709af24f5833dcdc3f3de5671d0766ccd8 /keyboards/ibm
parentfcf8b804ed95a98561bd4c1d6c85604be0f7cc7b (diff)
parentd06ce0153bd4b608a20698c4a9e1d559b4c05683 (diff)
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/ibm')
-rw-r--r--keyboards/ibm/model_m_4th_gen/info.json2561
-rw-r--r--keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h10
-rw-r--r--keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json19
-rw-r--r--keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.h91
4 files changed, 2574 insertions, 107 deletions
diff --git a/keyboards/ibm/model_m_4th_gen/info.json b/keyboards/ibm/model_m_4th_gen/info.json
new file mode 100644
index 0000000000..5c8c658607
--- /dev/null
+++ b/keyboards/ibm/model_m_4th_gen/info.json
@@ -0,0 +1,2561 @@
+{
+ "matrix_pins": {
+ "ghost": true
+ },
+ "usb": {
+ "vid": "0x16C0",
+ "pid": "0x27DB",
+ "device_version": "0.0.1"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {
+ "matrix": [
+ 0,
+ 0
+ ],
+ "x": 0,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 15
+ ],
+ "x": 2,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 14
+ ],
+ "x": 3,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 1,
+ 14
+ ],
+ "x": 4,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 0,
+ 14
+ ],
+ "x": 5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 0,
+ 6
+ ],
+ "x": 6.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 0,
+ 3
+ ],
+ "x": 7.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 1,
+ 4
+ ],
+ "x": 8.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 4
+ ],
+ "x": 9.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 6
+ ],
+ "x": 11,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 6
+ ],
+ "x": 12,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 8
+ ],
+ "x": 13,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 9
+ ],
+ "x": 14,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 12
+ ],
+ "x": 15.25,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 4,
+ 12
+ ],
+ "x": 16.25,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 6,
+ 11
+ ],
+ "x": 17.25,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 0
+ ],
+ "x": 0,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 0
+ ],
+ "x": 1,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 15
+ ],
+ "x": 2,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 14
+ ],
+ "x": 3,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 1
+ ],
+ "x": 4,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 1
+ ],
+ "x": 5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 2
+ ],
+ "x": 6,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 2
+ ],
+ "x": 7,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 3
+ ],
+ "x": 8,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 4
+ ],
+ "x": 9,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 5
+ ],
+ "x": 10,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 5
+ ],
+ "x": 11,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 3
+ ],
+ "x": 12,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 4,
+ 6
+ ],
+ "x": 13,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 1,
+ 6
+ ],
+ "x": 14,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 9
+ ],
+ "x": 15.25,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 11
+ ],
+ "x": 16.25,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 10
+ ],
+ "x": 17.25,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 8
+ ],
+ "x": 18.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 9
+ ],
+ "x": 19.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 10
+ ],
+ "x": 20.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 7,
+ 10
+ ],
+ "x": 21.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 1,
+ 0
+ ],
+ "x": 0,
+ "y": 2.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 4,
+ 0
+ ],
+ "x": 1.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 15
+ ],
+ "x": 2.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 14
+ ],
+ "x": 3.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 1
+ ],
+ "x": 4.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 1
+ ],
+ "x": 5.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 2
+ ],
+ "x": 6.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 2
+ ],
+ "x": 7.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 3
+ ],
+ "x": 8.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 4
+ ],
+ "x": 9.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 5
+ ],
+ "x": 10.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 5
+ ],
+ "x": 11.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 3
+ ],
+ "x": 12.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 5,
+ 6
+ ],
+ "x": 13.5,
+ "y": 2.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 8
+ ],
+ "x": 15.25,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 3,
+ 11
+ ],
+ "x": 16.25,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 3,
+ 10
+ ],
+ "x": 17.25,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 8
+ ],
+ "x": 18.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 9
+ ],
+ "x": 19.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 10
+ ],
+ "x": 20.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 11
+ ],
+ "x": 21.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 15
+ ],
+ "x": 0,
+ "y": 3.5,
+ "w": 1.75
+ },
+ {
+ "matrix": [
+ 5,
+ 0
+ ],
+ "x": 1.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 15
+ ],
+ "x": 2.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 14
+ ],
+ "x": 3.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 1
+ ],
+ "x": 4.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 0,
+ 1
+ ],
+ "x": 5.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 0,
+ 2
+ ],
+ "x": 6.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 2
+ ],
+ "x": 7.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 3
+ ],
+ "x": 8.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 4
+ ],
+ "x": 9.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 5
+ ],
+ "x": 10.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 0,
+ 5
+ ],
+ "x": 11.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 6,
+ 5
+ ],
+ "x": 12.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 6,
+ 6
+ ],
+ "x": 13.75,
+ "y": 3.5,
+ "w": 1.25
+ },
+ {
+ "matrix": [
+ 1,
+ 8
+ ],
+ "x": 18.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 9
+ ],
+ "x": 19.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 10
+ ],
+ "x": 20.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 11
+ ],
+ "x": 21.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 7
+ ],
+ "x": 0,
+ "y": 4.5,
+ "w": 1.25
+ },
+ {
+ "matrix": [
+ 0,
+ 15
+ ],
+ "x": 1.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 0
+ ],
+ "x": 2.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 15
+ ],
+ "x": 3.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 14
+ ],
+ "x": 4.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 1
+ ],
+ "x": 5.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 1
+ ],
+ "x": 6.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 2
+ ],
+ "x": 7.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 2
+ ],
+ "x": 8.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 3
+ ],
+ "x": 9.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 4
+ ],
+ "x": 10.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 5
+ ],
+ "x": 11.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 3
+ ],
+ "x": 12.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 7
+ ],
+ "x": 13.25,
+ "y": 4.5,
+ "w": 1.75
+ },
+ {
+ "matrix": [
+ 0,
+ 11
+ ],
+ "x": 16.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 8
+ ],
+ "x": 18.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 9
+ ],
+ "x": 19.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 10
+ ],
+ "x": 20.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 11
+ ],
+ "x": 21.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 2,
+ 13
+ ],
+ "x": 0,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 0,
+ 12
+ ],
+ "x": 2.5,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 7,
+ 15
+ ],
+ "x": 4,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 7,
+ 6
+ ],
+ "x": 5,
+ "y": 5.5,
+ "w": 6
+ },
+ {
+ "matrix": [
+ 7,
+ 12
+ ],
+ "x": 11,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 13
+ ],
+ "x": 13.5,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 7,
+ 11
+ ],
+ "x": 15.25,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 7,
+ 8
+ ],
+ "x": 16.25,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 7,
+ 9
+ ],
+ "x": 17.25,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 0,
+ 8
+ ],
+ "x": 18.5,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 0,
+ 9
+ ],
+ "x": 19.5,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 0,
+ 10
+ ],
+ "x": 20.5,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 5,
+ 12
+ ],
+ "x": 21.5,
+ "y": 5.5
+ }
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {
+ "matrix": [
+ 0,
+ 0
+ ],
+ "x": 0,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 15
+ ],
+ "x": 2,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 14
+ ],
+ "x": 3,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 1,
+ 14
+ ],
+ "x": 4,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 0,
+ 14
+ ],
+ "x": 5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 0,
+ 6
+ ],
+ "x": 6.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 0,
+ 3
+ ],
+ "x": 7.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 1,
+ 4
+ ],
+ "x": 8.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 4
+ ],
+ "x": 9.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 6
+ ],
+ "x": 11,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 6
+ ],
+ "x": 12,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 8
+ ],
+ "x": 13,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 9
+ ],
+ "x": 14,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 12
+ ],
+ "x": 15.25,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 4,
+ 12
+ ],
+ "x": 16.25,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 6,
+ 11
+ ],
+ "x": 17.25,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 0
+ ],
+ "x": 0,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 0
+ ],
+ "x": 1,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 15
+ ],
+ "x": 2,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 14
+ ],
+ "x": 3,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 1
+ ],
+ "x": 4,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 1
+ ],
+ "x": 5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 2
+ ],
+ "x": 6,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 2
+ ],
+ "x": 7,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 3
+ ],
+ "x": 8,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 4
+ ],
+ "x": 9,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 5
+ ],
+ "x": 10,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 5
+ ],
+ "x": 11,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 3
+ ],
+ "x": 12,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 1,
+ 6
+ ],
+ "x": 13,
+ "y": 1.5,
+ "w": 2
+ },
+ {
+ "matrix": [
+ 2,
+ 9
+ ],
+ "x": 15.25,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 11
+ ],
+ "x": 16.25,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 10
+ ],
+ "x": 17.25,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 8
+ ],
+ "x": 18.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 9
+ ],
+ "x": 19.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 10
+ ],
+ "x": 20.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 7,
+ 10
+ ],
+ "x": 21.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 1,
+ 0
+ ],
+ "x": 0,
+ "y": 2.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 4,
+ 0
+ ],
+ "x": 1.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 15
+ ],
+ "x": 2.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 14
+ ],
+ "x": 3.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 1
+ ],
+ "x": 4.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 1
+ ],
+ "x": 5.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 2
+ ],
+ "x": 6.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 2
+ ],
+ "x": 7.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 3
+ ],
+ "x": 8.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 4
+ ],
+ "x": 9.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 5
+ ],
+ "x": 10.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 5
+ ],
+ "x": 11.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 3
+ ],
+ "x": 12.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 5,
+ 6
+ ],
+ "x": 13.5,
+ "y": 2.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 8
+ ],
+ "x": 15.25,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 3,
+ 11
+ ],
+ "x": 16.25,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 3,
+ 10
+ ],
+ "x": 17.25,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 8
+ ],
+ "x": 18.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 9
+ ],
+ "x": 19.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 10
+ ],
+ "x": 20.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 11
+ ],
+ "x": 21.5,
+ "y": 2.5,
+ "h": 2
+ },
+ {
+ "matrix": [
+ 1,
+ 15
+ ],
+ "x": 0,
+ "y": 3.5,
+ "w": 1.75
+ },
+ {
+ "matrix": [
+ 5,
+ 0
+ ],
+ "x": 1.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 15
+ ],
+ "x": 2.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 14
+ ],
+ "x": 3.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 1
+ ],
+ "x": 4.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 0,
+ 1
+ ],
+ "x": 5.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 0,
+ 2
+ ],
+ "x": 6.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 2
+ ],
+ "x": 7.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 3
+ ],
+ "x": 8.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 4
+ ],
+ "x": 9.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 5
+ ],
+ "x": 10.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 0,
+ 5
+ ],
+ "x": 11.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 6,
+ 6
+ ],
+ "x": 12.75,
+ "y": 3.5,
+ "w": 2.25
+ },
+ {
+ "matrix": [
+ 1,
+ 8
+ ],
+ "x": 18.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 9
+ ],
+ "x": 19.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 10
+ ],
+ "x": 20.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 7
+ ],
+ "x": 0,
+ "y": 4.5,
+ "w": 2.25
+ },
+ {
+ "matrix": [
+ 6,
+ 0
+ ],
+ "x": 2.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 15
+ ],
+ "x": 3.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 14
+ ],
+ "x": 4.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 1
+ ],
+ "x": 5.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 1
+ ],
+ "x": 6.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 2
+ ],
+ "x": 7.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 2
+ ],
+ "x": 8.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 3
+ ],
+ "x": 9.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 4
+ ],
+ "x": 10.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 5
+ ],
+ "x": 11.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 7
+ ],
+ "x": 12.25,
+ "y": 4.5,
+ "w": 2.75
+ },
+ {
+ "matrix": [
+ 0,
+ 11
+ ],
+ "x": 16.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 8
+ ],
+ "x": 18.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 9
+ ],
+ "x": 19.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 10
+ ],
+ "x": 20.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 11
+ ],
+ "x": 21.5,
+ "y": 4.5,
+ "h": 2
+ },
+ {
+ "matrix": [
+ 2,
+ 13
+ ],
+ "x": 0,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 0,
+ 12
+ ],
+ "x": 2.5,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 7,
+ 6
+ ],
+ "x": 4,
+ "y": 5.5,
+ "w": 7
+ },
+ {
+ "matrix": [
+ 7,
+ 12
+ ],
+ "x": 11,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 13
+ ],
+ "x": 13.5,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 7,
+ 11
+ ],
+ "x": 15.25,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 7,
+ 8
+ ],
+ "x": 16.25,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 7,
+ 9
+ ],
+ "x": 17.25,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 0,
+ 9
+ ],
+ "x": 18.5,
+ "y": 5.5,
+ "w": 2
+ },
+ {
+ "matrix": [
+ 0,
+ 10
+ ],
+ "x": 20.5,
+ "y": 5.5
+ }
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {
+ "matrix": [
+ 0,
+ 0
+ ],
+ "x": 0,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 15
+ ],
+ "x": 2,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 14
+ ],
+ "x": 3,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 1,
+ 14
+ ],
+ "x": 4,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 0,
+ 14
+ ],
+ "x": 5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 0,
+ 6
+ ],
+ "x": 6.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 0,
+ 3
+ ],
+ "x": 7.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 1,
+ 4
+ ],
+ "x": 8.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 4
+ ],
+ "x": 9.5,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 6
+ ],
+ "x": 11,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 6
+ ],
+ "x": 12,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 8
+ ],
+ "x": 13,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 9
+ ],
+ "x": 14,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 3,
+ 12
+ ],
+ "x": 15.25,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 4,
+ 12
+ ],
+ "x": 16.25,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 6,
+ 11
+ ],
+ "x": 17.25,
+ "y": 0
+ },
+ {
+ "matrix": [
+ 2,
+ 0
+ ],
+ "x": 0,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 0
+ ],
+ "x": 1,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 15
+ ],
+ "x": 2,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 14
+ ],
+ "x": 3,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 1
+ ],
+ "x": 4,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 1
+ ],
+ "x": 5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 2
+ ],
+ "x": 6,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 2
+ ],
+ "x": 7,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 3
+ ],
+ "x": 8,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 4
+ ],
+ "x": 9,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 3,
+ 5
+ ],
+ "x": 10,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 5
+ ],
+ "x": 11,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 3
+ ],
+ "x": 12,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 1,
+ 6
+ ],
+ "x": 13,
+ "y": 1.5,
+ "w": 2
+ },
+ {
+ "matrix": [
+ 2,
+ 9
+ ],
+ "x": 15.25,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 11
+ ],
+ "x": 16.25,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 2,
+ 10
+ ],
+ "x": 17.25,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 8
+ ],
+ "x": 18.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 9
+ ],
+ "x": 19.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 10
+ ],
+ "x": 20.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 7,
+ 10
+ ],
+ "x": 21.5,
+ "y": 1.5
+ },
+ {
+ "matrix": [
+ 1,
+ 0
+ ],
+ "x": 0,
+ "y": 2.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 4,
+ 0
+ ],
+ "x": 1.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 15
+ ],
+ "x": 2.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 14
+ ],
+ "x": 3.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 1
+ ],
+ "x": 4.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 1
+ ],
+ "x": 5.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 2
+ ],
+ "x": 6.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 2
+ ],
+ "x": 7.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 3
+ ],
+ "x": 8.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 4
+ ],
+ "x": 9.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 5
+ ],
+ "x": 10.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 5
+ ],
+ "x": 11.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 1,
+ 3
+ ],
+ "x": 12.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 6,
+ 6
+ ],
+ "x": 13.75,
+ "y": 2.5,
+ "w": 1.25,
+ "h": 2
+ },
+ {
+ "matrix": [
+ 2,
+ 8
+ ],
+ "x": 15.25,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 3,
+ 11
+ ],
+ "x": 16.25,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 3,
+ 10
+ ],
+ "x": 17.25,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 8
+ ],
+ "x": 18.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 9
+ ],
+ "x": 19.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 10
+ ],
+ "x": 20.5,
+ "y": 2.5
+ },
+ {
+ "matrix": [
+ 4,
+ 11
+ ],
+ "x": 21.5,
+ "y": 2.5,
+ "h": 2
+ },
+ {
+ "matrix": [
+ 1,
+ 15
+ ],
+ "x": 0,
+ "y": 3.5,
+ "w": 1.75
+ },
+ {
+ "matrix": [
+ 5,
+ 0
+ ],
+ "x": 1.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 15
+ ],
+ "x": 2.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 14
+ ],
+ "x": 3.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 1
+ ],
+ "x": 4.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 0,
+ 1
+ ],
+ "x": 5.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 0,
+ 2
+ ],
+ "x": 6.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 2
+ ],
+ "x": 7.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 3
+ ],
+ "x": 8.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 4
+ ],
+ "x": 9.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 5,
+ 5
+ ],
+ "x": 10.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 0,
+ 5
+ ],
+ "x": 11.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 6,
+ 5
+ ],
+ "x": 12.75,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 8
+ ],
+ "x": 18.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 9
+ ],
+ "x": 19.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 10
+ ],
+ "x": 20.5,
+ "y": 3.5
+ },
+ {
+ "matrix": [
+ 1,
+ 7
+ ],
+ "x": 0,
+ "y": 4.5,
+ "w": 1.25
+ },
+ {
+ "matrix": [
+ 0,
+ 15
+ ],
+ "x": 1.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 0
+ ],
+ "x": 2.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 15
+ ],
+ "x": 3.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 14
+ ],
+ "x": 4.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 1
+ ],
+ "x": 5.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 1
+ ],
+ "x": 6.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 2
+ ],
+ "x": 7.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 2
+ ],
+ "x": 8.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 3
+ ],
+ "x": 9.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 4
+ ],
+ "x": 10.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 7,
+ 5
+ ],
+ "x": 11.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 6,
+ 7
+ ],
+ "x": 12.25,
+ "y": 4.5,
+ "w": 2.75
+ },
+ {
+ "matrix": [
+ 0,
+ 11
+ ],
+ "x": 16.25,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 8
+ ],
+ "x": 18.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 9
+ ],
+ "x": 19.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 10
+ ],
+ "x": 20.5,
+ "y": 4.5
+ },
+ {
+ "matrix": [
+ 5,
+ 11
+ ],
+ "x": 21.5,
+ "y": 4.5,
+ "h": 2
+ },
+ {
+ "matrix": [
+ 2,
+ 13
+ ],
+ "x": 0,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 0,
+ 12
+ ],
+ "x": 2.5,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 7,
+ 6
+ ],
+ "x": 4,
+ "y": 5.5,
+ "w": 7
+ },
+ {
+ "matrix": [
+ 7,
+ 12
+ ],
+ "x": 11,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 6,
+ 13
+ ],
+ "x": 13.5,
+ "y": 5.5,
+ "w": 1.5
+ },
+ {
+ "matrix": [
+ 7,
+ 11
+ ],
+ "x": 15.25,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 7,
+ 8
+ ],
+ "x": 16.25,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 7,
+ 9
+ ],
+ "x": 17.25,
+ "y": 5.5
+ },
+ {
+ "matrix": [
+ 0,
+ 9
+ ],
+ "x": 18.5,
+ "y": 5.5,
+ "w": 2
+ },
+ {
+ "matrix": [
+ 0,
+ 10
+ ],
+ "x": 20.5,
+ "y": 5.5
+ }
+ ]
+ }
+ }
+}
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
index c02ea1f913..71e60e9cfe 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/config.h
@@ -15,17 +15,17 @@
*/
#pragma once
+#define DEF_SERIAL_NUMBER "purdea.ro:overnumpad_controller"
-#define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-#define MATRIX_HAS_GHOST
+#ifndef SERIAL_NUMBER
+#define SERIAL_NUMBER DEF_SERIAL_NUMBER
+#endif
#define STM32_HSECLK 16000000
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
-#define SOLENOID_DEFAULT_DWELL 4
+#define SOLENOID_DEFAULT_DWELL 20
#define SOLENOID_MIN_DWELL 4
#define HAPTIC_OFF_IN_LOW_POWER 1
#define NO_HAPTIC_MOD
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
index 95a572bd17..3ef4fede8e 100644
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
+++ b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
@@ -1,5 +1,5 @@
{
- "keyboard_name": "IBM Model M (4th generation)",
+ "keyboard_name": "IBM Model M (4th generation)",
"manufacturer": "IBM/Purdea Andrei",
"url": "https://github.com/purdeaandrei/overnumpad_controller_1xb",
"maintainer": "purdeaandrei",
@@ -20,15 +20,12 @@
},
"processor": "STM32F446", // RET6
"bootloader": "stm32-dfu",
- "layouts": {
- "LAYOUT_all": {
- "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":21.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"x":13.25, "y":4.5, "w":1.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5}, {"x":5, "y":5.5, "w":6}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"x":20.5, "y":5.5}, {"x":21.5, "y":5.5}]
- },
- "LAYOUT_ansi": {
- "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5, "h":2}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5, "h":2}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5, "w":2}, {"x":20.5, "y":5.5}]
- },
- "LAYOUT_iso": {
- "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":18.5, "y":1.5}, {"x":19.5, "y":1.5}, {"x":20.5, "y":1.5}, {"x":21.5, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":18.5, "y":2.5}, {"x":19.5, "y":2.5}, {"x":20.5, "y":2.5}, {"x":21.5, "y":2.5, "h":2}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"x":20.5, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":18.5, "y":4.5}, {"x":19.5, "y":4.5}, {"x":20.5, "y":4.5}, {"x":21.5, "y":4.5, "h":2}, {"x":0, "y":5.5, "w":1.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}, {"x":18.5, "y":5.5, "w":2}, {"x":20.5, "y":5.5}]
- }
+ "diode_direction": "ROW2COL",
+ "matrix_pins": {
+ // All pins in order from left-to-right, as seen on the keyboard:
+ // C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10,
+ // On this keyboard columns and rows are staggered:
+ "cols": ["C3", "C2", "C1", "C0", "A3", "A4", "A5", "A6", "C4", "B0", "B10", "B13", "C6", "C7", "C8", "C9"],
+ "rows": ["A7", "C5", "B1", "B12", "B14", "B15", "A8", "A9"]
}
}
diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.h b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.h
deleted file mode 100644
index 4e210c53ac..0000000000
--- a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/overnumpad_1xb.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* Copyright 2020 Purdea Andrei
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-
-#define LAYOUT_all( \
- k_esc, k_f1, k_f2, k_f3, k_f4, k_f5, k_f6, k_f7, k_f8, k_f9, k_f10, k_f11, k_f12, k_prscr, k_scrl, k_pause, \
- k_tild, k_1, k_2, k_3, k_4, k_5, k_6, k_7, k_8, k_9, k_0, k_minus, k_equals, k_bsp_hidden, k_backspace, k_ins, k_home, k_pgup, kp_nl, kp_div, kp_mult, kp_minus, \
- k_tab, k_q, k_w, k_e, k_r, k_t, k_y, k_u, k_i, k_o, k_p, k_squarebrop, k_squarebrcl, k_backsl, k_del, k_end, k_pgdn, kp_7, kp_8, kp_9, kp_plus, \
- k_caps, k_a, k_s, k_d, k_f, k_g, k_h, k_j, k_k, k_l, k_semicolon, k_singlequote, k_nuhs,k_return, kp_4, kp_5, kp_6, kp_plus_hidden, \
- k_lshift,k_nubs,k_z, k_x, k_c, k_v, k_b, k_n, k_m, k_cm,k_period, k_fwslash, k_rshift_hidden, k_rshift, k_up, kp_1, kp_2, kp_3, kp_enter, \
- k_lctrl, k_lalt, k_code, k_space, k_ralt, k_rctrl, k_left, k_down, k_right, kp_0_hidden, kp_0, kp_dot, kp_enter_hidden \
-) \
-{ \
- /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ \
- /* 0 */ { k_esc, k_g, k_h, k_f6, KC_NO, k_singlequote, k_f5, KC_NO, kp_0_hidden, kp_0, kp_dot, k_up, k_lalt, KC_NO, k_f4, k_nubs }, \
- /* 1 */ { k_tab, k_t, k_y, k_squarebrcl, k_f7, k_squarebrop, k_backspace, k_lshift, kp_4, kp_5, kp_6, kp_plus_hidden, KC_NO, KC_NO, k_f3, k_caps }, \
- /* 2 */ { k_tild, k_5, k_6, k_equals, k_f8, k_minus, k_f9, KC_NO, k_del, k_ins, k_pgup, k_home, KC_NO, k_lctrl, k_f2, k_f1 }, \
- /* 3 */ { k_1, k_4, k_7, k_8, k_9, k_0, k_f10, KC_NO, k_f11, k_f12, k_pgdn, k_end, k_prscr, KC_NO, k_3, k_2 }, \
- /* 4 */ { k_q, k_r, k_u, k_i, k_o, k_p, k_bsp_hidden, KC_NO, kp_7, kp_8, kp_9, kp_plus, k_scrl, KC_NO, k_e, k_w }, \
- /* 5 */ { k_a, k_f, k_j, k_k, k_l, k_semicolon, k_backsl, KC_NO, kp_1, kp_2, kp_3, kp_enter, kp_enter_hidden, KC_NO, k_d, k_s }, \
- /* 6 */ { k_z, k_v, k_m, k_cm, k_period, k_nuhs, k_return, k_rshift, kp_nl, kp_div, kp_mult, k_pause, KC_NO, k_rctrl, k_c, k_x }, \
- /* 7 */ { KC_NO, k_b, k_n, k_rshift_hidden, KC_NO, k_fwslash, k_space, KC_NO, k_down, k_right, kp_minus, k_left, k_ralt, KC_NO, KC_NO, k_code } \
-}
-
-// the following three key mappings are informed guesses, based on similarity of the gen4 membrane to previous-gen membranes: kp_plus, k_ins, kp_0_hidden
-
-#define LAYOUT_ansi( \
- k_esc, k_f1, k_f2, k_f3, k_f4, k_f5, k_f6, k_f7, k_f8, k_f9, k_f10, k_f11, k_f12, k_prscr, k_scrl, k_pause, \
- k_tild, k_1, k_2, k_3, k_4, k_5, k_6, k_7, k_8, k_9, k_0, k_minus, k_equals, k_backspace, k_ins, k_home, k_pgup, kp_nl, kp_div, kp_mult, kp_minus, \
- k_tab, k_q, k_w, k_e, k_r, k_t, k_y, k_u, k_i, k_o, k_p, k_squarebrop, k_squarebrcl, k_backsl, k_del, k_end, k_pgdn, kp_7, kp_8, kp_9, kp_plus, \
- k_caps, k_a, k_s, k_d, k_f, k_g, k_h, k_j, k_k, k_l, k_semicolon, k_singlequote, k_return, kp_4, kp_5, kp_6, \
- k_lshift, k_z, k_x, k_c, k_v, k_b, k_n, k_m, k_cm,k_period, k_fwslash, k_rshift, k_up, kp_1, kp_2, kp_3, kp_enter, \
- k_lctrl, k_lalt, k_space, k_ralt, k_rctrl, k_left, k_down, k_right, kp_0, kp_dot \
-) \
-{ \
- /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ \
- /* 0 */ { k_esc, k_g, k_h, k_f6, KC_NO, k_singlequote, k_f5, KC_NO, KC_NO, kp_0, kp_dot, k_up, k_lalt, KC_NO, k_f4, KC_NO }, \
- /* 1 */ { k_tab, k_t, k_y, k_squarebrcl, k_f7, k_squarebrop, k_backspace, k_lshift, kp_4, kp_5, kp_6, KC_NO, KC_NO, KC_NO, k_f3, k_caps }, \
- /* 2 */ { k_tild, k_5, k_6, k_equals, k_f8, k_minus, k_f9, KC_NO, k_del, k_ins, k_pgup, k_home, KC_NO, k_lctrl, k_f2, k_f1 }, \
- /* 3 */ { k_1, k_4, k_7, k_8, k_9, k_0, k_f10, KC_NO, k_f11, k_f12, k_pgdn, k_end, k_prscr, KC_NO, k_3, k_2 }, \
- /* 4 */ { k_q, k_r, k_u, k_i, k_o, k_p, KC_NO, KC_NO, kp_7, kp_8, kp_9, kp_plus, k_scrl, KC_NO, k_e, k_w }, \
- /* 5 */ { k_a, k_f, k_j, k_k, k_l, k_semicolon, k_backsl, KC_NO, kp_1, kp_2, kp_3, kp_enter, KC_NO, KC_NO, k_d, k_s }, \
- /* 6 */ { k_z, k_v, k_m, k_cm, k_period, KC_NO, k_return, k_rshift, kp_nl, kp_div, kp_mult, k_pause, KC_NO, k_rctrl, k_c, k_x }, \
- /* 7 */ { KC_NO, k_b, k_n, KC_NO, KC_NO, k_fwslash, k_space, KC_NO, k_down, k_right, kp_minus, k_left, k_ralt, KC_NO, KC_NO, KC_NO } \
-}
-
-#define LAYOUT_iso( \
- k_esc, k_f1, k_f2, k_f3, k_f4, k_f5, k_f6, k_f7, k_f8, k_f9, k_f10, k_f11, k_f12, k_prscr, k_scrl, k_pause, \
- k_tild, k_1, k_2, k_3, k_4, k_5, k_6, k_7, k_8, k_9, k_0, k_minus, k_equals, k_backspace, k_ins, k_home, k_pgup, kp_nl, kp_div, kp_mult, kp_minus, \
- k_tab, k_q, k_w, k_e, k_r, k_t, k_y, k_u, k_i, k_o, k_p, k_squarebrop, k_squarebrcl, k_return, k_del, k_end, k_pgdn, kp_7, kp_8, kp_9, kp_plus, \
- k_caps, k_a, k_s, k_d, k_f, k_g, k_h, k_j, k_k, k_l, k_semicolon, k_singlequote, k_nuhs, kp_4, kp_5, kp_6, \
- k_lshift,k_nubs,k_z, k_x, k_c, k_v, k_b, k_n, k_m, k_cm,k_period, k_fwslash, k_rshift, k_up, kp_1, kp_2, kp_3, kp_enter, \
- k_lctrl, k_lalt, k_space, k_ralt, k_rctrl, k_left, k_down, k_right, kp_0, kp_dot \
-) \
-{ \
- /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ \
- /* 0 */ { k_esc, k_g, k_h, k_f6, KC_NO, k_singlequote, k_f5, KC_NO, KC_NO, kp_0, kp_dot, k_up, k_lalt, KC_NO, k_f4, k_nubs }, \
- /* 1 */ { k_tab, k_t, k_y, k_squarebrcl, k_f7, k_squarebrop, k_backspace, k_lshift, kp_4, kp_5, kp_6, KC_NO, KC_NO, KC_NO, k_f3, k_caps }, \
- /* 2 */ { k_tild, k_5, k_6, k_equals, k_f8, k_minus, k_f9, KC_NO, k_del, k_ins, k_pgup, k_home, KC_NO, k_lctrl, k_f2, k_f1 }, \
- /* 3 */ { k_1, k_4, k_7, k_8, k_9, k_0, k_f10, KC_NO, k_f11, k_f12, k_pgdn, k_end, k_prscr, KC_NO, k_3, k_2 }, \
- /* 4 */ { k_q, k_r, k_u, k_i, k_o, k_p, KC_NO, KC_NO, kp_7, kp_8, kp_9, kp_plus, k_scrl, KC_NO, k_e, k_w }, \
- /* 5 */ { k_a, k_f, k_j, k_k, k_l, k_semicolon, KC_NO, KC_NO, kp_1, kp_2, kp_3, kp_enter, KC_NO, KC_NO, k_d, k_s }, \
- /* 6 */ { k_z, k_v, k_m, k_cm, k_period, k_nuhs, k_return, k_rshift, kp_nl, kp_div, kp_mult, k_pause, KC_NO, k_rctrl, k_c, k_x }, \
- /* 7 */ { KC_NO, k_b, k_n, KC_NO, KC_NO, k_fwslash, k_space, KC_NO, k_down, k_right, kp_minus, k_left, k_ralt, KC_NO, KC_NO, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 05:01:42 +0000