diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h
new file mode 100644
index 0000000000..7d9b9ee0a6
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/config.h
@@ -0,0 +1,62 @@
+/* Copyright 2022 Jordan Duabe
+ * Copyright 2022 peepeetee
+ *
+ * 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"
+
+/* key matrix size */
+#define MATRIX_ROWS 11
+#define MATRIX_COLS 9
+
+/*
+ * 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 { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+
+#define DIODE_DIRECTION ROW2COL
+
+#define LED_CAPS_LOCK_PIN C6
+#define LED_SCROLL_LOCK_PIN C7
+#define LED_NUM_LOCK_PIN B5
+#define LED_PIN_ON_STATE 0
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 81
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 180
+#endif
diff --git a/keyboards/mt/ncr80/hotswap/hotswap.c b/keyboards/mt/ncr80/hotswap/hotswap.c
new file mode 100644
index 0000000000..93a9b53c12
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/hotswap.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 peepeetee
+*
+* 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 "hotswap.h"
diff --git a/keyboards/mt/ncr80/hotswap/hotswap.h b/keyboards/mt/ncr80/hotswap/hotswap.h
new file mode 100644
index 0000000000..586ce4622f
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/hotswap.h
@@ -0,0 +1,44 @@
+/* Copyright 2022 Jordan Duabe
+ * Copyright 2022 peepeetee
+ *
+ * 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"
+
+#define XXX KC_NO
+
+
+#define LAYOUT( \
+ K00, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73, K76, K72, K71, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83, K86, K82, K81, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93, \
+ K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, K92, \
+ K50, K52, K56, K57, K53, KA6, KA2, KA1 \
+) { \
+ { K00, XXX, K02, K03, K04, K05, K06, K07, K08 }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
+ { K40, XXX, K42, K43, K44, K45, K46, K47, K48 }, \
+ { K50, XXX, K52, K53, XXX, XXX, K56, K57, XXX }, \
+ { XXX, XXX, XXX, K63, K64, K65, XXX, K67, K68 }, \
+ { K70, K71, K72, K73, XXX, K75, K76, K77, K78 }, \
+ { XXX, K81, K82, K83, K84, K85, K86, K87, K88 }, \
+ { XXX, XXX, K92, K93, XXX, K95, XXX, K97, K98 }, \
+ { XXX, KA1, KA2, XXX, KA4, KA5, KA6, KA7, KA8 }, \
+}
+
+
diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json
new file mode 100644
index 0000000000..121498e5f9
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/info.json
@@ -0,0 +1,98 @@
+{
+ "keyboard_name": "NCR-80 Hotswap",
+ "manufacturer": "NCR",
+ "url": "https://www.aliexpress.com/item/1005003345941543.html",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4D54",
+ "pid": "0x2002",
+ "device_version": "0.0.1"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ { "label": "Esc", "x": 0, "y": 0 },
+ { "label": "F1", "x": 2, "y": 0 },
+ { "label": "F2", "x": 3, "y": 0 },
+ { "label": "F3", "x": 4, "y": 0 },
+ { "label": "F4", "x": 5, "y": 0 },
+ { "label": "F5", "x": 6.5, "y": 0 },
+ { "label": "F6", "x": 7.5, "y": 0 },
+ { "label": "F7", "x": 8.5, "y": 0 },
+ { "label": "F8", "x": 9.5, "y": 0 },
+ { "label": "F9", "x": 11, "y": 0 },
+ { "label": "F10", "x": 12, "y": 0 },
+ { "label": "F11", "x": 13, "y": 0 },
+ { "label": "F12", "x": 14, "y": 0 },
+ { "label": "~", "x": 0, "y": 1.5 },
+ { "label": "!", "x": 1, "y": 1.5 },
+ { "label": "@", "x": 2, "y": 1.5 },
+ { "label": "#", "x": 3, "y": 1.5 },
+ { "label": "$", "x": 4, "y": 1.5 },
+ { "label": "%", "x": 5, "y": 1.5 },
+ { "label": "^", "x": 6, "y": 1.5 },
+ { "label": "&", "x": 7, "y": 1.5 },
+ { "label": "*", "x": 8, "y": 1.5 },
+ { "label": "(", "x": 9, "y": 1.5 },
+ { "label": ")", "x": 10, "y": 1.5 },
+ { "label": "_", "x": 11, "y": 1.5 },
+ { "label": "+", "x": 12, "y": 1.5 },
+ { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
+ { "label": "Insert", "x": 15.25, "y": 1.5 },
+ { "label": "Home", "x": 16.25, "y": 1.5 },
+ { "label": "PgUp", "x": 17.25, "y": 1.5 },
+ { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
+ { "label": "Q", "x": 1.5, "y": 2.5 },
+ { "label": "W", "x": 2.5, "y": 2.5 },
+ { "label": "E", "x": 3.5, "y": 2.5 },
+ { "label": "R", "x": 4.5, "y": 2.5 },
+ { "label": "T", "x": 5.5, "y": 2.5 },
+ { "label": "Y", "x": 6.5, "y": 2.5 },
+ { "label": "U", "x": 7.5, "y": 2.5 },
+ { "label": "I", "x": 8.5, "y": 2.5 },
+ { "label": "O", "x": 9.5, "y": 2.5 },
+ { "label": "P", "x": 10.5, "y": 2.5 },
+ { "label": "{", "x": 11.5, "y": 2.5 },
+ { "label": "}", "x": 12.5, "y": 2.5 },
+ { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
+ { "label": "Delete", "x": 15.25, "y": 2.5 },
+ { "label": "End", "x": 16.25, "y": 2.5 },
+ { "label": "PgDn", "x": 17.25, "y": 2.5 },
+ { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
+ { "label": "A", "x": 1.75, "y": 3.5 },
+ { "label": "S", "x": 2.75, "y": 3.5 },
+ { "label": "D", "x": 3.75, "y": 3.5 },
+ { "label": "F", "x": 4.75, "y": 3.5 },
+ { "label": "G", "x": 5.75, "y": 3.5 },
+ { "label": "H", "x": 6.75, "y": 3.5 },
+ { "label": "J", "x": 7.75, "y": 3.5 },
+ { "label": "K", "x": 8.75, "y": 3.5 },
+ { "label": "L", "x": 9.75, "y": 3.5 },
+ { "label": ":", "x": 10.75, "y": 3.5 },
+ { "label": "\"", "x": 11.75, "y": 3.5 },
+ { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
+ { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
+ { "label": "Z", "x": 2.25, "y": 4.5 },
+ { "label": "X", "x": 3.25, "y": 4.5 },
+ { "label": "C", "x": 4.25, "y": 4.5 },
+ { "label": "V", "x": 5.25, "y": 4.5 },
+ { "label": "B", "x": 6.25, "y": 4.5 },
+ { "label": "N", "x": 7.25, "y": 4.5 },
+ { "label": "M", "x": 8.25, "y": 4.5 },
+ { "label": "<", "x": 9.25, "y": 4.5 },
+ { "label": ">", "x": 10.25, "y": 4.5 },
+ { "label": "?", "x": 11.25, "y": 4.5 },
+ { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
+ { "label": "Up", "x": 16.25, "y": 4.5 },
+ { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 },
+ { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 },
+ { "label": "Space", "x": 4, "y": 5.5, "w": 7 },
+ { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 },
+ { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 },
+ { "label": "Left", "x": 15.25, "y": 5.5 },
+ { "label": "Down", "x": 16.25, "y": 5.5 },
+ { "label": "Right", "x": 17.25, "y": 5.5 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/mt/ncr80/hotswap/keymaps/default/keymap.c b/keyboards/mt/ncr80/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..33f98796e3
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2022 peepeetee
+ *
+ * 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+ 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_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_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_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_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+};
diff --git a/keyboards/mt/ncr80/hotswap/keymaps/via/keymap.c b/keyboards/mt/ncr80/hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e23de81b78
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2022 peepeetee
+ *
+ * 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+ 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_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_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_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_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+ [1] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______),
+ [2] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______),
+ [3] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______),
+
+};
diff --git a/keyboards/mt/ncr80/hotswap/keymaps/via/rules.mk b/keyboards/mt/ncr80/hotswap/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mt/ncr80/hotswap/readme.md b/keyboards/mt/ncr80/hotswap/readme.md
new file mode 100644
index 0000000000..5f9aa43c3e
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/readme.md
@@ -0,0 +1,31 @@
+# NCR-80
+
+
+
+> Re-imagination of the classic rebranded Cherry G81-3000 by NCR
+
+NCR-80 is an affordable keyboard kit inspired by iconic vintage keyboards.
+
+* Keyboard Maintainer: QMK Community
+* Hardware Supported: ATmega32U4
+* Hardware Availability: [AliExpress](https://www.aliexpress.com/item/1005003345941543.html) [Taobao 淘宝](https://item.taobao.com/item.htm?id=657482028672)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ncr80/hotswap:default
+
+Flashing example for this keyboard:
+
+ make ncr80/hotswap:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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/mt/ncr80/hotswap/rules.mk b/keyboards/mt/ncr80/hotswap/rules.mk
new file mode 100644
index 0000000000..2501d49e2d
--- /dev/null
+++ b/keyboards/mt/ncr80/hotswap/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# 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 = yes # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mt/ncr80/readme.md b/keyboards/mt/ncr80/readme.md
new file mode 100644
index 0000000000..210822f28e
--- /dev/null
+++ b/keyboards/mt/ncr80/readme.md
@@ -0,0 +1,16 @@
+# NCR-80
+
+
+
+> Re-imagination of the classic rebranded Cherry G81-3000 by NCR
+
+NCR-80 is an affordable keyboard kit inspired by iconic vintage keyboards.
+
+For more information, read the readme.md in soldered/ or hotswap/, depending on the version you are interested in.
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ncr80/solder:default
+ make ncr80/hotswap:default
+
+For more information, read the readme.md in [solder/](solder/) or [hotswap/](hotswap/), depending on the version you are interested in.
diff --git a/keyboards/mt/ncr80/rules.mk b/keyboards/mt/ncr80/rules.mk
new file mode 100644
index 0000000000..5ebd6454f6
--- /dev/null
+++ b/keyboards/mt/ncr80/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mt/ncr80/hotswap
diff --git a/keyboards/mt/ncr80/solder/config.h b/keyboards/mt/ncr80/solder/config.h
new file mode 100644
index 0000000000..2a13dcaca7
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/config.h
@@ -0,0 +1,47 @@
+/* Copyright 2022 Jordan Duabe
+ * Copyright 2022 peepeetee
+ *
+ * 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"
+
+/* key matrix size */
+#define MATRIX_ROWS 11
+#define MATRIX_COLS 9
+
+/*
+ * 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 { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+
+#define DIODE_DIRECTION ROW2COL
+
+#define LED_CAPS_LOCK_PIN C6
+#define LED_SCROLL_LOCK_PIN C7
+#define LED_NUM_LOCK_PIN B5
+#define LED_PIN_ON_STATE 0
+#define BACKLIGHT_PIN B6
+// #define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 5
+
diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/info.json
new file mode 100644
index 0000000000..36d254d032
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/info.json
@@ -0,0 +1,290 @@
+{
+ "keyboard_name": "NCR-80",
+ "manufacturer": "NCR",
+ "url": "https://www.aliexpress.com/item/1005003364462523.html",
+ "maintainer": "qmk",
+ "usb": {
+ "vid": "0x4D54",
+ "pid": "0x2001",
+ "device_version": "0.0.1"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ { "label": "K00 (E6,D0)", "x": 0, "y": 0 },
+ { "label": "K02 (E6,D2)", "x": 2, "y": 0 },
+ { "label": "K03 (E6,D3)", "x": 3, "y": 0 },
+ { "label": "K04 (E6,D5)", "x": 4, "y": 0 },
+ { "label": "K05 (E6,D4)", "x": 5, "y": 0 },
+ { "label": "K06 (E6,D6)", "x": 6.5, "y": 0 },
+ { "label": "K07 (E6,D7)", "x": 7.5, "y": 0 },
+ { "label": "K08 (E6,B4)", "x": 8.5, "y": 0 },
+ { "label": "K68 (F7,B4)", "x": 9.5, "y": 0 },
+ { "label": "K67 (F7,D7)", "x": 11, "y": 0 },
+ { "label": "K65 (F7,D4)", "x": 12, "y": 0 },
+ { "label": "K64 (F7,D5)", "x": 13, "y": 0 },
+ { "label": "K63 (F7,D3)", "x": 14, "y": 0 },
+ { "label": "K66 (F7,D6)", "x": 15.25, "y": 0 },
+ { "label": "K62 (F7,D2)", "x": 16.25, "y": 0 },
+ { "label": "K61 (F7,D1)", "x": 17.25, "y": 0 },
+ { "label": "K10 (B0,D0)", "x": 0, "y": 1.5 },
+ { "label": "K11 (B0,D1)", "x": 1, "y": 1.5 },
+ { "label": "K12 (B0,D2)", "x": 2, "y": 1.5 },
+ { "label": "K13 (B0,D3)", "x": 3, "y": 1.5 },
+ { "label": "K14 (B0,D5)", "x": 4, "y": 1.5 },
+ { "label": "K15 (B0,D4)", "x": 5, "y": 1.5 },
+ { "label": "K16 (B0,D6)", "x": 6, "y": 1.5 },
+ { "label": "K17 (B0,D7)", "x": 7, "y": 1.5 },
+ { "label": "K18 (B0,B4)", "x": 8, "y": 1.5 },
+ { "label": "K78 (F6,B4)", "x": 9, "y": 1.5 },
+ { "label": "K70 (F6,D0)", "x": 10, "y": 1.5 },
+ { "label": "K77 (F6,D7)", "x": 11, "y": 1.5 },
+ { "label": "K75 (F6,D4)", "x": 12, "y": 1.5 },
+ { "label": "K74 (F6,D5)", "x": 13, "y": 1.5 },
+ { "label": "K73 (F6,D3)", "x": 14, "y": 1.5 },
+ { "label": "K76 (F6,D6)", "x": 15.25, "y": 1.5 },
+ { "label": "K72 (F6,D2)", "x": 16.25, "y": 1.5 },
+ { "label": "K71 (F6,D1)", "x": 17.25, "y": 1.5 },
+ { "label": "K20 (B1,D0)", "x": 0, "y": 2.5, "w": 1.5 },
+ { "label": "K21 (B1,D1)", "x": 1.5, "y": 2.5 },
+ { "label": "K22 (B1,D2)", "x": 2.5, "y": 2.5 },
+ { "label": "K23 (B1,D3)", "x": 3.5, "y": 2.5 },
+ { "label": "K24 (B1,D5)", "x": 4.5, "y": 2.5 },
+ { "label": "K25 (B1,D4)", "x": 5.5, "y": 2.5 },
+ { "label": "K26 (B1,D6)", "x": 6.5, "y": 2.5 },
+ { "label": "K27 (B1,D7)", "x": 7.5, "y": 2.5 },
+ { "label": "K28 (B1,B4)", "x": 8.5, "y": 2.5 },
+ { "label": "K88 (F5,B4)", "x": 9.5, "y": 2.5 },
+ { "label": "K87 (F5,D7)", "x": 10.5, "y": 2.5 },
+ { "label": "K85 (F5,D4)", "x": 11.5, "y": 2.5 },
+ { "label": "K84 (F5,D5)", "x": 12.5, "y": 2.5 },
+ { "label": "K83 (F5,D3)", "x": 13.5, "y": 2.5, "w": 1.5 },
+ { "label": "K86 (F5,D6)", "x": 15.25, "y": 2.5 },
+ { "label": "K82 (F5,D2)", "x": 16.25, "y": 2.5 },
+ { "label": "K81 (F5,D1)", "x": 17.25, "y": 2.5 },
+ { "label": "K30 (B2,D0)", "x": 0, "y": 3.5, "w": 1.75 },
+ { "label": "K31 (B2,D1)", "x": 1.75, "y": 3.5 },
+ { "label": "K32 (B2,D2)", "x": 2.75, "y": 3.5 },
+ { "label": "K33 (B2,D3)", "x": 3.75, "y": 3.5 },
+ { "label": "K34 (B2,D5)", "x": 4.75, "y": 3.5 },
+ { "label": "K35 (B2,D4)", "x": 5.75, "y": 3.5 },
+ { "label": "K36 (B2,D6)", "x": 6.75, "y": 3.5 },
+ { "label": "K37 (B2,D7)", "x": 7.75, "y": 3.5 },
+ { "label": "K38 (B2,B4)", "x": 8.75, "y": 3.5 },
+ { "label": "K98 (F4,B4)", "x": 9.75, "y": 3.5 },
+ { "label": "K97 (F4,D7)", "x": 10.75, "y": 3.5 },
+ { "label": "K95 (F4,D4)", "x": 11.75, "y": 3.5 },
+ { "label": "K93 (F4,D3)", "x": 12.75, "y": 3.5, "w": 2.25 },
+ { "label": "K40 (B3,D0)", "x": 0, "y": 4.5, "w": 1.25 },
+ { "label": "K41 (B3,D1)", "x": 1.25, "y": 4.5 },
+ { "label": "K42 (B3,D2)", "x": 2.25, "y": 4.5 },
+ { "label": "K43 (B3,D3)", "x": 3.25, "y": 4.5 },
+ { "label": "K44 (B3,D5)", "x": 4.25, "y": 4.5 },
+ { "label": "K45 (B3,D4)", "x": 5.25, "y": 4.5 },
+ { "label": "K46 (B3,D6)", "x": 6.25, "y": 4.5 },
+ { "label": "K47 (B3,D7)", "x": 7.25, "y": 4.5 },
+ { "label": "K48 (B3,B4)", "x": 8.25, "y": 4.5 },
+ { "label": "KA8 (F1,B4)", "x": 9.25, "y": 4.5 },
+ { "label": "KA7 (F1,D7)", "x": 10.25, "y": 4.5 },
+ { "label": "KA5 (F1,D4)", "x": 11.25, "y": 4.5 },
+ { "label": "KA4 (F1,D5)", "x": 12.25, "y": 4.5, "w": 1.75 },
+ { "label": "KA3 (F1,D3)", "x": 14, "y": 4.5 },
+ { "label": "K92 (F4,D2)", "x": 16.25, "y": 4.5 },
+ { "label": "K50 (B7,D0)", "x": 0, "y": 5.5, "w": 1.25 },
+ { "label": "K51 (B7,D1)", "x": 1.25, "y": 5.5, "w": 1.25 },
+ { "label": "K52 (B7,D2)", "x": 2.5, "y": 5.5, "w": 1.25 },
+ { "label": "K56 (B7,D6)", "x": 3.75, "y": 5.5, "w": 6.25 },
+ { "label": "K58 (B7,B4)", "x": 10, "y": 5.5, "w": 1.25 },
+ { "label": "K57 (B7,D7)", "x": 11.25, "y": 5.5, "w": 1.25 },
+ { "label": "K54 (B7,D5)", "x": 12.5, "y": 5.5, "w": 1.25 },
+ { "label": "K53 (B7,D3)", "x": 13.75, "y": 5.5, "w": 1.25 },
+ { "label": "KA6 (F1,D6)", "x": 15.25, "y": 5.5 },
+ { "label": "KA2 (F1,D2)", "x": 16.25, "y": 5.5 },
+ { "label": "KA1 (F1,D1)", "x": 17.25, "y": 5.5 }
+ ]
+ },
+ "LAYOUT_tkl_ansi": {
+ "layout": [
+ { "label": "Esc", "x": 0, "y": 0 },
+ { "label": "F1", "x": 2, "y": 0 },
+ { "label": "F2", "x": 3, "y": 0 },
+ { "label": "F3", "x": 4, "y": 0 },
+ { "label": "F4", "x": 5, "y": 0 },
+ { "label": "F5", "x": 6.5, "y": 0 },
+ { "label": "F6", "x": 7.5, "y": 0 },
+ { "label": "F7", "x": 8.5, "y": 0 },
+ { "label": "F8", "x": 9.5, "y": 0 },
+ { "label": "F9", "x": 11, "y": 0 },
+ { "label": "F10", "x": 12, "y": 0 },
+ { "label": "F11", "x": 13, "y": 0 },
+ { "label": "F12", "x": 14, "y": 0 },
+ { "label": "Print Screen", "x": 15.25, "y": 0 },
+ { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+ { "label": "Pause", "x": 17.25, "y": 0 },
+ { "label": "`", "x": 0, "y": 1.25 },
+ { "label": "1", "x": 1, "y": 1.25 },
+ { "label": "2", "x": 2, "y": 1.25 },
+ { "label": "3", "x": 3, "y": 1.25 },
+ { "label": "4", "x": 4, "y": 1.25 },
+ { "label": "5", "x": 5, "y": 1.25 },
+ { "label": "6", "x": 6, "y": 1.25 },
+ { "label": "7", "x": 7, "y": 1.25 },
+ { "label": "8", "x": 8, "y": 1.25 },
+ { "label": "9", "x": 9, "y": 1.25 },
+ { "label": "0", "x": 10, "y": 1.25 },
+ { "label": "-", "x": 11, "y": 1.25 },
+ { "label": "=", "x": 12, "y": 1.25 },
+ { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+ { "label": "Insert", "x": 15.25, "y": 1.25 },
+ { "label": "Home", "x": 16.25, "y": 1.25 },
+ { "label": "PgUp", "x": 17.25, "y": 1.25 },
+ { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+ { "label": "Q", "x": 1.5, "y": 2.25 },
+ { "label": "W", "x": 2.5, "y": 2.25 },
+ { "label": "E", "x": 3.5, "y": 2.25 },
+ { "label": "R", "x": 4.5, "y": 2.25 },
+ { "label": "T", "x": 5.5, "y": 2.25 },
+ { "label": "Y", "x": 6.5, "y": 2.25 },
+ { "label": "U", "x": 7.5, "y": 2.25 },
+ { "label": "I", "x": 8.5, "y": 2.25 },
+ { "label": "O", "x": 9.5, "y": 2.25 },
+ { "label": "P", "x": 10.5, "y": 2.25 },
+ { "label": "[", "x": 11.5, "y": 2.25 },
+ { "label": "]", "x": 12.5, "y": 2.25 },
+ { "label": "\\", "x": 13.5, "y": 2.25, "w": 1.5 },
+ { "label": "Delete", "x": 15.25, "y": 2.25 },
+ { "label": "End", "x": 16.25, "y": 2.25 },
+ { "label": "PgDn", "x": 17.25, "y": 2.25 },
+ { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+ { "label": "A", "x": 1.75, "y": 3.25 },
+ { "label": "S", "x": 2.75, "y": 3.25 },
+ { "label": "D", "x": 3.75, "y": 3.25 },
+ { "label": "F", "x": 4.75, "y": 3.25 },
+ { "label": "G", "x": 5.75, "y": 3.25 },
+ { "label": "H", "x": 6.75, "y": 3.25 },
+ { "label": "J", "x": 7.75, "y": 3.25 },
+ { "label": "K", "x": 8.75, "y": 3.25 },
+ { "label": "L", "x": 9.75, "y": 3.25 },
+ { "label": ";", "x": 10.75, "y": 3.25 },
+ { "label": "'", "x": 11.75, "y": 3.25 },
+ { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+ { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+ { "label": "Z", "x": 2.25, "y": 4.25 },
+ { "label": "X", "x": 3.25, "y": 4.25 },
+ { "label": "C", "x": 4.25, "y": 4.25 },
+ { "label": "V", "x": 5.25, "y": 4.25 },
+ { "label": "B", "x": 6.25, "y": 4.25 },
+ { "label": "N", "x": 7.25, "y": 4.25 },
+ { "label": "M", "x": 8.25, "y": 4.25 },
+ { "label": ",", "x": 9.25, "y": 4.25 },
+ { "label": ".", "x": 10.25, "y": 4.25 },
+ { "label": "/", "x": 11.25, "y": 4.25 },
+ { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+ { "label": "Up", "x": 16.25, "y": 4.25 },
+ { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+ { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+ { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+ { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
+ { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
+ { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+ { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
+ { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
+ { "label": "Left", "x": 15.25, "y": 5.25 },
+ { "label": "Down", "x": 16.25, "y": 5.25 },
+ { "label": "Right", "x": 17.25, "y": 5.25 }
+ ]
+ },
+ "LAYOUT_tkl_iso": {
+ "layout": [
+ { "label": "Esc", "x": 0, "y": 0 },
+ { "label": "F1", "x": 2, "y": 0 },
+ { "label": "F2", "x": 3, "y": 0 },
+ { "label": "F3", "x": 4, "y": 0 },
+ { "label": "F4", "x": 5, "y": 0 },
+ { "label": "F5", "x": 6.5, "y": 0 },
+ { "label": "F6", "x": 7.5, "y": 0 },
+ { "label": "F7", "x": 8.5, "y": 0 },
+ { "label": "F8", "x": 9.5, "y": 0 },
+ { "label": "F9", "x": 11, "y": 0 },
+ { "label": "F10", "x": 12, "y": 0 },
+ { "label": "F11", "x": 13, "y": 0 },
+ { "label": "F12", "x": 14, "y": 0 },
+ { "label": "Print Screen", "x": 15.25, "y": 0 },
+ { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+ { "label": "Pause", "x": 17.25, "y": 0 },
+ { "label": "`", "x": 0, "y": 1.25 },
+ { "label": "1", "x": 1, "y": 1.25 },
+ { "label": "2", "x": 2, "y": 1.25 },
+ { "label": "3", "x": 3, "y": 1.25 },
+ { "label": "4", "x": 4, "y": 1.25 },
+ { "label": "5", "x": 5, "y": 1.25 },
+ { "label": "6", "x": 6, "y": 1.25 },
+ { "label": "7", "x": 7, "y": 1.25 },
+ { "label": "8", "x": 8, "y": 1.25 },
+ { "label": "9", "x": 9, "y": 1.25 },
+ { "label": "0", "x": 10, "y": 1.25 },
+ { "label": "-", "x": 11, "y": 1.25 },
+ { "label": "=", "x": 12, "y": 1.25 },
+ { "label": "Backspace", "x": 13, "y": 1.25, "w": 2 },
+ { "label": "Insert", "x": 15.25, "y": 1.25 },
+ { "label": "Home", "x": 16.25, "y": 1.25 },
+ { "label": "PgUp", "x": 17.25, "y": 1.25 },
+ { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+ { "label": "Q", "x": 1.5, "y": 2.25 },
+ { "label": "W", "x": 2.5, "y": 2.25 },
+ { "label": "E", "x": 3.5, "y": 2.25 },
+ { "label": "R", "x": 4.5, "y": 2.25 },
+ { "label": "T", "x": 5.5, "y": 2.25 },
+ { "label": "Y", "x": 6.5, "y": 2.25 },
+ { "label": "U", "x": 7.5, "y": 2.25 },
+ { "label": "I", "x": 8.5, "y": 2.25 },
+ { "label": "O", "x": 9.5, "y": 2.25 },
+ { "label": "P", "x": 10.5, "y": 2.25 },
+ { "label": "[", "x": 11.5, "y": 2.25 },
+ { "label": "]", "x": 12.5, "y": 2.25 },
+ { "label": "Delete", "x": 15.25, "y": 2.25 },
+ { "label": "End", "x": 16.25, "y": 2.25 },
+ { "label": "PgDn", "x": 17.25, "y": 2.25 },
+ { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+ { "label": "A", "x": 1.75, "y": 3.25 },
+ { "label": "S", "x": 2.75, "y": 3.25 },
+ { "label": "D", "x": 3.75, "y": 3.25 },
+ { "label": "F", "x": 4.75, "y": 3.25 },
+ { "label": "G", "x": 5.75, "y": 3.25 },
+ { "label": "H", "x": 6.75, "y": 3.25 },
+ { "label": "J", "x": 7.75, "y": 3.25 },
+ { "label": "K", "x": 8.75, "y": 3.25 },
+ { "label": "L", "x": 9.75, "y": 3.25 },
+ { "label": ";", "x": 10.75, "y": 3.25 },
+ { "label": "'", "x": 11.75, "y": 3.25 },
+ { "label": "#", "x": 12.75, "y": 3.25 },
+ { "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h": 2 },
+ { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
+ { "label": "\\", "x": 1.25, "y": 4.25 },
+ { "label": "Z", "x": 2.25, "y": 4.25 },
+ { "label": "X", "x": 3.25, "y": 4.25 },
+ { "label": "C", "x": 4.25, "y": 4.25 },
+ { "label": "V", "x": 5.25, "y": 4.25 },
+ { "label": "B", "x": 6.25, "y": 4.25 },
+ { "label": "N", "x": 7.25, "y": 4.25 },
+ { "label": "M", "x": 8.25, "y": 4.25 },
+ { "label": ",", "x": 9.25, "y": 4.25 },
+ { "label": ".", "x": 10.25, "y": 4.25 },
+ { "label": "/", "x": 11.25, "y": 4.25 },
+ { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
+ { "label": "Up", "x": 16.25, "y": 4.25 },
+ { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+ { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+ { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+ { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 },
+ { "label": "AltGr", "x": 10, "y": 5.25, "w": 1.25 },
+ { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+ { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
+ { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
+ { "label": "Left", "x": 15.25, "y": 5.25 },
+ { "label": "Down", "x": 16.25, "y": 5.25 },
+ { "label": "Right", "x": 17.25, "y": 5.25 }
+ ]
+ }
+ }
+}
diff --git a/keyboards/mt/ncr80/solder/keymaps/default/keymap.c b/keyboards/mt/ncr80/solder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..dd3e0e546d
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 Jordan Duabe
+ *
+ * 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_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_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_SPC, KC_BSPC, KC_INS, KC_HOME, 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_BSLS, KC_DEL, KC_END, 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_ENT,
+ KC_LSFT, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_SPC, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, BL_DEC, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_NUM, _______, _______, _______
+ ),
+
+};
diff --git a/keyboards/mt/ncr80/solder/keymaps/default_tkl_ansi/keymap.c b/keyboards/mt/ncr80/solder/keymaps/default_tkl_ansi/keymap.c
new file mode 100644
index 0000000000..f5604db5f4
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/keymaps/default_tkl_ansi/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 peepeetee
+ *
+ * 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_tkl_ansi(
+ 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_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_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_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_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ),
+
+};
diff --git a/keyboards/mt/ncr80/solder/keymaps/default_tkl_iso/keymap.c b/keyboards/mt/ncr80/solder/keymaps/default_tkl_iso/keymap.c
new file mode 100644
index 0000000000..b80c0f1d49
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/keymaps/default_tkl_iso/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2022 peepeetee
+ *
+ * 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_tkl_iso(
+ 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_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_END, 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,
+ 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_LGUI,KC_LALT, KC_SPC, KC_RALT,KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ),
+
+};
diff --git a/keyboards/mt/ncr80/solder/keymaps/via/keymap.c b/keyboards/mt/ncr80/solder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ab81a3e412
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2022 Jordan Duabe
+ *
+ * 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_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_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_SPC, KC_BSPC, KC_INS, KC_HOME, 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_BSLS, KC_DEL, KC_END, 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_ENT,
+ KC_LSFT, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_SPC, KC_UP,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+
+ [1] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, BL_DEC, BL_INC, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_NUM, _______, _______, _______
+ ),
+
+ [2] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+ [3] = LAYOUT_all(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+
+};
diff --git a/keyboards/mt/ncr80/solder/keymaps/via/rules.mk b/keyboards/mt/ncr80/solder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mt/ncr80/solder/readme.md b/keyboards/mt/ncr80/solder/readme.md
new file mode 100644
index 0000000000..9333c57ac1
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/readme.md
@@ -0,0 +1,29 @@
+# NCR-80
+
+
+
+> Re-imagination of the classic rebranded Cherry G81-3000 by NCR
+
+NCR-80 is an affordable keyboard kit inspired by iconic vintage keyboards.
+
+* Keyboard Maintainer: QMK Community
+* Hardware Supported: ATmega32U4
+* Hardware Availability: [AliExpress](https://www.aliexpress.com/item/1005003364462523.html) [Taobao 淘宝](https://item.taobao.com/item.htm?id=657482028672)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make ncr80/solder:default
+
+Flashing example for this keyboard:
+
+ make ncr80/solder:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
\ No newline at end of file
diff --git a/keyboards/mt/ncr80/solder/rules.mk b/keyboards/mt/ncr80/solder/rules.mk
new file mode 100644
index 0000000000..282578f0e0
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# 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 = yes # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mt/ncr80/solder/solder.c b/keyboards/mt/ncr80/solder/solder.c
new file mode 100644
index 0000000000..a9095bd2e5
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/solder.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 peepeetee
+*
+* 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 "solder.h"
diff --git a/keyboards/mt/ncr80/solder/solder.h b/keyboards/mt/ncr80/solder/solder.h
new file mode 100644
index 0000000000..2114b6031a
--- /dev/null
+++ b/keyboards/mt/ncr80/solder/solder.h
@@ -0,0 +1,84 @@
+/* Copyright 2022 Jordan Duabe
+ * Copyright 2022 peepeetee
+ *
+ * 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"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+ K00, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K74, K73, K76, K72, K71, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K94, K86, K82, K81, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K83, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, KA3, K92, \
+ K50, K51, K52, K56, K58, K57, K54, K53, KA6, KA2, KA1 \
+) { \
+ { K00, XXX, K02, K03, K04, K05, K06, K07, K08 }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
+ { K50, K51, K52, K53, K54, XXX, K56, K57, K58 }, \
+ { XXX, K61, K62, K63, K64, K65, K66, K67, K68 }, \
+ { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
+ { XXX, K81, K82, K83, K84, K85, K86, K87, K88 }, \
+ { XXX, XXX, K92, XXX, K94, K95, XXX, K97, K98 }, \
+ { XXX, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8 }, \
+}
+
+#define LAYOUT_tkl_iso( \
+ K00, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73, K76, K72, K71, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K86, K82, K81, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K94, K83, \
+ K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, K92, \
+ K50, K51, K52, K56, K58, K57, K54, K53, KA6, KA2, KA1 \
+) { \
+ { K00, XXX, K02, K03, K04, K05, K06, K07, K08 }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
+ { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
+ { K50, K51, K52, K53, K54, XXX, K56, K57, K58 }, \
+ { XXX, K61, K62, K63, K64, K65, K66, K67, K68 }, \
+ { K70, K71, K72, K73, XXX, K75, K76, K77, K78 }, \
+ { XXX, K81, K82, K83, K84, K85, K86, K87, K88 }, \
+ { XXX, XXX, K92, XXX, K94, K95, XXX, K97, K98 }, \
+ { XXX, KA1, KA2, XXX, KA4, KA5, KA6, KA7, KA8 }, \
+}
+
+#define LAYOUT_tkl_ansi( \
+ K00, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73, K76, K72, K71, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K94, K86, K82, K81, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K83, \
+ K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, K92, \
+ K50, K51, K52, K56, K58, K57, K54, K53, KA6, KA2, KA1 \
+) { \
+ { K00, XXX, K02, K03, K04, K05, K06, K07, K08 }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
+ { K40, XXX, K42, K43, K44, K45, K46, K47, K48 }, \
+ { K50, K51, K52, K53, K54, XXX, K56, K57, K58 }, \
+ { XXX, K61, K62, K63, K64, K65, K66, K67, K68 }, \
+ { K70, K71, K72, K73, XXX, K75, K76, K77, K78 }, \
+ { XXX, K81, K82, K83, K84, K85, K86, K87, K88 }, \
+ { XXX, XXX, K92, XXX, K94, K95, XXX, K97, K98 }, \
+ { XXX, KA1, KA2, XXX, KA4, KA5, KA6, KA7, KA8 }, \
+}
+