Merge remote-tracking branch 'upstream/master' into develop

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
+                },
+                {
+