Consolidate modelm v2 (#14996)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>

8 files changed, 0 insertions, 430 deletions

diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json
deleted file mode 100644
index 4d8eec3167..0000000000
--- a/keyboards/ashpil/modelm_usbc/info.json
+++ /dev/null
@@ -1,270 +0,0 @@
-{
-    "keyboard_name": "IBM Model M 101/102",
-    "manufacturer": "ashpil",
-    "url": "https://github.com/ashpil/qmk_firmware/tree/master/keyboards/ashpil/modelm_usbc",
-    "maintainer": "ashpil",
-    "usb": {
-        "vid": "0xFEED",
-        "pid": "0x0000",
-        "device_version": "0.0.1"
-    },
-    "matrix_pins": {
-        "cols": ["E6", "E7", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "A0", "A1", "A2", "A3", "A4", "A5"],
-        "rows": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0"]
-    },
-    "diode_direction": "ROW2COL",
-    "bootmagic": {
-        "matrix": [0, 2]
-    },
-    "processor": "at90usb1286",
-    "bootloader": "atmel-dfu",
-    "layouts": {
-        "LAYOUT_fullsize_iso_wkl": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-
-                {"matrix": [2, 3], "x": 2, "y": 0},
-                {"matrix": [2, 4], "x": 3, "y": 0},
-                {"matrix": [1, 4], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [1, 9], "x": 8.5, "y": 0},
-                {"matrix": [2, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [2, 6], "x": 11, "y": 0},
-                {"matrix": [3, 6], "x": 12, "y": 0},
-                {"matrix": [3, 11], "x": 13, "y": 0},
-                {"matrix": [3, 12], "x": 14, "y": 0},
-
-                {"matrix": [3, 15], "x": 15.25, "y": 0},
-                {"matrix": [4, 15], "x": 16.25, "y": 0},
-                {"matrix": [6, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 2], "x": 0, "y": 1.5},
-                {"matrix": [3, 2], "x": 1, "y": 1.5},
-                {"matrix": [3, 3], "x": 2, "y": 1.5},
-                {"matrix": [3, 4], "x": 3, "y": 1.5},
-                {"matrix": [3, 5], "x": 4, "y": 1.5},
-                {"matrix": [2, 5], "x": 5, "y": 1.5},
-                {"matrix": [2, 7], "x": 6, "y": 1.5},
-                {"matrix": [3, 7], "x": 7, "y": 1.5},
-                {"matrix": [3, 8], "x": 8, "y": 1.5},
-                {"matrix": [3, 9], "x": 9, "y": 1.5},
-                {"matrix": [3, 10], "x": 10, "y": 1.5},
-                {"matrix": [2, 10], "x": 11, "y": 1.5},
-                {"matrix": [2, 8], "x": 12, "y": 1.5},
-                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
-                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
-                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
-
-                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
-                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
-                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
-                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
-
-                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
-                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
-                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
-                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
-                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
-                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
-
-                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
-                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
-
-                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
-                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
-                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
-                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
-                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
-                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
-                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
-                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
-                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
-                {"matrix": [6, 10], "x": 12.75, "y": 3.5},
-                {"matrix": [6, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
-
-                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
-                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
-                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
-
-                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
-                {"matrix": [0, 3], "x": 1.25, "y": 4.5},
-                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
-                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
-                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
-                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
-                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
-                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
-                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
-                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
-
-                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
-                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
-            ]
-        },
-        "LAYOUT_fullsize_ansi_wkl": {
-            "layout": [
-                {"matrix": [0, 2], "x": 0, "y": 0},
-
-                {"matrix": [2, 3], "x": 2, "y": 0},
-                {"matrix": [2, 4], "x": 3, "y": 0},
-                {"matrix": [1, 4], "x": 4, "y": 0},
-                {"matrix": [0, 4], "x": 5, "y": 0},
-
-                {"matrix": [0, 6], "x": 6.5, "y": 0},
-                {"matrix": [0, 8], "x": 7.5, "y": 0},
-                {"matrix": [1, 9], "x": 8.5, "y": 0},
-                {"matrix": [2, 9], "x": 9.5, "y": 0},
-
-                {"matrix": [2, 6], "x": 11, "y": 0},
-                {"matrix": [3, 6], "x": 12, "y": 0},
-                {"matrix": [3, 11], "x": 13, "y": 0},
-                {"matrix": [3, 12], "x": 14, "y": 0},
-
-                {"matrix": [3, 15], "x": 15.25, "y": 0},
-                {"matrix": [4, 15], "x": 16.25, "y": 0},
-                {"matrix": [6, 14], "x": 17.25, "y": 0},
-
-                {"matrix": [2, 2], "x": 0, "y": 1.5},
-                {"matrix": [3, 2], "x": 1, "y": 1.5},
-                {"matrix": [3, 3], "x": 2, "y": 1.5},
-                {"matrix": [3, 4], "x": 3, "y": 1.5},
-                {"matrix": [3, 5], "x": 4, "y": 1.5},
-                {"matrix": [2, 5], "x": 5, "y": 1.5},
-                {"matrix": [2, 7], "x": 6, "y": 1.5},
-                {"matrix": [3, 7], "x": 7, "y": 1.5},
-                {"matrix": [3, 8], "x": 8, "y": 1.5},
-                {"matrix": [3, 9], "x": 9, "y": 1.5},
-                {"matrix": [3, 10], "x": 10, "y": 1.5},
-                {"matrix": [2, 10], "x": 11, "y": 1.5},
-                {"matrix": [2, 8], "x": 12, "y": 1.5},
-                {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
-
-                {"matrix": [2, 12], "x": 15.25, "y": 1.5},
-                {"matrix": [2, 14], "x": 16.25, "y": 1.5},
-                {"matrix": [2, 13], "x": 17.25, "y": 1.5},
-
-                {"matrix": [6, 11], "x": 18.5, "y": 1.5},
-                {"matrix": [6, 12], "x": 19.5, "y": 1.5},
-                {"matrix": [6, 13], "x": 20.5, "y": 1.5},
-                {"matrix": [7, 13], "x": 21.5, "y": 1.5},
-
-                {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
-                {"matrix": [4, 2], "x": 1.5, "y": 2.5},
-                {"matrix": [4, 3], "x": 2.5, "y": 2.5},
-                {"matrix": [4, 4], "x": 3.5, "y": 2.5},
-                {"matrix": [4, 5], "x": 4.5, "y": 2.5},
-                {"matrix": [1, 5], "x": 5.5, "y": 2.5},
-                {"matrix": [1, 7], "x": 6.5, "y": 2.5},
-                {"matrix": [4, 7], "x": 7.5, "y": 2.5},
-                {"matrix": [4, 8], "x": 8.5, "y": 2.5},
-                {"matrix": [4, 9], "x": 9.5, "y": 2.5},
-                {"matrix": [4, 10], "x": 10.5, "y": 2.5},
-                {"matrix": [1, 10], "x": 11.5, "y": 2.5},
-                {"matrix": [1, 8], "x": 12.5, "y": 2.5},
-                {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
-
-                {"matrix": [2, 11], "x": 15.25, "y": 2.5},
-                {"matrix": [3, 14], "x": 16.25, "y": 2.5},
-                {"matrix": [3, 13], "x": 17.25, "y": 2.5},
-
-                {"matrix": [4, 11], "x": 18.5, "y": 2.5},
-                {"matrix": [4, 12], "x": 19.5, "y": 2.5},
-                {"matrix": [4, 13], "x": 20.5, "y": 2.5},
-                {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2},
-
-                {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5},
-                {"matrix": [5, 2], "x": 1.75, "y": 3.5},
-                {"matrix": [5, 3], "x": 2.75, "y": 3.5},
-                {"matrix": [5, 4], "x": 3.75, "y": 3.5},
-                {"matrix": [5, 5], "x": 4.75, "y": 3.5},
-                {"matrix": [0, 5], "x": 5.75, "y": 3.5},
-                {"matrix": [0, 7], "x": 6.75, "y": 3.5},
-                {"matrix": [5, 7], "x": 7.75, "y": 3.5},
-                {"matrix": [5, 8], "x": 8.75, "y": 3.5},
-                {"matrix": [5, 9], "x": 9.75, "y": 3.5},
-                {"matrix": [5, 10], "x": 10.75, "y": 3.5},
-                {"matrix": [0, 10], "x": 11.75, "y": 3.5},
-                {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},
-
-                {"matrix": [1, 11], "x": 18.5, "y": 3.5},
-                {"matrix": [1, 12], "x": 19.5, "y": 3.5},
-                {"matrix": [1, 13], "x": 20.5, "y": 3.5},
-
-                {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 2.25},
-                {"matrix": [6, 2], "x": 2.25, "y": 4.5},
-                {"matrix": [6, 3], "x": 3.25, "y": 4.5},
-                {"matrix": [6, 4], "x": 4.25, "y": 4.5},
-                {"matrix": [6, 5], "x": 5.25, "y": 4.5},
-                {"matrix": [7, 5], "x": 6.25, "y": 4.5},
-                {"matrix": [7, 7], "x": 7.25, "y": 4.5},
-                {"matrix": [6, 7], "x": 8.25, "y": 4.5},
-                {"matrix": [6, 8], "x": 9.25, "y": 4.5},
-                {"matrix": [6, 9], "x": 10.25, "y": 4.5},
-                {"matrix": [7, 10], "x": 11.25, "y": 4.5},
-                {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
-
-                {"matrix": [0, 14], "x": 16.25, "y": 4.5},
-
-                {"matrix": [5, 11], "x": 18.5, "y": 4.5},
-                {"matrix": [5, 12], "x": 19.5, "y": 4.5},
-                {"matrix": [5, 13], "x": 20.5, "y": 4.5},
-                {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2},
-
-                {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
-                {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
-                {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
-                {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
-                {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
-
-                {"matrix": [7, 14], "x": 15.25, "y": 5.5},
-                {"matrix": [7, 11], "x": 16.25, "y": 5.5},
-                {"matrix": [7, 12], "x": 17.25, "y": 5.5},
-
-                {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2},
-                {"matrix": [0, 13], "x": 20.5, "y": 5.5}
-            ]
-        }
-    }
-}
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h
deleted file mode 100644
index 59cec33010..0000000000
--- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * 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
-
-// place overrides here
-
-
-/* Add combos */
-#define COMBO_TERM 200
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c
deleted file mode 100644
index e8df1f0c81..0000000000
--- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * 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_fullsize_ansi_wkl( /* Base layer */
-    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_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_MEDIA_PLAY_PAUSE,  KC_AUDIO_MUTE, KC_AUDIO_VOL_UP,   KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
-    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_BSLS,   KC_MEDIA_PREV_TRACK,  KC_MEDIA_NEXT_TRACK,  KC_AUDIO_VOL_DOWN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    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_ENT,                                 KC_P4,   KC_P5,   KC_P6,
-    KC_LSFT,          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_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LGUI,          KC_LALT,                           KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT
-  ),
-};
-
-enum combo_events {
-  CTRL_PAUS_RESET,
-};
-
-const uint16_t PROGMEM reset_combo[] = {KC_LCTL, KC_PAUS, COMBO_END};
-
-combo_t key_combos[] = {
-  [CTRL_PAUS_RESET] = COMBO_ACTION(reset_combo),
-};
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-  switch(combo_index) {
-    case CTRL_PAUS_RESET:
-      if (pressed) {
-        reset_keyboard();
-      }
-      break;
-  }
-}
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk b/keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk
deleted file mode 100644
index 23b7c173b8..0000000000
--- a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes          # Reset combo
\ No newline at end of file
diff --git a/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c b/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c
deleted file mode 100644
index d8f80a5c72..0000000000
--- a/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * 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_fullsize_ansi_wkl( /* Base layer */
-    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_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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    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_BSLS,   KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    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_ENT,                                 KC_P4,   KC_P5,   KC_P6,
-    KC_LSFT,          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_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LCTL,          KC_LALT,                           KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT
-  ),
-};
diff --git a/keyboards/ashpil/modelm_usbc/modelm_usbc.c b/keyboards/ashpil/modelm_usbc/modelm_usbc.c
deleted file mode 100644
index 92b577635c..0000000000
--- a/keyboards/ashpil/modelm_usbc/modelm_usbc.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2019 ashpil
- *
- * 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 "quantum.h"
-
-void keyboard_pre_init_kb(void) {
-  /* Setting status LEDs pins to output and +5V (off) */
-  setPinOutput(D5);
-  setPinOutput(D6);
-  setPinOutput(D7);
-  writePinHigh(D5);
-  writePinHigh(D6);
-  writePinHigh(D7);
-}
-
-bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
-        writePin(D5, !led_state.num_lock);
-        writePin(D6, !led_state.caps_lock);
-        writePin(D7, !led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/ashpil/modelm_usbc/readme.md b/keyboards/ashpil/modelm_usbc/readme.md
deleted file mode 100644
index 261d97ab49..0000000000
--- a/keyboards/ashpil/modelm_usbc/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# USB C Model M
-
-![modelm_usbc](https://raw.githubusercontent.com/ashpil/Model-M-Type-C-Controller/master/images/render.png)
-
-This is a configuration of QMK intended to be used with the [USB C Model M alt controller](https://github.com/ashpil/Model-M-Type-C-Controller "USB C Model M alt controller"). Many thanks to iw0rm3r for working on a similar project and providing the foundation for this!
-
-* Keyboard Maintainer: [ashpil](https://github.com/ashpil)
-* Hardware Supported: [USB C Model M alt controller](https://github.com/ashpil/Model-M-Type-C-Controller)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make ashpil/modelm_usbc: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/ashpil/modelm_usbc/rules.mk b/keyboards/ashpil/modelm_usbc/rules.mk
deleted file mode 100644
index 6fe874e748..0000000000
--- a/keyboards/ashpil/modelm_usbc/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output