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

21 files changed, 785 insertions, 0 deletions

diff --git a/keyboards/handwired/ibm122m/keymaps/andresteare/keymap.c b/keyboards/handwired/ibm122m/keymaps/andresteare/keymap.c
new file mode 100644
index 0000000000..cfa6043540
--- /dev/null
+++ b/keyboards/handwired/ibm122m/keymaps/andresteare/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2018 andresteare
+ *
+ * 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] = {
+  // Programmer's Dvorak
+  [0] = LAYOUT(
+                     KC_F13,  KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22,  KC_F23,  KC_F24,
+                     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_ESC, KC_NO,   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_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NO,  KC_NO,   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_ENT,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_NO,  KC_NO,   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_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
+    KC_NO,  KC_NO,   KC_LSFT, KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            KC_LEFT, KC_NO,   KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_NO,  KC_NO,   KC_LCTL, KC_LALT,                                        KC_SPC,                           KC_RALT, KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
+  ),
+};
diff --git a/keyboards/handwired/ibm122m/keymaps/via/keymap.c b/keyboards/handwired/ibm122m/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b6cdfbc0d9
--- /dev/null
+++ b/keyboards/handwired/ibm122m/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2018 andresteare
+ *
+ * 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] = {
+  // Programmer's Dvorak
+  [0] = LAYOUT(
+                     KC_F13,  KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22,  KC_F23,  KC_F24,
+                     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_ESC, KC_NO,   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_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_NO,  KC_NO,   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_ENT,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_NO,  KC_NO,   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_BSLS,                     KC_UP,               KC_P4,   KC_P5,   KC_P6,   KC_BSPC,
+    KC_NO,  KC_NO,   KC_LSFT, KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            KC_LEFT, KC_NO,   KC_RIGHT,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_NO,  KC_NO,   KC_LCTL, KC_LALT,                                        KC_SPC,                           KC_RALT, KC_RCTL,                     KC_DOWN,             KC_P0,            KC_PDOT
+  ),
+
+  // Qwerty layer + function
+  [1] = LAYOUT(
+                            KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,
+                            KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,                       KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,                                    KC_TRNS,                                                            KC_TRNS,  KC_TRNS,                       KC_TRNS,             KC_TRNS,          KC_TRNS
+  ),    
+
+  // Orirginal Layer
+  [2] = LAYOUT(
+                            KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,
+                            KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,                       KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,                                    KC_TRNS,                                                            KC_TRNS,  KC_TRNS,                       KC_TRNS,             KC_TRNS,          KC_TRNS
+  ),  
+
+  // Function Layer
+  [3] = LAYOUT(
+                            KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,
+                            KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,                       KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,                                    KC_TRNS,                                                            KC_TRNS,  KC_TRNS,                       KC_TRNS,             KC_TRNS,          KC_TRNS
+  ),
+  
+};
\ No newline at end of file
diff --git a/keyboards/handwired/ibm122m/keymaps/via/rules.mk b/keyboards/handwired/ibm122m/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/handwired/ibm122m/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/ibm_wheelwriter/config.h b/keyboards/handwired/ibm_wheelwriter/config.h
new file mode 100644
index 0000000000..ecca69fff8
--- /dev/null
+++ b/keyboards/handwired/ibm_wheelwriter/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 andresteare
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x8767
+#define PRODUCT_ID      0x5f89
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    IBM
+#define PRODUCT         ibm6715
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 13
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, D5 }
+
+#define DIODE_DIRECTION COL2ROW
+
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c
new file mode 100644
index 0000000000..eb8e446905
--- /dev/null
+++ b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c
@@ -0,0 +1,20 @@
+/* Copyright 2021 andresteare
+ *
+ * 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 "ibm_wheelwriter.h"
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h
new file mode 100644
index 0000000000..55d54580aa
--- /dev/null
+++ b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h
@@ -0,0 +1,40 @@
+/* Copyright 2021 andresteare
+ *
+ * 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"
+
+#define LAYOUT( \
+                                                                                                \
+    K22,    K24, K34, K35, K36, K37, K27, K28, K38, K39, K3A, K3B, K2B, K29, K2C,        K3C,   \
+    K41,    K42,    K44, K45, K46, K47, K57, K58, K48, K49, K4A, K4B, K5B, K59,  K6C,    K4C,   \
+    K52,    K62,     K14, K15, K16, K17, K07, K08, K18, K19, K1A, K1B, K0B, K6B,         K1C,   \
+    K12,    K73,   K74, K64, K65, K66, K67, K77, K78, K68, K69, K6A, K7B,                K61,   \
+    K01,                    K70,            K71,             K72,                        K7C    \
+    ) { \
+    { KC_NO, K01,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K07,   K08,   KC_NO, KC_NO, K0B,   KC_NO }, \
+    { KC_NO, KC_NO, K12,   KC_NO, K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
+    { KC_NO, KC_NO, K22,   KC_NO, K24,   KC_NO, KC_NO, K27,   K28,   K29,   KC_NO, K2B,   K2C   }, \
+    { KC_NO, KC_NO, KC_NO, KC_NO, K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C   }, \
+    { KC_NO, K41,   K42,   KC_NO, K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C   }, \
+    { KC_NO, KC_NO, K52,   KC_NO, KC_NO, KC_NO, KC_NO, K57,   K58,   K59,   KC_NO, K5B,   KC_NO }, \
+    { KC_NO, K61,   K62,   KC_NO, K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   K6C   }, \
+    { K70,   K71,   K72,   K73,   K74,   KC_NO, KC_NO, K77,   K78,   KC_NO, KC_NO, K7B,   K7C   }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/info.json
new file mode 100644
index 0000000000..0bd7841738
--- /dev/null
+++ b/keyboards/handwired/ibm_wheelwriter/info.json
@@ -0,0 +1,80 @@
+{
+    "keyboard_name": "ibm_wheelwriter",
+    "url": "https://github.com/andresteare/qmk_firmware",
+    "maintainer": "andresteare",
+    "width": 18.5,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K22 (B2,F4)", "x":0, "y":1, "w":1.5},
+                {"label":"K24 (B2,F6)", "x":1.75, "y":1},
+                {"label":"K34 (B3,F6)", "x":2.75, "y":1},
+                {"label":"K35 (B3,F7)", "x":3.75, "y":1},
+                {"label":"K36 (B3,B6)", "x":4.75, "y":1},
+                {"label":"K37 (B3,B5)", "x":5.75, "y":1},
+                {"label":"K27 (B2,B5)", "x":6.75, "y":1},
+                {"label":"K28 (B2,B4)", "x":7.75, "y":1},
+                {"label":"K38 (B3,B4)", "x":8.75, "y":1},
+                {"label":"K39 (B3,D7)", "x":9.75, "y":1},
+                {"label":"K3A (B3,D6)", "x":10.75, "y":1},
+                {"label":"K3B (B3,D4)", "x":11.75, "y":1},
+                {"label":"K2B (B2,D4)", "x":12.75, "y":1},
+                {"label":"K29 (B2,D7)", "x":13.75, "y":1},
+                {"label":"K2C (B2,D5)", "x":14.75, "y":1, "w":2},
+                {"label":"K3C (B3,D5)", "x":17, "y":1, "w":1.5},
+                {"label":"K41 (B7,F1)", "x":0, "y":2, "w":1.5},
+                {"label":"K42 (B7,F4)", "x":1.75, "y":2, "w":1.5},
+                {"label":"K44 (B7,F6)", "x":3.25, "y":2},
+                {"label":"K45 (B7,F7)", "x":4.25, "y":2},
+                {"label":"K46 (B7,B6)", "x":5.25, "y":2},
+                {"label":"K47 (B7,B5)", "x":6.25, "y":2},
+                {"label":"K57 (D0,B5)", "x":7.25, "y":2},
+                {"label":"K58 (D0,B4)", "x":8.25, "y":2},
+                {"label":"K48 (B7,B4)", "x":9.25, "y":2},
+                {"label":"K49 (B7,D7)", "x":10.25, "y":2},
+                {"label":"K4A (B7,D6)", "x":11.25, "y":2},
+                {"label":"K4B (B7,D4)", "x":12.25, "y":2},
+                {"label":"K5B (D0,D4)", "x":13.25, "y":2},
+                {"label":"K59 (D0,D7)", "x":14.25, "y":2},
+                {"label":"K6C (D1,D5)", "x":15.5, "y":2, "w":1.25, "h":2},
+                {"label":"K4C (B7,D5)", "x":17, "y":2, "w":1.5},
+                {"label":"K52 (D0,F4)", "x":0, "y":3, "w":1.5},
+                {"label":"K62 (D1,F4)", "x":1.75, "y":3, "w":1.25},
+                {"label":"K14 (B1,F6)", "x":3.5, "y":3},
+                {"label":"K15 (B1,F7)", "x":4.5, "y":3},
+                {"label":"K16 (B1,B6)", "x":5.5, "y":3},
+                {"label":"K17 (B1,B5)", "x":6.5, "y":3},
+                {"label":"K07 (B0,B5)", "x":7.5, "y":3},
+                {"label":"K08 (B0,B4)", "x":8.5, "y":3},
+                {"label":"K18 (B1,B4)", "x":9.5, "y":3},
+                {"label":"K19 (B1,D7)", "x":10.5, "y":3},
+                {"label":"K1A (B1,D6)", "x":11.5, "y":3},
+                {"label":"K1B (B1,D4)", "x":12.5, "y":3},
+                {"label":"K0B (B0,D4)", "x":13.5, "y":3},
+                {"label":"K6B (D1,D4)", "x":14.5, "y":3},
+                {"label":"K1C (B1,D5)", "x":17, "y":3, "w":1.5},
+                {"label":"K12 (B1,F4)", "x":0, "y":4, "w":1.5},
+                {"label":"K73 (D2,F5)", "x":1.75, "y":4, "w":1.25},
+                {"label":"K74 (D2,F6)", "x":3, "y":4},
+                {"label":"K64 (D1,F6)", "x":4, "y":4},
+                {"label":"K65 (D1,F7)", "x":5, "y":4},
+                {"label":"K66 (D1,B6)", "x":6, "y":4},
+                {"label":"K67 (D1,B5)", "x":7, "y":4},
+                {"label":"K77 (D2,B5)", "x":8, "y":4},
+                {"label":"K78 (D2,B4)", "x":9, "y":4},
+                {"label":"K68 (D1,B4)", "x":10, "y":4},
+                {"label":"K69 (D1,D7)", "x":11, "y":4},
+                {"label":"K6A (D1,D6)", "x":12, "y":4},
+                {"label":"K7B (D2,D4)", "x":13, "y":4},
+                {"label":"K61 (D1,F1)", "x":17, "y":4, "w":1.5},
+                {"label":"K01 (B0,F1)", "x":0, "y":5, "w":1.5},
+                {"label":"K70 (D2,F0)", "x":4.25, "y":5, "w":2.75},
+                {"label":"K71 (D2,F1)", "x":7, "y":5, "w":7.25},
+                {"label":"K72 (D2,F4)", "x":15.25, "y":5, "w":1.5},
+                {"label":"K7C (D2,D5)", "x":17, "y":5, "w":1.5}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/handwired/ibm_wheelwriter/keymaps/default/keymap.c b/keyboards/handwired/ibm_wheelwriter/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d7156d4c14
--- /dev/null
+++ b/keyboards/handwired/ibm_wheelwriter/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2021 andresteare
+ *
+ * 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(
+        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,             MO(1),
+        KC_MPLY,       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_ENT,       KC_VOLU,
+        KC_CAPS,       KC_LCTL,        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_VOLD,
+        KC_LALT,       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_RGUI,
+        KC_LGUI,                                KC_SPC,                             KC_SPC,                                                        KC_RALT,      KC_RCTL
+    ),
+    [1] = LAYOUT(        
+        RESET,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,      KC_TRNS,
+        KC_TRNS,       KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,
+        KC_TRNS,       KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+        KC_TRNS,                                KC_TRNS,                            KC_TRNS,                                                       KC_TRNS,      KC_TRNS
+    ),
+};
diff --git a/keyboards/handwired/ibm_wheelwriter/keymaps/via/keymap.c b/keyboards/handwired/ibm_wheelwriter/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4390cedeab
--- /dev/null
+++ b/keyboards/handwired/ibm_wheelwriter/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 andresteare
+ *
+ * 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(
+        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,             MO(1),
+        KC_MPLY,       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_ENT,       KC_VOLU,
+        KC_CAPS,       KC_LCTL,        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_VOLD,
+        KC_LALT,       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_RGUI,
+        KC_LGUI,                                KC_SPC,                             KC_SPC,                                                        KC_RALT,      KC_RCTL
+    ),
+    [1] = LAYOUT(        
+        RESET,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,      KC_TRNS,
+        KC_TRNS,       KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,
+        KC_TRNS,       KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+        KC_TRNS,                                KC_TRNS,                            KC_TRNS,                                                       KC_TRNS,      KC_TRNS
+    ),
+    [2] = LAYOUT(        
+        KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,      KC_TRNS,
+        KC_TRNS,       KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,
+        KC_TRNS,       KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+        KC_TRNS,                                KC_TRNS,                            KC_TRNS,                                                       KC_TRNS,      KC_TRNS
+    ),
+    [3] = LAYOUT(        
+        KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,      KC_TRNS,
+        KC_TRNS,       KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS,
+        KC_TRNS,       KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+        KC_TRNS,                                KC_TRNS,                            KC_TRNS,                                                       KC_TRNS,      KC_TRNS
+    ),
+
+};
diff --git a/keyboards/handwired/ibm_wheelwriter/keymaps/via/rules.mk b/keyboards/handwired/ibm_wheelwriter/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/handwired/ibm_wheelwriter/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/ibm_wheelwriter/readme.md b/keyboards/handwired/ibm_wheelwriter/readme.md
new file mode 100644
index 0000000000..296930a25e
--- /dev/null
+++ b/keyboards/handwired/ibm_wheelwriter/readme.md
@@ -0,0 +1,17 @@
+# ibm_wheelwriter
+
+![top view](https://i.imgur.com/jwYI2qxl.jpg)
+
+Got this awesome buckling spring keyboard to work with a PC, it's really the cheapest way to try buckling springs :)
+
+ATTENTION: I DIDN'T INCLUDE THE RIGHT SHIFT KEY IN THE KEYMAP BECAUSE IT SHARES THE CIRCUIT WITH THE LEFT SHIFT KEY SO YOU CAN'T CUSTOMIZE BOTH INDEPENDENTLY
+I REPEAT, WHATEVER ACTION YOU ASIGN TO THE LEFT SHIFT KEY, THE RIGHT SHIFT KEY WILL DO THE SAME, SO IT WILL NOT APPEAR IN THE CONFIGURATOR OR IN VIA
+
+* Keyboard Maintainer: [Andres Teare](https://github.com/andresteare)
+* Hardware Supported: Teensy 2.0
+* Hardware Availability: got the teensy from aliexpress
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/ibm_wheelwriter:default
+
+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).
diff --git a/keyboards/handwired/ibm_wheelwriter/rules.mk b/keyboards/handwired/ibm_wheelwriter/rules.mk
new file mode 100644
index 0000000000..7b69908b1b
--- /dev/null
+++ b/keyboards/handwired/ibm_wheelwriter/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/oem_iso_fullsize/config.h b/keyboards/handwired/oem_iso_fullsize/config.h
new file mode 100644
index 0000000000..566af03b0f
--- /dev/null
+++ b/keyboards/handwired/oem_iso_fullsize/config.h
@@ -0,0 +1,61 @@
+/** Copyright 2021 andresteare
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x9856  // "Gamdias"
+#define PRODUCT_ID      0x7070
+#define DEVICE_VER      0x0001
+#define MANUFACTURER   Gamdias
+#define PRODUCT         teclado_oscar
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 21
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { C0, B4, F3, F4, F5, F6 }
+#define MATRIX_COL_PINS { C2, C1, E0, D4, D5, A4, A0, B2, B0, E7, E6, D6, B1, B3, D3, D2, B6, F7, F0, F1, F2 }
+
+/*Row 0, resistor R132, Pin A1
+*Row 1, R131, Pin B5
+*Row 2, R130, Pin E4
+*Row 3, R129, Pin A2
+*Row 4, R128, Pin E5
+*Row 5, R127, Pin A7
+#define LED_CAPS_LOCK_PIN C7
+#define LED_SCROLL_LOCK_PIN A3
+#define LED_NUM_LOCK_PIN C6
+#define BACKLIGHT_PINS { B5, E5, E4, A7, A1, A2 }
+#define BACKLIGHT_LEVELS 1*/
+
+#define DIODE_DIRECTION ROW2COL
+
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/oem_iso_fullsize/info.json b/keyboards/handwired/oem_iso_fullsize/info.json
new file mode 100644
index 0000000000..fbe3c2796c
--- /dev/null
+++ b/keyboards/handwired/oem_iso_fullsize/info.json
@@ -0,0 +1,119 @@
+{
+    "keyboard_name": "oem_iso_fullsize",
+    "url": "https://github.com/andresteare/qmk_firmware",
+    "maintainer": "andresteare",
+    "width": 22.5,
+    "height": 6.5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (C0,C2)", "x":0, "y":0},
+                {"label":"K01 (C0,C1)", "x":2, "y":0},
+                {"label":"K02 (C0,E0)", "x":3, "y":0},
+                {"label":"K03 (C0,D4)", "x":4, "y":0},
+                {"label":"K04 (C0,D5)", "x":5, "y":0},
+                {"label":"K05 (C0,A4)", "x":6.5, "y":0},
+                {"label":"K06 (C0,A0)", "x":7.5, "y":0},
+                {"label":"K07 (C0,B2)", "x":8.5, "y":0},
+                {"label":"K08 (C0,B0)", "x":9.5, "y":0},
+                {"label":"K09 (C0,E7)", "x":11, "y":0},
+                {"label":"K0A (C0,E6)", "x":12, "y":0},
+                {"label":"K0B (C0,D6)", "x":13, "y":0},
+                {"label":"K0C (C0,B1)", "x":14, "y":0},
+                {"label":"K0E (C0,D3)", "x":15.25, "y":0},
+                {"label":"K0F (C0,D2)", "x":16.25, "y":0},
+                {"label":"K0G (C0,B6)", "x":17.25, "y":0},
+                {"label":"K10 (B4,C2)", "x":0, "y":1.5},
+                {"label":"K11 (B4,C1)", "x":1, "y":1.5},
+                {"label":"K12 (B4,E0)", "x":2, "y":1.5},
+                {"label":"K13 (B4,D4)", "x":3, "y":1.5},
+                {"label":"K14 (B4,D5)", "x":4, "y":1.5},
+                {"label":"K15 (B4,A4)", "x":5, "y":1.5},
+                {"label":"K16 (B4,A0)", "x":6, "y":1.5},
+                {"label":"K17 (B4,B2)", "x":7, "y":1.5},
+                {"label":"K18 (B4,B0)", "x":8, "y":1.5},
+                {"label":"K19 (B4,E7)", "x":9, "y":1.5},
+                {"label":"K1A (B4,E6)", "x":10, "y":1.5},
+                {"label":"K1B (B4,D6)", "x":11, "y":1.5},
+                {"label":"K1C (B4,B1)", "x":12, "y":1.5},
+                {"label":"K1D (B4,B3)", "x":13, "y":1.5, "w":2},
+                {"label":"K1E (B4,D3)", "x":15.25, "y":1.5},
+                {"label":"K1F (B4,D2)", "x":16.25, "y":1.5},
+                {"label":"K1G (B4,B6)", "x":17.25, "y":1.5},
+                {"label":"K1H (B4,F7)", "x":18.5, "y":1.5},
+                {"label":"K1I (B4,F0)", "x":19.5, "y":1.5},
+                {"label":"K1J (B4,F1)", "x":20.5, "y":1.5},
+                {"label":"K1K (B4,F2)", "x":21.5, "y":1.5},
+                {"label":"K20 (F3,C2)", "x":0, "y":2.5, "w":1.5},
+                {"label":"K21 (F3,C1)", "x":1.5, "y":2.5},
+                {"label":"K22 (F3,E0)", "x":2.5, "y":2.5},
+                {"label":"K23 (F3,D4)", "x":3.5, "y":2.5},
+                {"label":"K24 (F3,D5)", "x":4.5, "y":2.5},
+                {"label":"K25 (F3,A4)", "x":5.5, "y":2.5},
+                {"label":"K26 (F3,A0)", "x":6.5, "y":2.5},
+                {"label":"K27 (F3,B2)", "x":7.5, "y":2.5},
+                {"label":"K28 (F3,B0)", "x":8.5, "y":2