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

3 files changed, 125 insertions, 1 deletions

diff --git a/keyboards/ibm/model_m/modelh/keyboard.json b/keyboards/ibm/model_m/modelh/keyboard.json
index 513d5d9bb6..6b9cf20c1d 100644
--- a/keyboards/ibm/model_m/modelh/keyboard.json
+++ b/keyboards/ibm/model_m/modelh/keyboard.json
@@ -284,6 +284,93 @@
                 {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
                 {"matrix": [0, 13], "x": 20.5, "y": 5.5}
             ]
-        }
+        },
+        "LAYOUT_wheelwriter_1x_iso": {
+            "layout": [
+                {"matrix": [2, 2], "x": 0, "y": 0},
+
+                {"matrix": [2, 4], "x": 1.25, "y": 0},
+                {"matrix": [3, 4], "x": 2.25, "y": 0},
+                {"matrix": [3, 5], "x": 3.25, "y": 0},
+                {"matrix": [3, 6], "x": 4.25, "y": 0},
+                {"matrix": [3, 7], "x": 5.25, "y": 0},
+                {"matrix": [2, 7], "x": 6.25, "y": 0},
+                {"matrix": [2, 8], "x": 7.25, "y": 0},
+                {"matrix": [3, 8], "x": 8.25, "y": 0},
+                {"matrix": [3, 9], "x": 9.25, "y": 0},
+                {"matrix": [3, 10], "x": 10.25, "y": 0},
+                {"matrix": [3, 11], "x": 11.25, "y": 0},
+                {"matrix": [2, 11], "x": 12.25, "y": 0},
+                {"matrix": [2, 9], "x": 13.25, "y": 0},
+                {"matrix": [2, 12], "x": 14.25, "y": 0, "w": 2},
+
+                {"matrix": [2, 13], "x": 17.5, "y": 0},
+
+                {"matrix": [4, 1], "x": 0, "y": 1},
+
+                {"matrix": [4, 2], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [4, 4], "x": 2.75, "y": 1},
+                {"matrix": [4, 5], "x": 3.75, "y": 1},
+                {"matrix": [4, 6], "x": 4.75, "y": 1},
+                {"matrix": [4, 7], "x": 5.75, "y": 1},
+                {"matrix": [5, 7], "x": 6.75, "y": 1},
+                {"matrix": [5, 8], "x": 7.75, "y": 1},
+                {"matrix": [4, 8], "x": 8.75, "y": 1},
+                {"matrix": [4, 9], "x": 9.75, "y": 1},
+                {"matrix": [4, 10], "x": 10.75, "y": 1},
+                {"matrix": [4, 11], "x": 11.75, "y": 1},
+                {"matrix": [5, 11], "x": 12.75, "y": 1},
+                {"matrix": [5, 9], "x": 13.75, "y": 1},
+
+                {"matrix": [4, 13], "x": 17.5, "y": 1},
+
+                {"matrix": [5, 2], "x": 0, "y": 2},
+
+                {"matrix": [6, 2], "x": 1.25, "y": 2, "w": 1.5},
+                {"matrix": [1, 4], "x": 3, "y": 2},
+                {"matrix": [1, 5], "x": 4, "y": 2},
+                {"matrix": [1, 6], "x": 5, "y": 2},
+                {"matrix": [1, 7], "x": 6, "y": 2},
+                {"matrix": [0, 7], "x": 7, "y": 2},
+                {"matrix": [0, 8], "x": 8, "y": 2},
+                {"matrix": [1, 8], "x": 9, "y": 2},
+                {"matrix": [1, 9], "x": 10, "y": 2},
+                {"matrix": [1, 10], "x": 11, "y": 2},
+                {"matrix": [1, 11], "x": 12, "y": 2},
+                {"matrix": [0, 11], "x": 13, "y": 2},
+                {"matrix": [6, 11], "x": 14, "y": 2},
+                {"matrix": [0, 12], "x": 15, "y": 2, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 13], "x": 17.5, "y": 2},
+
+                {"matrix": [1, 2], "x": 0, "y": 3},
+
+                {"matrix": [7, 3], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 4], "x": 2.5, "y": 3},
+                {"matrix": [6, 4], "x": 3.5, "y": 3},
+                {"matrix": [6, 5], "x": 4.5, "y": 3},
+                {"matrix": [6, 6], "x": 5.5, "y": 3},
+                {"matrix": [6, 7], "x": 6.5, "y": 3},
+                {"matrix": [7, 7], "x": 7.5, "y": 3},
+                {"matrix": [7, 8], "x": 8.5, "y": 3},
+                {"matrix": [6, 8], "x": 9.5, "y": 3},
+                {"matrix": [6, 9], "x": 10.5, "y": 3},
+                {"matrix": [6, 10], "x": 11.5, "y": 3},
+                {"matrix": [7, 11], "x": 12.5, "y": 3},
+                {"matrix": [6, 3], "x": 13.5, "y": 3, "w": 2.75},
+
+                {"matrix": [6, 12], "x": 17.5, "y": 3},
+
+                {"matrix": [0, 1], "x": 0, "y": 4},
+
+                {"matrix": [7, 14], "x": 3.75, "y": 4, "w": 2.5},
+                {"matrix": [7, 1], "x": 6.25, "y": 4, "w": 7.25},
+                {"matrix": [7, 2], "x": 14.75, "y": 4, "w": 1.5},
+
+                {"matrix": [7, 12], "x": 16.5, "y": 4},
+                {"matrix": [0, 13], "x": 17.5, "y": 4},
+                {"matrix": [7, 13], "x": 18.5, "y": 4}
+            ]
+        }
     }
 }
diff --git a/keyboards/ibm/model_m/modelh/keymaps/wheelwriter_1x_iso/keymap.c b/keyboards/ibm/model_m/modelh/keymaps/wheelwriter_1x_iso/keymap.c
new file mode 100644
index 0000000000..e603de22df
--- /dev/null
+++ b/keyboards/ibm/model_m/modelh/keymaps/wheelwriter_1x_iso/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2024 Robin Haberkorn
+ *
+ * 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/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_wheelwriter_1x_iso( /* Base layer */
+    KC_ESC,  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,  KC_BSPC,            KC_INS,
+    KC_PGUP, KC_TAB,  KC_Q,    KC_W,   KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                     KC_DEL,
+    KC_PGDN, KC_CAPS, KC_A,    KC_S,   KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,             MO(1),
+    KC_APP,  KC_LSFT, KC_NUBS, KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,            KC_UP,
+    KC_LCTL,                   KC_LALT,                                             KC_SPC,                                      KC_RALT,   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] = LAYOUT_wheelwriter_1x_iso( /* Function key layer */
+    KC_MUTE, KC_NO,   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_NO,              KC_BRIU,
+    KC_VOLU, KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                       KC_BRID,
+    KC_VOLD, KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,              KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,              KC_PGUP,
+    KC_NO,                     KC_NO,                                               KC_NO,                                       KC_NO,     KC_HOME, KC_PGDN, KC_END
+  ),
+};
diff --git a/keyboards/ibm/model_m/modelh/readme.md b/keyboards/ibm/model_m/modelh/readme.md
index bed79619ce..2a59ce99c8 100644
--- a/keyboards/ibm/model_m/modelh/readme.md
+++ b/keyboards/ibm/model_m/modelh/readme.md
@@ -17,4 +17,8 @@ Flashing example for this keyboard:
 
     make ibm/model_m/modelh:default:flash
 
+For IBM Wheelwriter 10/15/1000 modules (ISO), you can try the `wheelwriter_1x_iso` keymap:
+
+    make ibm/model_m/modelh:wheelwriter_1x_iso
+
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).