diff options
| -rw-r--r-- | keyboards/mf68/mf68.h | 4 | ||||
| -rw-r--r-- | keyboards/mf68/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/mf68_ble/mf68_ble.h | 4 | ||||
| -rw-r--r-- | layouts/community/68_ansi/layout.json | 5 | ||||
| -rw-r--r-- | layouts/community/68_ansi/mechmerlin/keymap.c | 18 | ||||
| -rw-r--r-- | layouts/community/68_ansi/mechmerlin/rules.mk | 1 | ||||
| -rw-r--r-- | layouts/community/68_ansi/readme.md | 5 | ||||
| -rw-r--r-- | layouts/default/65_ansi/default_65_ansi/keymap.c | 11 | ||||
| -rw-r--r-- | layouts/default/65_ansi/layout.json | 5 | ||||
| -rw-r--r-- | layouts/default/65_ansi/readme.md | 5 | ||||
| -rw-r--r-- | layouts/default/68_ansi/default_68_ansi/keymap.c | 8 | ||||
| -rw-r--r-- | layouts/default/68_ansi/layout.json | 10 | ||||
| -rw-r--r-- | layouts/default/68_ansi/readme.md | 4 |
13 files changed, 68 insertions, 14 deletions
diff --git a/keyboards/mf68/mf68.h b/keyboards/mf68/mf68.h index a7aefc647..a55c1d60b 100644 --- a/keyboards/mf68/mf68.h +++ b/keyboards/mf68/mf68.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #include "quantum.h" | 4 | #include "quantum.h" |
| 5 | 5 | ||
| 6 | #define LAYOUT( \ | 6 | #define LAYOUT_68_ansi( \ |
| 7 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \ | 7 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \ |
| 8 | K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, \ | 8 | K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, \ |
| 9 | K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \ | 9 | K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \ |
| @@ -26,7 +26,7 @@ | |||
| 26 | K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \ | 26 | K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \ |
| 27 | K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, \ | 27 | K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, \ |
| 28 | K64, K65, K66, K67, K68, K70, K71, K72, K73, K74 \ | 28 | K64, K65, K66, K67, K68, K70, K71, K72, K73, K74 \ |
| 29 | ) LAYOUT( \ | 29 | ) LAYOUT_68_ansi( \ |
| 30 | KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, \ | 30 | KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, \ |
| 31 | KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, \ | 31 | KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, \ |
| 32 | KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, \ | 32 | KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, \ |
diff --git a/keyboards/mf68/rules.mk b/keyboards/mf68/rules.mk index a535a9d0e..9f6445686 100644 --- a/keyboards/mf68/rules.mk +++ b/keyboards/mf68/rules.mk | |||
| @@ -64,3 +64,5 @@ MIDI_ENABLE ?= no # MIDI controls | |||
| 64 | UNICODE_ENABLE ?= no # Unicode | 64 | UNICODE_ENABLE ?= no # Unicode |
| 65 | BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID | 65 | BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 66 | AUDIO_ENABLE ?= no # Audio output on port C6 | 66 | AUDIO_ENABLE ?= no # Audio output on port C6 |
| 67 | |||
| 68 | LAYOUTS = 68_ansi \ No newline at end of file | ||
diff --git a/keyboards/mf68_ble/mf68_ble.h b/keyboards/mf68_ble/mf68_ble.h index fa17a9390..8ef14c98d 100644 --- a/keyboards/mf68_ble/mf68_ble.h +++ b/keyboards/mf68_ble/mf68_ble.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | #include "quantum.h" | 4 | #include "quantum.h" |
| 5 | 5 | ||
| 6 | #define LAYOUT( \ | 6 | #define LAYOUT_68_ansi( \ |
| 7 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \ | 7 | K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \ |
| 8 | K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, \ | 8 | K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, \ |
| 9 | K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \ | 9 | K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \ |
| @@ -26,7 +26,7 @@ | |||
| 26 | K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \ | 26 | K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \ |
| 27 | K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, \ | 27 | K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, \ |
| 28 | K64, K65, K66, K67, K68, K70, K71, K72, K73, K74 \ | 28 | K64, K65, K66, K67, K68, K70, K71, K72, K73, K74 \ |
| 29 | ) LAYOUT( \ | 29 | ) LAYOUT_68_ansi( \ |
| 30 | KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, \ | 30 | KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07, KC_##K08, \ |
| 31 | KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, \ | 31 | KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17, KC_##K18, \ |
| 32 | KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, \ | 32 | KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27, KC_##K28, \ |
diff --git a/layouts/community/68_ansi/layout.json b/layouts/community/68_ansi/layout.json new file mode 100644 index 000000000..f81ee0bcb --- /dev/null +++ b/layouts/community/68_ansi/layout.json | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | [{a:7},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"",""], | ||
| 2 | [{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"",""], | ||
| 3 | [{w:1.75},"","","","","","","","","","","","",{w:2.25},""], | ||
| 4 | [{w:2.25},"","","","","","","","","","","",{w:2.75},"",{x:0.25},""], | ||
| 5 | [{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},"",{x:0.5},"","",""] | ||
diff --git a/layouts/community/68_ansi/mechmerlin/keymap.c b/layouts/community/68_ansi/mechmerlin/keymap.c new file mode 100644 index 000000000..5059bd7d8 --- /dev/null +++ b/layouts/community/68_ansi/mechmerlin/keymap.c | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | #include "mechmerlin.h" | ||
| 3 | |||
| 4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 5 | [_BL] = LAYOUT_68_ansi(\ | ||
| 6 | KC_GESC, 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_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_CTCP, 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_LGUI, KC_LALT, KC_SPC, MO(_FL), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), | ||
| 11 | |||
| 12 | [_FL] = LAYOUT_68_ansi(\ | ||
| 13 | KC_GRV, 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_DEL, KC_TRNS, KC_TRNS, | ||
| 14 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 15 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 16 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, | ||
| 17 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), | ||
| 18 | }; \ No newline at end of file | ||
diff --git a/layouts/community/68_ansi/mechmerlin/rules.mk b/layouts/community/68_ansi/mechmerlin/rules.mk new file mode 100644 index 000000000..e2ce3d773 --- /dev/null +++ b/layouts/community/68_ansi/mechmerlin/rules.mk | |||
| @@ -0,0 +1 @@ | |||
| USER_NAME := mechmerlin \ No newline at end of file | |||
diff --git a/layouts/community/68_ansi/readme.md b/layouts/community/68_ansi/readme.md new file mode 100644 index 000000000..2180973de --- /dev/null +++ b/layouts/community/68_ansi/readme.md | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | # 68_ansi | ||
| 2 | |||
| 3 | LAYOUT_68_ansi | ||
| 4 | |||
| 5 | This is the 68 key ANSI layout made popular by boards such as the Magicforce 68 and Varmilo VA68M. \ No newline at end of file | ||
diff --git a/layouts/default/65_ansi/default_65_ansi/keymap.c b/layouts/default/65_ansi/default_65_ansi/keymap.c new file mode 100644 index 000000000..69fcccd63 --- /dev/null +++ b/layouts/default/65_ansi/default_65_ansi/keymap.c | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
| 4 | /* layer 0: qwerty */ | ||
| 5 | [0] = LAYOUT_65_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_HOME, | ||
| 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_PGUP, | ||
| 8 | 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_PGDN, | ||
| 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, KC_END, | ||
| 10 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT) | ||
| 11 | }; \ No newline at end of file | ||
diff --git a/layouts/default/65_ansi/layout.json b/layouts/default/65_ansi/layout.json new file mode 100644 index 000000000..0fa92b0f2 --- /dev/null +++ b/layouts/default/65_ansi/layout.json | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | ["","","","","","","","","","","","","",{w:2},"",""], | ||
| 2 | [{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",""], | ||
| 3 | [{w:1.75},"","","","","","","","","","","","",{w:2.25},"",""], | ||
| 4 | [{w:2.25},"","","","","","","","","","","",{w:1.75},"","",""], | ||
| 5 | [{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""] | ||
diff --git a/layouts/default/65_ansi/readme.md b/layouts/default/65_ansi/readme.md new file mode 100644 index 000000000..0cde8e727 --- /dev/null +++ b/layouts/default/65_ansi/readme.md | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | # 65_ansi | ||
| 2 | |||
| 3 | LAYOUT_65_ansi | ||
| 4 | |||
| 5 | This is the 65% ANSI layout made popular by boards such as the [Input Club Whitefox](https://github.com/qmk/qmk_firmware/tree/master/keyboards/whitefox) and [RAMA M65-A](https://github.com/qmk/qmk_firmware/tree/master/keyboards/jc65). \ No newline at end of file | ||
diff --git a/layouts/default/68_ansi/default_68_ansi/keymap.c b/layouts/default/68_ansi/default_68_ansi/keymap.c index 59b0ea47d..544f9c156 100644 --- a/layouts/default/68_ansi/default_68_ansi/keymap.c +++ b/layouts/default/68_ansi/default_68_ansi/keymap.c | |||
| @@ -3,9 +3,9 @@ | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | /* layer 0: qwerty */ | 4 | /* layer 0: qwerty */ |
| 5 | [0] = LAYOUT_68_ansi(\ | 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_HOME, | 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_INS, 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_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_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_PGDN, | 8 | 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, |
| 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, KC_END, | 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_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT) | 10 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT) |
| 11 | }; \ No newline at end of file | 11 | }; \ No newline at end of file |
diff --git a/layouts/default/68_ansi/layout.json b/layouts/default/68_ansi/layout.json index 0fa92b0f2..f81ee0bcb 100644 --- a/layouts/default/68_ansi/layout.json +++ b/layouts/default/68_ansi/layout.json | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ["","","","","","","","","","","","","",{w:2},"",""], | 1 | [{a:7},"","","","","","","","","","","","","",{w:2},"",{x:0.25},"",""], |
| 2 | [{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",""], | 2 | [{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",{x:0.25},"",""], |
| 3 | [{w:1.75},"","","","","","","","","","","","",{w:2.25},"",""], | 3 | [{w:1.75},"","","","","","","","","","","","",{w:2.25},""], |
| 4 | [{w:2.25},"","","","","","","","","","","",{w:1.75},"","",""], | 4 | [{w:2.25},"","","","","","","","","","","",{w:2.75},"",{x:0.25},""], |
| 5 | [{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""] | 5 | [{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"",{w:1.25},"",{w:1.25},"",{w:1.25},"",{x:0.5},"","",""] |
diff --git a/layouts/default/68_ansi/readme.md b/layouts/default/68_ansi/readme.md index eab8f312b..2180973de 100644 --- a/layouts/default/68_ansi/readme.md +++ b/layouts/default/68_ansi/readme.md | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | # 68_ansi | 1 | # 68_ansi |
| 2 | 2 | ||
| 3 | LAYOUT_68_ansi \ No newline at end of file | 3 | LAYOUT_68_ansi |
| 4 | |||
| 5 | This is the 68 key ANSI layout made popular by boards such as the Magicforce 68 and Varmilo VA68M. \ No newline at end of file | ||
