Unify 68keys with mf68 (#4435)

* Move 68keys keymap to mf68 folder

* Remove 68keys keyboard now its been migrated to mf68 keymap

* Migrate 68keys build config to mf68 keymap overrides

10 files changed, 35 insertions, 185 deletions

diff --git a/keyboards/40percentclub/mf68/keymaps/68keys/config.h b/keyboards/40percentclub/mf68/keymaps/68keys/config.h
new file mode 100644
index 0000000000..a0a576b7bf
--- /dev/null
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/config.h
@@ -0,0 +1,15 @@
+#pragma once
+
+/* USB Device descriptor parameter */
+#undef VENDOR_ID
+#undef PRODUCT_ID
+#undef DEVICE_VER
+#undef MANUFACTURER
+#undef PRODUCT
+#undef DESCRIPTION
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x0A0C
+#define DEVICE_VER 0x0068
+#define MANUFACTURER 68Keys.io
+#define PRODUCT The 68Keys.io Keyboard
+#define DESCRIPTION A 68 keys mechanical keyboard
diff --git a/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c b/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c
new file mode 100644
index 0000000000..3778ea21e7
--- /dev/null
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c
@@ -0,0 +1,11 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_68_ansi(
+    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_ESC, 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_PGDN,
+    KC_CAPSLOCK, 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_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  )
+};
diff --git a/keyboards/68keys/README.md b/keyboards/40percentclub/mf68/keymaps/68keys/readme.md
index 082a47a755..4b7cdf1259 100644
--- a/keyboards/68keys/README.md
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/readme.md
@@ -2,22 +2,22 @@
 
 Custom [68Keys.io](https://68keys.io) DIY keyboard.
 
-Keyboard Maintainer: [sbstjn](https://sbstjn.com)  
-Hardware Supported: Pro Micro  
+Keymap Maintainer: [sbstjn](https://sbstjn.com)
+Hardware Supported: mf68
 Hardware Availability: [DIY Guide](https://68keys.io)
 
 Make example for this keyboard (after setting up your build environment):
 
 ```bash
 $ > cd qmk_firmware/
-$ > make 68keys:default
+$ > make 40percentclub/mf68:68keys
 ```
 
 Example of flashing this keyboard:
 
 ```bash
 $ > cd qmk_firmware/
-$ > make 68keys:default:avrdude
+$ > make 40percentclub/mf68:68keys:avrdude
 ```
 
 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/40percentclub/mf68/keymaps/68keys/rules.mk b/keyboards/40percentclub/mf68/keymaps/68keys/rules.mk
new file mode 100644
index 0000000000..96ce13fe73
--- /dev/null
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/rules.mk
@@ -0,0 +1,5 @@
+BOOTLOADER = atmel-dfu
+
+EXTRAKEY_ENABLE = yes
+CONSOLE_ENABLE = no
+BACKLIGHT_ENABLE = no
diff --git a/keyboards/68keys/68keys.c b/keyboards/68keys/68keys.c
deleted file mode 100644
index dcf04e6a3d..0000000000
--- a/keyboards/68keys/68keys.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "68keys.h"
-
-void matrix_init_kb(void)
-{
-	matrix_init_user();
-}
diff --git a/keyboards/68keys/68keys.h b/keyboards/68keys/68keys.h
deleted file mode 100644
index e8a2c4aeed..0000000000
--- a/keyboards/68keys/68keys.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "quantum.h"
-
-#define LAYOUT_68_ansi(                                                             \
-    K00, K01, 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, K55, K56, K57, K58, K60, K61, K62, K63,                \
-    K64, K65, K66, K67, K68, K70, K71, K72, K73, K74)                               \
-    {                                                                               \
-        {K00, K01, 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, K55, K56, K57, K58},                          \
-            {K60, K61, K62, K63, K64, K65, K66, K67, K68},                          \
-        {                                                                           \
-            K70, K71, K72, K73, K74                                                 \
-        }                                                                           \
-    }
diff --git a/keyboards/68keys/config.h b/keyboards/68keys/config.h
deleted file mode 100644
index 07c87563d3..0000000000
--- a/keyboards/68keys/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0A0C
-#define DEVICE_VER 0x0068
-#define MANUFACTURER 68Keys.io
-#define PRODUCT The 68Keys.io Keyboard
-#define DESCRIPTION A 68 keys mechanical keyboard
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 9
-
-#define MATRIX_ROW_PINS                \
-    {                                  \
-        B6, B2, B3, B1, F7, F6, F5, F4 \
-    }
-#define MATRIX_COL_PINS                    \
-    {                                      \
-        D3, D2, D1, D0, D4, C6, D7, E6, B4 \
-    }
-#define UNUSED_PINS
-
-#define DIODE_DIRECTION COL2ROW
-
-#define BACKLIGHT_PIN B5
-#define BACKLIGHT_BREATHING
-#define BACKLIGHT_LEVELS 3
-
-#define DEBOUNCING_DELAY 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for magic key command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
diff --git a/keyboards/68keys/info.json b/keyboards/68keys/info.json
deleted file mode 100644
index b24e22b0a1..0000000000
--- a/keyboards/68keys/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  "keyboard_name": "68Keys.io",
-  "url": "https://68keys.io",
-  "maintainer": "qmk",
-  "width": 17.25,
-  "height": 5,
-  "layouts": {
-    "LAYOUT_68_ansi": {
-      "layout": [
-        { "label": "~", "x": 0, "y": 0 },
-        { "label": "!", "x": 1, "y": 0 },
-        { "label": "@", "x": 2, "y": 0 },
-        { "label": "#", "x": 3, "y": 0 },
-        { "label": "$", "x": 4, "y": 0 },
-        { "label": "%", "x": 5, "y": 0 },
-        { "label": "^", "x": 6, "y": 0 },
-        { "label": "&", "x": 7, "y": 0 },
-        { "label": "*", "x": 8, "y": 0 },
-        { "label": "(", "x": 9, "y": 0 },
-        { "label": ")", "x": 10, "y": 0 },
-        { "label": "_", "x": 11, "y": 0 },
-        { "label": "+", "x": 12, "y": 0 },
-        { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
-        { "label": "ESC", "x": 15.25, "y": 0 },
-        { "label": "PGUP", "x": 16.25, "y": 0 },
-        { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-        { "label": "Q", "x": 1.5, "y": 1 },
-        { "label": "W", "x": 2.5, "y": 1 },
-        { "label": "E", "x": 3.5, "y": 1 },
-        { "label": "R", "x": 4.5, "y": 1 },
-        { "label": "T", "x": 5.5, "y": 1 },
-        { "label": "Y", "x": 6.5, "y": 1 },
-        { "label": "U", "x": 7.5, "y": 1 },
-        { "label": "I", "x": 8.5, "y": 1 },
-        { "label": "O", "x": 9.5, "y": 1 },
-        { "label": "P", "x": 10.5, "y": 1 },
-        { "label": "{", "x": 11.5, "y": 1 },
-        { "label": "}", "x": 12.5, "y": 1 },
-        { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
-        { "label": "DEL", "x": 15.25, "y": 1 },
-        { "label": "PGDN", "x": 16.25, "y": 1 },
-        { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-        { "label": "A", "x": 1.75, "y": 2 },
-        { "label": "S", "x": 2.75, "y": 2 },
-        { "label": "D", "x": 3.75, "y": 2 },
-        { "label": "F", "x": 4.75, "y": 2 },
-        { "label": "G", "x": 5.75, "y": 2 },
-        { "label": "H", "x": 6.75, "y": 2 },
-        { "label": "J", "x": 7.75, "y": 2 },
-        { "label": "K", "x": 8.75, "y": 2 },
-        { "label": "L", "x": 9.75, "y": 2 },
-        { "label": ":", "x": 10.75, "y": 2 },
-        { "label": "\"", "x": 11.75, "y": 2 },
-        { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
-        { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
-        { "label": "Z", "x": 2.25, "y": 3 },
-        { "label": "X", "x": 3.25, "y": 3 },
-        { "label": "C", "x": 4.25, "y": 3 },
-        { "label": "V", "x": 5.25, "y": 3 },
-        { "label": "B", "x": 6.25, "y": 3 },
-        { "label": "N", "x": 7.25, "y": 3 },
-        { "label": "M", "x": 8.25, "y": 3 },
-        { "label": "<", "x": 9.25, "y": 3 },
-        { "label": ">", "x": 10.25, "y": 3 },
-        { "label": "?", "x": 11.25, "y": 3 },
-        { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
-        { "x": 15.25, "y": 3 },
-        { "label": "CTRL", "x": 0, "y": 4, "w": 1.25 },
-        { "label": "ALT", "x": 1.25, "y": 4, "w": 1.25 },
-        { "label": "GUI", "x": 2.5, "y": 4, "w": 1.25 },
-        { "x": 3.75, "y": 4, "w": 6.25 },
-        { "label": "GUI", "x": 10, "y": 4, "w": 1.25 },
-        { "label": "ALT", "x": 11.25, "y": 4, "w": 1.25 },
-        { "label": "CTRL", "x": 12.5, "y": 4, "w": 1.25 },
-        { "x": 14.25, "y": 4 },
-        { "x": 15.25, "y": 4 },
-        { "x": 16.25, "y": 4 }
-      ]
-    }
-  }
-}
diff --git a/keyboards/68keys/keymaps/default/keymap.c b/keyboards/68keys/keymaps/default/keymap.c
deleted file mode 100644
index 8f23d22462..0000000000
--- a/keyboards/68keys/keymaps/default/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "68keys.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_68_ansi(
-        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_ESC, 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_PGDN,
-        KC_CAPSLOCK, 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_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT)};
diff --git a/keyboards/68keys/rules.mk b/keyboards/68keys/rules.mk
deleted file mode 100644
index f1a56d496d..0000000000
--- a/keyboards/68keys/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LAYOUTS = 68_ansi
-
-MCU = atmega32u4
-F_CPU = 16000000
-ARCH = AVR8
-F_USB = $(F_CPU)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-BOOTLOADER = atmel-dfu
-
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration (+1000)
-MOUSEKEY_ENABLE = no        # Mouse keys (+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control (+450)
-CONSOLE_ENABLE = no         # Console for debug (+400)
-COMMAND_ENABLE = no         # Commands for debug and configuration
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NKRO_ENABLE = no            # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE = no            # MIDI controls
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-