aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzvecr <z.zvecr@gmail.com>2018-11-16 16:35:04 +0000
committerDrashna Jaelre <drashna@live.com>2018-11-16 08:35:04 -0800
commitb49f37dce97b1f84659146e7bbe4a55804407072 (patch)
treee61be740bd8ea5089768f3f8bb9cf2d77a437990
parent09813793bedd74c0bb109c6e87e3682bb864479a (diff)
downloadqmk_firmware-b49f37dce97b1f84659146e7bbe4a55804407072.tar.gz
qmk_firmware-b49f37dce97b1f84659146e7bbe4a55804407072.zip
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
Diffstat
-rw-r--r--keyboards/40percentclub/mf68/keymaps/68keys/config.h15
-rw-r--r--keyboards/40percentclub/mf68/keymaps/68keys/keymap.c11
-rw-r--r--keyboards/40percentclub/mf68/keymaps/68keys/readme.md (renamed from keyboards/68keys/README.md)8
-rw-r--r--keyboards/40percentclub/mf68/keymaps/68keys/rules.mk5
-rw-r--r--keyboards/68keys/68keys.c6
-rw-r--r--keyboards/68keys/68keys.h20
-rw-r--r--keyboards/68keys/config.h42
-rw-r--r--keyboards/68keys/info.json81
-rw-r--r--keyboards/68keys/keymaps/default/keymap.c10
-rw-r--r--keyboards/68keys/rules.mk22
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 000000000..a0a576b7b
--- /dev/null
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/config.h
@@ -0,0 +1,15 @@
1#pragma once
2
3/* USB Device descriptor parameter */
4#undef VENDOR_ID
5#undef PRODUCT_ID
6#undef DEVICE_VER
7#undef MANUFACTURER
8#undef PRODUCT
9#undef DESCRIPTION
10#define VENDOR_ID 0xFEED
11#define PRODUCT_ID 0x0A0C
12#define DEVICE_VER 0x0068
13#define MANUFACTURER 68Keys.io
14#define PRODUCT The 68Keys.io Keyboard
15#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 000000000..3778ea21e
--- /dev/null
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/keymap.c
@@ -0,0 +1,11 @@
1#include QMK_KEYBOARD_H
2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = LAYOUT_68_ansi(
5 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,
6 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,
7 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,
8 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,
9 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
10 )
11};
diff --git a/keyboards/68keys/README.md b/keyboards/40percentclub/mf68/keymaps/68keys/readme.md
index 082a47a75..4b7cdf125 100644
--- a/keyboards/68keys/README.md
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/readme.md
@@ -2,22 +2,22 @@
2 2
3Custom [68Keys.io](https://68keys.io) DIY keyboard. 3Custom [68Keys.io](https://68keys.io) DIY keyboard.
4 4
5Keyboard Maintainer: [sbstjn](https://sbstjn.com) 5Keymap Maintainer: [sbstjn](https://sbstjn.com)
6Hardware Supported: Pro Micro 6Hardware Supported: mf68
7Hardware Availability: [DIY Guide](https://68keys.io) 7Hardware Availability: [DIY Guide](https://68keys.io)
8 8
9Make example for this keyboard (after setting up your build environment): 9Make example for this keyboard (after setting up your build environment):
10 10
11```bash 11```bash
12$ > cd qmk_firmware/ 12$ > cd qmk_firmware/
13$ > make 68keys:default 13$ > make 40percentclub/mf68:68keys
14``` 14```
15 15
16Example of flashing this keyboard: 16Example of flashing this keyboard:
17 17
18```bash 18```bash
19$ > cd qmk_firmware/ 19$ > cd qmk_firmware/
20$ > make 68keys:default:avrdude 20$ > make 40percentclub/mf68:68keys:avrdude
21``` 21```
22 22
23See 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). 23See 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 000000000..96ce13fe7
--- /dev/null
+++ b/keyboards/40percentclub/mf68/keymaps/68keys/rules.mk
@@ -0,0 +1,5 @@
1BOOTLOADER = atmel-dfu
2
3EXTRAKEY_ENABLE = yes
4CONSOLE_ENABLE = no
5BACKLIGHT_ENABLE = no
diff --git a/keyboards/68keys/68keys.c b/keyboards/68keys/68keys.c
deleted file mode 100644
index dcf04e6a3..000000000
--- a/keyboards/68keys/68keys.c
+++ /dev/null
@@ -1,6 +0,0 @@
1#include "68keys.h"
2
3void matrix_init_kb(void)
4{
5 matrix_init_user();
6}
diff --git a/keyboards/68keys/68keys.h b/keyboards/68keys/68keys.h
deleted file mode 100644
index e8a2c4aee..000000000
--- a/keyboards/68keys/68keys.h
+++ /dev/null
@@ -1,20 +0,0 @@
1#include "quantum.h"
2
3#define LAYOUT_68_ansi( \
4 K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \
5 K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, \
6 K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \
7 K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, \
8 K64, K65, K66, K67, K68, K70, K71, K72, K73, K74) \
9 { \
10 {K00, K01, K02, K03, K04, K05, K06, K07, K08}, \
11 {K10, K11, K12, K13, K14, K15, K16, K17, K18}, \
12 {K20, K21, K22, K23, K24, K25, K26, K27, K28}, \
13 {K30, K31, K32, K33, K34, K35, K36, K37, K38}, \
14 {K40, K41, K42, K43, K44, K45, K46, K47, K48}, \
15 {K50, K51, K52, K53, K54, K55, K56, K57, K58}, \
16 {K60, K61, K62, K63, K64, K65, K66, K67, K68}, \
17 { \
18 K70, K71, K72, K73, K74 \
19 } \
20 }
diff --git a/keyboards/68keys/config.h b/keyboards/68keys/config.h
deleted file mode 100644
index 07c87563d..000000000
--- a/keyboards/68keys/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
1#pragma once
2
3#include "config_common.h"
4
5/* USB Device descriptor parameter */
6#define VENDOR_ID 0xFEED
7#define PRODUCT_ID 0x0A0C
8#define DEVICE_VER 0x0068
9#define MANUFACTURER 68Keys.io
10#define PRODUCT The 68Keys.io Keyboard
11#define DESCRIPTION A 68 keys mechanical keyboard
12
13/* key matrix size */
14#define MATRIX_ROWS 8
15#define MATRIX_COLS 9
16
17#define MATRIX_ROW_PINS \
18 { \
19 B6, B2, B3, B1, F7, F6, F5, F4 \
20 }
21#define MATRIX_COL_PINS \
22 { \
23 D3, D2, D1, D0, D4, C6, D7, E6, B4 \
24 }
25#define UNUSED_PINS
26
27#define DIODE_DIRECTION COL2ROW
28
29#define BACKLIGHT_PIN B5
30#define BACKLIGHT_BREATHING
31#define BACKLIGHT_LEVELS 3
32
33#define DEBOUNCING_DELAY 5
34
35/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
36#define LOCKING_SUPPORT_ENABLE
37/* Locking resynchronize hack */
38#define LOCKING_RESYNC_ENABLE
39
40/* key combination for magic key command */
41#define IS_COMMAND() ( \
42 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 b24e22b0a..000000000
--- a/keyboards/68keys/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
1{
2 "keyboard_name": "68Keys.io",
3 "url": "https://68keys.io",
4 "maintainer": "qmk",
5 "width": 17.25,
6 "height": 5,
7 "layouts": {
8 "LAYOUT_68_ansi": {
9 "layout": [
10 { "label": "~", "x": 0, "y": 0 },
11 { "label": "!", "x": 1, "y": 0 },
12 { "label": "@", "x": 2, "y": 0 },
13 { "label": "#", "x": 3, "y": 0 },
14 { "label": "$", "x": 4, "y": 0 },
15 { "label": "%", "x": 5, "y": 0 },
16 { "label": "^", "x": 6, "y": 0 },
17 { "label": "&", "x": 7, "y": 0 },
18 { "label": "*", "x": 8, "y": 0 },
19 { "label": "(", "x": 9, "y": 0 },
20 { "label": ")", "x": 10, "y": 0 },
21 { "label": "_", "x": 11, "y": 0 },
22 { "label": "+", "x": 12, "y": 0 },
23 { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
24 { "label": "ESC", "x": 15.25, "y": 0 },
25 { "label": "PGUP", "x": 16.25, "y": 0 },
26 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
27 { "label": "Q", "x": 1.5, "y": 1 },
28 { "label": "W", "x": 2.5, "y": 1 },
29 { "label": "E", "x": 3.5, "y": 1 },
30 { "label": "R", "x": 4.5, "y": 1 },
31 { "label": "T", "x": 5.5, "y": 1 },
32 { "label": "Y", "x": 6.5, "y": 1 },
33 { "label": "U", "x": 7.5, "y": 1 },
34 { "label": "I", "x": 8.5, "y": 1 },
35 { "label": "O", "x": 9.5, "y": 1 },
36 { "label": "P", "x": 10.5, "y": 1 },
37 { "label": "{", "x": 11.5, "y": 1 },
38 { "label": "}", "x": 12.5, "y": 1 },
39 { "label": "|", "x": 13.5, "y": 1, "w": 1.5 },
40 { "label": "DEL", "x": 15.25, "y": 1 },
41 { "label": "PGDN", "x": 16.25, "y": 1 },
42 { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
43 { "label": "A", "x": 1.75, "y": 2 },
44 { "label": "S", "x": 2.75, "y": 2 },
45 { "label": "D", "x": 3.75, "y": 2 },
46 { "label": "F", "x": 4.75, "y": 2 },
47 { "label": "G", "x": 5.75, "y": 2 },
48 { "label": "H", "x": 6.75, "y": 2 },
49 { "label": "J", "x": 7.75, "y": 2 },
50 { "label": "K", "x": 8.75, "y": 2 },
51 { "label": "L", "x": 9.75, "y": 2 },
52 { "label": ":", "x": 10.75, "y": 2 },
53 { "label": "\"", "x": 11.75, "y": 2 },
54 { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
55 { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
56 { "label": "Z", "x": 2.25, "y": 3 },
57 { "label": "X", "x": 3.25, "y": 3 },
58 { "label": "C", "x": 4.25, "y": 3 },
59 { "label": "V", "x": 5.25, "y": 3 },
60 { "label": "B", "x": 6.25, "y": 3 },
61 { "label": "N", "x": 7.25, "y": 3 },
62 { "label": "M", "x": 8.25, "y": 3 },
63 { "label": "<", "x": 9.25, "y": 3 },
64 { "label": ">", "x": 10.25, "y": 3 },
65 { "label": "?", "x": 11.25, "y": 3 },
66 { "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
67 { "x": 15.25, "y": 3 },
68 { "label": "CTRL", "x": 0, "y": 4, "w": 1.25 },
69 { "label": "ALT", "x": 1.25, "y": 4, "w": 1.25 },
70 { "label": "GUI", "x": 2.5, "y": 4, "w": 1.25 },
71 { "x": 3.75, "y": 4, "w": 6.25 },
72 { "label": "GUI", "x": 10, "y": 4, "w": 1.25 },
73 { "label": "ALT", "x": 11.25, "y": 4, "w": 1.25 },
74 { "label": "CTRL", "x": 12.5, "y": 4, "w": 1.25 },
75 { "x": 14.25, "y": 4 },
76 { "x": 15.25, "y": 4 },
77 { "x": 16.25, "y": 4 }
78 ]
79 }
80 }
81}
diff --git a/keyboards/68keys/keymaps/default/keymap.c b/keyboards/68keys/keymaps/default/keymap.c
deleted file mode 100644
index 8f23d2246..000000000
--- a/keyboards/68keys/keymaps/default/keymap.c
+++ /dev/null
@@ -1,10 +0,0 @@
1#include QMK_KEYBOARD_H
2#include "68keys.h"
3
4const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5 [0] = LAYOUT_68_ansi(
6 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,
7 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,
8 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,
9 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,
10 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 f1a56d496..000000000
--- a/keyboards/68keys/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
1LAYOUTS = 68_ansi
2
3MCU = atmega32u4
4F_CPU = 16000000
5ARCH = AVR8
6F_USB = $(F_CPU)
7OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
8BOOTLOADER = atmel-dfu
9
10BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration (+1000)
11MOUSEKEY_ENABLE = no # Mouse keys (+4700)
12EXTRAKEY_ENABLE = yes # Audio control and System control (+450)
13CONSOLE_ENABLE = no # Console for debug (+400)
14COMMAND_ENABLE = no # Commands for debug and configuration
15SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
16NKRO_ENABLE = no # USB Nkey Rollover
17BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality on B7 by default
18MIDI_ENABLE = no # MIDI controls
19UNICODE_ENABLE = no # Unicode
20BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
21AUDIO_ENABLE = no # Audio output on port C6
22
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-20 13:13:07 +0000