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

3 files changed, 262 insertions, 2 deletions

diff --git a/keyboards/rmkeebs/rm_fullsize/info.json b/keyboards/rmkeebs/rm_fullsize/info.json
index 4b02137ad3..f9ff4dd5b8 100644
--- a/keyboards/rmkeebs/rm_fullsize/info.json
+++ b/keyboards/rmkeebs/rm_fullsize/info.json
@@ -29,8 +29,11 @@
             { "pin_a": "GP11", "pin_b": "GP10" }
         ]
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 { "matrix": [0, 0], "x": 0, "y": 0.25 },
                 { "matrix": [0, 2], "x": 2, "y": 0.25 },
@@ -150,6 +153,239 @@
                 { "matrix": [5, 18], "x": 20.5, "y": 5.5 },
                 { "matrix": [5, 19], "x": 21.5, "y": 5.5 }
             ]
+        },
+        "LAYOUT_fullsize_108_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+                {"matrix": [0, 7], "x": 7.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 11, "y": 0.25},
+                {"matrix": [0, 11], "x": 12, "y": 0.25},
+                {"matrix": [0, 12], "x": 13, "y": 0.25},
+                {"matrix": [0, 13], "x": 14, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 15], "x": 16.25, "y": 0.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 0.25},
+                {"matrix": [0, 16], "x": 18.5, "y": 0.25},
+                {"matrix": [0, 17], "x": 19.5, "y": 0.25},
+                {"matrix": [0, 18], "x": 20.5, "y": 0.25},
+                {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 19], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 20.5, "y": 2.5},
+                {"matrix": [3, 19], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 16], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [3, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 16], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 19.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 19], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.5}
+            ]
+        },
+        "LAYOUT_fullsize_108_ansi_tsangan": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.5, "y": 0.25},
+                {"matrix": [0, 7], "x": 7.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 11, "y": 0.25},
+                {"matrix": [0, 11], "x": 12, "y": 0.25},
+                {"matrix": [0, 12], "x": 13, "y": 0.25},
+                {"matrix": [0, 13], "x": 14, "y": 0.25},
+                {"matrix": [0, 14], "x": 15.25, "y": 0.25},
+                {"matrix": [0, 15], "x": 16.25, "y": 0.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 0.25},
+                {"matrix": [0, 16], "x": 18.5, "y": 0.25},
+                {"matrix": [0, 17], "x": 19.5, "y": 0.25},
+                {"matrix": [0, 18], "x": 20.5, "y": 0.25},
+                {"matrix": [0, 19], "x": 21.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2},
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [4, 15], "x": 17.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 18.5, "y": 1.5},
+                {"matrix": [1, 17], "x": 19.5, "y": 1.5},
+                {"matrix": [1, 18], "x": 20.5, "y": 1.5},
+                {"matrix": [1, 19], "x": 21.5, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [5, 15], "x": 17.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 19.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 20.5, "y": 2.5},
+                {"matrix": [3, 19], "x": 21.5, "y": 2.5, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+                {"matrix": [3, 16], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 19.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 20.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+                {"matrix": [3, 14], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 16], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 19.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 20.5, "y": 4.5},
+                {"matrix": [5, 19], "x": 21.5, "y": 4.5, "h": 2},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 10], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 11], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 12], "x": 13.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 13], "x": 15.25, "y": 5.5},
+                {"matrix": [4, 14], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 17.25, "y": 5.5},
+                {"matrix": [5, 16], "x": 18.5, "y": 5.5, "w": 2},
+                {"matrix": [5, 18], "x": 20.5, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/rmkeebs/rm_fullsize/keymaps/default/keymap.c b/keyboards/rmkeebs/rm_fullsize/keymaps/default/keymap.c
index c94cc2e526..8f9f2356e9 100644
--- a/keyboards/rmkeebs/rm_fullsize/keymaps/default/keymap.c
+++ b/keyboards/rmkeebs/rm_fullsize/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │ │ 0 │ 00│ . │Del│
      * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───┴───┴───┴───┘
      */
-    [0] = LAYOUT(
+    [0] = LAYOUT_all(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SCRL, KC_PAUS,    KC_MPLY, KC_MPRV, KC_MNXT,   KC_MUTE,
 
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  C(KC_Z), KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,    KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
diff --git a/keyboards/rmkeebs/rm_fullsize/matrix_diagram.md b/keyboards/rmkeebs/rm_fullsize/matrix_diagram.md
new file mode 100644
index 0000000000..32c62990bc
--- /dev/null
+++ b/keyboards/rmkeebs/rm_fullsize/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for RuckerMachine rm_fullsize
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │2D     │
+                                                    └───────┘                           ┌───┐
+┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐┌───┬───┬───┐ │0J │
+│00 │   │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E │0F │3F ││0G │0H │0I │ └───┘
+└───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘└───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐┌───┬───┬───┬───┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D ││1E │1F │4F ││1G │1H │1I │1J │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤├───┼───┼───┼───┤   ┌───┐
+│20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │3D   ││2E │2F │5F ││2G │2H │2I │2J │   │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘├───┼───┼───┼───┤   │3J │ 2u Numpad Plus
+│30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C      │             │3G │3H │3I │3J │   │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤    ┌───┐    ├───┼───┼───┼───┤   ├───┤
+│40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B        │    │3E │    │4G │4H │4I │4J │   │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐├───┼───┼───┼───┤   │5J │ 2u Numpad Enter
+│50  │51  │52  │56                      │59  │5A  │5B  │5C  ││5D │4E │5E ││5G │5H │5I │5J │   │   │
+└────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘└───┴───┴───┴───┘   └───┘
+┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐             ┌───────┐
+│50   │51 │52   │56                         │5A   │5B │5C   │ Tsangan     │5G     │ 2u Numpad Zero
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘             └───────┘
+```